Merge pull request #376 from biolink/fix_click

Correct tests
biolink · Mar 9, 2022 · 72beeb8 · 72beeb8
2 parents 38a0682 + 4626786
commit 72beeb8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/kgx/sink/graph_sink.py b/kgx/sink/graph_sink.py
@@ -52,13 +52,12 @@ def write_edge(self, record: Dict) -> None:
             An edge record
 
         """
-        key = (
-            record["key"]
-            if "key" in record
-            else generate_edge_key(
-                record["subject"], record["predicate"], record["object"], record["id"]
+        if "key" in record:
+            key = (record["key"])
+        else:
+            key = generate_edge_key(
+                 record["subject"], record["predicate"], record["object"]
             )
-        )
         self.graph.add_edge(record["subject"], record["object"], key, **record)
 
     def finalize(self) -> None:

diff --git a/kgx/source/tsv_source.py b/kgx/source/tsv_source.py
@@ -282,7 +282,7 @@ def read_edge(self, edge: Dict) -> Optional[Tuple]:
 
         self.set_edge_provenance(edge_data)
 
-        key = generate_edge_key(s, edge_data["predicate"], o, edge_data["id"])
+        key = generate_edge_key(s, edge_data["predicate"], o)
         self.edge_properties.update(list(edge_data.keys()))
         if self.check_edge_filter(edge_data):
             self.node_properties.update(edge_data.keys())

diff --git a/kgx/utils/kgx_utils.py b/kgx/utils/kgx_utils.py
@@ -331,7 +331,7 @@ def get_toolkit(biolink_release: Optional[str] = None) -> Toolkit:
     return toolkit
 
 
-def generate_edge_key(s: str, edge_predicate: str, o: str, id: str="") -> str:
+def generate_edge_key(s: str, edge_predicate: str, o: str) -> str:
     """
     Generates an edge key based on a given subject, predicate, and object.
 
@@ -343,14 +343,16 @@ def generate_edge_key(s: str, edge_predicate: str, o: str, id: str="") -> str:
         Edge label
     o: str
         Object
+    id: str
+        Optional identifier that is used as the key if provided
 
     Returns
     -------
     str
         Edge key as a string
 
     """
-    return "{}-{}-{}{}".format(s, edge_predicate, o, id)
+    return "{}-{}-{}".format(s, edge_predicate, o)
 
 
 def get_curie_lookup_service():

diff --git a/tests/unit/test_sink/test_graph_sink.py b/tests/unit/test_sink/test_graph_sink.py
@@ -2,7 +2,7 @@
 from kgx.transformer import Transformer
 
 
-def test_write_graph():
+def test_write_graph_no_edge_identifier():
     """
     Write a graph via GraphSink.
     """