trustgraph-cli 2.2.26__tar.gz → 2.3.1__tar.gz

{trustgraph_cli-2.2.26 → trustgraph_cli-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-cli
-Version: 2.2.26
+Version: 2.3.1
 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
@@ -8,7 +8,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: trustgraph-base<2.3,>=2.2
+Requires-Dist: trustgraph-base<2.4,>=2.3
 Requires-Dist: requests
 Requires-Dist: pulsar-client
 Requires-Dist: aiohttp

{trustgraph_cli-2.2.26 → trustgraph_cli-2.3.1}/pyproject.toml

@@ -10,7 +10,7 @@ description = "TrustGraph provides a means to run a pipeline of flexible AI proc
 readme = "README.md"
 requires-python = ">=3.8"
 dependencies = [
-    "trustgraph-base>=2.2,<2.3",
+    "trustgraph-base>=2.3,<2.4",
     "requests",
     "pulsar-client",
     "aiohttp",

{trustgraph_cli-2.2.26 → trustgraph_cli-2.3.1}/trustgraph/cli/invoke_agent.py

@@ -126,7 +126,7 @@ def question_explainable(
 
     try:
         # Track last chunk type for formatting
-        last_chunk_type = None
+        last_message_type = None
         current_outputter = None
 
         # Stream agent with explainability - process events as they arrive
@@ -138,7 +138,7 @@ def question_explainable(
             group=group,
         ):
             if isinstance(item, AgentThought):
-                if last_chunk_type != "thought":
+                if last_message_type != "thought":
                     if current_outputter:
                         current_outputter.__exit__(None, None, None)
                         current_outputter = None
@@ -146,7 +146,7 @@ def question_explainable(
                     if verbose:
                         current_outputter = Outputter(width=78, prefix="\U0001f914  ")
                         current_outputter.__enter__()
-                    last_chunk_type = "thought"
+                    last_message_type = "thought"
                 if current_outputter:
                     current_outputter.output(item.content)
                     if current_outputter.word_buffer:
@@ -155,7 +155,7 @@ def question_explainable(
                         current_outputter.word_buffer = ""
 
             elif isinstance(item, AgentObservation):
-                if last_chunk_type != "observation":
+                if last_message_type != "observation":
                     if current_outputter:
                         current_outputter.__exit__(None, None, None)
                         current_outputter = None
@@ -163,7 +163,7 @@ def question_explainable(
                     if verbose:
                         current_outputter = Outputter(width=78, prefix="\U0001f4a1  ")
                         current_outputter.__enter__()
-                    last_chunk_type = "observation"
+                    last_message_type = "observation"
                 if current_outputter:
                     current_outputter.output(item.content)
                     if current_outputter.word_buffer:
@@ -172,12 +172,12 @@ def question_explainable(
                         current_outputter.word_buffer = ""
 
             elif isinstance(item, AgentAnswer):
-                if last_chunk_type != "answer":
+                if last_message_type != "answer":
                     if current_outputter:
                         current_outputter.__exit__(None, None, None)
                         current_outputter = None
                         print()
-                    last_chunk_type = "answer"
+                    last_message_type = "answer"
                 # Print answer content directly
                 print(item.content, end="", flush=True)
 
@@ -261,7 +261,7 @@ def question_explainable(
             current_outputter = None
 
         # Final newline if we ended with answer
-        if last_chunk_type == "answer":
+        if last_message_type == "answer":
             print()
 
     finally:
@@ -272,7 +272,8 @@ def question(
         url, question, flow_id, user, collection,
         plan=None, state=None, group=None, pattern=None,
         verbose=False, streaming=True,
-        token=None, explainable=False, debug=False
+        token=None, explainable=False, debug=False,
+        show_usage=False
 ):
     # Explainable mode uses the API to capture and process provenance events
     if explainable:
@@ -321,15 +322,16 @@ def question(
         # Handle streaming response
         if streaming:
             # Track last chunk type and current outputter for streaming
-            last_chunk_type = None
+            last_message_type = None
             current_outputter = None
+            last_answer_chunk = None
 
             for chunk in response:
-                chunk_type = chunk.chunk_type
+                message_type = chunk.message_type
                 content = chunk.content
 
                 # Check if we're switching to a new message type
-                if last_chunk_type != chunk_type:
+                if last_message_type != message_type:
                     # Close previous outputter if exists
                     if current_outputter:
                         current_outputter.__exit__(None, None, None)
@@ -337,15 +339,15 @@ def question(
                         print()  # Blank line between message types
 
                     # Create new outputter for new message type
-                    if chunk_type == "thought" and verbose:
+                    if message_type == "thought" and verbose:
                         current_outputter = Outputter(width=78, prefix="\U0001f914  ")
                         current_outputter.__enter__()
-                    elif chunk_type == "observation" and verbose:
+                    elif message_type == "observation" and verbose:
                         current_outputter = Outputter(width=78, prefix="\U0001f4a1  ")
                         current_outputter.__enter__()
                     # For answer, don't use Outputter - just print as-is
 
-                    last_chunk_type = chunk_type
+                    last_message_type = message_type
 
                 # Output the chunk
                 if current_outputter:
@@ -355,33 +357,42 @@ def question(
                         print(current_outputter.word_buffer, end="", flush=True)
                         current_outputter.column += len(current_outputter.word_buffer)
                         current_outputter.word_buffer = ""
-                elif chunk_type == "final-answer":
+                elif message_type == "final-answer":
                     print(content, end="", flush=True)
+                    last_answer_chunk = chunk
 
             # Close any remaining outputter
             if current_outputter:
                 current_outputter.__exit__(None, None, None)
                 current_outputter = None
             # Add final newline if we were outputting answer
-            elif last_chunk_type == "final-answer":
+            elif last_message_type == "final-answer":
                 print()
 
+            if show_usage and last_answer_chunk:
+                print(
+                    f"Input tokens: {last_answer_chunk.in_token}  "
+                    f"Output tokens: {last_answer_chunk.out_token}  "
+                    f"Model: {last_answer_chunk.model}",
+                    file=sys.stderr,
+                )
+
         else:
             # Non-streaming response - but agents use multipart messaging
             # so we iterate through the chunks (which are complete messages, not text chunks)
             for chunk in response:
                 # Display thoughts if verbose
-                if chunk.chunk_type == "thought" and verbose:
+                if chunk.message_type == "thought" and verbose:
                     output(wrap(chunk.content), "\U0001f914 ")
                     print()
 
                 # Display observations if verbose
-                elif chunk.chunk_type == "observation" and verbose:
+                elif chunk.message_type == "observation" and verbose:
                     output(wrap(chunk.content), "\U0001f4a1 ")
                     print()
 
                 # Display answer
-                elif chunk.chunk_type == "final-answer" or chunk.chunk_type == "answer":
+                elif chunk.message_type == "final-answer" or chunk.message_type == "answer":
                     print(chunk.content)
 
     finally:
@@ -477,6 +488,12 @@ def main():
         help='Show debug output for troubleshooting'
     )
 
+    parser.add_argument(
+        '--show-usage',
+        action='store_true',
+        help='Show token usage and model on stderr'
+    )
+
     args = parser.parse_args()
 
     try:
@@ -496,6 +513,7 @@ def main():
             token = args.token,
             explainable = args.explainable,
             debug = args.debug,
+            show_usage = args.show_usage,
         )
 
     except Exception as e:

{trustgraph_cli-2.2.26 → trustgraph_cli-2.3.1}/trustgraph/cli/invoke_document_rag.py

@@ -99,7 +99,8 @@ def question_explainable(
 
 def question(
     url, flow_id, question_text, user, collection, doc_limit,
-    streaming=True, token=None, explainable=False, debug=False
+    streaming=True, token=None, explainable=False, debug=False,
+    show_usage=False
 ):
     # Explainable mode uses the API to capture and process provenance events
     if explainable:
@@ -133,22 +134,40 @@ def question(
             )
 
             # Stream output
+            last_chunk = None
             for chunk in response:
-                print(chunk, end="", flush=True)
+                print(chunk.content, end="", flush=True)
+                last_chunk = chunk
             print()  # Final newline
 
+            if show_usage and last_chunk:
+                print(
+                    f"Input tokens: {last_chunk.in_token}  "
+                    f"Output tokens: {last_chunk.out_token}  "
+                    f"Model: {last_chunk.model}",
+                    file=sys.stderr,
+                )
+
         finally:
             socket.close()
     else:
         # Use REST API for non-streaming
         flow = api.flow().id(flow_id)
-        resp = flow.document_rag(
+        result = flow.document_rag(
             query=question_text,
             user=user,
             collection=collection,
             doc_limit=doc_limit,
         )
-        print(resp)
+        print(result.text)
+
+        if show_usage:
+            print(
+                f"Input tokens: {result.in_token}  "
+                f"Output tokens: {result.out_token}  "
+                f"Model: {result.model}",
+                file=sys.stderr,
+            )
 
 
 def main():
@@ -219,6 +238,12 @@ def main():
         help='Show debug output for troubleshooting'
     )
 
+    parser.add_argument(
+        '--show-usage',
+        action='store_true',
+        help='Show token usage and model on stderr'
+    )
+
     args = parser.parse_args()
 
     try:
@@ -234,6 +259,7 @@ def main():
             token=args.token,
             explainable=args.explainable,
             debug=args.debug,
+            show_usage=args.show_usage,
         )
 
     except Exception as e:

{trustgraph_cli-2.2.26 → trustgraph_cli-2.3.1}/trustgraph/cli/invoke_graph_rag.py

@@ -753,7 +753,7 @@ def question(
         url, flow_id, question, user, collection, entity_limit, triple_limit,
         max_subgraph_size, max_path_length, edge_score_limit=50,
         edge_limit=25, streaming=True, token=None,
-        explainable=False, debug=False
+        explainable=False, debug=False, show_usage=False
 ):
 
     # Explainable mode uses the API to capture and process provenance events
@@ -798,16 +798,26 @@ def question(
             )
 
             # Stream output
+            last_chunk = None
             for chunk in response:
-                print(chunk, end="", flush=True)
+                print(chunk.content, end="", flush=True)
+                last_chunk = chunk
             print()  # Final newline
 
+            if show_usage and last_chunk:
+                print(
+                    f"Input tokens: {last_chunk.in_token}  "
+                    f"Output tokens: {last_chunk.out_token}  "
+                    f"Model: {last_chunk.model}",
+                    file=sys.stderr,
+                )
+
         finally:
             socket.close()
     else:
         # Use REST API for non-streaming
         flow = api.flow().id(flow_id)
-        resp = flow.graph_rag(
+        result = flow.graph_rag(
             query=question,
             user=user,
             collection=collection,
@@ -818,7 +828,15 @@ def question(
             edge_score_limit=edge_score_limit,
             edge_limit=edge_limit,
         )
-        print(resp)
+        print(result.text)
+
+        if show_usage:
+            print(
+                f"Input tokens: {result.in_token}  "
+                f"Output tokens: {result.out_token}  "
+                f"Model: {result.model}",
+                file=sys.stderr,
+            )
 
 def main():
 
@@ -923,6 +941,12 @@ def main():
         help='Show debug output for troubleshooting'
     )
 
+    parser.add_argument(
+        '--show-usage',
+        action='store_true',
+        help='Show token usage and model on stderr'
+    )
+
     args = parser.parse_args()
 
     try:
@@ -943,6 +967,7 @@ def main():
             token=args.token,
             explainable=args.explainable,
             debug=args.debug,
+            show_usage=args.show_usage,
         )
 
     except Exception as e:

{trustgraph_cli-2.2.26 → trustgraph_cli-2.3.1}/trustgraph/cli/invoke_llm.py

@@ -10,7 +10,8 @@ from trustgraph.api import Api
 default_url = os.getenv("TRUSTGRAPH_URL", 'http://localhost:8088/')
 default_token = os.getenv("TRUSTGRAPH_TOKEN", None)
 
-def query(url, flow_id, system, prompt, streaming=True, token=None):
+def query(url, flow_id, system, prompt, streaming=True, token=None,
+          show_usage=False):
 
     # Create API client
     api = Api(url=url, token=token)
@@ -26,14 +27,29 @@ def query(url, flow_id, system, prompt, streaming=True, token=None):
         )
 
         if streaming:
-            # Stream output to stdout without newline
+            last_chunk = None
             for chunk in response:
-                print(chunk, end="", flush=True)
-            # Add final newline after streaming
+                print(chunk.content, end="", flush=True)
+                last_chunk = chunk
             print()
+
+            if show_usage and last_chunk:
+                print(
+                    f"Input tokens: {last_chunk.in_token}  "
+                    f"Output tokens: {last_chunk.out_token}  "
+                    f"Model: {last_chunk.model}",
+                    file=__import__('sys').stderr,
+                )
         else:
-            # Non-streaming: print complete response
-            print(response)
+            print(response.text)
+
+            if show_usage:
+                print(
+                    f"Input tokens: {response.in_token}  "
+                    f"Output tokens: {response.out_token}  "
+                    f"Model: {response.model}",
+                    file=__import__('sys').stderr,
+                )
 
     finally:
         # Clean up socket connection
@@ -82,6 +98,12 @@ def main():
         help='Disable streaming (default: streaming enabled)'
     )
 
+    parser.add_argument(
+        '--show-usage',
+        action='store_true',
+        help='Show token usage and model on stderr'
+    )
+
     args = parser.parse_args()
 
     try:
@@ -93,6 +115,7 @@ def main():
             prompt=args.prompt[0],
             streaming=not args.no_streaming,
             token=args.token,
+            show_usage=args.show_usage,
         )
 
     except Exception as e:

{trustgraph_cli-2.2.26 → trustgraph_cli-2.3.1}/trustgraph/cli/invoke_prompt.py

@@ -15,7 +15,8 @@ from trustgraph.api import Api
 default_url = os.getenv("TRUSTGRAPH_URL", 'http://localhost:8088/')
 default_token = os.getenv("TRUSTGRAPH_TOKEN", None)
 
-def query(url, flow_id, template_id, variables, streaming=True, token=None):
+def query(url, flow_id, template_id, variables, streaming=True, token=None,
+          show_usage=False):
 
     # Create API client
     api = Api(url=url, token=token)
@@ -31,16 +32,30 @@ def query(url, flow_id, template_id, variables, streaming=True, token=None):
         )
 
         if streaming:
-            # Stream output (prompt yields strings directly)
+            last_chunk = None
             for chunk in response:
-                if chunk:
-                    print(chunk, end="", flush=True)
-            # Add final newline after streaming
+                if chunk.content:
+                    print(chunk.content, end="", flush=True)
+                last_chunk = chunk
             print()
 
+            if show_usage and last_chunk:
+                print(
+                    f"Input tokens: {last_chunk.in_token}  "
+                    f"Output tokens: {last_chunk.out_token}  "
+                    f"Model: {last_chunk.model}",
+                    file=__import__('sys').stderr,
+                )
         else:
-            # Non-streaming: print complete response
-            print(response)
+            print(response.text)
+
+            if show_usage:
+                print(
+                    f"Input tokens: {response.in_token}  "
+                    f"Output tokens: {response.out_token}  "
+                    f"Model: {response.model}",
+                    file=__import__('sys').stderr,
+                )
 
     finally:
         # Clean up socket connection
@@ -92,6 +107,12 @@ specified multiple times''',
         help='Disable streaming (default: streaming enabled for text responses)'
     )
 
+    parser.add_argument(
+        '--show-usage',
+        action='store_true',
+        help='Show token usage and model on stderr'
+    )
+
     args = parser.parse_args()
 
     variables = {}
@@ -113,6 +134,7 @@ specified multiple times''',
             variables=variables,
             streaming=not args.no_streaming,
             token=args.token,
+            show_usage=args.show_usage,
         )
 
     except Exception as e:

{trustgraph_cli-2.2.26 → trustgraph_cli-2.3.1}/trustgraph/cli/invoke_sparql_query.py

@@ -62,6 +62,11 @@ def sparql_query(url, token, flow_id, query, user, collection, limit,
             limit=limit,
             batch_size=batch_size,
         ):
+            if "error" in response:
+                err = response["error"]
+                msg = err.get("message", err) if isinstance(err, dict) else err
+                raise RuntimeError(msg)
+
             query_type = response.get("query-type", "select")
 
             # ASK queries - just print and return

trustgraph_cli-2.3.1/trustgraph/cli_version.py

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

{trustgraph_cli-2.2.26 → trustgraph_cli-2.3.1}/trustgraph_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-cli
-Version: 2.2.26
+Version: 2.3.1
 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
@@ -8,7 +8,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: trustgraph-base<2.3,>=2.2
+Requires-Dist: trustgraph-base<2.4,>=2.3
 Requires-Dist: requests
 Requires-Dist: pulsar-client
 Requires-Dist: aiohttp

{trustgraph_cli-2.2.26 → trustgraph_cli-2.3.1}/trustgraph_cli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-trustgraph-base<2.3,>=2.2
+trustgraph-base<2.4,>=2.3
 requests
 pulsar-client
 aiohttp

trustgraph_cli-2.2.26/trustgraph/cli_version.py

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