gremlinpython 3.6.6__tar.gz → 3.6.8__tar.gz

gremlinpython-3.6.8/NOTICE

@@ -0,0 +1,5 @@
+Apache TinkerPop
+Copyright 2015-2024 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

{gremlinpython-3.6.6/gremlinpython.egg-info → gremlinpython-3.6.8}/PKG-INFO

@@ -1,14 +1,17 @@
 Metadata-Version: 2.1
 Name: gremlinpython
-Version: 3.6.6
+Version: 3.6.8
 Summary: Gremlin-Python for Apache TinkerPop
-Home-page: http://tinkerpop.apache.org
+Home-page: https://tinkerpop.apache.org
+Maintainer: Apache TinkerPop
+Maintainer-email: dev@tinkerpop.apache.org
 License: Apache 2
 Platform: UNKNOWN
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 Provides-Extra: kerberos
 Provides-Extra: ujson

{gremlinpython-3.6.6 → gremlinpython-3.6.8}/gremlin_python/__version__.py

@@ -16,5 +16,5 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 '''
-version   = '3.6.6'
-timestamp = 1701718721
+version   = '3.6.8'
+timestamp = 1730222094

{gremlinpython-3.6.6 → gremlinpython-3.6.8}/gremlin_python/driver/aiohttp/transport.py

@@ -29,7 +29,8 @@ __author__ = 'Lyndon Bauto (lyndonb@bitquilltech.com)'
 class AiohttpTransport(AbstractBaseTransport):
     nest_asyncio_applied = False
 
-    def __init__(self, call_from_event_loop=None, read_timeout=None, write_timeout=None, **kwargs):
+    def __init__(self, call_from_event_loop=None, read_timeout=None, write_timeout=None, enable_compression=False,
+                 **kwargs):
         if call_from_event_loop is not None and call_from_event_loop and not AiohttpTransport.nest_asyncio_applied:
             """ 
                 The AiohttpTransport implementation uses the asyncio event loop. Because of this, it cannot be called 
@@ -50,10 +51,13 @@ class AiohttpTransport(AbstractBaseTransport):
         self._aiohttp_kwargs = kwargs
         self._write_timeout = write_timeout
         self._read_timeout = read_timeout
+        self._enable_compression = enable_compression
         if "max_content_length" in self._aiohttp_kwargs:
             self._aiohttp_kwargs["max_msg_size"] = self._aiohttp_kwargs.pop("max_content_length")
         if "ssl_options" in self._aiohttp_kwargs:
             self._aiohttp_kwargs["ssl"] = self._aiohttp_kwargs.pop("ssl_options")
+        if self._enable_compression and "compress" not in self._aiohttp_kwargs:
+            self._aiohttp_kwargs["compress"] = 15  # enable per-message deflate compression with 32k sliding window size
 
     def __del__(self):
         # Close will only actually close if things are left open, so this is safe to call.
@@ -211,7 +215,9 @@ class AiohttpHTTPTransport(AbstractBaseTransport):
         # Inner function to perform async read.
         async def async_read():
             async with async_timeout.timeout(self._read_timeout):
-                return await self._http_req_resp.read()
+                return {"content": await self._http_req_resp.read(),
+                        "ok": self._http_req_resp.ok,
+                        "status": self._http_req_resp.status}
 
         return self._loop.run_until_complete(async_read())
 

{gremlinpython-3.6.6 → gremlinpython-3.6.8}/gremlin_python/driver/client.py

@@ -44,7 +44,8 @@ class Client:
                  transport_factory=None, pool_size=None, max_workers=None,
                  message_serializer=None, username="", password="",
                  kerberized_service="", headers=None, session=None,
-                 enable_user_agent_on_connect=True, **transport_kwargs):
+                 enable_user_agent_on_connect=True, enable_compression=False,
+                 **transport_kwargs):
         log.info("Creating Client with url '%s'", url)
 
         # check via url that we are using http protocol
@@ -55,6 +56,7 @@ class Client:
         self._headers = headers
         self._enable_user_agent_on_connect = enable_user_agent_on_connect
         self._traversal_source = traversal_source
+        self._enable_compression = enable_compression
         if not self._use_http and "max_content_length" not in transport_kwargs:
             transport_kwargs["max_content_length"] = 10 * 1024 * 1024
         if message_serializer is None:
@@ -77,7 +79,7 @@ class Client:
                     if self._use_http:
                         return AiohttpHTTPTransport(**transport_kwargs)
                     else:
-                        return AiohttpTransport(**transport_kwargs)
+                        return AiohttpTransport(enable_compression=enable_compression, **transport_kwargs)
         self._transport_factory = transport_factory
         if protocol_factory is None:
             def protocol_factory():

{gremlinpython-3.6.6 → gremlinpython-3.6.8}/gremlin_python/driver/connection.py

@@ -39,9 +39,7 @@ class Connection:
         self._inited = False
         self._enable_user_agent_on_connect = enable_user_agent_on_connect
         if self._enable_user_agent_on_connect:
-            if self._headers is None:
-                self._headers = dict()
-            self._headers[useragent.userAgentHeader] = useragent.userAgent
+            self.__add_header(useragent.userAgentHeader, useragent.userAgent)
 
     def connect(self):
         if self._transport:
@@ -58,10 +56,11 @@ class Connection:
     def write(self, request_message):
         if not self._inited:
             self.connect()
-        request_id = str(uuid.uuid4())
         if request_message.args.get("requestId"):
-            request_id = request_message.args.get("requestId")
-            uuid.UUID(request_id) # Checks for proper UUID or else server will return an error.
+            request_id = str(request_message.args.get("requestId"))
+            uuid.UUID(request_id)  # Checks for proper UUID or else server will return an error.
+        else:
+            request_id = str(uuid.uuid4())
         result_set = resultset.ResultSet(queue.Queue(), request_id)
         self._results[request_id] = result_set
         # Create write task
@@ -93,3 +92,15 @@ class Connection:
                     break
         finally:
             self._pool.put_nowait(self)
+
+    def __add_header(self, key, value):
+        if self._headers is None:
+            self._headers = dict()
+        # Headers may be a list of pairs
+        if isinstance(self._headers, list):
+            for pair in self._headers:
+                if pair[0] == key:
+                    self._headers.remove(pair)
+            self._headers.append((key, value))
+        else:
+            self._headers[key] = value

{gremlinpython-3.6.6 → gremlinpython-3.6.8}/gremlin_python/driver/driver_remote_connection.py

@@ -39,7 +39,7 @@ class DriverRemoteConnection(RemoteConnection):
                  username="", password="", kerberized_service='',
                  message_serializer=None, graphson_reader=None,
                  graphson_writer=None, headers=None, session=None,
-                 enable_user_agent_on_connect=True, **transport_kwargs):
+                 enable_user_agent_on_connect=True, enable_compression=False, **transport_kwargs):
         log.info("Creating DriverRemoteConnection with url '%s'", str(url))
         self.__url = url
         self.__traversal_source = traversal_source
@@ -56,6 +56,7 @@ class DriverRemoteConnection(RemoteConnection):
         self.__headers = headers
         self.__session = session
         self.__enable_user_agent_on_connect = enable_user_agent_on_connect
+        self.__enable_compression = enable_compression
         self.__transport_kwargs = transport_kwargs
 
         # keeps a list of sessions that have been spawned from this DriverRemoteConnection
@@ -78,6 +79,7 @@ class DriverRemoteConnection(RemoteConnection):
                                      headers=headers,
                                      session=session,
                                      enable_user_agent_on_connect=enable_user_agent_on_connect,
+                                     enable_compression=enable_compression,
                                      **transport_kwargs)
         self._url = self._client._url
         self._traversal_source = self._client._traversal_source

{gremlinpython-3.6.6 → gremlinpython-3.6.8}/gremlin_python/driver/protocol.py

@@ -223,35 +223,37 @@ class GremlinServerHTTPProtocol(AbstractBaseProtocol):
 
         self._transport.write(message)
 
-    def data_received(self, message, results_dict):
+    def data_received(self, response, results_dict):
         # if Gremlin Server cuts off then we get a None for the message
-        if message is None:
+        if response is None:
             log.error("Received empty message from server.")
             raise GremlinServerError({'code': 500,
                                       'message': 'Server disconnected - please try to reconnect', 'attributes': {}})
 
-        message = self._message_serializer.deserialize_message(message)
-        request_id = message['requestId']
-        result_set = results_dict[request_id] if request_id in results_dict else ResultSet(None, None)
-        status_code = message['status']['code']
-        aggregate_to = message['result']['meta'].get('aggregateTo', 'list')
-        data = message['result']['data']
-        result_set.aggregate_to = aggregate_to
-
-        if status_code == 204:
-            result_set.stream.put_nowait([])
-            del results_dict[request_id]
-            return status_code
-        elif status_code in [200, 206]:
-            result_set.stream.put_nowait(data)
-            if status_code == 200:
-                result_set.status_attributes = message['status']['attributes']
+        if response['ok']:
+            message = self._message_serializer.deserialize_message(response['content'])
+            request_id = message['requestId']
+            result_set = results_dict[request_id] if request_id in results_dict else ResultSet(None, None)
+            status_code = message['status']['code']
+            aggregate_to = message['result']['meta'].get('aggregateTo', 'list')
+            data = message['result']['data']
+            result_set.aggregate_to = aggregate_to
+
+            if status_code == 204:
+                result_set.stream.put_nowait([])
                 del results_dict[request_id]
-            return status_code
+                return status_code
+            elif status_code in [200, 206]:
+                result_set.stream.put_nowait(data)
+                if status_code == 200:
+                    result_set.status_attributes = message['status']['attributes']
+                    del results_dict[request_id]
+                return status_code
         else:
             # This message is going to be huge and kind of hard to read, but in the event of an error,
             # it can provide invaluable info, so space it out appropriately.
             log.error("\r\nReceived error message '%s'\r\n\r\nWith results dictionary '%s'",
-                      str(message), str(results_dict))
-            del results_dict[request_id]
-            raise GremlinServerError(message['status'])
+                      str(response['content']), str(results_dict))
+            body = json.loads(response['content'])
+            del results_dict[body['requestId']]
+            raise GremlinServerError({'code': response['status'], 'message': body['message'], 'attributes': {}})

{gremlinpython-3.6.6 → gremlinpython-3.6.8}/gremlin_python/driver/serializer.py

@@ -240,7 +240,7 @@ class GraphBinarySerializersV1(object):
     def finalize_message(self, message, mime_len, mime_type):
         ba = bytearray()
 
-        request_id = uuid.UUID(message['requestId'])
+        request_id = uuid.UUID(str(message['requestId']))
         ba.extend(self.header_pack(mime_len, mime_type, 0x81,
                                    (request_id.int >> 64) & self.max_int64, request_id.int & self.max_int64))
 

{gremlinpython-3.6.6 → gremlinpython-3.6.8}/gremlin_python/driver/useragent.py

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

{gremlinpython-3.6.6 → gremlinpython-3.6.8}/gremlin_python/process/graph_traversal.py

@@ -1538,7 +1538,7 @@ class Transaction:
     def rollback(self):
         with self.__mutex:
             # Verify transaction is open, close session and return result of transaction's rollback.
-            self.__verify_transaction_state(True, "Cannot commit a transaction that is not started.")
+            self.__verify_transaction_state(True, "Cannot rollback a transaction that is not started.")
             return self.__close_session(self._session_based_connection.rollback())
 
     # Commits the current transaction.

{gremlinpython-3.6.6 → gremlinpython-3.6.8}/gremlin_python/process/traversal.py

@@ -207,9 +207,9 @@ 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')
 
-statics.add_static('any', Pick.any)
+statics.add_static('any_', Pick.any_)
 statics.add_static('none', Pick.none)
 
 Pop = Enum('Pop', ' all_ first last mixed')

{gremlinpython-3.6.6 → gremlinpython-3.6.8}/gremlin_python/structure/io/graphsonV2d0.py

@@ -30,7 +30,7 @@ from aenum import Enum
 from isodate import parse_duration, duration_isoformat
 
 from gremlin_python import statics
-from gremlin_python.statics import FloatType, FunctionType, IntType, LongType, TypeType, SingleByte, ByteBufferType, SingleChar
+from gremlin_python.statics import FloatType, FunctionType, ShortType, IntType, LongType, TypeType, SingleByte, ByteBufferType, SingleChar
 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
@@ -498,6 +498,30 @@ class Int32IO(Int64IO):
             return GraphSONUtil.typed_value(cls.graphson_base_type, n)
 
 
+class Int16IO(Int64IO):
+    python_type = ShortType
+    graphson_type = "gx:Int16"
+    graphson_base_type = "Int16"
+
+    @classmethod
+    def dictify(cls, n, writer):
+        # if we exceed Java int range then we need a long
+        if isinstance(n, bool):
+            return n
+        elif n < -9223372036854775808 or n > 9223372036854775807:
+            return GraphSONUtil.typed_value("BigInteger", str(n), "gx")
+        elif n < -2147483648 or n > 2147483647:
+            return GraphSONUtil.typed_value("Int64", n)
+        elif n < -32768 or n > 32767:
+            return GraphSONUtil.typed_value("Int32", n)
+        else:
+            return GraphSONUtil.typed_value(cls.graphson_base_type, n, "gx")
+
+    @classmethod
+    def objectify(cls, v, _):
+        return int.__new__(ShortType, v)
+
+
 class ByteIO(_NumberIO):
     python_type = SingleByte
     graphson_type = "gx:Byte"

{gremlinpython-3.6.6 → gremlinpython-3.6.8}/gremlin_python/structure/io/graphsonV3d0.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+
 import calendar
 import datetime
 import json
@@ -28,7 +29,7 @@ from aenum import Enum
 from isodate import parse_duration, duration_isoformat
 
 from gremlin_python import statics
-from gremlin_python.statics import FloatType, FunctionType, 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
 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
@@ -596,6 +597,31 @@ class Int32IO(Int64IO):
         else:
             return GraphSONUtil.typed_value(cls.graphson_base_type, n)
 
+
+class Int16IO(Int64IO):
+    python_type = ShortType
+    graphson_type = "gx:Int16"
+    graphson_base_type = "Int16"
+
+    @classmethod
+    def dictify(cls, n, writer):
+        # if we exceed Java int range then we need a long
+        if isinstance(n, bool):
+            return n
+        elif n < -9223372036854775808 or n > 9223372036854775807:
+            return GraphSONUtil.typed_value("BigInteger", str(n), "gx")
+        elif n < -2147483648 or n > 2147483647:
+            return GraphSONUtil.typed_value("Int64", n)
+        elif n < -32768 or n > 32767:
+            return GraphSONUtil.typed_value("Int32", n)
+        else:
+            return GraphSONUtil.typed_value(cls.graphson_base_type, n, "gx")
+
+    @classmethod
+    def objectify(cls, v, _):
+        return int.__new__(ShortType, v)
+
+
 class ByteIO(_NumberIO):
     python_type = SingleByte
     graphson_type = "gx:Byte"

{gremlinpython-3.6.6 → gremlinpython-3.6.8/gremlinpython.egg-info}/PKG-INFO

@@ -1,14 +1,17 @@
 Metadata-Version: 2.1
 Name: gremlinpython
-Version: 3.6.6
+Version: 3.6.8
 Summary: Gremlin-Python for Apache TinkerPop
-Home-page: http://tinkerpop.apache.org
+Home-page: https://tinkerpop.apache.org
+Maintainer: Apache TinkerPop
+Maintainer-email: dev@tinkerpop.apache.org
 License: Apache 2
 Platform: UNKNOWN
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 Provides-Extra: kerberos
 Provides-Extra: ujson

{gremlinpython-3.6.6 → gremlinpython-3.6.8}/gremlinpython.egg-info/requires.txt

@@ -1,8 +1,8 @@
 nest_asyncio
 aiohttp<4.0.0,>=3.8.0
 aenum<4.0.0,>=1.4.5
-six<2.0.0,>=1.10.0
 isodate<1.0.0,>=0.6.0
+async-timeout<5.0.0,>=4.0.3
 
 [kerberos]
 kerberos<2.0.0,>=1.3.0

{gremlinpython-3.6.6 → gremlinpython-3.6.8}/setup.cfg

@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 1
-
 [aliases]
 test = pytest
 

{gremlinpython-3.6.6 → gremlinpython-3.6.8}/setup.py

@@ -18,7 +18,6 @@ under the License.
 """
 import codecs
 import os
-import sys
 import time
 from setuptools import setup
 
@@ -48,13 +47,10 @@ install_requires = [
     'nest_asyncio',
     'aiohttp>=3.8.0,<4.0.0',
     'aenum>=1.4.5,<4.0.0',
-    'six>=1.10.0,<2.0.0',
-    'isodate>=0.6.0,<1.0.0'
+    'isodate>=0.6.0,<1.0.0',
+    'async-timeout>=4.0.3,<5.0.0'
 ]
 
-if sys.version_info < (3, 5):
-    install_requires += ['pyparsing>=2.4.7,<3.0.0']
-
 setup(
     name='gremlinpython',
     version=version,
@@ -62,8 +58,10 @@ setup(
               'gremlin_python.driver.aiohttp', 'gremlin_python.process',
               'gremlin_python.structure', 'gremlin_python.structure.io'],
     license='Apache 2',
-    url='http://tinkerpop.apache.org',
+    url='https://tinkerpop.apache.org',
     description='Gremlin-Python for Apache TinkerPop',
+    maintainer='Apache TinkerPop',
+    maintainer_email='dev@tinkerpop.apache.org',
     long_description=codecs.open("README.rst", "r", "UTF-8").read(),
     long_description_content_type='text/x-rst',
     test_suite="tests",
@@ -74,7 +72,6 @@ setup(
     ],
     tests_require=[
         'pytest>=4.6.4,<7.2.0',
-        'mock>=3.0.5,<5.0.0',
         'radish-bdd==0.13.4',
         'PyHamcrest>=1.9.0,<3.0.0'
     ],
@@ -88,5 +85,6 @@ setup(
         "License :: OSI Approved :: Apache Software License",
         "Natural Language :: English",
         "Programming Language :: Python :: 3"
-    ]
+    ],
+    python_requires='>=3.9'
 )

gremlinpython-3.6.6/NOTICE

@@ -1,5 +0,0 @@
-Apache TinkerPop
-Copyright 2015-2023 The Apache Software Foundation.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).