trustgraph-flow 1.1.6__tar.gz → 1.1.7__tar.gz

{trustgraph-flow-1.1.6 → trustgraph-flow-1.1.7}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: trustgraph-flow
-Version: 1.1.6
+Version: 1.1.7
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Home-page: https://github.com/trustgraph-ai/trustgraph
-Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v1.1.6.tar.gz
+Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v1.1.7.tar.gz
 Author: trustgraph.ai
 Author-email: security@trustgraph.ai
 Classifier: Programming Language :: Python :: 3

{trustgraph-flow-1.1.6 → trustgraph-flow-1.1.7}/trustgraph/agent/react/agent_manager.py

@@ -14,12 +14,19 @@ class AgentManager:
 
     async def reason(self, question, history, context):
 
+        print(f"calling reason: {question}", flush=True)
+
         tools = self.tools
 
+        print(f"in reason", flush=True)
+        print(tools, flush=True)
+
         tool_names = ",".join([
             t for t in self.tools.keys()
         ])
 
+        print("Tool names:", tool_names, flush=True)
+
         variables = {
             "question": question,
             "tools": [
@@ -83,6 +90,9 @@ class AgentManager:
 
     async def react(self, question, history, think, observe, context):
 
+        logger.info(f"question: {question}")
+        print(f"question: {question}", flush=True)
+
         act = await self.reason(
             question = question,
             history = history,
@@ -104,13 +114,12 @@ class AgentManager:
             else:
                 raise RuntimeError(f"No action for {act.name}!")
 
-            print("TOOL>>>", act)
+            print("TOOL>>>", act, flush=True)
+
             resp = await action.implementation(context).invoke(
                 **act.arguments
             )
 
-            print("RSETUL", resp)
-
             resp = resp.strip()
 
             logger.info(f"resp: {resp}")

{trustgraph-flow-1.1.6 → trustgraph-flow-1.1.7}/trustgraph/agent/react/service.py

@@ -5,13 +5,14 @@ Simple agent infrastructure broadly implements the ReAct flow.
 import json
 import re
 import sys
+import functools
 
 from ... base import AgentService, TextCompletionClientSpec, PromptClientSpec
-from ... base import GraphRagClientSpec
+from ... base import GraphRagClientSpec, ToolClientSpec
 
 from ... schema import AgentRequest, AgentResponse, AgentStep, Error
 
-from . tools import KnowledgeQueryImpl, TextCompletionImpl
+from . tools import KnowledgeQueryImpl, TextCompletionImpl, McpToolImpl
 from . agent_manager import AgentManager
 
 from . types import Final, Action, Tool, Argument
@@ -67,6 +68,13 @@ class Processor(AgentService):
             )
         )
 
+        self.register_specification(
+            ToolClientSpec(
+                request_name = "mcp-tool-request",
+                response_name = "mcp-tool-response",
+            )
+        )
+
     async def on_tools_config(self, config, version):
 
         print("Loading configuration version", version)
@@ -102,17 +110,21 @@ class Processor(AgentService):
 
                 impl_id = data.get("type")
 
+                name = data.get("name")
+
                 if impl_id == "knowledge-query":
                     impl = KnowledgeQueryImpl
                 elif impl_id == "text-completion":
                     impl = TextCompletionImpl
+                elif impl_id == "mcp-tool":
+                    impl = functools.partial(McpToolImpl, name=k)
                 else:
                     raise RuntimeError(
                         f"Tool-kind {impl_id} not known"
                     )
 
                 tools[data.get("name")] = Tool(
-                    name = data.get("name"),
+                    name = name,
                     description = data.get("description"),
                     implementation = impl,
                     config=data.get("config", {}),
@@ -181,6 +193,8 @@ class Processor(AgentService):
 
                 await respond(r)
 
+            print("Call React", flush=True)
+
             act = await self.agent.react(
                 question = request.question,
                 history = history,

{trustgraph-flow-1.1.6 → trustgraph-flow-1.1.7}/trustgraph/agent/react/tools.py

@@ -1,4 +1,6 @@
 
+import json
+
 # This tool implementation knows how to put a question to the graph RAG
 # service
 class KnowledgeQueryImpl:
@@ -23,3 +25,29 @@ class TextCompletionImpl:
             arguments.get("question")
         )
 
+# This tool implementation knows how to do MCP tool invocation.  This uses
+# the mcp-tool service.
+class McpToolImpl:
+
+    def __init__(self, context, name):
+        self.context = context
+        self.name = name
+
+    async def invoke(self, **arguments):
+
+        client = self.context("mcp-tool-request")
+
+        print(f"MCP tool invocation: {self.name}...", flush=True)
+        output = await client.invoke(
+            name = self.name,
+            parameters = {},
+        )
+
+        print(output)
+
+        if isinstance(output, str):
+            return output
+        else:
+            return json.dumps(output)
+
+        

trustgraph-flow-1.1.7/trustgraph/flow_version.py

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

{trustgraph-flow-1.1.6 → trustgraph-flow-1.1.7}/trustgraph_flow.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: trustgraph-flow
-Version: 1.1.6
+Version: 1.1.7
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Home-page: https://github.com/trustgraph-ai/trustgraph
-Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v1.1.6.tar.gz
+Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v1.1.7.tar.gz
 Author: trustgraph.ai
 Author-email: security@trustgraph.ai
 Classifier: Programming Language :: Python :: 3

trustgraph-flow-1.1.6/trustgraph/flow_version.py

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