diff --git a/README.md b/README.md
index b361a1be0c348418f364f1521e35b922f782c0a3..a5c19225b9bb81c05928483ea34b5a5b5af214b3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# aiogremlin 0.0.2 [(gizmo grew up)](https://pypi.python.org/pypi/gizmo/0.1.12)
+# aiogremlin 0.0.4 [(gizmo grew up)](https://pypi.python.org/pypi/gizmo/0.1.12)
`aiogremlin` is a **Python 3** driver for the the [Tinkerpop 3 Gremlin Server](http://www.tinkerpop.com/docs/3.0.0.M7/#gremlin-server). This module is built on [Asyncio](https://docs.python.org/3/library/asyncio.html). By default it uses the [aiohttp](http://aiohttp.readthedocs.org/en/v0.15.3/index.html) websocket client , but it is easy to plug in a different implementation. `aiogremlin` is currently in **alpha** mode, but all major functionality has test coverage.
diff --git a/aiogremlin/__init__.py b/aiogremlin/__init__.py
index 123064e230d20d2bac48a14b064cac0ef6d0c1cc..5480f02b0d08e1e733eaf36f0b3e6e3f50053bc1 100644
--- a/aiogremlin/__init__.py
+++ b/aiogremlin/__init__.py
@@ -3,4 +3,4 @@ from .connection import (WebsocketPool, AiohttpFactory, BaseFactory,
BaseConnection)
from .client import GremlinClient, create_client
from .exceptions import RequestError, GremlinServerError, SocketClientError
-__version__ = "0.0.3"
+__version__ = "0.0.4"
diff --git a/aiogremlin/client.py b/aiogremlin/client.py
index a8596906f5e55beddfd4a590928c741053b59bf8..63e99a606a33d225460e28bc6c49952156ebdee8 100644
--- a/aiogremlin/client.py
+++ b/aiogremlin/client.py
@@ -4,23 +4,24 @@ import asyncio
import ssl
import uuid
-import ujson
from aiogremlin.connection import WebsocketPool
from aiogremlin.log import client_logger
from aiogremlin.protocol import gremlin_response_parser, GremlinWriter
+from aiogremlin.log import INFO, client_logger
@asyncio.coroutine
def create_client(uri='ws://localhost:8182/', loop=None, ssl=None,
protocol=None, lang="gremlin-groovy", op="eval",
processor="", pool=None, factory=None, poolsize=10,
- timeout=None, **kwargs):
+ timeout=None, verbose=False, **kwargs):
pool = WebsocketPool(uri,
factory=factory,
poolsize=poolsize,
timeout=timeout,
- loop=loop)
+ loop=loop,
+ verbose=verbose)
yield from pool.init_pool()
@@ -32,7 +33,8 @@ def create_client(uri='ws://localhost:8182/', loop=None, ssl=None,
op=op,
processor=processor,
pool=pool,
- factory=factory)
+ factory=factory,
+ verbose=verbose)
class GremlinClient:
@@ -40,7 +42,7 @@ class GremlinClient:
def __init__(self, uri='ws://localhost:8182/', loop=None, ssl=None,
protocol=None, lang="gremlin-groovy", op="eval",
processor="", pool=None, factory=None, poolsize=10,
- timeout=None, **kwargs):
+ timeout=None, verbose=True, **kwargs):
"""
"""
self.uri = uri
@@ -61,6 +63,8 @@ class GremlinClient:
self.pool = pool or WebsocketPool(uri, factory=factory,
poolsize=poolsize, timeout=timeout, loop=self._loop)
self.factory = factory or self.pool.factory
+ if verbose:
+ client_logger.setLevel(INFO)
@property
def loop(self):
@@ -87,7 +91,7 @@ class GremlinClient:
lang = lang or self.lang
op = op or self.op
processor = processor or self.processor
- message = ujson.dumps({
+ message = {
"requestId": str(uuid.uuid4()),
"op": op,
"processor": processor,
@@ -96,7 +100,11 @@ class GremlinClient:
"bindings": bindings,
"language": lang
}
- })
+ }
+ if processor == "session":
+ message["args"]["session"] = str(uuid.uuid4())
+ client_logger.info(
+ "Session ID: {}".format(message["args"]["session"]))
if connection is None:
connection = yield from self.pool.connect(self.uri, loop=self.loop)
writer = GremlinWriter(connection)
diff --git a/aiogremlin/connection.py b/aiogremlin/connection.py
index 74f4794660e66bfea5522a827b26a2de048312d7..c5cea34354c3a6cc906bc26673beb2181b4b611c 100644
--- a/aiogremlin/connection.py
+++ b/aiogremlin/connection.py
@@ -102,17 +102,15 @@ class WebsocketPool:
try:
socket = yield from self.factory.connect(uri, pool=self,
loop=loop)
- except:
- raise
- else:
- conn_logger.info("New connection on socket: {} at {}".format(
- socket, uri))
finally:
self.num_connecting -= 1
if not socket.closed:
+ conn_logger.info("New connection on socket: {} at {}".format(
+ socket, uri))
self.active_conns.add(socket)
# Untested.
elif num_retries > 0:
+ conn_logger.warning("Got bad socket, retry...")
socket = yield from self.connect(uri, loop, num_retries - 1)
else:
raise RuntimeError("Unable to connect, max retries exceeded.")
diff --git a/aiogremlin/protocol.py b/aiogremlin/protocol.py
index 2a2613561e2e86421594f1174611cee12f825bbd..6413aa9e1d29f0b5d212ed131f7feb6b90d516b3 100644
--- a/aiogremlin/protocol.py
+++ b/aiogremlin/protocol.py
@@ -42,6 +42,7 @@ class GremlinWriter:
@asyncio.coroutine
def write(self, message, binary=True, mime_type="application/json"):
+ message = ujson.dumps(message)
if binary:
message = self._set_message_header(message, mime_type)
yield from self._connection.send(message, binary)
diff --git a/benchmark.py b/benchmark.py
index bf6c4c27feb8a2b6e1b45799f7fd0b4caa010f17..a74ed05c48123d19219eb2bfd0d77f1a68ab9c13 100644
--- a/benchmark.py
+++ b/benchmark.py
@@ -27,7 +27,7 @@ def run(client, count, concurrency, loop):
assert resp[0].data[0] == result, resp[0].data[0]
processed_count += 1
except Exception:
- continue
+ raise
for i in range(count):
rnd1 = random.randint(1, 9)
@@ -79,7 +79,7 @@ ARGS.add_argument(
help='message count (default: `%(default)s`)')
ARGS.add_argument(
'-c', '--concurrency', action="store",
- nargs='?', type=int, default=500,
+ nargs='?', type=int, default=256,
help='count of parallel requests (default: `%(default)s`)')
ARGS.add_argument(
'-p', '--poolsize', action="store",
@@ -87,7 +87,7 @@ ARGS.add_argument(
help='num connected websockets (default: `%(default)s`)')
ARGS.add_argument(
'-w', '--warmups', action="store",
- nargs='?', type=int, default=1,
+ nargs='?', type=int, default=5,
help='num warmups (default: `%(default)s`)')
@@ -102,8 +102,8 @@ if __name__ == "__main__":
client = loop.run_until_complete(
aiogremlin.create_client(loop=loop, poolsize=poolsize))
try:
- print("Runs: {}. Warmups: {}. Messages: {}. Concurrency: {}.".format(
- num_tests, num_warmups, num_mssg, concurr))
+ print("Runs: {}. Warmups: {}. Messages: {}. Concurrency: {}. Poolsize: {}".format(
+ num_tests, num_warmups, num_mssg, concurr, poolsize))
main = main(client, num_tests, num_mssg, concurr, num_warmups, loop)
loop.run_until_complete(main)
finally:
diff --git a/changes.txt b/changes.txt
index e134c84a70a455761e5f2b1c6b12c372beee47d8..2fbf42b17c05ee7a2fe8f01d31b6f6552f445aaa 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,4 @@
0.0.1 - 4/2015: Birth!
0.0.2 - 5/1/2015: Added an init_pool method and a create_client constructor.
0.0.3 - 5/2/2015: Using ujson for serialization.
+0.0.4 - 5/12/2015: Added support for sessions.
diff --git a/setup.py b/setup.py
index 4244101250fd5644525abe738f48bbeb02d4e80f..01a7bd91490adc083ae3f1e279a31244c97ff6df 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup
setup(
name="aiogremlin",
- version="0.0.3",
+ version="0.0.4",
url="",
license="MIT",
author="davebshow",
diff --git a/tests/tests.py b/tests/tests.py
index bd5c7ca0a4c4dbf783aaef611107ee1b178de446..e66518d47a7c83000847d5fd2f53fbd7417c15a6 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -76,6 +76,11 @@ class GremlinClientTests(unittest.TestCase):
error = True
self.assertTrue(error)
+ def test_session(self):
+ execute = self.gc.execute("x + x", processor="session", bindings={"x": 4})
+ results = self.loop.run_until_complete(execute)
+ self.assertEqual(results[0].data[0], 8)
+
class WebsocketPoolTests(unittest.TestCase):