PyStellarDB 0.13.1__tar.gz → 0.13.3__tar.gz

{pystellardb-0.13.1 → pystellardb-0.13.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyStellarDB
-Version: 0.13.1
+Version: 0.13.3
 Summary: Python interface to StellarDB
 Home-page: https://github.com/WarpCloud/PyStellarDB
 Author: Zhiping Wang

{pystellardb-0.13.1 → pystellardb-0.13.3}/PyStellarDB.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyStellarDB
-Version: 0.13.1
+Version: 0.13.3
 Summary: Python interface to StellarDB
 Home-page: https://github.com/WarpCloud/PyStellarDB
 Author: Zhiping Wang

{pystellardb-0.13.1 → pystellardb-0.13.3}/pystellardb/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-08-20T10:49:46+0800",
+ "date": "2024-09-11T10:31:56+0800",
  "dirty": false,
  "error": null,
- "full-revisionid": "b83cfb5780b16466ce79235a756422bb00844b1b",
- "version": "0.13.1"
+ "full-revisionid": "7b244e0a10d56e002a7a10d9cf7fb5f7049c55b5",
+ "version": "0.13.3"
 }
 '''  # END VERSION_JSON
 

{pystellardb-0.13.1 → pystellardb-0.13.3}/pystellardb/graph_types.py

@@ -18,6 +18,7 @@ class GraphElement(with_metaclass(abc.ABCMeta, object)):
         self._label = label
         self._fields = {}
         self._tags = []
+        self._rowKeyHexString = None
 
     def getLabel(self):
         return self._label
@@ -40,6 +41,12 @@ class GraphElement(with_metaclass(abc.ABCMeta, object)):
     def setTags(self, newTags):
         self._tags = newTags
 
+    def setRowKeyHexString(self, rowkey):
+        self._rowKeyHexString = rowkey
+
+    def getRowKeyHexString(self):
+        return self._rowKeyHexString
+
 
 class Vertex(GraphElement):
     """
@@ -58,6 +65,7 @@ class Vertex(GraphElement):
             'type': 'vertex',
             'label': self._label,
             'uid': self._uid,
+            'RowKeyHexString': self._rowKeyHexString,
         }
 
         if self._tags is not None and len(self._tags) > 0:
@@ -98,6 +106,9 @@ class Vertex(GraphElement):
         if '__tags' in prop_dict:
             vertex.setTags(prop_dict['__tags'])
 
+        rk = " ".join(map(lambda x: str(x), m['entityKey']))
+        vertex.setRowKeyHexString(rk)
+
         return vertex
 
     @staticmethod
@@ -176,6 +187,7 @@ class Edge(GraphElement):
             'euid': self._uid,
             'startNode': self._startNode.toJSON(),
             'endNode': self._endNode.toJSON(),
+            'RowKeyHexString': self._rowKeyHexString,
         }
 
         if self._tags is not None and len(self._tags) > 0:
@@ -204,6 +216,9 @@ class Edge(GraphElement):
 
         edge = Edge(m['labels'][0])
 
+        rk = " ".join(map(lambda x: str(x), m['entityKey']))
+        edge.setRowKeyHexString(rk)
+
         prop_dict = m['properties']
 
         # parse start node
@@ -222,8 +237,10 @@ class Edge(GraphElement):
             raise ValueError(
                 'Could not find start node label with label index `{}`'.format(
                     startLabelIdx))
-
-        edge.setStartNode(Vertex(startUid, startLabel))
+        
+        start_node = Vertex(startUid, startLabel)
+        start_node.setRowKeyHexString(" ".join(map(lambda x: str(x), m['entityKey'][:8])))
+        edge.setStartNode(start_node)
 
         # parse end node
         if 'endKey' not in m:
@@ -242,7 +259,9 @@ class Edge(GraphElement):
                 'Could not find end node label with label index `{}`'.format(
                     endLabelIdx))
 
-        edge.setEndNode(Vertex(endUid, endLabel))
+        end_node = Vertex(endUid, endLabel)
+        end_node.setRowKeyHexString(" ".join(map(lambda x: str(x), m['entityKey'][8:16])))
+        edge.setEndNode(end_node)
 
         # parse extra edge id
         if '__uid' in prop_dict:

{pystellardb-0.13.1 → pystellardb-0.13.3}/pystellardb/stellar_hive.py

@@ -146,6 +146,7 @@ class StellarConnection(object):
         protocol_version = ttypes.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V6
 
         self._graph_schema = None
+        self._graph_schema_from_data = None
 
         try:
             self._transport.open()
@@ -171,6 +172,11 @@ class StellarConnection(object):
 
                     self._graph_schema = graph_types.GraphSchema.parseSchemaFromJson(
                         schemaInJson)
+                    
+                    # get schema from data
+                    cursor.execute('manipulate graph {} get_schema_from_data'.format(graph_name))
+                    self._graph_schema_from_data = cursor.fetchone()[0]
+                    self._graph_schema_from_data = json.loads(self._graph_schema_from_data)
             else:
                 assert response.serverProtocolVersion == protocol_version, \
                     "Unable to handle protocol version {}".format(response.serverProtocolVersion)
@@ -219,6 +225,25 @@ class StellarConnection(object):
     def getGraphSchema(self):
         return self._graph_schema
 
+    def getSchemaFromData(self) -> dict:
+        """
+        Get schema from graph data.
+        The difference of getGraphSchema() and getSchemaFromData() is the latter one will return start node labels and end node labels of edges.
+        Result format is:
+        {
+            "vertices": [
+                { "label": "label_a", "fields": ["prop1", "prop2", ...] }
+            ],
+            "edges": [
+                "label": "label_b",
+                "fields": ["prop3", "prop4", ...],
+                "src_dst_labels": [
+                    {"src": "label_x", "dst": "label_y"},
+                ]
+            ]
+        }
+        """
+        return self._graph_schema_from_data
 
 class StellarCursor(hive.Cursor):
     """These objects represent a database cursor, which is used to manage the context of a fetch