gremlinpython 3.7.6__tar.gz → 3.8.1__tar.gz

{gremlinpython-3.7.6/gremlinpython.egg-info → gremlinpython-3.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gremlinpython
-Version: 3.7.6
+Version: 3.8.1
 Summary: Gremlin-Python for Apache TinkerPop
 Maintainer-email: Apache TinkerPop <dev@tinkerpop.apache.org>
 License: Apache 2
@@ -9,7 +9,7 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
@@ -23,7 +23,7 @@ Requires-Dist: kerberos<2.0.0,>=1.3.0; extra == "kerberos"
 Provides-Extra: ujson
 Requires-Dist: ujson>=2.0.0; extra == "ujson"
 Provides-Extra: test
-Requires-Dist: pytest<7.2.0,>=4.6.4; extra == "test"
+Requires-Dist: pytest<8.0.0,>=6.2.5; extra == "test"
 Requires-Dist: radish-bdd==0.18.2; extra == "test"
 Requires-Dist: lxml==5.3.0; extra == "test"
 Requires-Dist: PyHamcrest<3.0.0,>=1.9.0; extra == "test"

{gremlinpython-3.7.6 → gremlinpython-3.8.1}/gremlin_python/__init__.py

@@ -18,4 +18,4 @@
 #
 
 __author__ = 'Marko A. Rodriguez (http://markorodriguez.com)'
-__version__ = '3.7.6'
+__version__ = '3.8.1'

{gremlinpython-3.7.6 → gremlinpython-3.8.1}/gremlin_python/driver/useragent.py

@@ -18,7 +18,7 @@
 #
 import platform
 
-gremlin_version = "3.7.6"  # DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+gremlin_version = "3.8.1"  # DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
 
 def _generate_user_agent():
     application_name = "NotAvailable"

{gremlinpython-3.7.6 → gremlinpython-3.8.1}/gremlin_python/process/anonymous_traversal.py

@@ -36,25 +36,22 @@ class AnonymousTraversalSource(object):
     def traversal(cls, traversal_source_class=GraphTraversalSource):
         return AnonymousTraversalSource(traversal_source_class)
 
-    def withGraph(self, graph):
-        warnings.warn(
-            "gremlin_python.process.AnonymousTraversalSource.withGraph will be replaced by "
-            "gremlin_python.process.AnonymousTraversalSource.with_graph.",
-            DeprecationWarning)
-        return self.with_graph(graph)
-
-    def with_graph(self, graph):
-        return self.traversal_source_class(graph, TraversalStrategies.global_cache[graph.__class__])
+    def with_(self, remote_connection):
+        return self.traversal_source_class(Graph(), TraversalStrategies(), None, remote_connection)
 
     def withRemote(self, remote_connection):
         warnings.warn(
             "gremlin_python.process.AnonymousTraversalSource.withRemote will be replaced by "
-            "gremlin_python.process.AnonymousTraversalSource.with_remote.",
+            "gremlin_python.process.AnonymousTraversalSource.with_.",
             DeprecationWarning)
-        return self.with_remote(remote_connection)
+        return self.with_(remote_connection)
 
     def with_remote(self, remote_connection):
-        return self.with_graph(Graph()).with_remote(remote_connection)
+        warnings.warn(
+            "gremlin_python.process.AnonymousTraversalSource.with_remote will be replaced by "
+            "gremlin_python.process.AnonymousTraversalSource.with_.",
+            DeprecationWarning)
+        return self.with_(remote_connection)
 
 
 def traversal(traversal_source_class=GraphTraversalSource):

{gremlinpython-3.7.6 → gremlinpython-3.8.1}/gremlin_python/process/graph_traversal.py

@@ -35,7 +35,7 @@ __author__ = 'Stephen Mallette (http://stephen.genoprime.com), Lyndon Bauto (lyn
 
 
 class GraphTraversalSource(object):
-    def __init__(self, graph, traversal_strategies, bytecode=None):
+    def __init__(self, graph, traversal_strategies, bytecode=None, remote_connection=None):
         log.info("Creating GraphTraversalSource.")
         self.graph = graph
         self.traversal_strategies = traversal_strategies
@@ -43,7 +43,9 @@ class GraphTraversalSource(object):
             bytecode = Bytecode()
         self.bytecode = bytecode
         self.graph_traversal = GraphTraversal
-        self.remote_connection = None
+        if remote_connection:
+            self.traversal_strategies.add_strategies([RemoteStrategy(remote_connection)])
+        self.remote_connection = remote_connection
 
     def __repr__(self):
         return "graphtraversalsource[" + str(self.graph) + "]"
@@ -133,26 +135,13 @@ class GraphTraversalSource(object):
 
         val = True if v is None else v
         if options_strategy is None:
-            options_strategy = OptionsStrategy({k: val})
+            options_strategy = OptionsStrategy(**{k: val})
             source = self.with_strategies(options_strategy)
         else:
             options_strategy[1].configuration[k] = val
 
         return source
 
-    def withRemote(self, remote_connection):
-        warnings.warn(
-            "gremlin_python.process.GraphTraversalSource.withRemote will be replaced by "
-            "gremlin_python.process.GraphTraversalSource.with_remote.",
-            DeprecationWarning)
-        return self.with_remote(remote_connection)
-
-    def with_remote(self, remote_connection):
-        source = self.get_graph_traversal_source()
-        source.traversal_strategies.add_strategies([RemoteStrategy(remote_connection)])
-        self.remote_connection = remote_connection
-        return source
-
     def tx(self):
         # In order to keep the constructor unchanged within 3.5.x we can try to pop the RemoteConnection out of the
         # TraversalStrategies. keeping this unchanged will allow user DSLs to not take a break.
@@ -325,10 +314,18 @@ class GraphTraversal(Traversal):
         self.bytecode.add_step("as", *args)
         return self
 
+    def as_bool(self, *args):
+        self.bytecode.add_step("asBool", *args)
+        return self
+
     def as_date(self, *args):
         self.bytecode.add_step("asDate", *args)
         return self
 
+    def as_number(self, *args):
+        self.bytecode.add_step("asNumber", *args)
+        return self
+
     def as_string(self, *args):
         self.bytecode.add_step("asString", *args)
         return self
@@ -449,6 +446,10 @@ class GraphTraversal(Traversal):
         self.bytecode.add_step("difference", *args)
         return self
 
+    def discard(self, *args):
+        self.bytecode.add_step("discard", *args)
+        return self
+
     def disjunct(self, *args):
         self.bytecode.add_step("disjunct", *args)
         return self
@@ -555,6 +556,10 @@ class GraphTraversal(Traversal):
         self.bytecode.add_step("hasKey", *args)
         return self
 
+    def has_key(self, *args):
+        self.bytecode.add_step("hasKey", *args)
+        return self
+
     def hasLabel(self, *args):
         warnings.warn(
             "gremlin_python.process.GraphTraversalSource.hasLabel will be replaced by "
@@ -909,10 +914,6 @@ class GraphTraversal(Traversal):
         self.bytecode.add_step("split", *args)
         return self
 
-    def store(self, *args):
-        self.bytecode.add_step("store", *args)
-        return self
-
     def subgraph(self, *args):
         self.bytecode.add_step("subgraph", *args)
         return self
@@ -1102,10 +1103,18 @@ class __(object, metaclass=MagicType):
     def as_(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).as_(*args)
 
+    @classmethod
+    def as_bool(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).as_bool(*args)
+
     @classmethod
     def as_date(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).as_date(*args)
 
+    @classmethod
+    def as_number(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).as_number(*args)
+
     @classmethod
     def as_string(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).as_string(*args)
@@ -1214,6 +1223,10 @@ class __(object, metaclass=MagicType):
     def difference(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).difference(*args)
 
+    @classmethod
+    def discard(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).discard(*args)
+
     @classmethod
     def disjunct(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).disjunct(*args)
@@ -1441,7 +1454,7 @@ class __(object, metaclass=MagicType):
             "gremlin_python.process.__.l_trim.",
             DeprecationWarning)
         return cls.l_trim(*args)
-    
+
     @classmethod
     def l_trim(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).l_trim(*args)
@@ -1646,10 +1659,6 @@ class __(object, metaclass=MagicType):
     def split(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).split(*args)
 
-    @classmethod
-    def store(cls, *args):
-        return cls.graph_traversal(None, None, Bytecode()).store(*args)
-
     @classmethod
     def subgraph(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).subgraph(*args)
@@ -1882,10 +1891,18 @@ def as_(*args):
     return __.as_(*args)
 
 
+def as_bool(*args):
+    return __.as_bool(*args)
+
+
 def as_date(*args):
     return __.as_date(*args)
 
 
+def as_number(*args):
+    return __.as_number(*args)
+
+
 def as_string(*args):
     return __.as_string(*args)
 
@@ -1982,6 +1999,10 @@ def difference(*args):
     return __.difference(*args)
 
 
+def discard(*args):
+    return __.discard(*args)
+
+
 def disjunct(*args):
     return __.disjunct(*args)
 
@@ -2336,10 +2357,6 @@ def split(*args):
     return __.split(*args)
 
 
-def store(*args):
-    return __.store(*args)
-
-
 def subgraph(*args):
     return __.subgraph(*args)
 
@@ -2457,8 +2474,12 @@ statics.add_static('any_', any_)
 
 statics.add_static('as_', as_)
 
+statics.add_static('as_bool', as_bool)
+
 statics.add_static('as_date', as_date)
 
+statics.add_static('as_number', as_number)
+
 statics.add_static('as_string', as_string)
 
 statics.add_static('barrier', barrier)
@@ -2507,6 +2528,8 @@ statics.add_static('dedup', dedup)
 
 statics.add_static('difference', difference)
 
+statics.add_static('discard', discard)
+
 statics.add_static('disjunct', disjunct)
 
 statics.add_static('drop', drop)
@@ -2681,8 +2704,6 @@ statics.add_static('skip', skip)
 
 statics.add_static('split', split)
 
-statics.add_static('store', store)
-
 statics.add_static('subgraph', subgraph)
 
 statics.add_static('substring', substring)

{gremlinpython-3.7.6 → gremlinpython-3.8.1}/gremlin_python/process/strategies.py

@@ -19,7 +19,7 @@
 
 __author__ = 'Marko A. Rodriguez (http://markorodriguez.com)'
 
-from gremlin_python.process.traversal import TraversalStrategy
+from .traversal import TraversalStrategy
 
 base_namespace = 'org.apache.tinkerpop.gremlin.process.traversal.strategy.'
 decoration_namespace = base_namespace + 'decoration.'
@@ -41,6 +41,7 @@ class ConnectiveStrategy(TraversalStrategy):
 class ElementIdStrategy(TraversalStrategy):
     def __init__(self):
         TraversalStrategy.__init__(self, fqcn=decoration_namespace + 'ElementIdStrategy')
+        self.configuration = {}
 
 
 # EventStrategy doesn't make sense outside JVM traversal machine
@@ -53,7 +54,7 @@ class HaltedTraverserStrategy(TraversalStrategy):
 
 
 class OptionsStrategy(TraversalStrategy):
-    def __init__(self, options=None):
+    def __init__(self, **options):
         TraversalStrategy.__init__(self, configuration=options, fqcn=decoration_namespace + 'OptionsStrategy')
 
 
@@ -87,7 +88,7 @@ class SubgraphStrategy(TraversalStrategy):
         if vertex_properties is not None:
             self.configuration["vertexProperties"] = vertex_properties
         if check_adjacent_vertices is not None:
-            self.configuration["checkAdjacentProperties"] = check_adjacent_vertices
+            self.configuration["checkAdjacentVertices"] = check_adjacent_vertices
 
 
 class VertexProgramStrategy(TraversalStrategy):
@@ -109,6 +110,19 @@ class VertexProgramStrategy(TraversalStrategy):
         if configuration is not None:
             self.configuration.update(configuration)
 
+class ReferenceElementStrategy(TraversalStrategy):
+    def __init__(self, options=None):
+        TraversalStrategy.__init__(self, configuration=options, fqcn=decoration_namespace + 'ReferenceElementStrategy')
+
+
+class ComputerFinalizationStrategy(TraversalStrategy):
+    def __init__(self, options=None):
+        TraversalStrategy.__init__(self, configuration=options, fqcn=decoration_namespace + 'ComputerFinalizationStrategy')
+
+
+class ProfileStrategy(TraversalStrategy):
+    def __init__(self, options=None):
+        TraversalStrategy.__init__(self, configuration=options, fqcn=decoration_namespace + 'ProfileStrategy')
 
 ###########################
 # FINALIZATION STRATEGIES #
@@ -132,12 +146,12 @@ class AdjacentToIncidentStrategy(TraversalStrategy):
 
 class ByModulatorOptimizationStrategy(TraversalStrategy):
     def __init__(self):
-        TraversalStrategy.__init__(self, fqcn="org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy")
+        TraversalStrategy.__init__(self, fqcn=optimization_namespace + 'ByModulatorOptimizationStrategy')
 
 
 class CountStrategy(TraversalStrategy):
     def __init__(self):
-        TraversalStrategy.__init__(self, fqcn="org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.CountStrategy")
+        TraversalStrategy.__init__(self, fqcn=optimization_namespace + 'CountStrategy')
 
 
 class FilterRankingStrategy(TraversalStrategy):
@@ -210,10 +224,19 @@ class EarlyLimitStrategy(TraversalStrategy):
     def __init__(self):
         TraversalStrategy.__init__(self, fqcn=optimization_namespace + 'EarlyLimitStrategy')
 
+
+class MessagePassingReductionStrategy(TraversalStrategy):
+    def __init__(self, options=None):
+        TraversalStrategy.__init__(self, configuration=options, fqcn=optimization_namespace + 'MessagePassingReductionStrategy')
+
 ###########################
 # VERIFICATION STRATEGIES #
 ###########################
 
+class ComputerVerificationStrategy(TraversalStrategy):
+    def __init__(self, options=None):
+        TraversalStrategy.__init__(self, configuration=options, fqcn=verification_namespace + 'ComputerVerificationStrategy')
+
 
 class LambdaRestrictionStrategy(TraversalStrategy):
     def __init__(self):
@@ -237,3 +260,13 @@ class ReservedKeysVerificationStrategy(TraversalStrategy):
         self.configuration["logWarning"] = log_warning
         self.configuration["throwException"] = throw_exception
         self.configuration["keys"] = keys
+
+
+class VertexProgramRestrictionStrategy(TraversalStrategy):
+    def __init__(self):
+        TraversalStrategy.__init__(self, fqcn=verification_namespace + 'VertexProgramRestrictionStrategy')
+
+
+class StandardVerificationStrategy(TraversalStrategy):
+    def __init__(self):
+        TraversalStrategy.__init__(self, fqcn=verification_namespace + 'StandardVerificationStrategy')

{gremlinpython-3.7.6 → gremlinpython-3.8.1}/gremlin_python/process/traversal.py

@@ -75,7 +75,7 @@ class Traversal(object):
         return set(iter(self))
 
     def iterate(self):
-        self.bytecode.add_step("none")
+        self.bytecode.add_step("discard")
         while True:
             try: self.next_traverser()
             except StopIteration: return self
@@ -214,10 +214,11 @@ statics.add_static('shuffle', Order.shuffle)
 statics.add_static('asc', Order.asc)
 statics.add_static('desc', Order.desc)
 
-Pick = Enum('Pick', ' any_ none')
+Pick = Enum('Pick', ' any_ none unproductive')
 
 statics.add_static('any_', Pick.any_)
 statics.add_static('none', Pick.none)
+statics.add_static('unproductive', Pick.unproductive)
 
 Pop = Enum('Pop', ' all_ first last mixed')
 
@@ -258,6 +259,37 @@ statics.add_static('add_all', Operator.add_all)
 statics.add_static('sum_long', Operator.sum_long)
 
 
+GType = Enum('GType', ' BIGDECIMAL BIGINT BINARY BOOLEAN BYTE CHAR DATETIME DOUBLE DURATION EDGE FLOAT GRAPH INT LIST LONG MAP NULL NUMBER PATH PROPERTY SET SHORT STRING TREE UUID VERTEX VPROPERTY')
+
+statics.add_static('BIGDECIMAL', GType.BIGDECIMAL)
+statics.add_static('BIGINT', GType.BIGINT)
+statics.add_static('BINARY', GType.BINARY)
+statics.add_static('BOOLEAN', GType.BOOLEAN)
+statics.add_static('BYTE', GType.BYTE)
+statics.add_static('CHAR', GType.CHAR)
+statics.add_static('DATETIME', GType.DATETIME)
+statics.add_static('DOUBLE', GType.DOUBLE)
+statics.add_static('DURATION', GType.DURATION)
+statics.add_static('EDGE', GType.EDGE)
+statics.add_static('FLOAT', GType.FLOAT)
+statics.add_static('GRAPH', GType.GRAPH)
+statics.add_static('INT', GType.INT)
+statics.add_static('LIST', GType.LIST)
+statics.add_static('LONG', GType.LONG)
+statics.add_static('MAP', GType.MAP)
+statics.add_static('NULL', GType.NULL)
+statics.add_static('NUMBER', GType.NUMBER)
+statics.add_static('PATH', GType.PATH)
+statics.add_static('PROPERTY', GType.PROPERTY)
+statics.add_static('SET', GType.SET)
+statics.add_static('SHORT', GType.SHORT)
+statics.add_static('STRING', GType.STRING)
+statics.add_static('TREE', GType.TREE)
+statics.add_static('UUID', GType.UUID)
+statics.add_static('VERTEX', GType.VERTEX)
+statics.add_static('VPROPERTY', GType.VPROPERTY)
+
+
 class P(object):
     def __init__(self, operator, value, other=None):
         self.operator = operator
@@ -308,6 +340,10 @@ class P(object):
     def test(*args):
         return P("test", *args)
 
+    @staticmethod
+    def type_of(*args):
+        return P("typeOf", *args)
+
     @staticmethod
     def within(*args):
         if len(args) == 1 and type(args[0]) == list:
@@ -387,6 +423,10 @@ def without(*args):
     return P.without(*args)
 
 
+def type_of(*args):
+    return P.type_of(*args)
+
+
 statics.add_static('between', between)
 
 statics.add_static('eq', eq)
@@ -411,6 +451,8 @@ statics.add_static('within', within)
 
 statics.add_static('without', without)
 
+statics.add_static('typeOf', type_of)
+
 
 class TextP(P):
     def __init__(self, operator, value, other=None):
@@ -688,7 +730,6 @@ TRAVERSAL STRATEGIES
 
 
 class TraversalStrategies(object):
-    global_cache = {}
 
     def __init__(self, traversal_strategies=None):
         self.traversal_strategies = traversal_strategies.traversal_strategies if traversal_strategies is not None else []

{gremlinpython-3.7.6 → gremlinpython-3.8.1}/gremlin_python/statics.py

@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-
+import decimal
 from types import FunctionType
 from aenum import Enum
 
@@ -84,10 +84,48 @@ class GremlinType(object):
 
 
 class BigDecimal(object):
+    """
+    Provides a way to represent a BigDecimal for Gremlin.
+    """
     def __init__(self, scale, unscaled_value):
         self.scale = scale
         self.unscaled_value = unscaled_value
 
+    @property
+    def value(self):
+        self._as_decimal = decimal.Decimal(self.unscaled_value)
+        precision = len(self._as_decimal.as_tuple().digits)
+        with decimal.localcontext(decimal.Context(prec=precision)):
+            return self._as_decimal.scaleb(-self.scale)
+
+    def __eq__(self, other):
+        if not isinstance(other, BigDecimal):
+            return False
+        return self.scale == other.scale and self.unscaled_value == other.unscaled_value
+
+    def __hash__(self):
+        return hash((self.scale, self.unscaled_value))
+
+    def __repr__(self):
+        return f"BigDecimal(scale={self.scale}, unscaled_value={self.unscaled_value})"
+
+    def __str__(self):
+        return str(self.value)
+
+"""
+Create a BigDecimal from a number that can be converted to a Decimal. Note precision may be lost during the conversion.
+"""
+def bigdecimal(value):
+    try:
+        decimal_value = value if isinstance(value, decimal.Decimal) else decimal.Decimal(str(value))
+        scale = -decimal_value.as_tuple().exponent
+        unscaled_value = int("".join(map(str, decimal_value.as_tuple().digits)))
+    except TypeError:
+        raise ValueError("BigDecimal does not support NaN, Infinity or -Infinity")
+    except Exception as err:
+        raise ValueError(f'Encountered error: {err}. Value must be able to convert to a Decimal.')
+    return BigDecimal(scale, unscaled_value if decimal_value >= 0 else -unscaled_value)
+
 
 staticMethods = {}
 staticEnums = {}

{gremlinpython-3.7.6 → gremlinpython-3.8.1}/gremlin_python/structure/graph.py

@@ -25,18 +25,6 @@ import warnings
 
 
 class Graph(object):
-    def __init__(self):
-        if self.__class__ not in TraversalStrategies.global_cache:
-            TraversalStrategies.global_cache[self.__class__] = TraversalStrategies()
-
-    def traversal(self, traversal_source_class=None):
-        warnings.warn(
-            "As of release 3.3.5, replaced by the gremlin_python.process.anonymous_traversal.traversal() function.",
-            DeprecationWarning)
-
-        if not traversal_source_class:
-            traversal_source_class = GraphTraversalSource
-        return traversal_source_class(self, TraversalStrategies.global_cache[self.__class__])
 
     def __repr__(self):
         return "graph[]"
@@ -46,7 +34,7 @@ class Element(object):
     def __init__(self, id, label, properties=None):
         self.id = id
         self.label = label
-        self.properties = properties
+        self.properties = [] if properties is None else properties
 
     def __eq__(self, other):
         return isinstance(other, self.__class__) and self.id == other.id

{gremlinpython-3.7.6 → gremlinpython-3.8.1}/gremlin_python/structure/io/graphbinaryV1.py

@@ -33,8 +33,8 @@ from gremlin_python import statics
 from gremlin_python.statics import FloatType, BigDecimal, FunctionType, ShortType, IntType, LongType, BigIntType, \
                                    TypeType, DictType, ListType, SetType, SingleByte, ByteBufferType, GremlinType, \
                                    SingleChar
-from gremlin_python.process.traversal import Barrier, Binding, Bytecode, Cardinality, Column, Direction, DT, Merge, \
-                                             Operator, Order, Pick, Pop, P, Scope, TextP, Traversal, Traverser, \
+from gremlin_python.process.traversal import Barrier, Binding, Bytecode, Cardinality, Column, Direction, DT, GType, \
+                                             Merge,Operator, Order, Pick, Pop, P, Scope, TextP, Traversal, Traverser, \
                                              TraversalStrategy, T
 from gremlin_python.process.graph_traversal import GraphTraversal
 from gremlin_python.structure.graph import Graph, Edge, Property, Vertex, VertexProperty, Path
@@ -98,6 +98,7 @@ class DataType(Enum):
     traversalmetrics = 0x2d
     merge = 0x2e
     dt = 0x2f
+    gtype = 0x30
     char = 0x80
     duration = 0x81
     inetaddress = 0x82            # todo
@@ -106,7 +107,7 @@ class DataType(Enum):
     localdatetime = 0x85          # todo
     localtime = 0x86              # todo
     monthday = 0x87               # todo
-    offsetdatetime = 0x88         # todo
+    offsetdatetime = 0x88
     offsettime = 0x89             # todo
     period = 0x8a                 # todo
     year = 0x8b                   # todo
@@ -343,6 +344,44 @@ class DateIO(_GraphBinaryTypeIO):
                            nullable)
 
 
+class OffsetDateTimeIO(_GraphBinaryTypeIO):
+
+    python_type = datetime.datetime
+    graphbinary_type = DataType.offsetdatetime
+
+    @classmethod
+    def dictify(cls, obj, writer, to_extend, as_value=False, nullable=True):
+        if obj.tzinfo is None:
+            return DateIO.dictify(obj, writer, to_extend, as_value, nullable)
+        cls.prefix_bytes(cls.graphbinary_type, as_value, nullable, to_extend)
+        IntIO.dictify(obj.year, writer, to_extend, True, False)
+        ByteIO.dictify(obj.month, writer, to_extend, True, False)
+        ByteIO.dictify(obj.day, writer, to_extend, True, False)
+        # construct time of day in nanoseconds
+        h = obj.time().hour
+        m = obj.time().minute
+        s = obj.time().second
+        ms = obj.time().microsecond
+        ns = round((h*60*60*1e9) + (m*60*1e9) + (s*1e9) + (ms*1e3))
+        LongIO.dictify(ns, writer, to_extend, True, False)
+        os = round(obj.utcoffset().total_seconds())
+        IntIO.dictify(os, writer, to_extend, True, False)
+        return to_extend
+
+    @classmethod
+    def objectify(cls, buff, reader, nullable=True):
+        return cls.is_null(buff, reader, cls._read_dt, nullable)
+
+    @classmethod
+    def _read_dt(cls, b, r):
+        year = r.to_object(b, DataType.int, False)
+        month = r.to_object(b, DataType.byte, False)
+        day = r.to_object(b, DataType.byte, False)
+        ns = r.to_object(b, DataType.long, False)
+        offset = r.to_object(b, DataType.int, False)
+        tz = datetime.timezone(timedelta(seconds=offset))
+        return datetime.datetime(year, month, day, tzinfo=tz) + timedelta(microseconds=ns/1000)
+
 # Based on current implementation, this class must always be declared before FloatIO.
 # Seems pretty fragile for future maintainers. Maybe look into this.
 class TimestampIO(_GraphBinaryTypeIO):
@@ -955,6 +994,11 @@ class TIO(_EnumIO):
     python_type = T
 
 
+class GTYPEIO(_EnumIO):
+    graphbinary_type = DataType.gtype
+    python_type = GType
+
+
 class TraverserIO(_GraphBinaryTypeIO):
     graphbinary_type = DataType.traverser
     python_type = Traverser

{gremlinpython-3.7.6 → gremlinpython-3.8.1}/gremlin_python/structure/io/graphsonV2d0.py

@@ -30,7 +30,8 @@ from aenum import Enum
 from isodate import parse_duration, duration_isoformat
 
 from gremlin_python import statics
-from gremlin_python.statics import FloatType, FunctionType, ShortType, IntType, LongType, TypeType, SingleByte, ByteBufferType, SingleChar
+from gremlin_python.statics import FloatType, FunctionType, ShortType, IntType, LongType, TypeType, SingleByte, \
+    ByteBufferType, SingleChar, BigDecimal, bigdecimal
 from gremlin_python.process.traversal import Binding, Bytecode, P, TextP, Traversal, Traverser, TraversalStrategy
 from gremlin_python.structure.graph import Edge, Property, Vertex, VertexProperty, Path
 from gremlin_python.structure.io.util import SymbolUtil
@@ -236,7 +237,12 @@ class TraversalStrategySerializer(_GraphSONTypeIO):
 
     @classmethod
     def dictify(cls, strategy, writer):
-        return GraphSONUtil.typed_value(strategy.strategy_name, writer.to_dict(strategy.configuration))
+        strat_dict = {}
+        strat_dict["fqcn"] = strategy.fqcn
+        strat_dict["conf"] = {}
+        for key in strategy.configuration:
+            strat_dict["conf"][key] = writer.to_dict(strategy.configuration[key])
+        return GraphSONUtil.typed_value(strategy.strategy_name, strat_dict)
 
 
 class TraverserIO(_GraphSONTypeIO):
@@ -339,7 +345,6 @@ class UUIDIO(_GraphSONTypeIO):
 
 
 class DateIO(_GraphSONTypeIO):
-    python_type = datetime.datetime
     graphson_type = "g:Date"
     graphson_base_type = "Date"
 
@@ -360,6 +365,24 @@ class DateIO(_GraphSONTypeIO):
         return datetime.datetime.utcfromtimestamp(ts / 1000.0)
 
 
+    class OffsetDateTimeIO(_GraphSONTypeIO):
+        python_type = datetime.datetime
+        graphson_type = "gx:OffsetDateTime"
+        graphson_base_type = "OffsetDateTime"
+
+        @classmethod
+        def dictify(cls, obj, writer):
+            if obj.tzinfo is None:
+                return DateIO.dictify(obj, writer)
+            return GraphSONUtil.typed_value(cls.graphson_base_type, obj.isoformat(), "gx")
+
+        @classmethod
+        def objectify(cls, dt, reader):
+            # specially handling as python isoformat does not support zulu until 3.11
+            dt_iso = dt[:-1] + '+00:00' if dt.endswith('Z') else dt
+            return datetime.datetime.fromisoformat(dt_iso)
+
+
 # Based on current implementation, this class must always be declared before FloatIO.
 # Seems pretty fragile for future maintainers. Maybe look into this.
 class TimestampIO(_GraphSONTypeIO):
@@ -425,34 +448,17 @@ class FloatIO(_NumberIO):
 
 
 class BigDecimalIO(_NumberIO):
-    python_type = Decimal
+    python_type = BigDecimal
     graphson_type = "gx:BigDecimal"
     graphson_base_type = "BigDecimal"
 
     @classmethod
     def dictify(cls, n, writer):
-        if isinstance(n, bool):  # because isinstance(False, int) and isinstance(True, int)
-            return n
-        elif math.isnan(n):
-            return GraphSONUtil.typed_value(cls.graphson_base_type, "NaN", "gx")
-        elif math.isinf(n) and n > 0:
-            return GraphSONUtil.typed_value(cls.graphson_base_type, "Infinity", "gx")
-        elif math.isinf(n) and n < 0:
-            return GraphSONUtil.typed_value(cls.graphson_base_type, "-Infinity", "gx")
-        else:
-            return GraphSONUtil.typed_value(cls.graphson_base_type, str(n), "gx")
+        return GraphSONUtil.typed_value(cls.graphson_base_type, str(n.value), "gx")
 
     @classmethod
     def objectify(cls, v, _):
-        if isinstance(v, str):
-            if v == 'NaN':
-                return Decimal('nan')
-            elif v == "Infinity":
-                return Decimal('inf')
-            elif v == "-Infinity":
-                return Decimal('-inf')
-
-        return Decimal(v)
+        return bigdecimal(v)
 
 
 class DoubleIO(FloatIO):
@@ -585,7 +591,7 @@ class VertexDeserializer(_GraphSONTypeIO):
 
     @classmethod
     def objectify(cls, d, reader):
-        properties = None
+        properties = []
         if "properties" in d:
             properties = reader.to_object(d["properties"])
             if properties is not None:
@@ -598,7 +604,7 @@ class EdgeDeserializer(_GraphSONTypeIO):
 
     @classmethod
     def objectify(cls, d, reader):
-        properties = None
+        properties = []
         if "properties" in d:
             properties = reader.to_object(d["properties"])
             if properties is not None:
@@ -615,7 +621,7 @@ class VertexPropertyDeserializer(_GraphSONTypeIO):
 
     @classmethod
     def objectify(cls, d, reader):
-        properties = None
+        properties = []
         if "properties" in d:
             properties = reader.to_object(d["properties"])
             if properties is not None:

{gremlinpython-3.7.6 → gremlinpython-3.8.1}/gremlin_python/structure/io/graphsonV3d0.py

@@ -29,7 +29,8 @@ from aenum import Enum
 from isodate import parse_duration, duration_isoformat
 
 from gremlin_python import statics
-from gremlin_python.statics import FloatType, FunctionType, ShortType, IntType, LongType, TypeType, DictType, ListType, SetType, SingleByte, ByteBufferType, SingleChar
+from gremlin_python.statics import FloatType, FunctionType, ShortType, IntType, LongType, TypeType, DictType, ListType, \
+    SetType, SingleByte, ByteBufferType, SingleChar, BigDecimal, bigdecimal
 from gremlin_python.process.traversal import Binding, Bytecode, Direction, P, TextP, Traversal, Traverser, TraversalStrategy, T
 from gremlin_python.structure.graph import Edge, Property, Vertex, VertexProperty, Path
 from gremlin_python.structure.io.util import HashableDict, SymbolUtil
@@ -240,10 +241,12 @@ class TraversalStrategySerializer(_GraphSONTypeIO):
 
     @classmethod
     def dictify(cls, strategy, writer):
-        configuration = {}
+        strat_dict = {}
+        strat_dict["fqcn"] = strategy.fqcn
+        strat_dict["conf"] = {}
         for key in strategy.configuration:
-            configuration[key] = writer.to_dict(strategy.configuration[key])
-        return GraphSONUtil.typed_value(strategy.strategy_name, configuration)
+            strat_dict["conf"][key] = writer.to_dict(strategy.configuration[key])
+        return GraphSONUtil.typed_value(strategy.strategy_name, strat_dict)
 
 
 class TraverserIO(_GraphSONTypeIO):
@@ -346,7 +349,6 @@ class UUIDIO(_GraphSONTypeIO):
 
 
 class DateIO(_GraphSONTypeIO):
-    python_type = datetime.datetime
     graphson_type = "g:Date"
     graphson_base_type = "Date"
 
@@ -367,6 +369,24 @@ class DateIO(_GraphSONTypeIO):
         return datetime.datetime.utcfromtimestamp(ts / 1000.0)
 
 
+class OffsetDateTimeIO(_GraphSONTypeIO):
+    python_type = datetime.datetime
+    graphson_type = "gx:OffsetDateTime"
+    graphson_base_type = "OffsetDateTime"
+
+    @classmethod
+    def dictify(cls, obj, writer):
+        if obj.tzinfo is None:
+            return DateIO.dictify(obj, writer)
+        return GraphSONUtil.typed_value(cls.graphson_base_type, obj.isoformat(), "gx")
+
+    @classmethod
+    def objectify(cls, dt, reader):
+        # specially handling as python isoformat does not support zulu until 3.11
+        dt_iso = dt[:-1] + '+00:00' if dt.endswith('Z') else dt
+        return datetime.datetime.fromisoformat(dt_iso)
+
+
 # Based on current implementation, this class must always be declared before FloatIO.
 # Seems pretty fragile for future maintainers. Maybe look into this.
 class TimestampIO(_GraphSONTypeIO):
@@ -534,34 +554,17 @@ class FloatIO(_NumberIO):
 
 
 class BigDecimalIO(_NumberIO):
-    python_type = Decimal
+    python_type = BigDecimal
     graphson_type = "gx:BigDecimal"
     graphson_base_type = "BigDecimal"
 
     @classmethod
     def dictify(cls, n, writer):
-        if isinstance(n, bool):  # because isinstance(False, int) and isinstance(True, int)
-            return n
-        elif math.isnan(n):
-            return GraphSONUtil.typed_value(cls.graphson_base_type, "NaN", "gx")
-        elif math.isinf(n) and n > 0:
-            return GraphSONUtil.typed_value(cls.graphson_base_type, "Infinity", "gx")
-        elif math.isinf(n) and n < 0:
-            return GraphSONUtil.typed_value(cls.graphson_base_type, "-Infinity", "gx")
-        else:
-            return GraphSONUtil.typed_value(cls.graphson_base_type, str(n), "gx")
+        return GraphSONUtil.typed_value(cls.graphson_base_type, str(n.value), "gx")
 
     @classmethod
     def objectify(cls, v, _):
-        if isinstance(v, str):
-            if v == 'NaN':
-                return Decimal('nan')
-            elif v == "Infinity":
-                return Decimal('inf')
-            elif v == "-Infinity":
-                return Decimal('-inf')
-
-        return Decimal(v)
+        return bigdecimal(v)
 
 
 class DoubleIO(FloatIO):
@@ -694,7 +697,7 @@ class VertexDeserializer(_GraphSONTypeIO):
 
     @classmethod
     def objectify(cls, d, reader):
-        properties = None
+        properties = []
         if "properties" in d:
             properties = reader.to_object(d["properties"])
             if properties is not None:
@@ -707,7 +710,7 @@ class EdgeDeserializer(_GraphSONTypeIO):
 
     @classmethod
     def objectify(cls, d, reader):
-        properties = None
+        properties = []
         if "properties" in d:
             properties = reader.to_object(d["properties"])
             if properties is not None:
@@ -724,7 +727,7 @@ class VertexPropertyDeserializer(_GraphSONTypeIO):
 
     @classmethod
     def objectify(cls, d, reader):
-        properties = None
+        properties = []
         if "properties" in d:
             properties = reader.to_object(d["properties"])
             if properties is not None:

{gremlinpython-3.7.6 → gremlinpython-3.8.1/gremlinpython.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gremlinpython
-Version: 3.7.6
+Version: 3.8.1
 Summary: Gremlin-Python for Apache TinkerPop
 Maintainer-email: Apache TinkerPop <dev@tinkerpop.apache.org>
 License: Apache 2
@@ -9,7 +9,7 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
@@ -23,7 +23,7 @@ Requires-Dist: kerberos<2.0.0,>=1.3.0; extra == "kerberos"
 Provides-Extra: ujson
 Requires-Dist: ujson>=2.0.0; extra == "ujson"
 Provides-Extra: test
-Requires-Dist: pytest<7.2.0,>=4.6.4; extra == "test"
+Requires-Dist: pytest<8.0.0,>=6.2.5; extra == "test"
 Requires-Dist: radish-bdd==0.18.2; extra == "test"
 Requires-Dist: lxml==5.3.0; extra == "test"
 Requires-Dist: PyHamcrest<3.0.0,>=1.9.0; extra == "test"

{gremlinpython-3.7.6 → gremlinpython-3.8.1}/gremlinpython.egg-info/requires.txt

@@ -8,7 +8,7 @@ async-timeout<5.0.0,>=4.0.3
 kerberos<2.0.0,>=1.3.0
 
 [test]
-pytest<7.2.0,>=4.6.4
+pytest<8.0.0,>=6.2.5
 radish-bdd==0.18.2
 lxml==5.3.0
 PyHamcrest<3.0.0,>=1.9.0

{gremlinpython-3.7.6 → gremlinpython-3.8.1}/pyproject.toml

@@ -26,7 +26,7 @@ description = "Gremlin-Python for Apache TinkerPop"
 readme = {file = "README.rst", content-type = "text/x-rst"}
 license = {text = "Apache 2"}
 maintainers = [{name = "Apache TinkerPop", email = "dev@tinkerpop.apache.org"}]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
     "nest_asyncio",
     "aiohttp>=3.8.0,<4.0.0",
@@ -48,7 +48,7 @@ Homepage = "https://tinkerpop.apache.org"
 kerberos = ["kerberos>=1.3.0,<2.0.0"]
 ujson = ["ujson>=2.0.0"]
 test = [
-    "pytest>=4.6.4,<7.2.0",
+    "pytest>=6.2.5,<8.0.0",
     "radish-bdd==0.18.2",
     "lxml==5.3.0",
     "PyHamcrest>=1.9.0,<3.0.0",