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

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: trustgraph-base
-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: pulsar-client
 Requires-Dist: prometheus-client

{trustgraph_base-2.9.2 → trustgraph_base-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 = [
     "pulsar-client",
     "prometheus-client",

{trustgraph_base-2.9.2 → trustgraph_base-2.9.4}/trustgraph/base/async_librarian_client.py

@@ -15,10 +15,13 @@ from ..schema import LibrarianRequest, LibrarianResponse, DocumentMetadata
 
 logger = logging.getLogger(__name__)
 
+default_librarian_timeout = 120
+
 
 class AsyncLibrarianClient:
 
-    def __init__(self):
+    def __init__(self, default_timeout=default_librarian_timeout):
+        self.default_timeout = default_timeout
         self._producer = None
         self._consumer = None
         self._receiver_task = None
@@ -29,9 +32,9 @@ class AsyncLibrarianClient:
     @classmethod
     async def create(
         cls, backend, request_topic, response_topic,
-        subscription=None,
+        subscription=None, default_timeout=default_librarian_timeout,
     ):
-        client = cls()
+        client = cls(default_timeout=default_timeout)
 
         client._producer = await backend.create_producer(
             topic=request_topic,
@@ -63,6 +66,9 @@ class AsyncLibrarianClient:
     async def start(self):
         pass
 
+    def _timeout(self, timeout):
+        return self.default_timeout if timeout is None else timeout
+
     async def _response_loop(self):
         try:
             while self.running:
@@ -87,7 +93,8 @@ class AsyncLibrarianClient:
                 f"Librarian response loop error: {e}", exc_info=True,
             )
 
-    async def request(self, request, timeout=120):
+    async def request(self, request, timeout=None):
+        timeout = self._timeout(timeout)
         request_id = str(uuid.uuid4())
 
         future = asyncio.get_event_loop().create_future()
@@ -111,7 +118,8 @@ class AsyncLibrarianClient:
             self._pending.pop(request_id, None)
             raise RuntimeError("Timeout waiting for librarian response")
 
-    async def stream(self, request, timeout=120):
+    async def stream(self, request, timeout=None):
+        timeout = self._timeout(timeout)
         request_id = str(uuid.uuid4())
 
         q = asyncio.Queue()
@@ -180,7 +188,7 @@ class AsyncLibrarianClient:
 
         logger.info("AsyncLibrarianClient closed")
 
-    async def fetch_document_content(self, document_id, timeout=120):
+    async def fetch_document_content(self, document_id, timeout=None):
         req = LibrarianRequest(
             operation="stream-document",
             document_id=document_id,
@@ -199,13 +207,13 @@ class AsyncLibrarianClient:
 
         return base64.b64encode(raw)
 
-    async def fetch_document_text(self, document_id, timeout=120):
+    async def fetch_document_text(self, document_id, timeout=None):
         content = await self.fetch_document_content(
             document_id, timeout=timeout,
         )
         return base64.b64decode(content).decode("utf-8")
 
-    async def fetch_document_metadata(self, document_id, timeout=120):
+    async def fetch_document_metadata(self, document_id, timeout=None):
         req = LibrarianRequest(
             operation="get-document-metadata",
             document_id=document_id,
@@ -215,7 +223,7 @@ class AsyncLibrarianClient:
 
     async def save_child_document(self, doc_id, parent_id, content,
                                   document_type="chunk", title=None,
-                                  kind="text/plain", timeout=120):
+                                  kind="text/plain", timeout=None):
         if isinstance(content, str):
             content = content.encode("utf-8")
 
@@ -238,7 +246,7 @@ class AsyncLibrarianClient:
 
     async def save_document(self, doc_id, content, title=None,
                             document_type="answer", kind="text/plain",
-                            timeout=120):
+                            timeout=None):
         if isinstance(content, str):
             content = content.encode("utf-8")
 

{trustgraph_base-2.9.2 → trustgraph_base-2.9.4}/trustgraph/base/config_client.py

@@ -1,5 +1,6 @@
 
 from . request_response_spec import RequestResponseSpec
+from . async_processor import default_config_timeout
 from .. schema import ConfigRequest, ConfigResponse, ConfigKey, ConfigValue
 
 CONFIG_TIMEOUT = 10
@@ -108,8 +109,12 @@ class ConfigClient:
 
 
 class ConfigClientSpec(RequestResponseSpec):
+
+    timeout_param = "config_timeout"
+    default_timeout = default_config_timeout
+
     def __init__(
-            self, request_name, response_name,
+            self, request_name, response_name, timeout=None,
     ):
         super(ConfigClientSpec, self).__init__(
             request_name=request_name,
@@ -117,4 +122,5 @@ class ConfigClientSpec(RequestResponseSpec):
             response_name=response_name,
             response_schema=ConfigResponse,
             impl=ConfigClient,
+            timeout=timeout,
         )

{trustgraph_base-2.9.2 → trustgraph_base-2.9.4}/trustgraph/base/flow_processor.py

@@ -16,6 +16,7 @@ from .. schema import config_push_queue
 from .. log_level import LogLevel
 from . workspace_processor import WorkspaceProcessor
 from . flow import Flow
+from . prompt_client import default_prompt_timeout
 
 # Module logger
 logger = logging.getLogger(__name__)
@@ -29,6 +30,10 @@ class FlowProcessor(WorkspaceProcessor):
         # Initialise base class
         super(FlowProcessor, self).__init__(**params)
 
+        self.prompt_timeout = int(params.get(
+            "prompt_timeout", default_prompt_timeout
+        ))
+
         # Register configuration handler for this processor's config type
         self.register_config_handler(
             self.on_configure_flows, types=[f"processor:{self.id}"]
@@ -114,6 +119,15 @@ class FlowProcessor(WorkspaceProcessor):
     def add_args(parser: ArgumentParser) -> None:
 
         WorkspaceProcessor.add_args(parser)
+        WorkspaceProcessor.add_librarian_args(parser)
+
+        parser.add_argument(
+            '--prompt-timeout',
+            type=int,
+            default=default_prompt_timeout,
+            help=f'Prompt request timeout in seconds '
+                 f'(default: {default_prompt_timeout})',
+        )
 
         # parser.add_argument(
         #     '--rate-limit-retry',

{trustgraph_base-2.9.2 → trustgraph_base-2.9.4}/trustgraph/base/librarian_spec.py

@@ -3,19 +3,23 @@ from __future__ import annotations
 import uuid
 from typing import Any
 
-from . spec import Spec
+from . spec import Spec, TimeoutSpec
+from . async_librarian_client import AsyncLibrarianClient, default_librarian_timeout
 
 
-class LibrarianSpec(Spec):
+class LibrarianSpec(TimeoutSpec, Spec):
+
+    timeout_param = "librarian_timeout"
+    default_timeout = default_librarian_timeout
+
     def __init__(self, request_name="librarian-request",
-                 response_name="librarian-response"):
+                 response_name="librarian-response", timeout=None):
         self.request_name = request_name
         self.response_name = response_name
+        self.timeout = timeout
 
     async def register(self, flow: Any, processor: Any, definition: dict[str, Any]) -> Any:
 
-        from .async_librarian_client import AsyncLibrarianClient
-
         subscription = (
             processor.id + "--" + flow.workspace + "--" +
             flow.name + "--librarian--" + str(uuid.uuid4())
@@ -26,6 +30,7 @@ class LibrarianSpec(Spec):
             request_topic=definition["topics"][self.request_name],
             response_topic=definition["topics"][self.response_name],
             subscription=subscription,
+            default_timeout=self.resolve_timeout(processor),
         )
 
         flow.librarian = client

{trustgraph_base-2.9.2 → trustgraph_base-2.9.4}/trustgraph/base/prompt_client.py

@@ -8,6 +8,8 @@ from typing import Optional, Any
 from . request_response_spec import RequestResponseSpec
 from .. schema import PromptRequest, PromptResponse
 
+default_prompt_timeout = 600
+
 @dataclass
 class PromptResult:
     response_type: str              # "text", "json", or "jsonl"
@@ -20,7 +22,7 @@ class PromptResult:
 
 class PromptClient:
 
-    async def prompt(self, id, variables, timeout=600, streaming=False, chunk_callback=None):
+    async def prompt(self, id, variables, timeout=None, streaming=False, chunk_callback=None):
 
         if not streaming:
 
@@ -136,28 +138,28 @@ class PromptClient:
                 model=last_resp.model,
             )
 
-    async def extract_definitions(self, text, timeout=600):
+    async def extract_definitions(self, text, timeout=None):
         return await self.prompt(
             id = "extract-definitions",
             variables = { "text": text },
             timeout = timeout,
         )
 
-    async def extract_relationships(self, text, timeout=600):
+    async def extract_relationships(self, text, timeout=None):
         return await self.prompt(
             id = "extract-relationships",
             variables = { "text": text },
             timeout = timeout,
         )
 
-    async def extract_objects(self, text, schema, timeout=600):
+    async def extract_objects(self, text, schema, timeout=None):
         return await self.prompt(
             id = "extract-rows",
             variables = { "text": text, "schema": schema, },
             timeout = timeout,
         )
 
-    async def document_prompt(self, query, documents, timeout=600, streaming=False, chunk_callback=None):
+    async def document_prompt(self, query, documents, timeout=None, streaming=False, chunk_callback=None):
         return await self.prompt(
             id = "document-prompt",
             variables = {
@@ -169,7 +171,7 @@ class PromptClient:
             chunk_callback = chunk_callback,
         )
 
-    async def agent_react(self, variables, timeout=600, streaming=False, chunk_callback=None):
+    async def agent_react(self, variables, timeout=None, streaming=False, chunk_callback=None):
         return await self.prompt(
             id = "agent-react",
             variables = variables,
@@ -178,7 +180,7 @@ class PromptClient:
             chunk_callback = chunk_callback,
         )
 
-    async def question(self, question, timeout=600):
+    async def question(self, question, timeout=None):
         return await self.prompt(
             id = "question",
             variables = {
@@ -188,8 +190,12 @@ class PromptClient:
         )
 
 class PromptClientSpec(RequestResponseSpec):
+
+    timeout_param = "prompt_timeout"
+    default_timeout = default_prompt_timeout
+
     def __init__(
-            self, request_name, response_name,
+            self, request_name, response_name, timeout=None,
     ):
         super(PromptClientSpec, self).__init__(
             request_name = request_name,
@@ -197,4 +203,5 @@ class PromptClientSpec(RequestResponseSpec):
             response_name = response_name,
             response_schema = PromptResponse,
             impl = PromptClient,
+            timeout = timeout,
         )

{trustgraph_base-2.9.2 → trustgraph_base-2.9.4}/trustgraph/base/request_response_spec.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import logging
 from typing import Any
 
-from . spec import Spec
+from . spec import Spec, TimeoutSpec
 
 # Module logger
 logger = logging.getLogger(__name__)
@@ -12,10 +12,13 @@ logger = logging.getLogger(__name__)
 # use another service in request/response mode.  Uses two topics:
 # - we send on the request topic as a producer
 # - we receive on the response topic as a subscriber
-class RequestResponseSpec(Spec):
+class RequestResponseSpec(TimeoutSpec, Spec):
+
+    default_timeout = 300
+
     def __init__(
             self, request_name, request_schema, response_name,
-            response_schema, impl=None, optional=False
+            response_schema, impl=None, optional=False, timeout=None,
     ):
         self.request_name = request_name
         self.request_schema = request_schema
@@ -23,6 +26,7 @@ class RequestResponseSpec(Spec):
         self.response_schema = response_schema
         self.impl = impl
         self.optional = optional
+        self.timeout = timeout
 
     async def register(self, flow: Any, processor: Any, definition: dict[str, Any]) -> Any:
 
@@ -42,6 +46,7 @@ class RequestResponseSpec(Spec):
             response_schema=self.response_schema,
             processor_id=getattr(processor, 'id', None),
             target_service=self.request_name,
+            default_timeout=self.resolve_timeout(processor),
         )
 
         wrapper = _make_impl_wrapper(rr_client, self.impl)
@@ -59,7 +64,7 @@ def _make_impl_wrapper(rr_client, impl_cls):
         def __init__(self):
             self._rr_client = rr_client
 
-        async def request(self, req, timeout=300, recipient=None):
+        async def request(self, req, timeout=None, recipient=None):
             if recipient is None:
                 return await self._rr_client.request(req, timeout=timeout)
 

trustgraph_base-2.9.4/trustgraph/base/spec.py

@@ -0,0 +1,28 @@
+
+class Spec:
+
+    async def register(self, flow, processor, definition):
+        self.add(flow, processor, definition)
+        return None
+
+    def add(self, flow, processor, definition):
+        pass
+
+
+class TimeoutSpec:
+    # Mixin for specs that create a client. An explicit constructor value
+    # wins over the processor attribute named by timeout_param, which wins
+    # over the class default.
+    timeout_param = None
+    default_timeout = None
+    timeout = None
+
+    def resolve_timeout(self, processor):
+        # Reads a plain attribute: a Mock processor yields a Mock, not None.
+        if self.timeout is not None:
+            return self.timeout
+        if self.timeout_param is not None:
+            value = getattr(processor, self.timeout_param, None)
+            if value is not None:
+                return value
+        return self.default_timeout

{trustgraph_base-2.9.2 → trustgraph_base-2.9.4}/trustgraph/base/workspace_processor.py

@@ -5,6 +5,7 @@ from argparse import ArgumentParser
 import logging
 
 from . async_processor import AsyncProcessor
+from . async_librarian_client import default_librarian_timeout
 
 logger = logging.getLogger(__name__)
 
@@ -18,6 +19,10 @@ class WorkspaceProcessor(AsyncProcessor):
 
         super(WorkspaceProcessor, self).__init__(**params)
 
+        self.librarian_timeout = int(params.get(
+            "librarian_timeout", default_librarian_timeout
+        ))
+
         self.active_workspaces = set()
 
         self.register_workspace_handler(self._handle_workspace_changes)
@@ -63,3 +68,13 @@ class WorkspaceProcessor(AsyncProcessor):
     @staticmethod
     def add_args(parser: ArgumentParser) -> None:
         AsyncProcessor.add_args(parser)
+
+    @staticmethod
+    def add_librarian_args(parser: ArgumentParser) -> None:
+        parser.add_argument(
+            '--librarian-timeout',
+            type=int,
+            default=default_librarian_timeout,
+            help=f'Librarian request timeout in seconds '
+                 f'(default: {default_librarian_timeout})',
+        )

trustgraph_base-2.9.4/trustgraph/base_version.py

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

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: trustgraph-base
-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: pulsar-client
 Requires-Dist: prometheus-client

trustgraph_base-2.9.2/trustgraph/base/spec.py

@@ -1,9 +0,0 @@
-
-class Spec:
-
-    async def register(self, flow, processor, definition):
-        self.add(flow, processor, definition)
-        return None
-
-    def add(self, flow, processor, definition):
-        pass

trustgraph_base-2.9.2/trustgraph/base_version.py

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