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

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: trustgraph-flow
-Version: 1.1.5
+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.5.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.7/scripts/mcp-tool

@@ -0,0 +1,6 @@
+#!/usr/bin/env python3
+
+from trustgraph.agent.mcp_tool import run
+
+run()
+

{trustgraph-flow-1.1.5 → trustgraph-flow-1.1.7}/setup.py

@@ -49,6 +49,7 @@ setuptools.setup(
         "langchain-community",
         "langchain-core",
         "langchain-text-splitters",
+        "mcp",
         "minio",
         "mistralai",
         "neo4j",
@@ -99,6 +100,7 @@ setuptools.setup(
         "scripts/kg-store",
         "scripts/kg-manager",
         "scripts/librarian",
+        "scripts/mcp-tool",
         "scripts/metering",
         "scripts/object-extract-row",
         "scripts/oe-write-milvus",

trustgraph-flow-1.1.7/trustgraph/agent/mcp_tool/service.py

@@ -0,0 +1,105 @@
+
+"""
+MCP tool-calling service, calls an external MCP tool.  Input is
+name + parameters, output is the response, either a string or an object.
+"""
+
+import json
+from mcp.client.streamable_http import streamablehttp_client
+from mcp import ClientSession
+
+from ... base import ToolService
+
+default_ident = "mcp-tool"
+
+class Service(ToolService):
+
+    def __init__(self, **params):
+
+        super(Service, self).__init__(
+            **params
+        )
+
+        self.register_config_handler(self.on_mcp_config)
+
+        self.mcp_services = {}
+
+    async def on_mcp_config(self, config, version):
+
+        print("Got config version", version)
+
+        if "mcp" not in config: return
+
+        self.mcp_services = {
+            k: json.loads(v)
+            for k, v in config["mcp"].items()
+        }
+
+    async def invoke_tool(self, name, parameters):
+
+        try:
+
+            if name not in self.mcp_services:
+                raise RuntimeError(f"MCP service {name} not known")
+
+            if "url" not in self.mcp_services[name]:
+                raise RuntimeError(f"MCP service {name} URL not defined")
+
+            url = self.mcp_services[name]["url"]
+
+            if "name" in self.mcp_services[name]:
+                remote_name = self.mcp_services[name]["name"]
+            else:
+                remote_name = name
+
+            print("Invoking", remote_name, "at", url, flush=True)
+
+            # Connect to a streamable HTTP server
+            async with streamablehttp_client(url) as (
+                    read_stream,
+                    write_stream,
+                    _,
+            ):
+
+                # Create a session using the client streams
+                async with ClientSession(read_stream, write_stream) as session:
+
+                    # Initialize the connection
+                    await session.initialize()
+
+                    # Call a tool
+                    result = await session.call_tool(
+                        remote_name,
+                        parameters
+                    )
+
+                    if result.structuredContent:
+                        return result.structuredContent
+                    elif hasattr(result, "content"):
+                            return "".join([
+                                x.text
+                                for x in result.content
+                            ])
+                    else:
+                        return "No content"
+
+        except BaseExceptionGroup as e:
+
+            for child in e.exceptions:
+                print(child)
+
+            raise e.exceptions[0]
+
+        except Exception as e:
+
+            print(e)
+            raise e
+            
+    @staticmethod
+    def add_args(parser):
+
+        ToolService.add_args(parser)
+
+def run():
+    Service.launch(default_ident, __doc__)
+

{trustgraph-flow-1.1.5 → 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.5 → 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.5 → 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.5 → trustgraph-flow-1.1.7}/trustgraph/gateway/dispatch/manager.py

@@ -17,7 +17,7 @@ from . document_rag import DocumentRagRequestor
 from . triples_query import TriplesQueryRequestor
 from . embeddings import EmbeddingsRequestor
 from . graph_embeddings_query import GraphEmbeddingsQueryRequestor
-from . prompt import PromptRequestor
+from . mcp_tool import McpToolRequestor
 from . text_load import TextLoad
 from . document_load import DocumentLoad
 
@@ -40,6 +40,7 @@ request_response_dispatchers = {
     "agent": AgentRequestor,
     "text-completion": TextCompletionRequestor,
     "prompt": PromptRequestor,
+    "mcp-tool": McpToolRequestor,
     "graph-rag": GraphRagRequestor,
     "document-rag": DocumentRagRequestor,
     "embeddings": EmbeddingsRequestor,

trustgraph-flow-1.1.7/trustgraph/gateway/dispatch/mcp_tool.py

@@ -0,0 +1,32 @@
+
+from ... schema import ToolRequest, ToolResponse
+from ... messaging import TranslatorRegistry
+
+from . requestor import ServiceRequestor
+
+class McpToolRequestor(ServiceRequestor):
+    def __init__(
+            self, pulsar_client, request_queue, response_queue, timeout,
+            consumer, subscriber,
+    ):
+
+        super(McpToolRequestor, self).__init__(
+            pulsar_client=pulsar_client,
+            request_queue=request_queue,
+            response_queue=response_queue,
+            request_schema=ToolRequest,
+            response_schema=ToolResponse,
+            subscription = subscriber,
+            consumer_name = consumer,
+            timeout=timeout,
+        )
+
+        self.request_translator = TranslatorRegistry.get_request_translator("tool")
+        self.response_translator = TranslatorRegistry.get_response_translator("tool")
+
+    def to_request(self, body):
+        return self.request_translator.to_pulsar(body)
+
+    def from_response(self, message):
+        return self.response_translator.from_response_with_completion(message)
+

trustgraph-flow-1.1.7/trustgraph/model/prompt/template/__main__.py

@@ -0,0 +1,7 @@
+#!/usr/bin/env python3
+
+from . service import run
+
+if __name__ == '__main__':
+    run()
+

trustgraph-flow-1.1.7/trustgraph/query/triples/neo4j/__init__.py

@@ -0,0 +1,3 @@
+
+from . service import *
+

{trustgraph-flow-1.1.5 → 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.5
+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.5.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.5 → trustgraph-flow-1.1.7}/trustgraph_flow.egg-info/SOURCES.txt

@@ -29,6 +29,7 @@ scripts/kg-extract-topics
 scripts/kg-manager
 scripts/kg-store
 scripts/librarian
+scripts/mcp-tool
 scripts/metering
 scripts/object-extract-row
 scripts/oe-write-milvus
@@ -63,6 +64,9 @@ scripts/wikipedia-lookup
 trustgraph/__init__.py
 trustgraph/flow_version.py
 trustgraph/agent/__init__.py
+trustgraph/agent/mcp_tool/__init__.py
+trustgraph/agent/mcp_tool/__main__.py
+trustgraph/agent/mcp_tool/service.py
 trustgraph/agent/react/__init__.py
 trustgraph/agent/react/__main__.py
 trustgraph/agent/react/agent_manager.py
@@ -154,6 +158,7 @@ trustgraph/gateway/dispatch/graph_rag.py
 trustgraph/gateway/dispatch/knowledge.py
 trustgraph/gateway/dispatch/librarian.py
 trustgraph/gateway/dispatch/manager.py
+trustgraph/gateway/dispatch/mcp_tool.py
 trustgraph/gateway/dispatch/mux.py
 trustgraph/gateway/dispatch/prompt.py
 trustgraph/gateway/dispatch/requestor.py

{trustgraph-flow-1.1.5 → trustgraph-flow-1.1.7}/trustgraph_flow.egg-info/requires.txt

@@ -12,6 +12,7 @@ langchain
 langchain-community
 langchain-core
 langchain-text-splitters
+mcp
 minio
 mistralai
 mistralai

trustgraph-flow-1.1.5/trustgraph/flow_version.py

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