TINKERPOP-1427 Fixed problems with v2 vs v3 in gremlin-python There were several problems. In protocol.py there was an expectation as the to the format of the ResponseMessage that changed between v2 and v3. I added a bit of a sketchy hack to deal with that detects v2/v3 and then parses accordingly. That should be nicer. There were some issues with tests as well that bound assertions to v2 so that when the default serializer swapped from v2 to v3 those assertions started failing. I forced those specific tests to v2 to get them to pass. Ultimately, we need to more generally test v2 and v3, but at least gremlin-python is defaulted to v3 at this point and all tests are passing.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8c299879 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8c299879 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8c299879 Branch: refs/heads/TINKERPOP-1427 Commit: 8c299879e777765748c2c2b03a58b6d0c5c401de Parents: 97d27d5 Author: Stephen Mallette <[email protected]> Authored: Fri Jul 7 13:52:15 2017 -0400 Committer: Stephen Mallette <[email protected]> Committed: Thu Jul 13 13:01:35 2017 -0400 ---------------------------------------------------------------------- .../src/main/jython/gremlin_python/driver/client.py | 2 +- .../src/main/jython/gremlin_python/driver/protocol.py | 11 ++++++++--- .../main/jython/gremlin_python/driver/serializer.py | 14 +++++++------- gremlin-python/src/main/jython/tests/conftest.py | 13 +++++++++++++ .../src/main/jython/tests/driver/test_client.py | 5 ++++- .../tests/driver/test_driver_remote_connection.py | 4 ++-- .../jython/tests/structure/io/test_graphsonV3d0.py | 5 ++--- 7 files changed, 37 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c299879/gremlin-python/src/main/jython/gremlin_python/driver/client.py ---------------------------------------------------------------------- diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/client.py b/gremlin-python/src/main/jython/gremlin_python/driver/client.py index 4d06071..faf4ca4 100644 --- a/gremlin-python/src/main/jython/gremlin_python/driver/client.py +++ b/gremlin-python/src/main/jython/gremlin_python/driver/client.py @@ -42,7 +42,7 @@ class Client: self._url = url self._traversal_source = traversal_source if message_serializer is None: - message_serializer = serializer.GraphSONMessageSerializer() + message_serializer = serializer.GraphSONSerializersV3d0() self._message_serializer = message_serializer self._username = username self._password = password http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c299879/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py ---------------------------------------------------------------------- diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py b/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py index 84a7d82..75c99bc 100644 --- a/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py +++ b/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py @@ -86,9 +86,14 @@ class GremlinServerWSProtocol(AbstractBaseProtocol): del results_dict[request_id] elif status_code in [200, 206]: results = [] - for msg in data["result"]["data"]: - results.append( - self._message_serializer.deserialize_message(msg)) + # this is a bit of a hack for now. basically the protocol.py picks the json apart and doesn't + # account for types too well right now. + if self._message_serializer.version == b"application/vnd.gremlin-v2.0+json": + for msg in data["result"]["data"]: + results.append( + self._message_serializer.deserialize_message(msg)) + else: + results = self._message_serializer.deserialize_message(data["result"]["data"]["@value"]) result_set.stream.put_nowait(results) if status_code == 206: data = self._transport.read() http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c299879/gremlin-python/src/main/jython/gremlin_python/driver/serializer.py ---------------------------------------------------------------------- diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/serializer.py b/gremlin-python/src/main/jython/gremlin_python/driver/serializer.py index 3248b4e..8686b7b 100644 --- a/gremlin-python/src/main/jython/gremlin_python/driver/serializer.py +++ b/gremlin-python/src/main/jython/gremlin_python/driver/serializer.py @@ -84,12 +84,13 @@ class Traversal(Processor): class GraphSONMessageSerializer: """Message serializer for GraphSON""" - def __init__(self, reader=None, writer=None): + def __init__(self, reader=None, writer=None, version=b"application/vnd.gremlin-v3.0+json"): + self.version = version if not reader: - reader = graphsonV2d0.GraphSONReader() + reader = graphsonV3d0.GraphSONReader() self._graphson_reader = reader if not writer: - writer = graphsonV2d0.GraphSONWriter() + writer = graphsonV3d0.GraphSONWriter() self.standard = Standard(writer) self.traversal = Traversal(writer) @@ -118,8 +119,7 @@ class GraphSONMessageSerializer: 'op': op, 'args': args } - return self.finalize_message(message, b"\x21", - b"application/vnd.gremlin-v2.0+json") + return self.finalize_message(message, b"\x21", self.version) def finalize_message(self, message, mime_len, mime_type): message = json.dumps(message) @@ -133,7 +133,7 @@ class GraphSONSerializersV2d0(GraphSONMessageSerializer): """Message serializer for GraphSON 2.0""" def __init__(self, reader=None, writer=None): - GraphSONMessageSerializer.__init__(self, reader, writer, "2.0") + GraphSONMessageSerializer.__init__(self, reader, writer, b"application/vnd.gremlin-v2.0+json") if not reader: self._graphson_reader = graphsonV2d0.GraphSONReader() if not writer: @@ -146,7 +146,7 @@ class GraphSONSerializersV3d0(GraphSONMessageSerializer): """Message serializer for GraphSON 3.0""" def __init__(self, reader=None, writer=None): - GraphSONMessageSerializer.__init__(self, reader, writer, "3.0") + GraphSONMessageSerializer.__init__(self, reader, writer, b"application/vnd.gremlin-v3.0+json") if not reader: self._graphson_reader = graphsonV3d0.GraphSONReader() if not writer: http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c299879/gremlin-python/src/main/jython/tests/conftest.py ---------------------------------------------------------------------- diff --git a/gremlin-python/src/main/jython/tests/conftest.py b/gremlin-python/src/main/jython/tests/conftest.py index 2cd4282..d014296 100644 --- a/gremlin-python/src/main/jython/tests/conftest.py +++ b/gremlin-python/src/main/jython/tests/conftest.py @@ -23,6 +23,7 @@ from six.moves import queue from gremlin_python.driver.client import Client from gremlin_python.driver.connection import Connection +from gremlin_python.driver import serializer from gremlin_python.driver.driver_remote_connection import ( DriverRemoteConnection) from gremlin_python.driver.protocol import GremlinServerWSProtocol @@ -73,3 +74,15 @@ def remote_connection(request): remote_conn.close() request.addfinalizer(fin) return remote_conn + [email protected] +def remote_connection_v2(request): + try: + remote_conn = DriverRemoteConnection('ws://localhost:45940/gremlin', 'g', message_serializer=serializer.GraphSONSerializersV2d0()) + except OSError: + pytest.skip('Gremlin Server is not running') + else: + def fin(): + remote_conn.close() + request.addfinalizer(fin) + return remote_conn http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c299879/gremlin-python/src/main/jython/tests/driver/test_client.py ---------------------------------------------------------------------- diff --git a/gremlin-python/src/main/jython/tests/driver/test_client.py b/gremlin-python/src/main/jython/tests/driver/test_client.py index f7b01ce..7a6f3b4 100644 --- a/gremlin-python/src/main/jython/tests/driver/test_client.py +++ b/gremlin-python/src/main/jython/tests/driver/test_client.py @@ -21,6 +21,7 @@ import pytest from gremlin_python.driver.client import Client from gremlin_python.driver.request import RequestMessage from gremlin_python.structure.graph import Graph +from gremlin_python.driver import serializer __author__ = 'David M. Brown ([email protected])' @@ -78,7 +79,7 @@ def test_client_async(client): def test_connection_share(client): # Overwrite fixture with pool_size=1 client - client = Client('ws://localhost:45940/gremlin', 'g', pool_size=1) + client = Client('ws://localhost:45940/gremlin', 'g', pool_size=1, message_serializer=serializer.GraphSONSerializersV2d0()) g = Graph().traversal() t = g.V() message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode}) @@ -98,6 +99,8 @@ def test_multi_conn_pool(client): g = Graph().traversal() t = g.V() message = RequestMessage('traversal', 'bytecode', {'gremlin': t.bytecode}) + + client = Client('ws://localhost:45940/gremlin', 'g', pool_size=1, message_serializer=serializer.GraphSONSerializersV2d0()) future = client.submitAsync(message) future2 = client.submitAsync(message) http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c299879/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py ---------------------------------------------------------------------- diff --git a/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py index 71cebf0..45b7433 100644 --- a/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py +++ b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py @@ -103,10 +103,10 @@ class TestDriverRemoteConnection(object): assert 6 == g.V().count().next() assert 6 == g.E().count().next() - def test_side_effects(self, remote_connection): + def test_side_effects(self, remote_connection_v2): statics.load_statics(globals()) # - g = Graph().traversal().withRemote(remote_connection) + g = Graph().traversal().withRemote(remote_connection_v2) ### t = g.V().hasLabel("project").name.iterate() assert 0 == len(t.side_effects.keys()) http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c299879/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV3d0.py ---------------------------------------------------------------------- diff --git a/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV3d0.py b/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV3d0.py index 65425e4..19897dc 100644 --- a/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV3d0.py +++ b/gremlin-python/src/main/jython/tests/structure/io/test_graphsonV3d0.py @@ -176,9 +176,8 @@ class TestGraphSONWriter(object): {"@type": "g:Int32", "@value": 3}]} == json.loads( self.graphson_writer.writeObject(set([1, 2, 3, 3]))) assert {"@type": "g:Map", - "@value": ['a', {"@type": "g:Int32", "@value": 1}, - 'b', {"@type": "g:Int32", "@value": 2}]} == json.loads( - self.graphson_writer.writeObject({'a': 1, 'b': 2})) + "@value": ['a', {"@type": "g:Int32", "@value": 1}]} == json.loads( + self.graphson_writer.writeObject({'a': 1})) def test_number_output(self): assert {"@type": "g:Int64", "@value": 2} == json.loads(self.graphson_writer.writeObject(long(2)))
