Fix rel type setting to cypher call

Call properly the rel_id in kge notebook

Author: orazve

examples/kge-predict-transe-pyg-train.ipynb

@@ -307,16 +307,13 @@
    "outputs": [],
    "source": [
     "def create_data_from_graph(relationship_type):\n",
-    "    rels_tmp = gds.graph.relationshipProperties.stream(\n",
-    "        ttv_G, [\"rel_id\"], relationship_type, separate_property_columns=True\n",
-    "    )\n",
-    "    # print(rels_tmp)\n",
+    "    rels_tmp = gds.graph.relationshipProperty.stream(ttv_G, \"rel_id\", relationship_type)\n",
     "    topology = [\n",
     "        rels_tmp.sourceNodeId.map(lambda x: nodeId_to_id[x]),\n",
     "        rels_tmp.targetNodeId.map(lambda x: nodeId_to_id[x]),\n",
     "    ]\n",
     "    edge_index = torch.tensor(topology, dtype=torch.long)\n",
-    "    edge_type = torch.tensor(rels_tmp.rel_id.astype(int), dtype=torch.long)\n",
+    "    edge_type = torch.tensor(rels_tmp.propertyValue.astype(int), dtype=torch.long)\n",
     "    data = Data(edge_index=edge_index, edge_type=edge_type)\n",
     "    data.num_nodes = len(nodeId_to_id)\n",
     "    display(data)\n",

graphdatascience/graph/base_graph_proc_runner.py

@@ -15,12 +15,12 @@
 from ..server_version.compatible_with import compatible_with
 from ..server_version.server_version import ServerVersion
 from .graph_entity_ops_runner import (
-    GraphElementPropertyRunner,
     GraphLabelRunner,
     GraphNodePropertiesRunner,
     GraphNodePropertyRunner,
     GraphPropertyRunner,
     GraphRelationshipPropertiesRunner,
+    GraphRelationshipPropertyRunner,
     GraphRelationshipRunner,
     GraphRelationshipsRunner,
 )
@@ -390,9 +390,9 @@ def nodeProperties(self) -> GraphNodePropertiesRunner:
         return GraphNodePropertiesRunner(self._query_runner, self._namespace, self._server_version)
 
     @property
-    def relationshipProperty(self) -> GraphElementPropertyRunner:
+    def relationshipProperty(self) -> GraphRelationshipPropertyRunner:
         self._namespace += ".relationshipProperty"
-        return GraphElementPropertyRunner(self._query_runner, self._namespace, self._server_version)
+        return GraphRelationshipPropertyRunner(self._query_runner, self._namespace, self._server_version)
 
     @property
     def relationshipProperties(self) -> GraphRelationshipPropertiesRunner:

graphdatascience/graph/graph_entity_ops_runner.py

@@ -70,13 +70,6 @@ def _handle_properties(
         )
 
 
-class GraphElementPropertyRunner(GraphEntityOpsBaseRunner):
-    @compatible_with("stream", min_inclusive=ServerVersion(2, 2, 0))
-    def stream(self, G: Graph, node_properties: str, node_labels: Strings = ["*"], **config: Any) -> DataFrame:
-        self._namespace += ".stream"
-        return self._handle_properties(G, node_properties, node_labels, config)
-
-
 class GraphNodePropertyRunner(GraphEntityOpsBaseRunner):
     @compatible_with("stream", min_inclusive=ServerVersion(2, 2, 0))
     @filter_id_func_deprecation_warning()
@@ -197,6 +190,16 @@ def drop(self, G: Graph, node_properties: List[str], **config: Any) -> "Series[A
         ).squeeze()
 
 
+class GraphRelationshipPropertyRunner(GraphEntityOpsBaseRunner):
+    @compatible_with("stream", min_inclusive=ServerVersion(2, 2, 0))
+    def stream(
+        self, G: Graph, relationship_property: str, relationship_types: Strings = ["*"], **config: Any
+    ) -> DataFrame:
+        self._namespace += ".stream"
+        relationship_types = [relationship_types] if isinstance(relationship_types, str) else relationship_types
+        return self._handle_properties(G, relationship_property, relationship_types, config)
+
+
 class GraphRelationshipPropertiesRunner(GraphEntityOpsBaseRunner):
     @compatible_with("stream", min_inclusive=ServerVersion(2, 2, 0))
     def stream(

graphdatascience/session/aura_api_responses.py

@@ -164,6 +164,7 @@ def from_json(cls, json: Dict[str, Any]) -> TenantDetails:
 
 # datetime.fromisoformat only works with Python version > 3.9
 class TimeParser:
+
     @staticmethod
     def fromisoformat(date: str) -> datetime:
         if sys.version_info >= (3, 11):

graphdatascience/tests/unit/test_aura_api.py

@@ -53,6 +53,7 @@ def test_create_session(requests_mock: Mocker) -> None:
 
 
 def test_list_session(requests_mock: Mocker) -> None:
+
     api = AuraApi(client_id="", client_secret="", tenant_id="some-tenant")
 
     mock_auth_token(requests_mock)