attp-client 0.0.1__py3-none-any.whl → 0.0.2__py3-none-any.whl

attp_client/catalog.py

@@ -1,11 +1,21 @@
+import asyncio
 from typing import Any, Callable, MutableMapping
+
+from attp_client.errors.attp_exception import AttpException
 from attp_client.errors.not_found import NotFoundError
+from attp_client.interfaces.catalogs.tools.envelope import IEnvelope
+from attp_client.interfaces.error import IErr
 from attp_client.tools import ToolsManager
 
+from reactivex import operators as ops
+from reactivex.scheduler.eventloop import AsyncIOScheduler
+
+from attp_core.rs_api import PyAttpMessage
+
 
 class AttpCatalog:
-    attached_tools: MutableMapping[str, Callable[..., Any]]
-    tool_name_to_id_symlink: MutableMapping[str, str]
+    attached_tools: MutableMapping[str, Callable[..., Any]] # id, callback
+    tool_name_to_id_symlink: MutableMapping[str, str] # name, id
     
     def __init__(
         self,
@@ -18,12 +28,51 @@ class AttpCatalog:
         self.tool_manager = manager
         self.attached_tools = {}
         self.tool_name_to_id_symlink = {}
+        
+        self.responder = self.tool_manager.router.responder
+    
+    async def start_tool_listener(self):
+        scheduler = AsyncIOScheduler(asyncio.get_event_loop())
+        
+        def handle_call(item: IEnvelope):
+            asyncio.create_task(self.handle_call(item))
+        
+        def send_err(err: AttpException):
+            asyncio.create_task(self.tool_manager.router.session.send_error(err=err.to_ierr(), correlation_id=None, route=1))
+        
+        def envelopize(item: PyAttpMessage):
+            if not item.payload:
+                raise AttpException("EmptyPayload", detail={"message": "Payload was empty."})
+            try:
+                return IEnvelope.mps(item.payload)
+            except Exception as e:
+                raise AttpException("InvalidPayload", detail={"message": f"Payload was invalid: {str(e)}"})
+
+        def catch_handler(err: Any, _: Any):
+            # Convert any exception to AttpException if needed
+            if not isinstance(err, AttpException):
+                attp_err = AttpException("UnhandledException", detail={"message": str(err)})
+            else:
+                attp_err = err
+            send_err(attp_err)
+            # Return an empty observable to terminate the stream after error
+            from reactivex import empty
+            return empty()
+
+        self.responder.pipe(
+            ops.filter(lambda item: item.payload is not None and item.correlation_id == 1),
+            ops.map(lambda item: envelopize(item)),
+            ops.catch(catch_handler),
+            ops.filter(lambda item: item.catalog == self.catalog_name and item.tool_id in self.attached_tools),
+            ops.observe_on(scheduler),
+        ).subscribe(lambda item: handle_call(item))
     
     async def attach_tool(
         self,
-        callback: Callable[..., Any],
+        callback: Callable[[IEnvelope], Any],
         name: str, 
         description: str | None = None,
+        schema: dict | None = None,
         schema_id: str | None = None,
         *,
         return_direct: bool = False,
@@ -37,6 +86,7 @@ class AttpCatalog:
             description=description,
             schema_id=schema_id,
             return_direct=return_direct,
+            schema=schema,
             schema_ver=schema_ver,
             timeout_ms=timeout_ms,
             idempotent=idempotent
@@ -56,4 +106,12 @@ class AttpCatalog:
             raise NotFoundError(f"Tool {name} not marked as registered and wasn't found in the catalog {self.catalog_name}.")
         
         await self.tool_manager.unregister(self.catalog_name, tool_id)
-        return tool_id
+        return tool_id
+    
+    async def handle_call(self, envelope: IEnvelope) -> Any:
+        tool = self.attached_tools.get(envelope.tool_id)
+
+        if not tool:
+            raise NotFoundError(f"Tool {envelope.tool_id} not marked as registered and wasn't found in the catalog {self.catalog_name}.")
+
+        return await tool(envelope)

attp_client/interfaces/catalogs/tools/envelope.py

@@ -0,0 +1,13 @@
+from typing import Annotated, Any, Mapping
+from pydantic import Field
+from typing_extensions import Doc
+from attp_client.misc.fixed_basemodel import FixedBaseModel
+
+
+class IEnvelope(FixedBaseModel):
+    """Uniform tool output"""
+    type: Annotated[str, Doc("Envelop discriminator; For tools only 'tool-call'")] = Field("tool-call")
+    catalog: Annotated[str, Doc("Tool catalog name where tool is registered and being called from")]
+    tool_id: Annotated[str, Doc("Tool ID being called")]
+    metadata: Annotated[Mapping[str, Any], Doc("AgentHub/trace metadata")] = Field(default_factory=dict)
+    data: Annotated[Mapping[str, Any], Doc("Tool output JSON matching provided tool arg schema")]

attp_client/tools.py

@@ -15,6 +15,7 @@ class ToolsManager:
         name: str, 
         description: str | None = None,
         schema_id: str | None = None,
+        schema: dict | None = None,
         *,
         return_direct: bool = False,
         schema_ver: str = "1.0",
@@ -31,6 +32,7 @@ class ToolsManager:
                     "schema_id": schema_id,
                     "return_direct": return_direct,
                     "schema_ver": schema_ver,
+                    "schema": schema,
                     "timeout_ms": timeout_ms,
                     "idempotent": idempotent
                 }

{attp_client-0.0.1.dist-info → attp_client-0.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: attp-client
-Version: 0.0.1
+Version: 0.0.2
 Summary: A python-sdk client for interacting with AgentHub's ATTP protocol (Agent Tool Transport Protocol)
 License: MIT
 Author: Ascender Team

{attp_client-0.0.1.dist-info → attp_client-0.0.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-attp_client/catalog.py,sha256=rStW3wveo09hiQOpq7XGlZtqd7dEjc96yowh1VCN78c,1799
+attp_client/catalog.py,sha256=trWLiE_nDXnhlygr4yewti9JLGwanokDdMhHYffMNKs,4296
 attp_client/client.py,sha256=aSjDaH1pHkmPsVZBwIrSIMX8QXDtbDfGpVBXR5KgnF4,3989
 attp_client/consts.py,sha256=6UZyqWddycOp-TKW5yvb0JW2fdfcS-J2xFVVNfuJQbU,18
 attp_client/errors/attp_exception.py,sha256=HePYyYMknS4t6tMrwU-p9L_LPdj1i7chntrlM53ueK4,347
@@ -9,6 +9,7 @@ attp_client/errors/serialization_error.py,sha256=Pa8PRzFJrrikA1Ikj0q-0euvXVUMb_q
 attp_client/errors/unauthenticated_error.py,sha256=F0V1FjO0qVLMl6Y120y3AXKZnwb5iDD17c4GEMbL5aI,46
 attp_client/inference.py,sha256=wZ-iF-O8eWDn_YosW234ClnXFa7Gw7I73eD2ugmXvfU,4626
 attp_client/interfaces/catalogs/catalog.py,sha256=3PxlRwR3y2tbQVfXAkhDIv07AJPraMfH0c_pyi7Y6z8,146
+attp_client/interfaces/catalogs/tools/envelope.py,sha256=6aUx06ou9If9OYv4BODKiBybrgBL2YWfSHZ6ukIR1K0,693
 attp_client/interfaces/error.py,sha256=fIrk5XlAhMs6mbYQ5PzgwS0v-LIbtne3OlQue4CjWXs,139
 attp_client/interfaces/handshake/auth.py,sha256=lCbu4Mz50N7-XC5szQKht6xnw-d8pPQMeBviSPfRB2U,337
 attp_client/interfaces/handshake/hello.py,sha256=hlwWcvSpRebtnbS3lLBYmBm7AfHE4n6dp0ILgfqMUFU,680
@@ -23,11 +24,11 @@ attp_client/misc/fixed_basemodel.py,sha256=0MTVmlTrA75Oxv0pVfLdXFTSp5AmBzgiNwvDi
 attp_client/misc/serializable.py,sha256=tU08TsjiLiafAhU1jKd5BxajlHdEDcdKeEiKPqhMSTI,2102
 attp_client/router.py,sha256=UDHU2xsvTjgSIzMtV0jkPvOYK9R7GFjKfIrjjBHws-Q,4575
 attp_client/session.py,sha256=YDrd1KYmwKsZW6Xdkt6UprXZzGz6pFFSkk6O7XS6ZsA,11409
-attp_client/tools.py,sha256=stKrT8cAIIdIpiE8LhH3YPSGa7OsDux-mTeNsT294ng,1765
+attp_client/tools.py,sha256=8GppeVYtnWNqc8M6a-s-S43QYpZROU4aYk67R9388yc,1839
 attp_client/types/route_mapping.py,sha256=Kb9ZX88lqihRZr8IryfH1Vg_YAobW699Yjl6Raz1rdg,375
 attp_client/utils/context_awaiter.py,sha256=oCptu5g8mY43j5cr-W4fOe85OCCaqQI9r_Pn92NgZSY,1035
 attp_client/utils/route_mapper.py,sha256=uJNhKp6ipCSUxoiZS0Liix2lHOgUAnJM0kfgXWAh9RQ,554
 attp_client/utils/serializer.py,sha256=O1tWYbQS9jC9aus-ISKtliKCgGmOEIb9hxykVrmMKGY,636
-attp_client-0.0.1.dist-info/METADATA,sha256=3b74iG5sWjaUpDqeJwjrjJ-8meMF0YOcWGJpEhOiEOI,7137
-attp_client-0.0.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-attp_client-0.0.1.dist-info/RECORD,,
+attp_client-0.0.2.dist-info/METADATA,sha256=HbejbdD7QR0-oSgJOnW5YfmS5qWwBSrU3UfA2zw_25U,7137
+attp_client-0.0.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+attp_client-0.0.2.dist-info/RECORD,,