trustgraph-flow 2.9.2__tar.gz → 2.9.4__tar.gz

{trustgraph_flow-2.9.2 → trustgraph_flow-2.9.4}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: trustgraph-flow
-Version: 2.9.2
+Version: 2.9.4
 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
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: trustgraph-base<2.10,>=2.9
 Requires-Dist: aiohttp
@@ -24,7 +24,7 @@ Requires-Dist: langchain
 Requires-Dist: langchain-community
 Requires-Dist: langchain-core
 Requires-Dist: langchain-text-splitters
-Requires-Dist: mcp
+Requires-Dist: mcp<3,>=1.8
 Requires-Dist: minio
 Requires-Dist: mistralai<2.0.0
 Requires-Dist: neo4j

{trustgraph_flow-2.9.2 → trustgraph_flow-2.9.4}/pyproject.toml

@@ -8,7 +8,7 @@ dynamic = ["version"]
 authors = [{name = "trustgraph.ai", email = "security@trustgraph.ai"}]
 description = "TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline."
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 dependencies = [
     "trustgraph-base>=2.9,<2.10",
     "aiohttp",
@@ -26,7 +26,7 @@ dependencies = [
     "langchain-community",
     "langchain-core",
     "langchain-text-splitters",
-    "mcp",
+    "mcp>=1.8,<3",
     "minio",
     "mistralai<2.0.0",
     "neo4j",
@@ -137,4 +137,4 @@ joke-service = "trustgraph.tool_service.joke:run"
 include = ["trustgraph*"]
 
 [tool.setuptools.dynamic]
-version = {attr = "trustgraph.flow_version.__version__"}
+version = {attr = "trustgraph.flow_version.__version__"}

{trustgraph_flow-2.9.2 → trustgraph_flow-2.9.4}/trustgraph/agent/mcp_tool/service.py

@@ -6,16 +6,46 @@ name + parameters, output is the response, either a string or an object.
 
 import json
 import logging
-from mcp.client.streamable_http import streamable_http_client
+from contextlib import asynccontextmanager
+
 from mcp import ClientSession
+from mcp.shared._httpx_utils import create_mcp_http_client
 
 from ... base import ToolService
 
+try:
+    from mcp.client.streamable_http import streamable_http_client
+    _MCP_USES_CALLER_HTTP_CLIENT = True
+except ImportError:
+    from mcp.client.streamable_http import (
+        streamablehttp_client as streamable_http_client,
+    )
+    _MCP_USES_CALLER_HTTP_CLIENT = False
+
 # Module logger
 logger = logging.getLogger(__name__)
 
 default_ident = "mcp-tool"
 
+
+@asynccontextmanager
+async def connect_streamable_http(url, headers):
+    """Yield the read/write streams across MCP's two HTTP client APIs."""
+    if _MCP_USES_CALLER_HTTP_CLIENT:
+        async with create_mcp_http_client(headers=headers) as http_client:
+            async with streamable_http_client(
+                url,
+                http_client=http_client,
+            ) as streams:
+                yield streams[:2]
+    else:
+        async with streamable_http_client(
+            url,
+            headers=headers,
+        ) as streams:
+            yield streams[:2]
+
+
 class Service(ToolService):
 
     def __init__(self, **params):
@@ -68,21 +98,22 @@ class Service(ToolService):
 
             # Build headers with optional bearer token
             headers = {}
-            if "auth-token" in ws_services[name]:
-                token = ws_services[name]["auth-token"]
+            token = ws_services[name].get("auth-token")
+            if token:
                 headers["Authorization"] = f"Bearer {token}"
 
             logger.info(f"Invoking {remote_name} at {url}")
 
-            # Connect to a streamable HTTP server with headers
-            async with streamable_http_client(url, headers=headers) as (
-                    read_stream,
-                    write_stream,
-                    _,
-            ):
+            async with connect_streamable_http(
+                url,
+                headers,
+            ) as (read_stream, write_stream):
 
                 # Create a session using the client streams
-                async with ClientSession(read_stream, write_stream) as session:
+                async with ClientSession(
+                    read_stream,
+                    write_stream,
+                ) as session:
 
                     # Initialize the connection
                     await session.initialize()
@@ -93,13 +124,25 @@ class Service(ToolService):
                         parameters
                     )
 
-                    if result.structured_content:
-                        return result.structured_content
+                    structured_content = getattr(
+                        result,
+                        "structured_content",
+                        None,
+                    )
+                    if structured_content is None:
+                        structured_content = getattr(
+                            result,
+                            "structuredContent",
+                            None,
+                        )
+
+                    if structured_content:
+                        return structured_content
                     elif hasattr(result, "content"):
-                            return "".join([
-                                x.text
-                                for x in result.content
-                            ])
+                        return "".join([
+                            x.text
+                            for x in result.content
+                        ])
                     else:
                         return "No content"
 

{trustgraph_flow-2.9.2 → trustgraph_flow-2.9.4}/trustgraph/cores/service.py

@@ -140,6 +140,7 @@ class Processor(WorkspaceProcessor):
                 librarian_response_queue, workspace,
             ),
             subscription=f"{self.id}--{workspace}--librarian",
+            default_timeout=self.librarian_timeout,
         )
 
         self.librarian_clients[workspace] = librarian_client
@@ -266,6 +267,7 @@ class Processor(WorkspaceProcessor):
     def add_args(parser):
 
         WorkspaceProcessor.add_args(parser)
+        WorkspaceProcessor.add_librarian_args(parser)
 
         parser.add_argument(
             '--knowledge-request-queue',

trustgraph_flow-2.9.4/trustgraph/flow_version.py

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

{trustgraph_flow-2.9.2 → trustgraph_flow-2.9.4}/trustgraph/gateway/audit.py

@@ -3,11 +3,11 @@ Audit middleware for the API gateway.
 
 Wraps every HTTP request with timing and metadata collection, then
 emits a ``gateway.request`` audit event after the response is sent.
-Handlers can enrich the event by annotating the request dict:
+Handlers can enrich the event by annotating the request:
 
-    request['audit_identity'] = identity.principal_id
-    request['audit_capability'] = capability
-    request['audit_workspace'] = workspace
+    request[audit_identity_key] = identity.principal_id
+    request[audit_capability_key] = capability
+    request[audit_workspace_key] = workspace
 """
 
 import time
@@ -16,6 +16,11 @@ from uuid import uuid4
 
 from aiohttp import web
 
+audit_request_id_key = web.RequestKey("audit_request_id", str)
+audit_identity_key = web.RequestKey("audit_identity", str)
+audit_capability_key = web.RequestKey("audit_capability", str)
+audit_workspace_key = web.RequestKey("audit_workspace", str)
+
 from trustgraph.base import AuditPublisher
 
 logger = logging.getLogger("audit")
@@ -44,7 +49,7 @@ def make_audit_middleware(audit_publisher):
     @web.middleware
     async def audit_middleware(request, handler):
         request_id = str(uuid4())
-        request['audit_request_id'] = request_id
+        request[audit_request_id_key] = request_id
         start = time.monotonic()
 
         status_code = 500
@@ -81,15 +86,15 @@ def make_audit_middleware(audit_publisher):
                 "response_size_bytes": response_size,
             }
 
-            identity = request.get('audit_identity')
+            identity = request.get(audit_identity_key)
             if identity:
                 payload["identity"] = identity
 
-            capability = request.get('audit_capability')
+            capability = request.get(audit_capability_key)
             if capability:
                 payload["capability"] = capability
 
-            workspace = request.get('audit_workspace')
+            workspace = request.get(audit_workspace_key)
             if workspace:
                 payload["workspace"] = workspace
 

{trustgraph_flow-2.9.2 → trustgraph_flow-2.9.4}/trustgraph/gateway/auth.py

@@ -28,6 +28,7 @@ from prometheus_client import Counter, Enum, Gauge
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import ed25519
 
+from .audit import audit_identity_key, audit_request_id_key
 from ..base.iam_client import IamClient
 from ..base.request_response_client import RequestResponseClient
 from ..base.request_response_spec import _make_impl_wrapper
@@ -259,7 +260,7 @@ class IamAuth:
         cannot distinguish missing / malformed / invalid / expired /
         revoked credentials."""
 
-        request_id = request.get('audit_request_id', '') if hasattr(request, 'get') else ''
+        request_id = request.get(audit_request_id_key, '') if hasattr(request, 'get') else ''
         client_ip = self._extract_client_ip(request)
 
         header = request.headers.get("Authorization", "")
@@ -307,7 +308,7 @@ class IamAuth:
     @staticmethod
     def _annotate_request(request, identity):
         try:
-            request['audit_identity'] = identity.principal_id
+            request[audit_identity_key] = identity.principal_id
         except Exception:
             pass
 

{trustgraph_flow-2.9.2 → trustgraph_flow-2.9.4}/trustgraph/gateway/endpoint/iam_endpoint.py

@@ -16,6 +16,7 @@ import logging
 
 from aiohttp import web
 
+from .. audit import audit_request_id_key, audit_capability_key, audit_workspace_key
 from .. capabilities import (
     PUBLIC, AUTHENTICATED, auth_failure,
 )
@@ -90,13 +91,13 @@ class IamEndpoint:
 
             await self.auth.authorise(
                 identity, op.capability, resource, parameters,
-                request_id=request.get('audit_request_id', ''),
+                request_id=request.get(audit_request_id_key, ''),
                 client_ip=self.auth._extract_client_ip(request),
             )
-            request['audit_capability'] = op.capability
+            request[audit_capability_key] = op.capability
             ws = resource.get('workspace', '')
             if ws:
-                request['audit_workspace'] = ws
+                request[audit_workspace_key] = ws
 
         # Plumb the authenticated caller's handle through as ``actor``
         # so iam-svc handlers (e.g. whoami, future actor-scoped

{trustgraph_flow-2.9.2 → trustgraph_flow-2.9.4}/trustgraph/gateway/endpoint/manager.py

@@ -12,6 +12,7 @@ from . auth_endpoints import AuthEndpoints
 from . iam_endpoint import IamEndpoint
 from . registry_endpoint import RegistryRoutedVariableEndpoint
 
+from .. audit import audit_request_id_key, audit_capability_key, audit_workspace_key
 from .. capabilities import PUBLIC, AUTHENTICATED, auth_failure, workspace_not_found
 from .. registry import lookup as _registry_lookup, RequestContext, ResourceLevel
 
@@ -75,14 +76,14 @@ class _RoutedVariableEndpoint:
             parameters = op.extract_parameters(ctx)
             await self.auth.authorise(
                 identity, op.capability, resource, parameters,
-                request_id=request.get('audit_request_id', ''),
+                request_id=request.get(audit_request_id_key, ''),
                 client_ip=self.auth._extract_client_ip(request),
             )
-            request['audit_capability'] = op.capability
+            request[audit_capability_key] = op.capability
 
             ws = resource.get("workspace", "")
             if ws:
-                request['audit_workspace'] = ws
+                request[audit_workspace_key] = ws
             if ws and ws not in self.auth.known_workspaces:
                 raise workspace_not_found()
 
@@ -148,14 +149,14 @@ class _RoutedSocketEndpoint:
             parameters = op.extract_parameters(ctx)
             await self.auth.authorise(
                 identity, op.capability, resource, parameters,
-                request_id=request.get('audit_request_id', ''),
+                request_id=request.get(audit_request_id_key, ''),
                 client_ip=self.auth._extract_client_ip(request),
             )
-            request['audit_capability'] = op.capability
+            request[audit_capability_key] = op.capability
 
             ws = resource.get("workspace", "")
             if ws:
-                request['audit_workspace'] = ws
+                request[audit_workspace_key] = ws
             if ws and ws not in self.auth.known_workspaces:
                 raise workspace_not_found()
 

{trustgraph_flow-2.9.2 → trustgraph_flow-2.9.4}/trustgraph/gateway/endpoint/registry_endpoint.py

@@ -19,6 +19,7 @@ import logging
 
 from aiohttp import web
 
+from .. audit import audit_request_id_key, audit_capability_key, audit_workspace_key
 from .. capabilities import (
     PUBLIC, AUTHENTICATED, auth_failure, workspace_not_found,
 )
@@ -98,13 +99,13 @@ class RegistryRoutedVariableEndpoint:
 
             await self.auth.authorise(
                 identity, op.capability, resource, parameters,
-                request_id=request.get('audit_request_id', ''),
+                request_id=request.get(audit_request_id_key, ''),
                 client_ip=self.auth._extract_client_ip(request),
             )
-            request['audit_capability'] = op.capability
+            request[audit_capability_key] = op.capability
             ws = resource.get('workspace', '')
             if ws:
-                request['audit_workspace'] = ws
+                request[audit_workspace_key] = ws
 
             # Default-fill workspace into the body so downstream
             # dispatchers see the canonical resolved value.  The

{trustgraph_flow-2.9.2 → trustgraph_flow-2.9.4}/trustgraph/retrieval/document_rag/rag.py

@@ -337,7 +337,8 @@ class Processor(FlowProcessor):
             type=int,
             default=120,
             help='Timeout in seconds for fetching a document chunk from the '
-                 'librarian (default: 120)'
+                 'librarian, overrides --librarian-timeout for that call '
+                 '(default: 120)'
         )
         
         parser.add_argument(

{trustgraph_flow-2.9.2 → trustgraph_flow-2.9.4}/trustgraph_flow.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: trustgraph-flow
-Version: 2.9.2
+Version: 2.9.4
 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
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: trustgraph-base<2.10,>=2.9
 Requires-Dist: aiohttp
@@ -24,7 +24,7 @@ Requires-Dist: langchain
 Requires-Dist: langchain-community
 Requires-Dist: langchain-core
 Requires-Dist: langchain-text-splitters
-Requires-Dist: mcp
+Requires-Dist: mcp<3,>=1.8
 Requires-Dist: minio
 Requires-Dist: mistralai<2.0.0
 Requires-Dist: neo4j

{trustgraph_flow-2.9.2 → trustgraph_flow-2.9.4}/trustgraph_flow.egg-info/requires.txt

@@ -14,7 +14,7 @@ langchain
 langchain-community
 langchain-core
 langchain-text-splitters
-mcp
+mcp<3,>=1.8
 minio
 mistralai<2.0.0
 neo4j

trustgraph_flow-2.9.2/trustgraph/flow_version.py

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