Skip to content

Commit c0325c6

Browse files
committed
refactors to allow Server init without yaml file
1 parent 8d038d6 commit c0325c6

File tree

4 files changed

+22
-9
lines changed

4 files changed

+22
-9
lines changed

gremlin/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.0.2"
1+
__version__ = "0.0.3"

gremlin/remote.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,25 @@ class RemoteTraversal:
1717
helper class for Apache Tinkerpop Gremlin Python GLV remote access
1818
"""
1919

20-
def __init__(self,serverName='server',config_path:str=None):
20+
def __init__(self,server):
2121
"""
2222
constructor
2323
24+
"""
25+
self.server=server
26+
27+
@classmethod
28+
def fromYaml(cls,serverName='server',config_path:str=None)->"RemoteTraversal":
29+
"""
30+
create a server from the given yaml file
31+
2432
Args:
2533
serverName(str): the servername to use
34+
config_path(str): the path to the server configuration file
2635
"""
27-
self.server=Server.read(serverName,config_path)
36+
server=Server.read(serverName,config_path)
37+
rt=RemoteTraversal(server)
38+
return rt
2839

2940
def g(self):
3041
"""

tests/base_gremlin_test.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@author: wf
55
'''
66
from tests.basetest import Basetest
7-
from gremlin.remote import RemoteTraversal
7+
from gremlin.remote import RemoteTraversal, Server
88
from gremlin.examples import Examples, Volume
99

1010
class BaseGremlinTest(Basetest):
@@ -17,7 +17,8 @@ def setUp(self, debug=False, profile=True):
1717
prepare the test environment
1818
"""
1919
Basetest.setUp(self, debug, profile)
20-
self.remote_traversal=RemoteTraversal()
20+
self.server=Server()
21+
self.remote_traversal=RemoteTraversal(self.server)
2122
self.g=self.remote_traversal.g()
2223
self.volume=Volume.docker()
2324
self.examples=Examples(volume=self.volume,debug=self.debug)

tests/test_003_connection.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
# see https://github.com/apache/tinkerpop/blob/master/gremlin-python/src/main/jython/tests/driver/test_client.py
33
from gremlin_python.driver.request import RequestMessage
4-
from gremlin.remote import RemoteTraversal
4+
from gremlin.remote import RemoteTraversal, Server
55
from tests.basetest import Basetest
66

77
class TestConnection(Basetest):
@@ -11,10 +11,11 @@ class TestConnection(Basetest):
1111
# test a connection
1212
def test_connection(self):
1313
# see https://github.com/apache/tinkerpop/blob/master/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
14-
remoteTraversal=RemoteTraversal()
15-
g = remoteTraversal.g()
14+
server=Server()
15+
remote_traversal=RemoteTraversal(server)
16+
g = remote_traversal.g()
1617
t=g.V()
17-
remoteConnection=remoteTraversal.remoteConnection
18+
remoteConnection=remote_traversal.remoteConnection
1819
# see https://github.com/apache/tinkerpop/blob/master/gremlin-python/src/main/jython/gremlin_python/driver/client.py
1920
client=remoteConnection._client
2021

0 commit comments

Comments
 (0)