PyStellarDB 0.13.2__tar.gz → 0.13.4__tar.gz

{pystellardb-0.13.2 → pystellardb-0.13.4}/PKG-INFO

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

{pystellardb-0.13.2 → pystellardb-0.13.4}/PyStellarDB.egg-info/PKG-INFO

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

{pystellardb-0.13.2 → pystellardb-0.13.4}/pystellardb/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-09-05T19:42:39+0800",
+ "date": "2024-10-30T09:30:52+0800",
  "dirty": false,
  "error": null,
- "full-revisionid": "9e31319f3dbef3dc053f379b94f099e358d589a5",
- "version": "0.13.2"
+ "full-revisionid": "88d8d41626e7131ffbf0e675bce34330a12fd953",
+ "version": "0.13.4"
 }
 '''  # END VERSION_JSON
 

{pystellardb-0.13.2 → pystellardb-0.13.4}/pystellardb/graph_types.py

@@ -8,6 +8,7 @@ from future.utils import with_metaclass
 import json
 import logging
 import binascii
+from typing import cast
 
 _logger = logging.getLogger(__name__)
 
@@ -46,6 +47,21 @@ class GraphElement(with_metaclass(abc.ABCMeta, object)):
 
     def getRowKeyHexString(self):
         return self._rowKeyHexString
+    
+    def __hash__(self):
+        if self._rowKeyHexString:
+            return hash(self._rowKeyHexString)
+        else:
+            return hash(self._fields)
+
+    def __eq__(self, value):
+        if isinstance(value, GraphElement):
+            if self._rowKeyHexString:
+                return self._rowKeyHexString == value._rowKeyHexString
+            else:
+                return self._fields == value._fields
+        else:
+            return False
 
 
 class Vertex(GraphElement):
@@ -292,6 +308,22 @@ class Path(object):
 
     def __str__(self):
         return str([str(entry) for entry in self._elems])
+    
+    def __hash__(self):
+        rks = []
+        for elem in self._elems:
+            rks.append(cast(GraphElement, elem).getRowKeyHexString())
+        
+        return hash(tuple(rks))
+
+    def __eq__(self, value):
+        if isinstance(value, Path):
+            if self.length() == value.length():
+                return self.getElements() == value.getElements()
+            else:
+                return False
+        else:
+            return False
 
     @staticmethod
     def parsePathFromJson(schema, json_str):

{pystellardb-0.13.2 → pystellardb-0.13.4}/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