Merge branch 'release/v0.21' into pulsar-api-support

trustgraph-cli/scripts/tg-graph-show

@@ -6,24 +6,23 @@ Connects to the graph query service and dumps all graph edges.
 
 import argparse
 import os
-from trustgraph.clients.triples_query_client import TriplesQueryClient
+from trustgraph.api import Api
 
-default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://localhost:6650')
-default_pulsar_api_key = os.getenv("PULSAR_API_KEY", None)
+default_url = os.getenv("TRUSTGRAPH_URL", 'http://localhost:8088/')
 default_user = 'trustgraph'
 default_collection = 'default'
 
-def show_graph(pulsar, user, collection, pulsar_api_key=None):
+def show_graph(url, user, collection):
 
-    tq = TriplesQueryClient(pulsar_host=pulsar, pulsar_api_key=pulsar_api_key)
+    api = Api(url)
 
-    rows = tq.request(
-        user=user, collection=collection,
-        s=None, p=None, o=None, limit=10_000_000
+    rows = api.triples_query(
+#         user=user, collection=collection,
+        s=None, p=None, o=None, limit=10_000,
     )
 
     for row in rows:
-        print(row.s.value, row.p.value, row.o.value)
+        print(row.s, row.p, row.o)
 
 def main():
 
@@ -33,35 +32,30 @@ def main():
     )
 
     parser.add_argument(
-        '-p', '--pulsar-host',
-        default=default_pulsar_host,
-        help=f'Pulsar host (default: {default_pulsar_host})',
+        '-u', '--api-url',
+        default=default_url,
+        help=f'API URL (default: {default_url})',
     )
 
     parser.add_argument(
-        '-u', '--user',
+        '-U', '--user',
         default=default_user,
         help=f'User ID (default: {default_user})'
     )
 
     parser.add_argument(
-        '-c', '--collection',
+        '-C', '--collection',
         default=default_collection,
         help=f'Collection ID (default: {default_collection})'
     )
-        
-    parser.add_argument(
-        '--pulsar-api-key',
-        default=default_pulsar_api_key,
-        help=f'Pulsar API key',
-    )
     
     args = parser.parse_args()
 
     try:
 
         show_graph(
-            pulsar=args.pulsar_host, user=args.user,
+            url=args.api_url,
+            user=args.user,
             collection=args.collection,
             pulsar_api_key=args.pulsar_api_key,
         )