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

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: trustgraph-base
-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-base-1.1.5 → trustgraph-base-1.1.7}/trustgraph/api/config.py

@@ -49,6 +49,19 @@ class Config:
 
         self.request(input)
 
+    def delete(self, keys):
+
+        # The input consists of system and prompt strings
+        input = {
+            "operation": "delete",
+            "keys": [
+                { "type": v.type, "key": v.key }
+                for v in keys
+            ]
+        }
+
+        self.request(input)
+
     def list(self, type):
 
         # The input consists of system and prompt strings
@@ -67,7 +80,7 @@ class Config:
             "type": type,
         }
 
-        object = self.request(input)["directory"]
+        object = self.request(input)
 
         try:
             return [

{trustgraph-base-1.1.5 → trustgraph-base-1.1.7}/trustgraph/api/flow.py

@@ -4,6 +4,7 @@ import base64
 
 from .. knowledge import hash, Uri, Literal
 from . types import Triple
+from . exceptions import ProtocolException
 
 def to_value(x):
     if x["e"]: return Uri(x["v"])
@@ -197,7 +198,6 @@ class FlowInstance:
 
     def prompt(self, id, variables):
 
-        # The input consists of system and prompt strings
         input = {
             "id": id,
             "variables": variables
@@ -221,12 +221,37 @@ class FlowInstance:
 
         raise ProtocolException("Response not formatted correctly")
 
+    def mcp_tool(self, name, parameters={}):
+
+        # The input consists of name and parameters
+        input = {
+            "name": name,
+            "parameters": parameters,
+        }
+
+        object = self.request(
+            "service/mcp-tool",
+            input
+        )
+
+        if "text" in object:
+            return object["text"]
+
+        if "object" in object:
+            try:
+                return object["object"]
+            except Exception as e:
+                raise ProtocolException(
+                    "Returned object not well-formed JSON"
+                )
+
+        raise ProtocolException("Response not formatted correctly")
+
     def triples_query(
             self, s=None, p=None, o=None,
             user=None, collection=None, limit=10000
     ):
 
-        # The input consists of system and prompt strings
         input = {
             "limit": limit
         }

{trustgraph-base-1.1.5 → trustgraph-base-1.1.7}/trustgraph/base/__init__.py

@@ -28,4 +28,6 @@ from . triples_client import TriplesClientSpec
 from . document_embeddings_client import DocumentEmbeddingsClientSpec
 from . agent_service import AgentService
 from . graph_rag_client import GraphRagClientSpec
+from . tool_service import ToolService
+from . tool_client import ToolClientSpec
 

trustgraph-base-1.1.7/trustgraph/base/tool_client.py

@@ -0,0 +1,40 @@
+
+import json
+
+from . request_response_spec import RequestResponse, RequestResponseSpec
+from .. schema import ToolRequest, ToolResponse
+
+class ToolClient(RequestResponse):
+
+    async def invoke(self, name, parameters={}, timeout=600):
+
+        if parameters is None:
+            parameters = {}
+
+        resp = await self.request(
+            ToolRequest(
+                name = name,
+                parameters = json.dumps(parameters),
+            ),
+            timeout=timeout
+        )
+
+        if resp.error:
+            raise RuntimeError(resp.error.message)
+
+        if resp.text: return resp.text
+
+        return json.loads(resp.object)
+
+class ToolClientSpec(RequestResponseSpec):
+    def __init__(
+            self, request_name, response_name,
+    ):
+        super(ToolClientSpec, self).__init__(
+            request_name = request_name,
+            request_schema = ToolRequest,
+            response_name = response_name,
+            response_schema = ToolResponse,
+            impl = ToolClient,
+        )
+

trustgraph-base-1.1.7/trustgraph/base/tool_service.py

@@ -0,0 +1,121 @@
+
+"""
+Tool invocation base class
+"""
+
+import json
+from prometheus_client import Counter
+
+from .. schema import ToolRequest, ToolResponse, Error
+from .. exceptions import TooManyRequests
+from .. base import FlowProcessor, ConsumerSpec, ProducerSpec
+
+default_concurrency = 1
+
+class ToolService(FlowProcessor):
+
+    def __init__(self, **params):
+
+        id = params.get("id")
+        concurrency = params.get("concurrency", 1)
+
+        super(ToolService, self).__init__(**params | {
+            "id": id,
+            "concurrency": concurrency,
+        })
+
+        self.register_specification(
+            ConsumerSpec(
+                name = "request",
+                schema = ToolRequest,
+                handler = self.on_request,
+                concurrency = concurrency,
+            )
+        )
+
+        self.register_specification(
+            ProducerSpec(
+                name = "response",
+                schema = ToolResponse
+            )
+        )
+
+        if not hasattr(__class__, "tool_invocation_metric"):
+            __class__.tool_invocation_metric = Counter(
+                'tool_invocation_count', 'Tool invocation count',
+                ["id", "flow", "name"],
+            )
+
+    async def on_request(self, msg, consumer, flow):
+
+        try:
+
+            request = msg.value()
+
+            # Sender-produced ID
+
+            id = msg.properties()["id"]
+
+            response = await self.invoke_tool(
+                request.name,
+                json.loads(request.parameters) if request.parameters else {},
+            )
+
+            if isinstance(response, str):
+                await flow("response").send(
+                    ToolResponse(
+                        error=None,
+                        text=response,
+                        object=None,
+                    ),
+                    properties={"id": id}
+                )
+            else:
+                await flow("response").send(
+                    ToolResponse(
+                        error=None,
+                        text=None,
+                        object=json.dumps(response),
+                    ),
+                    properties={"id": id}
+                )
+
+            __class__.tool_invocation_metric.labels(
+                id = self.id, flow = flow.name, name = request.name,
+            ).inc()
+
+        except TooManyRequests as e:
+            raise e
+
+        except Exception as e:
+
+            # Apart from rate limits, treat all exceptions as unrecoverable
+
+            print(f"Exception: {e}")
+
+            print("Send error response...", flush=True)
+
+            await flow.producer["response"].send(
+                ToolResponse(
+                    error=Error(
+                        type = "tool-error",
+                        message = str(e),
+                    ),
+                    text=None,
+                    object=None,
+                ),
+                properties={"id": id}
+            )
+
+    @staticmethod
+    def add_args(parser):
+
+        parser.add_argument(
+            '-c', '--concurrency',
+            type=int,
+            default=default_concurrency,
+            help=f'Concurrent processing threads (default: {default_concurrency})'
+        )
+
+        FlowProcessor.add_args(parser)
+

trustgraph-base-1.1.7/trustgraph/base_version.py

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

{trustgraph-base-1.1.5 → trustgraph-base-1.1.7}/trustgraph/messaging/__init__.py

@@ -16,6 +16,7 @@ from .translators.document_loading import DocumentTranslator, TextDocumentTransl
 from .translators.config import ConfigRequestTranslator, ConfigResponseTranslator
 from .translators.flow import FlowRequestTranslator, FlowResponseTranslator
 from .translators.prompt import PromptRequestTranslator, PromptResponseTranslator
+from .translators.tool import ToolRequestTranslator, ToolResponseTranslator
 from .translators.embeddings_query import (
     DocumentEmbeddingsRequestTranslator, DocumentEmbeddingsResponseTranslator,
     GraphEmbeddingsRequestTranslator, GraphEmbeddingsResponseTranslator
@@ -88,6 +89,12 @@ TranslatorRegistry.register_service(
     PromptResponseTranslator()
 )
 
+TranslatorRegistry.register_service(
+    "tool", 
+    ToolRequestTranslator(), 
+    ToolResponseTranslator()
+)
+
 TranslatorRegistry.register_service(
     "document-embeddings-query", 
     DocumentEmbeddingsRequestTranslator(), 

trustgraph-base-1.1.7/trustgraph/messaging/translators/tool.py

@@ -0,0 +1,51 @@
+import json
+from typing import Dict, Any, Tuple
+from ...schema import ToolRequest, ToolResponse
+from .base import MessageTranslator
+
+class ToolRequestTranslator(MessageTranslator):
+    """Translator for ToolRequest schema objects"""
+    
+    def to_pulsar(self, data: Dict[str, Any]) -> ToolRequest:
+        # Handle both "name" and "parameters" input keys
+        name = data.get("name", "")
+        if "parameters" in data:
+            parameters = json.dumps(data["parameters"])
+        else:
+            parameters = None
+        
+        return ToolRequest(
+            name = name,
+            parameters = parameters,
+        )
+    
+    def from_pulsar(self, obj: ToolRequest) -> Dict[str, Any]:
+        result = {}
+        
+        if obj.name:
+            result["name"] = obj.name
+        if obj.parameters is not None:
+            result["parameters"] = json.loads(obj.parameters)
+        
+        return result
+
+class ToolResponseTranslator(MessageTranslator):
+    """Translator for ToolResponse schema objects"""
+    
+    def to_pulsar(self, data: Dict[str, Any]) -> ToolResponse:
+        raise NotImplementedError("Response translation to Pulsar not typically needed")
+    
+    def from_pulsar(self, obj: ToolResponse) -> Dict[str, Any]:
+
+        result = {}
+        
+        if obj.text:
+            result["text"] = obj.text
+        if obj.object:
+            result["object"] = json.loads(obj.object)
+        
+        return result
+    
+    def from_response_with_completion(self, obj: ToolResponse) -> Tuple[Dict[str, Any], bool]:
+        """Returns (response_dict, is_final)"""
+        return self.from_pulsar(obj), True

{trustgraph-base-1.1.5 → trustgraph-base-1.1.7}/trustgraph/schema/models.py

@@ -30,3 +30,22 @@ class EmbeddingsResponse(Record):
     error = Error()
     vectors = Array(Array(Double()))
 
+############################################################################
+
+# Tool request/response
+
+class ToolRequest(Record):
+    name = String()
+
+    # Parameters are JSON encoded
+    parameters = String()
+
+class ToolResponse(Record):
+    error = Error()
+
+    # Plain text aka "unstructured"
+    text = String()
+
+    # JSON-encoded object aka "structured"
+    object = String()
+

{trustgraph-base-1.1.5 → trustgraph-base-1.1.7}/trustgraph_base.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: trustgraph-base
-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-base-1.1.5 → trustgraph-base-1.1.7}/trustgraph_base.egg-info/SOURCES.txt

@@ -42,6 +42,8 @@ trustgraph/base/spec.py
 trustgraph/base/subscriber.py
 trustgraph/base/subscriber_spec.py
 trustgraph/base/text_completion_client.py
+trustgraph/base/tool_client.py
+trustgraph/base/tool_service.py
 trustgraph/base/triples_client.py
 trustgraph/base/triples_query_service.py
 trustgraph/base/triples_store_service.py
@@ -80,6 +82,7 @@ trustgraph/messaging/translators/primitives.py
 trustgraph/messaging/translators/prompt.py
 trustgraph/messaging/translators/retrieval.py
 trustgraph/messaging/translators/text_completion.py
+trustgraph/messaging/translators/tool.py
 trustgraph/messaging/translators/triples.py
 trustgraph/objects/__init__.py
 trustgraph/objects/field.py

trustgraph-base-1.1.5/trustgraph/base_version.py

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