trustgraph-cli 2.6.12__tar.gz → 2.6.14__tar.gz

{trustgraph_cli-2.6.12 → trustgraph_cli-2.6.14}/PKG-INFO

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

@@ -116,6 +116,8 @@ tg-put-config-item = "trustgraph.cli.put_config_item:main"
 tg-delete-config-item = "trustgraph.cli.delete_config_item:main"
 tg-export-workspace-config = "trustgraph.cli.export_workspace_config:main"
 tg-import-workspace-config = "trustgraph.cli.import_workspace_config:main"
+tg-export-workspace = "trustgraph.cli.export_workspace:main"
+tg-import-workspace = "trustgraph.cli.import_workspace:main"
 tg-list-collections = "trustgraph.cli.list_collections:main"
 tg-set-collection = "trustgraph.cli.set_collection:main"
 tg-delete-collection = "trustgraph.cli.delete_collection:main"

trustgraph_cli-2.6.14/trustgraph/cli/export_workspace.py

@@ -0,0 +1,141 @@
+"""
+Exports a workspace's full configuration state as a portable .tgx bundle
+(a gzipped tar archive) for backup, migration between deployments, or
+sharing a pre-configured workspace.
+
+The bundle is human-readable: a manifest.json plus one pretty-printed JSON
+file per config key under config/<type>/, so it can be inspected and
+hand-edited before import. Each entry file embeds its own type and key, so
+filenames are cosmetic. Knowledge export (triples, documents, embeddings)
+is not yet included; the manifest records that so future importers can
+distinguish config-only bundles.
+"""
+
+import argparse
+import io
+import json
+import os
+import sys
+import tarfile
+import time
+from urllib.parse import quote
+
+from trustgraph.api import Api
+
+default_url = os.getenv("TRUSTGRAPH_URL", 'http://localhost:8088/')
+default_token = os.getenv("TRUSTGRAPH_TOKEN", None)
+default_workspace = os.getenv("TRUSTGRAPH_WORKSPACE", "default")
+
+MANIFEST_FORMAT = "tgx"
+MANIFEST_FORMAT_VERSION = 1
+
+
+def _add_bytes(tar, name, data):
+    info = tarfile.TarInfo(name=name)
+    info.size = len(data)
+    info.mtime = int(time.time())
+    tar.addfile(info, io.BytesIO(data))
+
+
+def export_workspace(url, workspace, output, token=None):
+
+    api = Api(url, token=token, workspace=workspace).config()
+
+    config, version = api.all()
+
+    manifest = {
+        "format": MANIFEST_FORMAT,
+        "format_version": MANIFEST_FORMAT_VERSION,
+        "workspace": workspace,
+        "config_version": version,
+        "exported_at": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()),
+        "contents": {"config": True, "knowledge": False},
+    }
+
+    count = 0
+
+    with tarfile.open(output, "w:gz") as tar:
+
+        _add_bytes(
+            tar, "manifest.json",
+            json.dumps(manifest, indent=2).encode("utf-8"),
+        )
+
+        for type_, entries in sorted(config.items()):
+            for key, raw in sorted(entries.items()):
+
+                # Config values are stored as JSON strings; parse so the
+                # bundle is pretty-printed and hand-editable. A value that
+                # isn't valid JSON is preserved verbatim.
+                try:
+                    value = json.loads(raw)
+                except (TypeError, json.JSONDecodeError):
+                    value = raw
+
+                entry = {"type": type_, "key": key, "value": value}
+
+                # Keys may contain path-unsafe characters; the entry embeds
+                # the real key, so the quoted filename is cosmetic only.
+                name = f"config/{quote(type_, safe='')}/{quote(key, safe='')}.json"
+
+                _add_bytes(
+                    tar, name,
+                    json.dumps(entry, indent=2).encode("utf-8"),
+                )
+
+                count += 1
+
+    print(f"Exported {count} config item(s) from workspace "
+          f"'{workspace}' to {output}", flush=True)
+
+
+def main():
+
+    parser = argparse.ArgumentParser(
+        prog='tg-export-workspace',
+        description=__doc__,
+    )
+
+    parser.add_argument(
+        '-u', '--api-url',
+        default=default_url,
+        help=f'API URL (default: {default_url})',
+    )
+
+    parser.add_argument(
+        '-t', '--token',
+        default=default_token,
+        help='API token (default: TRUSTGRAPH_TOKEN environment variable)',
+    )
+
+    parser.add_argument(
+        '-w', '--workspace',
+        default=default_workspace,
+        help=f'Workspace to export (default: {default_workspace})',
+    )
+
+    parser.add_argument(
+        '-o', '--output',
+        required=True,
+        help='Output bundle path, e.g. workspace-default.tgx',
+    )
+
+    args = parser.parse_args()
+
+    try:
+
+        export_workspace(
+            url=args.api_url,
+            workspace=args.workspace,
+            output=args.output,
+            token=args.token,
+        )
+
+    except Exception as e:
+
+        print("Exception:", e, flush=True)
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

trustgraph_cli-2.6.14/trustgraph/cli/import_workspace.py

@@ -0,0 +1,194 @@
+"""
+Imports a workspace bundle (.tgx, produced by tg-export-workspace) into a
+TrustGraph deployment. The target workspace defaults to the name recorded
+in the bundle's manifest and can be renamed with --workspace.
+
+By default existing (type, key) entries in the target workspace are left
+untouched and only missing keys are added, matching WorkspaceInit's
+re-run behaviour; pass --overwrite to replace every imported key. Use
+--dry-run to show what would be written without changing anything.
+"""
+
+import argparse
+import json
+import os
+import sys
+import tarfile
+
+from trustgraph.api import Api
+from trustgraph.api.types import ConfigValue
+
+default_url = os.getenv("TRUSTGRAPH_URL", 'http://localhost:8088/')
+default_token = os.getenv("TRUSTGRAPH_TOKEN", None)
+
+SUPPORTED_FORMAT = "tgx"
+SUPPORTED_FORMAT_VERSION = 1
+
+
+def _read_bundle(path):
+    """Read manifest and config entries from a .tgx bundle."""
+
+    manifest = None
+    entries = []
+
+    with tarfile.open(path, "r:gz") as tar:
+        for member in tar.getmembers():
+            if not member.isfile():
+                continue
+            f = tar.extractfile(member)
+            if f is None:
+                continue
+            data = f.read()
+            if member.name == "manifest.json":
+                manifest = json.loads(data)
+            elif member.name.startswith("config/") and \
+                    member.name.endswith(".json"):
+                entries.append(json.loads(data))
+
+    if manifest is None:
+        raise RuntimeError("not a workspace bundle: manifest.json missing")
+
+    if manifest.get("format") != SUPPORTED_FORMAT:
+        raise RuntimeError(
+            f"unsupported bundle format: {manifest.get('format')!r}"
+        )
+
+    if manifest.get("format_version", 0) > SUPPORTED_FORMAT_VERSION:
+        raise RuntimeError(
+            f"bundle format version {manifest.get('format_version')} is "
+            f"newer than this tool supports ({SUPPORTED_FORMAT_VERSION}); "
+            "upgrade trustgraph-cli"
+        )
+
+    return manifest, entries
+
+
+def import_workspace(
+        url, input, workspace=None, overwrite=False, config_only=False,
+        dry_run=False, token=None,
+):
+
+    manifest, entries = _read_bundle(input)
+
+    # Knowledge import (triples, documents, embeddings) is not implemented
+    # yet; refuse to silently drop it from a bundle that carries it.
+    if manifest.get("contents", {}).get("knowledge") and not config_only:
+        raise RuntimeError(
+            "bundle contains knowledge data, which this tool cannot import "
+            "yet; re-run with --config-only to import just the configuration"
+        )
+
+    target = workspace or manifest.get("workspace") or "default"
+
+    api = Api(url, token=token, workspace=target).config()
+
+    # Mirror WorkspaceInit's re-run behaviour: without --overwrite, keys
+    # already present in the target workspace are skipped (per key, not per
+    # type). The config API's put is a blanket upsert, so filter client-side.
+    existing = {}
+    if not overwrite:
+        for type_ in sorted({e["type"] for e in entries}):
+            existing[type_] = set(api.list(type_))
+
+    values = []
+    skipped = 0
+
+    for e in entries:
+        type_, key, value = e["type"], e["key"], e["value"]
+        if not overwrite and key in existing.get(type_, set()):
+            skipped += 1
+            continue
+        # Config values are stored as JSON strings (see WorkspaceInit).
+        values.append(
+            ConfigValue(type=type_, key=key, value=json.dumps(value))
+        )
+
+    if dry_run:
+        for v in values:
+            print(f"would import {v.type}/{v.key}", flush=True)
+        print(f"Dry run: {len(values)} item(s) would be imported into "
+              f"workspace '{target}', {skipped} skipped as existing",
+              flush=True)
+        return
+
+    if values:
+        api.put(values)
+
+    print(f"Imported {len(values)} config item(s) into workspace "
+          f"'{target}', {skipped} skipped as existing", flush=True)
+
+
+def main():
+
+    parser = argparse.ArgumentParser(
+        prog='tg-import-workspace',
+        description=__doc__,
+    )
+
+    parser.add_argument(
+        '-u', '--api-url',
+        default=default_url,
+        help=f'API URL (default: {default_url})',
+    )
+
+    parser.add_argument(
+        '-t', '--token',
+        default=default_token,
+        help='API token (default: TRUSTGRAPH_TOKEN environment variable)',
+    )
+
+    parser.add_argument(
+        '-i', '--input',
+        required=True,
+        help='Input bundle path, e.g. workspace-default.tgx',
+    )
+
+    parser.add_argument(
+        '-w', '--workspace',
+        default=None,
+        help='Target workspace (default: the workspace recorded in the '
+             'bundle manifest)',
+    )
+
+    parser.add_argument(
+        '--overwrite',
+        action='store_true',
+        help='Replace existing keys in the target workspace (default: '
+             'keep existing keys and only add missing ones)',
+    )
+
+    parser.add_argument(
+        '--config-only',
+        action='store_true',
+        help='Import only the configuration, skipping any knowledge data '
+             'in the bundle',
+    )
+
+    parser.add_argument(
+        '--dry-run',
+        action='store_true',
+        help='Show what would be imported without writing anything',
+    )
+
+    args = parser.parse_args()
+
+    try:
+
+        import_workspace(
+            url=args.api_url,
+            input=args.input,
+            workspace=args.workspace,
+            overwrite=args.overwrite,
+            config_only=args.config_only,
+            dry_run=args.dry_run,
+            token=args.token,
+        )
+
+    except Exception as e:
+
+        print("Exception:", e, flush=True)
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

{trustgraph_cli-2.6.12 → trustgraph_cli-2.6.14}/trustgraph/cli/invoke_graph_rag.py

@@ -27,11 +27,13 @@ default_max_subgraph_size = 150
 default_max_path_length = 2
 default_edge_score_limit = 30
 default_edge_limit = 25
+default_max_reranker_input = 350
 
 def _question_explainable_api(
         url, flow_id, question_text, collection, entity_limit, triple_limit,
         max_subgraph_size, max_path_length, edge_score_limit=30,
-        edge_limit=25, token=None, debug=False, workspace="default",
+        edge_limit=25, max_reranker_input=350, token=None, debug=False,
+        workspace="default",
 ):
     """Execute graph RAG with explainability using the new API classes."""
     api = Api(url=url, token=token, workspace=workspace)
@@ -50,6 +52,7 @@ def _question_explainable_api(
             max_path_length=max_path_length,
             edge_score_limit=edge_score_limit,
             edge_limit=edge_limit,
+            max_reranker_input=max_reranker_input,
         ):
             if isinstance(item, RAGChunk):
                 # Print response content
@@ -138,7 +141,7 @@ def _question_explainable_api(
 def question(
         url, flow_id, question, collection, entity_limit, triple_limit,
         max_subgraph_size, max_path_length, edge_score_limit=50,
-        edge_limit=25, streaming=True, token=None,
+        edge_limit=25, max_reranker_input=350, streaming=True, token=None,
         explainable=False, debug=False, show_usage=False,
         workspace="default",
 ):
@@ -156,6 +159,7 @@ def question(
             max_path_length=max_path_length,
             edge_score_limit=edge_score_limit,
             edge_limit=edge_limit,
+            max_reranker_input=max_reranker_input,
             token=token,
             debug=debug,
             workspace=workspace,
@@ -180,6 +184,7 @@ def question(
                 max_path_length=max_path_length,
                 edge_score_limit=edge_score_limit,
                 edge_limit=edge_limit,
+                max_reranker_input=max_reranker_input,
                 streaming=True
             )
 
@@ -212,6 +217,7 @@ def question(
             max_path_length=max_path_length,
             edge_score_limit=edge_score_limit,
             edge_limit=edge_limit,
+            max_reranker_input=max_reranker_input,
         )
         print(result.text)
 
@@ -308,6 +314,13 @@ def main():
         help=f'Max edges after LLM scoring (default: {default_edge_limit})'
     )
 
+    parser.add_argument(
+        '--max-reranker-input',
+        type=int,
+        default=default_max_reranker_input,
+        help=f'Max candidate edges sent to reranker per hop (default: {default_max_reranker_input})'
+    )
+
     parser.add_argument(
         '--no-streaming',
         action='store_true',
@@ -347,6 +360,7 @@ def main():
             max_path_length=args.max_path_length,
             edge_score_limit=args.edge_score_limit,
             edge_limit=args.edge_limit,
+            max_reranker_input=args.max_reranker_input,
             streaming=not args.no_streaming,
             token=args.token,
             explainable=args.explainable,

trustgraph_cli-2.6.14/trustgraph/cli_version.py

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

{trustgraph_cli-2.6.12 → trustgraph_cli-2.6.14}/trustgraph_cli.egg-info/PKG-INFO

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

@@ -20,6 +20,7 @@ trustgraph/cli/disable_user.py
 trustgraph/cli/dump_msgpack.py
 trustgraph/cli/dump_queues.py
 trustgraph/cli/enable_user.py
+trustgraph/cli/export_workspace.py
 trustgraph/cli/export_workspace_config.py
 trustgraph/cli/get_config_item.py
 trustgraph/cli/get_de_core.py
@@ -27,6 +28,7 @@ trustgraph/cli/get_document_content.py
 trustgraph/cli/get_flow_blueprint.py
 trustgraph/cli/get_kg_core.py
 trustgraph/cli/graph_to_turtle.py
+trustgraph/cli/import_workspace.py
 trustgraph/cli/import_workspace_config.py
 trustgraph/cli/init_pulsar_manager.py
 trustgraph/cli/invoke_agent.py

{trustgraph_cli-2.6.12 → trustgraph_cli-2.6.14}/trustgraph_cli.egg-info/entry_points.txt

@@ -16,6 +16,7 @@ tg-disable-user = trustgraph.cli.disable_user:main
 tg-dump-msgpack = trustgraph.cli.dump_msgpack:main
 tg-dump-queues = trustgraph.cli.dump_queues:main
 tg-enable-user = trustgraph.cli.enable_user:main
+tg-export-workspace = trustgraph.cli.export_workspace:main
 tg-export-workspace-config = trustgraph.cli.export_workspace_config:main
 tg-get-config-item = trustgraph.cli.get_config_item:main
 tg-get-de-core = trustgraph.cli.get_de_core:main
@@ -23,6 +24,7 @@ tg-get-document-content = trustgraph.cli.get_document_content:main
 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 = trustgraph.cli.import_workspace:main
 tg-import-workspace-config = trustgraph.cli.import_workspace_config:main
 tg-invoke-agent = trustgraph.cli.invoke_agent:main
 tg-invoke-document-embeddings = trustgraph.cli.invoke_document_embeddings:main

trustgraph_cli-2.6.12/trustgraph/cli_version.py

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