trustgraph-cli 2.4.2__tar.gz → 2.4.4__tar.gz

{trustgraph_cli-2.4.2 → trustgraph_cli-2.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-cli
-Version: 2.4.2
+Version: 2.4.4
 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.4.2 → trustgraph_cli-2.4.4}/pyproject.toml

@@ -40,7 +40,6 @@ tg-get-flow-blueprint = "trustgraph.cli.get_flow_blueprint:main"
 tg-get-kg-core = "trustgraph.cli.get_kg_core:main"
 tg-get-document-content = "trustgraph.cli.get_document_content:main"
 tg-graph-to-turtle = "trustgraph.cli.graph_to_turtle:main"
-tg-init-trustgraph = "trustgraph.cli.init_trustgraph:main"
 tg-invoke-agent = "trustgraph.cli.invoke_agent:main"
 tg-invoke-document-rag = "trustgraph.cli.invoke_document_rag:main"
 tg-invoke-graph-rag = "trustgraph.cli.invoke_graph_rag:main"

{trustgraph_cli-2.4.2 → trustgraph_cli-2.4.4}/trustgraph/cli/show_flow_state.py

@@ -44,16 +44,18 @@ def show_processors(metrics_url, flow_label):
 
     obj = resp.json()
 
-    tbl = [
-        [
-            m["metric"]["job"],
-            "\U0001f49a" if int(m["value"][1]) > 0 else "\U0000274c"
-        ]
-        for m in obj["data"]["result"]
-    ]
-
-    for row in tbl:
-        print(f"- {row[0]:30} {row[1]}")
+    # consumer_state is one sample per consumer (queue); a processor
+    # with N subscriptions shows up N times.  Aggregate to one row per
+    # processor: green only if every consumer is running.
+    by_proc = {}
+    for m in obj["data"]["result"]:
+        name = m["metric"].get("processor", m["metric"]["job"])
+        running = int(m["value"][1]) > 0
+        by_proc[name] = by_proc.get(name, True) and running
+
+    for name in sorted(by_proc):
+        icon = "\U0001f49a" if by_proc[name] else "\U0000274c"
+        print(f"- {name:30} {icon}")
 
 def main():
 

{trustgraph_cli-2.4.2 → trustgraph_cli-2.4.4}/trustgraph/cli/show_processor_state.py

@@ -17,7 +17,7 @@ def dump_status(url):
 
     tbl = [
         [
-            m["metric"]["job"],
+            m["metric"].get("processor", m["metric"]["job"]),
             "\U0001f49a"
         ]
         for m in obj["data"]["result"]

trustgraph_cli-2.4.4/trustgraph/cli_version.py

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

{trustgraph_cli-2.4.2 → trustgraph_cli-2.4.4}/trustgraph_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-cli
-Version: 2.4.2
+Version: 2.4.4
 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.4.2 → trustgraph_cli-2.4.4}/trustgraph_cli.egg-info/SOURCES.txt

@@ -19,7 +19,6 @@ trustgraph/cli/get_kg_core.py
 trustgraph/cli/graph_to_turtle.py
 trustgraph/cli/import_workspace_config.py
 trustgraph/cli/init_pulsar_manager.py
-trustgraph/cli/init_trustgraph.py
 trustgraph/cli/invoke_agent.py
 trustgraph/cli/invoke_document_embeddings.py
 trustgraph/cli/invoke_document_rag.py

{trustgraph_cli-2.4.2 → trustgraph_cli-2.4.4}/trustgraph_cli.egg-info/entry_points.txt

@@ -15,7 +15,6 @@ tg-get-flow-blueprint = trustgraph.cli.get_flow_blueprint:main
 tg-get-kg-core = trustgraph.cli.get_kg_core:main
 tg-graph-to-turtle = trustgraph.cli.graph_to_turtle:main
 tg-import-workspace-config = trustgraph.cli.import_workspace_config:main
-tg-init-trustgraph = trustgraph.cli.init_trustgraph:main
 tg-invoke-agent = trustgraph.cli.invoke_agent:main
 tg-invoke-document-embeddings = trustgraph.cli.invoke_document_embeddings:main
 tg-invoke-document-rag = trustgraph.cli.invoke_document_rag:main

trustgraph_cli-2.4.2/trustgraph/cli/init_trustgraph.py

@@ -1,271 +0,0 @@
-"""
-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
-import time
-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"
-subscriber = "tg-init-pubsub"
-
-
-def get_clusters(url):
-
-    print("Get clusters...", flush=True)
-
-    resp = requests.get(f"{url}/admin/v2/clusters")
-
-    if resp.status_code != 200: raise RuntimeError("Could not fetch clusters")
-
-    return resp.json()
-
-def ensure_tenant(url, tenant, clusters):
-
-    resp = requests.get(f"{url}/admin/v2/tenants/{tenant}")
-
-    if resp.status_code == 200:
-        print(f"Tenant {tenant} already exists.", flush=True)
-        return
-
-    resp = requests.put(
-        f"{url}/admin/v2/tenants/{tenant}",
-        json={
-            "adminRoles": [],
-            "allowedClusters": clusters,
-        }
-    )
-
-    if resp.status_code != 204:
-        print(resp.text, flush=True)
-        raise RuntimeError("Tenant creation failed.")
-
-    print(f"Tenant {tenant} created.", flush=True)
-
-def ensure_namespace(url, tenant, namespace, config):
-
-    resp = requests.get(f"{url}/admin/v2/namespaces/{tenant}/{namespace}")
-
-    if resp.status_code == 200:
-        print(f"Namespace {tenant}/{namespace} already exists.", flush=True)
-        return
-
-    resp = requests.put(
-        f"{url}/admin/v2/namespaces/{tenant}/{namespace}",
-        json=config,
-    )
-
-    if resp.status_code != 204:
-        print(resp.status_code, flush=True)
-        print(resp.text, flush=True)
-        raise RuntimeError(f"Namespace {tenant}/{namespace} creation failed.")
-
-    print(f"Namespace {tenant}/{namespace} created.", flush=True)
-
-def ensure_config(config, workspace="default", **pubsub_config):
-
-    cli = ConfigClient(
-        subscriber=subscriber,
-        workspace=workspace,
-        **pubsub_config,
-    )
-
-    while True:
-
-        try:
-
-            print("Get current config...", flush=True)
-            current, version = cli.config(timeout=5)
-
-        except Exception as e:
-
-            print("Exception:", e, flush=True)
-            time.sleep(2)
-            print("Retrying...", flush=True)
-            continue
-
-        print("Current config version is", version, flush=True)
-
-        if version != 0:
-            print("Already updated, not updating config.  Done.", flush=True)
-            return
-
-        print("Config is version 0, updating...", flush=True)
-
-        batch = []
-
-        for type in config:
-            for key in config[type]:
-                print(f"Adding {type}/{key} to update.", flush=True)
-                batch.append({
-                    "type": type,
-                    "key": key,
-                    "value": json.dumps(config[type][key]),
-                })
-
-        try:
-            cli.put(batch, timeout=10)
-            print("Update succeeded.", flush=True)
-            break
-        except Exception as e:
-            print("Exception:", e, flush=True)
-            time.sleep(2)
-            print("Retrying...", flush=True)
-            continue
-
-def init_pulsar(pulsar_admin_url, tenant):
-    """Pulsar-specific setup: create tenant, namespaces, retention policies."""
-
-    clusters = get_clusters(pulsar_admin_url)
-
-    ensure_tenant(pulsar_admin_url, tenant, clusters)
-
-    ensure_namespace(pulsar_admin_url, tenant, "flow", {})
-
-    ensure_namespace(pulsar_admin_url, tenant, "request", {})
-
-    ensure_namespace(pulsar_admin_url, tenant, "response", {
-        "retention_policies": {
-            "retentionSizeInMB": -1,
-            "retentionTimeInMinutes": 3,
-            "subscriptionExpirationTimeMinutes": 30,
-        }
-    })
-
-    ensure_namespace(pulsar_admin_url, tenant, "notify", {
-        "retention_policies": {
-            "retentionSizeInMB": -1,
-            "retentionTimeInMinutes": 3,
-            "subscriptionExpirationTimeMinutes": 5,
-        }
-    })
-
-
-def push_config(config_json, config_file, workspace="default",
-                **pubsub_config):
-    """Push initial config if provided."""
-
-    if config_json is not None:
-
-        try:
-            print("Decoding config...", flush=True)
-            dec = json.loads(config_json)
-            print("Decoded.", flush=True)
-        except Exception as e:
-            print("Exception:", e, flush=True)
-            raise e
-
-        ensure_config(dec, workspace=workspace, **pubsub_config)
-
-    elif config_file is not None:
-
-        try:
-            print("Decoding config...", flush=True)
-            dec = json.load(open(config_file))
-            print("Decoded.", flush=True)
-        except Exception as e:
-            print("Exception:", e, flush=True)
-            raise e
-
-        ensure_config(dec, workspace=workspace, **pubsub_config)
-
-    else:
-        print("No config to update.", flush=True)
-
-
-def main():
-
-    parser = argparse.ArgumentParser(
-        prog='tg-init-trustgraph',
-        description=__doc__,
-    )
-
-    parser.add_argument(
-        '--pulsar-admin-url',
-        default=default_pulsar_admin_url,
-        help=f'Pulsar admin URL (default: {default_pulsar_admin_url})',
-    )
-
-    parser.add_argument(
-        '-c', '--config',
-        help=f'Initial configuration to load',
-    )
-
-    parser.add_argument(
-        '-C', '--config-file',
-        help=f'Initial configuration to load from file',
-    )
-
-    parser.add_argument(
-        '-t', '--tenant',
-        default="tg",
-        help=f'Tenant (default: tg)',
-    )
-
-    parser.add_argument(
-        '-w', '--workspace',
-        default="default",
-        help=f'Workspace (default: default)',
-    )
-
-    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',
-            'workspace',
-        )
-    }
-
-    while True:
-
-        try:
-
-            # 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,
-                workspace=args.workspace,
-                **pubsub_config,
-            )
-
-            print("Initialisation complete.", flush=True)
-            break
-
-        except Exception as e:
-
-            print("Exception:", e, flush=True)
-
-            print("Sleeping...", flush=True)
-            time.sleep(2)
-            print("Will retry...", flush=True)
-
-if __name__ == "__main__":
-    main()

trustgraph_cli-2.4.2/trustgraph/cli_version.py

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