Extract vertex label to env variable and remove cleanup code

Author: kirill-stepanishin

glv-examples/gremlin-python/connections.py

@@ -47,8 +47,8 @@ def with_remote():
     g.V().drop().iterate()
 
     # simple query to verify connection
-    v = g.add_v().iterate()
-    count = g.V().count().next()
+    v = g.add_v("connection").iterate()
+    count = g.V().has_label("connection").count().next()
     print("Vertex count: " + str(count))
 
     # cleanup
@@ -60,8 +60,8 @@ def with_auth():
     rc = DriverRemoteConnection('ws://localhost:8182/gremlin', 'g', username='stephen', password='password')
     g = traversal().with_remote(rc)
 
-    v = g.add_v().iterate()
-    count = g.V().count().next()
+    v = g.add_v("connection").iterate()
+    count = g.V().has_label("connection").count().next()
     print("Vertex count: " + str(count))
 
     rc.close()
@@ -72,8 +72,8 @@ def with_kerberos():
     rc = DriverRemoteConnection('ws://localhost:8182/gremlin', 'g', kerberized_service='[email protected]')
     g = traversal().with_remote(rc)
 
-    v = g.add_v().iterate()
-    count = g.V().count().next()
+    v = g.add_v("connection").iterate()
+    count = g.V().has_label("connection").count().next()
     print("Vertex count: " + str(count))
 
     rc.close()
@@ -90,8 +90,8 @@ def with_configs():
     )
     g = traversal().with_remote(rc)
 
-    v = g.add_v().iterate()
-    count = g.V().count().next()
+    v = g.add_v("connection").iterate()
+    count = g.V().has_label("connection").count().next()
     print("Vertex count: " + str(count))
 
     rc.close()

gremlin-python/docker-compose.yml

@@ -65,6 +65,7 @@ services:
       - VERSION=${VERSION}
       - GREMLIN_SOCKET_SERVER_URL=ws://gremlin-socket-server-python:{}/gremlin
       - GREMLIN_SOCKET_SERVER_CONFIG_PATH=/python_app/gremlin-socket-server/conf/test-ws-gremlin.yaml
+      - VERTEX_LABEL=python-example
     working_dir: /python_app
     command: >
       bash -c "apt-get update && apt-get -y install libkrb5-dev krb5-user

gremlin-python/src/main/python/examples/basic_gremlin.py

@@ -28,31 +28,29 @@
 def main():
     # if there is a port placeholder in the env var then we are running with docker so set appropriate port 
     server_url = os.getenv('GREMLIN_SERVER_URL', 'ws://localhost:8182/gremlin').format(45940)
+    vertex_label = os.getenv('VERTEX_LABEL', 'person')
     rc = DriverRemoteConnection(server_url, 'g')
     g = traversal().with_remote(rc)
 
     # basic Gremlin: adding and retrieving data
-    v1 = g.add_v('person-py-ex').property('name', 'marko').next()
-    v2 = g.add_v('person-py-ex').property('name', 'stephen').next()
-    v3 = g.add_v('person-py-ex').property('name', 'vadas').next()
+    v1 = g.add_v(vertex_label).property('name', 'marko').next()
+    v2 = g.add_v(vertex_label).property('name', 'stephen').next()
+    v3 = g.add_v(vertex_label).property('name', 'vadas').next()
 
     # be sure to use a terminating step like next() or iterate() so that the traversal "executes"
     # iterate() does not return any data and is used to just generate side-effects (i.e. write data to the database)
     g.V(v1).add_e('knows').to(v2).property('weight', 0.75).iterate()
     g.V(v1).add_e('knows').to(v3).property('weight', 0.75).iterate()
 
     # retrieve the data from the "marko" vertex
-    marko = g.V().has('person-py-ex', 'name', 'marko').values('name').next()
+    marko = g.V().has(vertex_label, 'name', 'marko').values('name').next()
     print("name: " + marko)
 
     # find the "marko" vertex and then traverse to the people he "knows" and return their data
-    people_marko_knows = g.V().has('person-py-ex', 'name', 'marko').out('knows').values('name').to_list()
+    people_marko_knows = g.V().has(vertex_label, 'name', 'marko').out('knows').values('name').to_list()
     for person in people_marko_knows:
         print("marko knows " + person)
 
-    # clean added data
-    g.V().has_label('person-py-ex').drop().iterate()
-
     rc.close()
 
 

gremlin-python/src/main/python/examples/connections.py

@@ -46,16 +46,15 @@ def with_remote():
     # variable named "g" as referenced in the following line.
     # if there is a port placeholder in the env var then we are running with docker so set appropriate port 
     server_url = os.getenv('GREMLIN_SERVER_URL', 'ws://localhost:8182/gremlin').format(45940)
+    vertex_label = os.getenv('VERTEX_LABEL', 'connection')
     rc = DriverRemoteConnection(server_url, 'g')
     g = traversal().with_remote(rc)
 
     # simple query to verify connection
-    v = g.add_v('py-conn-ex').iterate()
-    count = g.V().has_label('py-conn-ex').count().next()
+    v = g.add_v(vertex_label).iterate()
+    count = g.V().has_label(vertex_label).count().next()
     print("Vertex count: " + str(count))
 
-    # clean added data
-    g.V().has_label('py-conn-ex').drop().iterate()
     # cleanup
     rc.close()
 
@@ -64,6 +63,7 @@ def with_remote():
 def with_auth():
     # if there is a port placeholder in the env var then we are running with docker so set appropriate port 
     server_url = os.getenv('GREMLIN_SERVER_BASIC_AUTH_URL', 'ws://localhost:8182/gremlin').format(45941)
+    vertex_label = os.getenv('VERTEX_LABEL', 'connection')
 
     # disable SSL certificate verification for remote hosts in test environments
     if 'localhost' not in server_url:
@@ -77,38 +77,36 @@ def with_auth():
 
     g = traversal().with_remote(rc)
 
-    v = g.add_v('py-conn-ex').iterate()
-    count = g.V().has_label('py-conn-ex').count().next()
+    v = g.add_v(vertex_label).iterate()
+    count = g.V().has_label(vertex_label).count().next()
     print("Vertex count: " + str(count))
 
-    # clean added data
-    g.V().has_label('py-conn-ex').drop().iterate()
     rc.close()
 
 
 # connecting with Kerberos SASL authentication
 def with_kerberos():
     # if there is a port placeholder in the env var then we are running with docker so set appropriate port 
     server_url = os.getenv('GREMLIN_SERVER_URL', 'ws://localhost:8182/gremlin').format(45942)
+    vertex_label = os.getenv('VERTEX_LABEL', 'connection')
     kerberos_hostname = os.getenv('KRB_HOSTNAME', socket.gethostname())
     kerberized_service = f'test-service@{kerberos_hostname}'
 
     rc = DriverRemoteConnection(server_url, 'g', kerberized_service=kerberized_service)
     g = traversal().with_remote(rc)
 
-    v = g.add_v('py-conn-ex').iterate()
-    count = g.V().has_label('py-conn-ex').count().next()
+    v = g.add_v(vertex_label).iterate()
+    count = g.V().has_label(vertex_label).count().next()
     print("Vertex count: " + str(count))
 
-    # clean added data
-    g.V().has_label('py-conn-ex').drop().iterate()
     rc.close()
 
 
 # connecting with customized configurations
 def with_configs():
     # if there is a port placeholder in the env var then we are running with docker so set appropriate port 
     server_url = os.getenv('GREMLIN_SERVER_URL', 'ws://localhost:8182/gremlin').format(45940)
+    vertex_label = os.getenv('VERTEX_LABEL', 'connection')
     rc = DriverRemoteConnection(
         server_url, 'g',
         username="", password="", kerberized_service='',
@@ -118,13 +116,10 @@ def with_configs():
     )
     g = traversal().with_remote(rc)
 
-    v = g.add_v('py-conn-ex').iterate()
-    count = g.V().has_label('py-conn-ex').count().next()
+    v = g.add_v(vertex_label).iterate()
+    count = g.V().has_label(vertex_label).count().next()
     print("Vertex count: " + str(count))
 
-    # clean added data
-    g.V().has_label('py-conn-ex').drop().iterate()
-
     rc.close()