trustgraph-cli 2.2.15__tar.gz → 2.2.17__tar.gz

{trustgraph_cli-2.2.15 → trustgraph_cli-2.2.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-cli
-Version: 2.2.15
+Version: 2.2.17
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Author-email: "trustgraph.ai" <security@trustgraph.ai>
 Project-URL: Homepage, https://github.com/trustgraph-ai/trustgraph

{trustgraph_cli-2.2.15 → trustgraph_cli-2.2.17}/pyproject.toml

@@ -51,6 +51,7 @@ tg-invoke-document-embeddings = "trustgraph.cli.invoke_document_embeddings:main"
 tg-invoke-mcp-tool = "trustgraph.cli.invoke_mcp_tool:main"
 tg-invoke-nlp-query = "trustgraph.cli.invoke_nlp_query:main"
 tg-invoke-rows-query = "trustgraph.cli.invoke_rows_query:main"
+tg-invoke-sparql-query = "trustgraph.cli.invoke_sparql_query:main"
 tg-invoke-row-embeddings = "trustgraph.cli.invoke_row_embeddings:main"
 tg-invoke-prompt = "trustgraph.cli.invoke_prompt:main"
 tg-invoke-structured-query = "trustgraph.cli.invoke_structured_query:main"

{trustgraph_cli-2.2.15 → trustgraph_cli-2.2.17}/trustgraph/cli/dump_queues.py

@@ -354,10 +354,8 @@ IMPORTANT:
             output_file=args.output,
             subscriber_name=args.subscriber,
             append_mode=args.append,
-            pubsub_backend=args.pubsub_backend,
-            pulsar_host=args.pulsar_host,
-            pulsar_api_key=args.pulsar_api_key,
-            pulsar_listener=args.pulsar_listener,
+            **{k: v for k, v in vars(args).items()
+               if k not in ('queues', 'output', 'subscriber', 'append')},
         ))
     except KeyboardInterrupt:
         # Already handled in async_main

{trustgraph_cli-2.2.15 → trustgraph_cli-2.2.17}/trustgraph/cli/init_trustgraph.py

@@ -1,5 +1,8 @@
 """
-Initialises Pulsar with Trustgraph tenant / namespaces & policy.
+Initialises TrustGraph pub/sub infrastructure and pushes initial config.
+
+For Pulsar: creates tenant, namespaces, and retention policies.
+For RabbitMQ: queues are auto-declared, so only config push is needed.
 """
 
 import requests
@@ -8,10 +11,11 @@ import argparse
 import json
 
 from trustgraph.clients.config_client import ConfigClient
+from trustgraph.base.pubsub import add_pubsub_args
 
 default_pulsar_admin_url = "http://pulsar:8080"
-default_pulsar_host = "pulsar://pulsar:6650"
-subscriber = "tg-init-pulsar"
+subscriber = "tg-init-pubsub"
+
 
 def get_clusters(url):
 
@@ -65,12 +69,11 @@ def ensure_namespace(url, tenant, namespace, config):
 
     print(f"Namespace {tenant}/{namespace} created.", flush=True)
 
-def ensure_config(config, pulsar_host, pulsar_api_key):
+def ensure_config(config, **pubsub_config):
 
     cli = ConfigClient(
         subscriber=subscriber,
-        pulsar_host=pulsar_host,
-        pulsar_api_key=pulsar_api_key,
+        **pubsub_config,
     )
 
     while True:
@@ -115,11 +118,9 @@ def ensure_config(config, pulsar_host, pulsar_api_key):
             time.sleep(2)
             print("Retrying...", flush=True)
             continue
-    
-def init(
-        pulsar_admin_url, pulsar_host, pulsar_api_key, tenant,
-        config, config_file,
-):
+
+def init_pulsar(pulsar_admin_url, tenant):
+    """Pulsar-specific setup: create tenant, namespaces, retention policies."""
 
     clusters = get_clusters(pulsar_admin_url)
 
@@ -145,17 +146,21 @@ def init(
         }
     })
 
-    if config is not None:
+
+def push_config(config_json, config_file, **pubsub_config):
+    """Push initial config if provided."""
+
+    if config_json is not None:
 
         try:
             print("Decoding config...", flush=True)
-            dec = json.loads(config)
+            dec = json.loads(config_json)
             print("Decoded.", flush=True)
         except Exception as e:
             print("Exception:", e, flush=True)
             raise e
 
-        ensure_config(dec, pulsar_host, pulsar_api_key)
+        ensure_config(dec, **pubsub_config)
 
     elif config_file is not None:
 
@@ -167,11 +172,12 @@ def init(
             print("Exception:", e, flush=True)
             raise e
 
-        ensure_config(dec, pulsar_host, pulsar_api_key)
+        ensure_config(dec, **pubsub_config)
 
     else:
         print("No config to update.", flush=True)
 
+
 def main():
 
     parser = argparse.ArgumentParser(
@@ -180,22 +186,11 @@ def main():
     )
 
     parser.add_argument(
-        '-p', '--pulsar-admin-url',
+        '--pulsar-admin-url',
         default=default_pulsar_admin_url,
         help=f'Pulsar admin URL (default: {default_pulsar_admin_url})',
     )
 
-    parser.add_argument(
-        '--pulsar-host',
-        default=default_pulsar_host,
-        help=f'Pulsar host (default: {default_pulsar_host})',
-    )
-
-    parser.add_argument(
-        '--pulsar-api-key',
-        help=f'Pulsar API key',
-    )
-
     parser.add_argument(
         '-c', '--config',
         help=f'Initial configuration to load',
@@ -212,18 +207,43 @@ def main():
         help=f'Tenant (default: tg)',
     )
 
+    add_pubsub_args(parser)
+
     args = parser.parse_args()
 
+    backend_type = args.pubsub_backend
+
+    # Extract pubsub config from args
+    pubsub_config = {
+        k: v for k, v in vars(args).items()
+        if k not in ('pulsar_admin_url', 'config', 'config_file', 'tenant')
+    }
+
     while True:
 
         try:
 
-            print(flush=True)
-            print(
-                f"Initialising with Pulsar {args.pulsar_admin_url}...",
-                flush=True
+            # Pulsar-specific setup (tenants, namespaces)
+            if backend_type == 'pulsar':
+                print(flush=True)
+                print(
+                    f"Initialising Pulsar at {args.pulsar_admin_url}...",
+                    flush=True,
+                )
+                init_pulsar(args.pulsar_admin_url, args.tenant)
+            else:
+                print(flush=True)
+                print(
+                    f"Using {backend_type} backend (no admin setup needed).",
+                    flush=True,
+                )
+
+            # Push config (works with any backend)
+            push_config(
+                args.config, args.config_file,
+                **pubsub_config,
             )
-            init(**vars(args))
+
             print("Initialisation complete.", flush=True)
             break
 
@@ -236,4 +256,4 @@ def main():
             print("Will retry...", flush=True)
 
 if __name__ == "__main__":
-    main()
+    main()

trustgraph_cli-2.2.17/trustgraph/cli/invoke_sparql_query.py

@@ -0,0 +1,239 @@
+"""
+Execute a SPARQL query against the TrustGraph knowledge graph.
+"""
+
+import argparse
+import os
+import json
+import sys
+from trustgraph.api import Api
+
+default_url = os.getenv("TRUSTGRAPH_URL", 'http://localhost:8088/')
+default_user = 'trustgraph'
+default_collection = 'default'
+
+
+def _term_cell(val):
+    """Extract display string from a wire-format term."""
+    if val is None:
+        return ""
+    t = val.get("t", "")
+    if t == "i":
+        return val.get("i", "")
+    elif t == "l":
+        return val.get("v", "")
+    return val.get("v", val.get("i", ""))
+
+
+def _term_str(val):
+    """Convert a wire-format term to a Turtle-style display string."""
+    if val is None:
+        return "?"
+    t = val.get("t", "")
+    if t == "i":
+        return f"<{val.get('i', '')}>"
+    elif t == "l":
+        v = val.get("v", "")
+        dt = val.get("d", "")
+        lang = val.get("l", "")
+        if lang:
+            return f'"{v}"@{lang}'
+        elif dt:
+            return f'"{v}"^^<{dt}>'
+        return f'"{v}"'
+    return str(val)
+
+
+def sparql_query(url, token, flow_id, query, user, collection, limit,
+                 batch_size, output_format):
+
+    socket = Api(url=url, token=token).socket()
+    flow = socket.flow(flow_id)
+
+    variables = None
+    all_rows = []
+
+    try:
+
+        for response in flow.sparql_query_stream(
+            query=query,
+            user=user,
+            collection=collection,
+            limit=limit,
+            batch_size=batch_size,
+        ):
+            query_type = response.get("query-type", "select")
+
+            # ASK queries - just print and return
+            if query_type == "ask":
+                print("true" if response.get("ask-result") else "false")
+                return
+
+            # CONSTRUCT/DESCRIBE - print triples
+            if query_type in ("construct", "describe"):
+                triples = response.get("triples", [])
+                if not triples:
+                    print("No triples.")
+                elif output_format == "json":
+                    print(json.dumps(triples, indent=2))
+                else:
+                    for t in triples:
+                        s = _term_str(t.get("s"))
+                        p = _term_str(t.get("p"))
+                        o = _term_str(t.get("o"))
+                        print(f"{s} {p} {o} .")
+                return
+
+            # SELECT - accumulate bindings across batches
+            if variables is None:
+                variables = response.get("variables", [])
+
+            bindings = response.get("bindings", [])
+            for binding in bindings:
+                values = binding.get("values", [])
+                all_rows.append([_term_cell(v) for v in values])
+
+        # Output SELECT results
+        if variables is None:
+            print("No results.")
+            return
+
+        if not all_rows:
+            print("No results.")
+            return
+
+        if output_format == "json":
+            rows = []
+            for row in all_rows:
+                rows.append({
+                    var: cell for var, cell in zip(variables, row)
+                })
+            print(json.dumps(rows, indent=2))
+        else:
+            # Table format
+            col_widths = [len(v) for v in variables]
+            for row in all_rows:
+                for i, cell in enumerate(row):
+                    if i < len(col_widths):
+                        col_widths[i] = max(col_widths[i], len(cell))
+
+            header = " | ".join(
+                v.ljust(col_widths[i]) for i, v in enumerate(variables)
+            )
+            separator = "-+-".join("-" * w for w in col_widths)
+            print(header)
+            print(separator)
+            for row in all_rows:
+                line = " | ".join(
+                    cell.ljust(col_widths[i]) if i < len(col_widths) else cell
+                    for i, cell in enumerate(row)
+                )
+                print(line)
+
+    finally:
+        socket.close()
+
+
+def main():
+
+    parser = argparse.ArgumentParser(
+        prog='tg-invoke-sparql-query',
+        description=__doc__,
+    )
+
+    parser.add_argument(
+        '-u', '--url',
+        default=default_url,
+        help=f'API URL (default: {default_url})',
+    )
+
+    parser.add_argument(
+        '-t', '--token',
+        default=os.getenv("TRUSTGRAPH_TOKEN"),
+        help='API bearer token (default: TRUSTGRAPH_TOKEN env var)',
+    )
+
+    parser.add_argument(
+        '-f', '--flow-id',
+        default="default",
+        help='Flow ID (default: default)',
+    )
+
+    parser.add_argument(
+        '-q', '--query',
+        help='SPARQL query string',
+    )
+
+    parser.add_argument(
+        '-i', '--input',
+        help='Read SPARQL query from file (use - for stdin)',
+    )
+
+    parser.add_argument(
+        '-U', '--user',
+        default=default_user,
+        help=f'User ID (default: {default_user})',
+    )
+
+    parser.add_argument(
+        '-C', '--collection',
+        default=default_collection,
+        help=f'Collection ID (default: {default_collection})',
+    )
+
+    parser.add_argument(
+        '-l', '--limit',
+        type=int,
+        default=10000,
+        help='Result limit (default: 10000)',
+    )
+
+    parser.add_argument(
+        '-b', '--batch-size',
+        type=int,
+        default=20,
+        help='Streaming batch size (default: 20)',
+    )
+
+    parser.add_argument(
+        '--format',
+        choices=['table', 'json'],
+        default='table',
+        help='Output format (default: table)',
+    )
+
+    args = parser.parse_args()
+
+    # Get query from argument or file
+    query = args.query
+    if not query and args.input:
+        if args.input == '-':
+            query = sys.stdin.read()
+        else:
+            with open(args.input) as f:
+                query = f.read()
+
+    if not query:
+        parser.error("Either -q/--query or -i/--input is required")
+
+    try:
+
+        sparql_query(
+            url=args.url,
+            token=args.token,
+            flow_id=args.flow_id,
+            query=query,
+            user=args.user,
+            collection=args.collection,
+            limit=args.limit,
+            batch_size=args.batch_size,
+            output_format=args.format,
+        )
+
+    except Exception as e:
+        print(f"Exception: {e}", flush=True, file=sys.stderr)
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

{trustgraph_cli-2.2.15 → trustgraph_cli-2.2.17}/trustgraph/cli/monitor_prompts.py

@@ -316,10 +316,8 @@ def main():
             queue_type=args.queue_type,
             max_lines=args.max_lines,
             max_width=args.max_width,
-            pulsar_host=args.pulsar_host,
-            pulsar_api_key=args.pulsar_api_key,
-            pulsar_listener=args.pulsar_listener,
-            pubsub_backend=args.pubsub_backend,
+            **{k: v for k, v in vars(args).items()
+               if k not in ('flow', 'queue_type', 'max_lines', 'max_width')},
         ))
     except KeyboardInterrupt:
         pass

{trustgraph_cli-2.2.15 → trustgraph_cli-2.2.17}/trustgraph/cli/verify_system_status.py

@@ -377,24 +377,14 @@ def main():
     print("=" * 60)
     print("TrustGraph System Status Verification")
     print("=" * 60)
-#    print(f"Global timeout: {args.global_timeout}s")
-#    print(f"Check timeout: {args.check_timeout}s")
-#    print(f"Retry delay: {args.retry_delay}s")
-#    print("=" * 60)
     print()
 
     # Phase 1: Infrastructure
     print("Phase 1: Infrastructure")
     print("-" * 60)
 
-    if not checker.run_check(
-        "Pulsar",
-        check_pulsar,
-        args.pulsar_url,
-        args.check_timeout
-    ):
-        print("\n⚠️  Pulsar is not responding - other checks may fail")
-        print()
+    # Pulsar check is skipped — not all deployments use Pulsar.
+    # The API Gateway check covers broker connectivity indirectly.
 
     checker.run_check(
         "API Gateway",

trustgraph_cli-2.2.17/trustgraph/cli_version.py

@@ -0,0 +1 @@
+__version__ = "2.2.17"

{trustgraph_cli-2.2.15 → trustgraph_cli-2.2.17}/trustgraph_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-cli
-Version: 2.2.15
+Version: 2.2.17
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Author-email: "trustgraph.ai" <security@trustgraph.ai>
 Project-URL: Homepage, https://github.com/trustgraph-ai/trustgraph

{trustgraph_cli-2.2.15 → trustgraph_cli-2.2.17}/trustgraph_cli.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ trustgraph/cli/invoke_nlp_query.py
 trustgraph/cli/invoke_prompt.py
 trustgraph/cli/invoke_row_embeddings.py
 trustgraph/cli/invoke_rows_query.py
+trustgraph/cli/invoke_sparql_query.py
 trustgraph/cli/invoke_structured_query.py
 trustgraph/cli/list_collections.py
 trustgraph/cli/list_config_items.py

{trustgraph_cli-2.2.15 → trustgraph_cli-2.2.17}/trustgraph_cli.egg-info/entry_points.txt

@@ -26,6 +26,7 @@ tg-invoke-nlp-query = trustgraph.cli.invoke_nlp_query:main
 tg-invoke-prompt = trustgraph.cli.invoke_prompt:main
 tg-invoke-row-embeddings = trustgraph.cli.invoke_row_embeddings:main
 tg-invoke-rows-query = trustgraph.cli.invoke_rows_query:main
+tg-invoke-sparql-query = trustgraph.cli.invoke_sparql_query:main
 tg-invoke-structured-query = trustgraph.cli.invoke_structured_query:main
 tg-list-collections = trustgraph.cli.list_collections:main
 tg-list-config-items = trustgraph.cli.list_config_items:main

trustgraph_cli-2.2.15/trustgraph/cli_version.py

@@ -1 +0,0 @@
-__version__ = "2.2.15"