acp-sdk 0.12.0__tar.gz → 0.12.2__tar.gz

{acp_sdk-0.12.0 → acp_sdk-0.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acp-sdk
-Version: 0.12.0
+Version: 0.12.2
 Summary: Agent Communication Protocol SDK
 Author: IBM Corp.
 Maintainer-email: Tomas Pilar <thomas7pilar@gmail.com>

{acp_sdk-0.12.0 → acp_sdk-0.12.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "acp-sdk"
-version = "0.12.0"
+version = "0.12.2"
 description = "Agent Communication Protocol SDK"
 license = "Apache-2.0"
 readme = "README.md"

{acp_sdk-0.12.0 → acp_sdk-0.12.2}/src/acp_sdk/models/models.py

@@ -6,10 +6,11 @@ from enum import Enum
 from typing import Any, Literal, Optional, Union
 
 from pydantic import AnyUrl, BaseModel, ConfigDict, Field
+from pydantic.json_schema import SkipJsonSchema
 
 from acp_sdk.models.errors import ACPError, Error
 from acp_sdk.models.platform import PlatformUIAnnotation
-from acp_sdk.models.types import AgentName, ResourceId, ResourceUrl, RunId, SessionId
+from acp_sdk.models.types import AgentName, ResourceUrl, RunId, SessionId
 from acp_sdk.shared import ResourceLoader, ResourceStore
 
 
@@ -336,8 +337,8 @@ class Session(BaseModel):
     history: list[ResourceUrl] = Field(default_factory=list)
     state: ResourceUrl | None = None
 
-    loader: ResourceLoader | None = Field(None, exclude=True)
-    store: ResourceStore | None = Field(None, exclude=True)
+    loader: SkipJsonSchema[ResourceLoader | None] = Field(None, exclude=True)
+    store: SkipJsonSchema[ResourceStore | None] = Field(None, exclude=True)
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
@@ -357,6 +358,6 @@ class Session(BaseModel):
         if not store:
             raise ValueError("Store must be specified")
 
-        id = ResourceId()
+        id = uuid.uuid4()
         await store.store(id, data)
         return await store.url(id)

{acp_sdk-0.12.0 → acp_sdk-0.12.2}/src/acp_sdk/server/app.py

@@ -51,6 +51,7 @@ from acp_sdk.server.errors import (
     validation_exception_handler,
 )
 from acp_sdk.server.executor import CancelData, Executor, RunData
+from acp_sdk.server.resources import ServerResourceLoader
 from acp_sdk.server.store import MemoryStore, Store
 from acp_sdk.server.utils import stream_sse, wait_util_stop
 from acp_sdk.shared import ResourceLoader, ResourceStore
@@ -161,14 +162,30 @@ def create_app(
         if request.session_id and request.session and request.session_id != request.session.id:
             raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Session ID mismatch")
 
+        def create_resource_url_forwarded(id: ResourceId) -> ResourceUrl:
+            if not forward_resources:
+                raise RuntimeError("Resource forwarding disabled")
+            return ResourceUrl(url=str(req.url_for("get_resource", resource_id=id)))
+
+        async def create_resource_url(id: ResourceId) -> ResourceUrl:
+            if forward_resources:
+                return create_resource_url_forwarded(id)
+            else:
+                return await resource_store.url(id)
+
+        server_resource_loader = ServerResourceLoader(
+            loader=resource_loader,
+            store=resource_store,
+            create_resource_url=create_resource_url_forwarded if forward_resources else None,
+        )
+
         session = request.session or (
-            (
-                await session_store.get(request.session_id)
-                or Session(id=request.session_id, loader=resource_loader, store=resource_store)
-            )
+            (await session_store.get(request.session_id) or Session(id=request.session_id))
             if request.session_id
-            else Session(loader=resource_loader, store=resource_store)
+            else Session()
         )
+        session.loader = server_resource_loader
+        session.store = resource_store
 
         nonlocal executor
         run_data = RunData(
@@ -183,12 +200,6 @@ def create_app(
         headers = {Headers.RUN_ID: str(run_data.run.run_id)}
         ready = asyncio.Event()
 
-        async def create_resource_url(id: ResourceId) -> ResourceUrl:
-            if forward_resources:
-                return ResourceUrl(url=str(req.url_for("get_resource", resource_id=id)))
-            else:
-                return await resource_store.url(id)
-
         Executor(
             agent=agent,
             run_data=run_data,
@@ -200,7 +211,7 @@ def create_app(
             executor=executor,
             request=req,
             resource_store=resource_store,
-            resource_loader=resource_loader,
+            resource_loader=server_resource_loader,
             create_resource_url=create_resource_url,
         ).execute(request.input, wait=ready)
 

acp_sdk-0.12.2/src/acp_sdk/server/resources.py

@@ -0,0 +1,38 @@
+import re
+import uuid
+from typing import Callable
+
+import cachetools
+
+from acp_sdk.models import ResourceUrl
+from acp_sdk.models.types import ResourceId
+from acp_sdk.shared.resources import ResourceLoader, ResourceStore
+
+
+class ServerResourceLoader(ResourceLoader):
+    def __init__(
+        self,
+        *,
+        loader: ResourceLoader,
+        store: ResourceStore,
+        create_resource_url: Callable[[ResourceId], ResourceUrl] | None,
+    ) -> None:
+        self._loader = loader
+        self._store = store
+
+        placeholder_id = uuid.uuid4()
+        self._url_pattern = (
+            re.escape(str(create_resource_url(placeholder_id))).replace(re.escape(str(placeholder_id)), r"([^/?&#]+)")
+            if create_resource_url
+            else None
+        )
+
+    @cachetools.func.lfu_cache
+    async def load(self, url: ResourceUrl) -> bytes:
+        if self._url_pattern:
+            match = re.match(self._url_pattern, str(url))
+            if match:
+                id = ResourceId(match.group(1))
+                result = await self._store.load(id)
+                return (await result.bytes_async()).to_bytes()
+        return await self._loader.load(url)