PyStellarDB 0.13.0__tar.gz → 0.13.2__tar.gz

{PyStellarDB-0.13.0 → pystellardb-0.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyStellarDB
-Version: 0.13.0
+Version: 0.13.2
 Summary: Python interface to StellarDB
 Home-page: https://github.com/WarpCloud/PyStellarDB
 Author: Zhiping Wang
@@ -11,12 +11,24 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Database :: Front-Ends
 Requires-Python: >=2.7
+License-File: LICENSE
+Requires-Dist: future
+Requires-Dist: python-dateutil
+Requires-Dist: pyhive
+Requires-Dist: sasl
+Requires-Dist: thrift
+Requires-Dist: thrift-sasl>=0.3.0
 Provides-Extra: presto
+Requires-Dist: requests>=1.0.0; extra == "presto"
 Provides-Extra: hive
+Requires-Dist: sasl>=0.2.1; extra == "hive"
+Requires-Dist: thrift>=0.10.0; extra == "hive"
 Provides-Extra: sqlalchemy
+Requires-Dist: sqlalchemy>=1.3.0; extra == "sqlalchemy"
 Provides-Extra: kerberos
+Requires-Dist: requests_kerberos>=0.12.0; extra == "kerberos"
 Provides-Extra: pyspark
-License-File: LICENSE
+Requires-Dist: pyspark>=2.4.0; extra == "pyspark"
 
 PyStellarDB
 ===========

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyStellarDB
-Version: 0.13.0
+Version: 0.13.2
 Summary: Python interface to StellarDB
 Home-page: https://github.com/WarpCloud/PyStellarDB
 Author: Zhiping Wang
@@ -11,12 +11,24 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Database :: Front-Ends
 Requires-Python: >=2.7
+License-File: LICENSE
+Requires-Dist: future
+Requires-Dist: python-dateutil
+Requires-Dist: pyhive
+Requires-Dist: sasl
+Requires-Dist: thrift
+Requires-Dist: thrift-sasl>=0.3.0
 Provides-Extra: presto
+Requires-Dist: requests>=1.0.0; extra == "presto"
 Provides-Extra: hive
+Requires-Dist: sasl>=0.2.1; extra == "hive"
+Requires-Dist: thrift>=0.10.0; extra == "hive"
 Provides-Extra: sqlalchemy
+Requires-Dist: sqlalchemy>=1.3.0; extra == "sqlalchemy"
 Provides-Extra: kerberos
+Requires-Dist: requests_kerberos>=0.12.0; extra == "kerberos"
 Provides-Extra: pyspark
-License-File: LICENSE
+Requires-Dist: pyspark>=2.4.0; extra == "pyspark"
 
 PyStellarDB
 ===========

{PyStellarDB-0.13.0 → pystellardb-0.13.2}/pystellardb/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-10-12T17:24:59+0800",
+ "date": "2024-09-05T19:42:39+0800",
  "dirty": false,
  "error": null,
- "full-revisionid": "dd89f07848abc550fb782d2225c956aef43d5235",
- "version": "0.13.0"
+ "full-revisionid": "9e31319f3dbef3dc053f379b94f099e358d589a5",
+ "version": "0.13.2"
 }
 '''  # END VERSION_JSON
 

{PyStellarDB-0.13.0 → pystellardb-0.13.2}/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:
@@ -69,7 +77,7 @@ class Vertex(GraphElement):
         return m
 
     def __str__(self):
-        return json.dumps(self.toJSON())
+        return json.dumps(self.toJSON(), ensure_ascii=False)
 
     @staticmethod
     def parseVertexFromJson(json_str):
@@ -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:
@@ -187,7 +199,7 @@ class Edge(GraphElement):
         return m
 
     def __str__(self):
-        return json.dumps(self.toJSON())
+        return json.dumps(self.toJSON(), ensure_ascii=False)
 
     @staticmethod
     def parseEdgeFromJson(schema, json_str):
@@ -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:
@@ -362,7 +381,7 @@ class GraphSchema(object):
         return m
 
     def __str__(self):
-        return json.dumps(self.toJSON())
+        return json.dumps(self.toJSON(), ensure_ascii=False)
 
     @staticmethod
     def parseSchemaFromJson(json_str):