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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-cli
-Version: 2.2.15
+Version: 2.2.16
 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.16}/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.16}/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.15 → trustgraph_cli-2.2.16}/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.16/trustgraph/cli_version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-cli
-Version: 2.2.15
+Version: 2.2.16
 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_version.py

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