acp-sdk 0.10.1__py3-none-any.whl → 0.12.0__py3-none-any.whl

acp_sdk/server/server.py

@@ -11,7 +11,7 @@ import uvicorn.config
 from fastapi import FastAPI
 
 from acp_sdk.models import Metadata
-from acp_sdk.server.agent import Agent
+from acp_sdk.server.agent import AgentManifest
 from acp_sdk.server.agent import agent as agent_decorator
 from acp_sdk.server.app import create_app
 from acp_sdk.server.logging import configure_logger as configure_logger_func
@@ -19,11 +19,12 @@ from acp_sdk.server.logging import logger
 from acp_sdk.server.store import Store
 from acp_sdk.server.telemetry import configure_telemetry as configure_telemetry_func
 from acp_sdk.server.utils import async_request_with_retry
+from acp_sdk.shared.resources import ResourceLoader, ResourceStore
 
 
 class Server:
     def __init__(self) -> None:
-        self.agents: list[Agent] = []
+        self.agents: list[AgentManifest] = []
         self.server: uvicorn.Server | None = None
 
     def agent(
@@ -42,7 +43,7 @@ class Server:
 
         return decorator
 
-    def register(self, *agents: Agent) -> None:
+    def register(self, *agents: AgentManifest) -> None:
         self.agents.extend(agents)
 
     @asynccontextmanager
@@ -56,6 +57,8 @@ class Server:
         configure_telemetry: bool = False,
         self_registration: bool = True,
         store: Store | None = None,
+        resource_store: ResourceStore | None = None,
+        resource_loader: ResourceLoader | None = None,
         host: str = "127.0.0.1",
         port: int = 8000,
         uds: str | None = None,
@@ -118,7 +121,13 @@ class Server:
 
         import uvicorn
 
-        app = create_app(*self.agents, lifespan=self.lifespan, store=store)
+        app = create_app(
+            *self.agents,
+            lifespan=self.lifespan,
+            store=store,
+            resource_loader=resource_loader,
+            resource_store=resource_store,
+        )
 
         if configure_logger:
             configure_logger_func()
@@ -185,6 +194,8 @@ class Server:
         configure_telemetry: bool = False,
         self_registration: bool = True,
         store: Store | None = None,
+        resource_store: ResourceStore | None = None,
+        resource_loader: ResourceLoader | None = None,
         host: str = "127.0.0.1",
         port: int = 8000,
         uds: str | None = None,
@@ -243,6 +254,8 @@ class Server:
                 configure_telemetry=configure_telemetry,
                 self_registration=self_registration,
                 store=store,
+                resource_store=resource_store,
+                resource_loader=resource_loader,
                 host=host,
                 port=port,
                 uds=uds,

acp_sdk/server/store/memory_store.py

@@ -5,25 +5,25 @@ from typing import Generic
 
 from cachetools import TTLCache
 
-from acp_sdk.server.store.store import Store, T
+from acp_sdk.server.store.store import Store, StoreModel, T
 from acp_sdk.server.store.utils import Stringable
 
 
 class MemoryStore(Store[T], Generic[T]):
     def __init__(self, *, limit: int, ttl: int | None = None) -> None:
         super().__init__()
-        self._cache: TTLCache[str, T] = TTLCache(maxsize=limit, ttl=ttl, timer=datetime.now)
+        self._cache: TTLCache[str, str] = TTLCache(maxsize=limit, ttl=ttl, timer=datetime.now)
         self._event = asyncio.Event()
 
     async def get(self, key: Stringable) -> T | None:
         value = self._cache.get(str(key))
-        return value.model_copy(deep=True) if value else value
+        return StoreModel.model_validate_json(value) if value else value
 
     async def set(self, key: Stringable, value: T | None) -> None:
         if value is None:
             del self._cache[str(key)]
         else:
-            self._cache[str(key)] = value.model_copy(deep=True)
+            self._cache[str(key)] = value.model_dump_json()
         self._event.set()
 
     async def watch(self, key: Stringable, *, ready: asyncio.Event | None = None) -> AsyncIterator[T | None]:

acp_sdk/server/utils.py

@@ -9,7 +9,7 @@ from pydantic import BaseModel
 from acp_sdk.models import RunStatus
 from acp_sdk.server.executor import RunData
 from acp_sdk.server.logging import logger
-from acp_sdk.server.store.store import Store
+from acp_sdk.server.store import Store
 
 
 def encode_sse(model: BaseModel) -> str:

acp_sdk/shared/__init__.py

@@ -0,0 +1,2 @@
+from acp_sdk.shared.resources import ResourceLoader as ResourceLoader
+from acp_sdk.shared.resources import ResourceStore as ResourceStore

acp_sdk/shared/resources.py

@@ -0,0 +1,46 @@
+from datetime import timedelta
+
+import cachetools
+import cachetools.func
+import httpx
+import obstore
+from obstore.store import AzureStore, GCSStore, HTTPStore, ObjectStore, S3Store
+
+from acp_sdk.models.types import ResourceId, ResourceUrl
+
+
+class ResourceLoader:
+    def __init__(self, *, client: httpx.AsyncClient | None = None) -> None:
+        self._client = client or httpx.AsyncClient(follow_redirects=False)
+
+    @cachetools.func.lfu_cache
+    async def load(self, url: ResourceUrl) -> bytes:
+        response = await self._client.get(str(url))
+        response.raise_for_status()
+        return await response.aread()
+
+
+class ResourceStore:
+    def __init__(self, *, store: ObjectStore, presigned_url_expiration: timedelta = timedelta(days=7)) -> None:
+        self._store = store
+        self._presigned_url_expiration = presigned_url_expiration
+
+    async def load(self, id: ResourceId):  # noqa: ANN201
+        result = await self._store.get_async(str(id))
+        return result
+
+    async def store(
+        self,
+        id: ResourceId,
+        data: bytes,
+    ) -> None:
+        await self._store.put_async(str(id), data)
+
+    async def url(self, id: ResourceId) -> ResourceUrl:
+        if isinstance(self._store, (AzureStore, GCSStore, S3Store)):
+            url = await obstore.sign_async(self._store, "GET", str(id), self._presigned_url_expiration)
+            return ResourceUrl(url=url)
+        elif isinstance(self._store, HTTPStore):
+            return ResourceUrl(url=f"{self._store.url}/{id!s}")
+        else:
+            raise NotImplementedError("Unsupported store")

{acp_sdk-0.10.1.dist-info → acp_sdk-0.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acp-sdk
-Version: 0.10.1
+Version: 0.12.0
 Summary: Agent Communication Protocol SDK
 Author: IBM Corp.
 Maintainer-email: Tomas Pilar <thomas7pilar@gmail.com>
@@ -11,6 +11,7 @@ Requires-Dist: fastapi[standard]>=0.115
 Requires-Dist: httpx-sse>=0.4
 Requires-Dist: httpx>=0.26
 Requires-Dist: janus>=2.0
+Requires-Dist: obstore>=0.6
 Requires-Dist: opentelemetry-api>=1.31
 Requires-Dist: opentelemetry-exporter-otlp-proto-http>=1.31
 Requires-Dist: opentelemetry-instrumentation-fastapi>=0.52b1

acp_sdk-0.12.0.dist-info/RECORD

@@ -0,0 +1,36 @@
+acp_sdk/__init__.py,sha256=tXdAUM9zcmdSKCAkVrOCrGcXcuVS-yuvQUoQwTe9pek,98
+acp_sdk/instrumentation.py,sha256=JqSyvILN3sGAfOZrmckQq4-M_4_5alyPn95DK0o5lfA,161
+acp_sdk/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+acp_sdk/version.py,sha256=Niy83rgvigB4hL_rR-O4ySvI7dj6xnqkyOe_JTymi9s,73
+acp_sdk/client/__init__.py,sha256=Bca1DORrswxzZsrR2aUFpATuNG2xNSmYvF1Z2WJaVbc,51
+acp_sdk/client/client.py,sha256=p6e5zmH9-hdx0t0zoQOCSkgSUgmH-YCTD5_1idcwTEQ,12763
+acp_sdk/client/types.py,sha256=_H6zYt-2OHOOYRtssRnbDIiwmgsl2-KIXc9lb-mJLFA,133
+acp_sdk/client/utils.py,sha256=2jhJyrPJmVFRoDJh0q_JMqOMlC3IxCh-6HXed-PIZS8,924
+acp_sdk/models/__init__.py,sha256=_XDSvUwlHeRsqUayAxHusJ5s8Z1jWXV1ZcUKlJakOt4,200
+acp_sdk/models/errors.py,sha256=rEyaMVvQuBi7fwWe_d0PGGySYsD3FZTluQ-SkC0yhAs,444
+acp_sdk/models/models.py,sha256=OBpCsRq7vSkPN67MrT40LvfzitwjXK_darSFdj1G_zE,10821
+acp_sdk/models/platform.py,sha256=qgQhBZZNPG9XLlytEZmuv1LTkejbklmlj7YpnpUV_DE,497
+acp_sdk/models/schemas.py,sha256=Vu3aO-6M0IW71I9thxAiphLGXXMvyZXFMJCdj7euUmc,915
+acp_sdk/models/types.py,sha256=tH79qqpW3DrPJggZD1KFlLtGE_ZKT6eLtwiR3p3x2QM,145
+acp_sdk/server/__init__.py,sha256=TfTOOI7G2nejjOB6RZB5ujynyh3bFeH51pfDIMzv3N4,627
+acp_sdk/server/agent.py,sha256=tzdk9bXb4aKBKD3F1-QfI7zrjMZYEg6qm3gGRWJGC1E,3739
+acp_sdk/server/app.py,sha256=KKjZcVxJxQvxAEP_cQna4f9ed1O5mN9Ldo1X_tXfFfI,11107
+acp_sdk/server/context.py,sha256=Xz1am_HLNTgEvG0IPtS0tRJcPk-rEhLtNyTQGUAvLQw,1271
+acp_sdk/server/errors.py,sha256=GSO8yYIqEeX8Y4Lz86ks35dMTHiQiXuOrLYYx0eXsbI,2110
+acp_sdk/server/executor.py,sha256=ktM1FCwixtbjsU60VM7PHxwF_Saz15M_9fNXN4mItrU,12607
+acp_sdk/server/logging.py,sha256=Oc8yZigCsuDnHHPsarRzu0RX3NKaLEgpELM2yovGKDI,411
+acp_sdk/server/server.py,sha256=HJOub1ynHiJTQrfKq_bq0r9aqgL1kQeboZH_ArZcuh0,14651
+acp_sdk/server/telemetry.py,sha256=lbB2ppijUcqbHUOn0e-15LGcVvT_qrMguq8qBokICac,2016
+acp_sdk/server/types.py,sha256=gLb5wCkMYhmu2laj_ymK-TPfN9LSjRgKOP1H_893UzA,304
+acp_sdk/server/utils.py,sha256=O9GUZ8SKqk8P5Vo-N4BD7hXS3XuE7l8wifOhvKMX3ws,2715
+acp_sdk/server/store/__init__.py,sha256=zzKic0byQTM86cyC2whwZeNP4prfy_HZrbSriTaV5j8,282
+acp_sdk/server/store/memory_store.py,sha256=ykGskORGJUhQNMxTmXuNB8tX8xCgukr5502PSZr14nk,1214
+acp_sdk/server/store/postgresql_store.py,sha256=bHyAgf4vSn_07wGXXq6juFwm3JldYNOjU9RARcDSYQo,2717
+acp_sdk/server/store/redis_store.py,sha256=IKXvDseOFMcoGjVYPOkOBhPnJAchy_RyeMayKLoVCGA,1378
+acp_sdk/server/store/store.py,sha256=jGmYy9oiuVjhYYJY8QRo4g2J2Qyt1HLTmq_eHy4aI7c,1806
+acp_sdk/server/store/utils.py,sha256=JumEOMs1h1uGlnHnUGeguee-srGzT7_Y2NVEYt01QuY,92
+acp_sdk/shared/__init__.py,sha256=vZuhdQ6lrWVdyYPmIyXpPvs5eMnzemhNek3gfYPA3Bc,138
+acp_sdk/shared/resources.py,sha256=3oPvevYv2B1YaHyoMH85B7fcHVyhgZDUaDCBVEflTlA,1592
+acp_sdk-0.12.0.dist-info/METADATA,sha256=AFY7mxImu6UwA0LZlc0ItpdmhLzw8Tw59AJXBjeWq2Q,1713
+acp_sdk-0.12.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+acp_sdk-0.12.0.dist-info/RECORD,,

acp_sdk/server/session.py

@@ -1,24 +0,0 @@
-import uuid
-
-from pydantic import BaseModel, Field
-
-from acp_sdk.models import Message, RunId, RunStatus, SessionId
-from acp_sdk.server.executor import RunData
-from acp_sdk.server.store import Store
-
-
-class Session(BaseModel):
-    id: SessionId = Field(default_factory=uuid.uuid4)
-    runs: list[RunId] = []
-
-    def append(self, run_id: RunId) -> None:
-        self.runs.append(run_id)
-
-    async def history(self, store: Store[RunData]) -> list[Message]:
-        history = []
-        for run_id in self.runs:
-            run_data = await store.get(run_id)
-            if run_data is not None and run_data.run.status == RunStatus.COMPLETED:
-                history.extend(run_data.input)
-                history.extend(run_data.run.output)
-        return history

acp_sdk-0.10.1.dist-info/RECORD

@@ -1,33 +0,0 @@
-acp_sdk/__init__.py,sha256=tXdAUM9zcmdSKCAkVrOCrGcXcuVS-yuvQUoQwTe9pek,98
-acp_sdk/instrumentation.py,sha256=JqSyvILN3sGAfOZrmckQq4-M_4_5alyPn95DK0o5lfA,161
-acp_sdk/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-acp_sdk/version.py,sha256=Niy83rgvigB4hL_rR-O4ySvI7dj6xnqkyOe_JTymi9s,73
-acp_sdk/client/__init__.py,sha256=Bca1DORrswxzZsrR2aUFpATuNG2xNSmYvF1Z2WJaVbc,51
-acp_sdk/client/client.py,sha256=7GVD7eVlaSU78O3puMlyoOTqKjTwZYaBKLHyYvbvr3I,8504
-acp_sdk/client/types.py,sha256=_H6zYt-2OHOOYRtssRnbDIiwmgsl2-KIXc9lb-mJLFA,133
-acp_sdk/client/utils.py,sha256=2jhJyrPJmVFRoDJh0q_JMqOMlC3IxCh-6HXed-PIZS8,924
-acp_sdk/models/__init__.py,sha256=numSDBDT1QHx7n_Y3Deb5VOvKWcUBxbOEaMwQBSRHxc,151
-acp_sdk/models/errors.py,sha256=rEyaMVvQuBi7fwWe_d0PGGySYsD3FZTluQ-SkC0yhAs,444
-acp_sdk/models/models.py,sha256=So5D9VjJxX2jdOF8BGc3f9D2ssbAyFEO2Rgr1KykI-M,7730
-acp_sdk/models/schemas.py,sha256=_ah7_zHsQJGxDXvnzsBvASdRsQHVphFQ7Sum6A04iRw,759
-acp_sdk/server/__init__.py,sha256=mxBBBFaZuMEUENRMLwp1XZkuLeT9QghcFmNvjnqvAAU,377
-acp_sdk/server/agent.py,sha256=6VBKn_qVXqUl79G8T7grwhnuLMwr67d4UGagMGX1hMs,6586
-acp_sdk/server/app.py,sha256=XeMn8hfU2J2O2QxSvsH5q6lowxCfwS1-DTWz-gUVotA,8733
-acp_sdk/server/context.py,sha256=MgnLV6qcDIhc_0BjW7r4Jj1tHts4ZuwpdTGIBnz2Mgo,1036
-acp_sdk/server/errors.py,sha256=GSO8yYIqEeX8Y4Lz86ks35dMTHiQiXuOrLYYx0eXsbI,2110
-acp_sdk/server/executor.py,sha256=YL0J9cVY1QZtdTeqwjJaKDpB_T6_sByHlHc52kgNAJo,7742
-acp_sdk/server/logging.py,sha256=Oc8yZigCsuDnHHPsarRzu0RX3NKaLEgpELM2yovGKDI,411
-acp_sdk/server/server.py,sha256=slePybTpocXD8k9HxOvxCiyvigiDUdZmkz3kiI-dCFU,14113
-acp_sdk/server/session.py,sha256=vGUVpKzUGefI1c7LeK08Bvd8zvJIRfsdJEt2KhYoEg0,764
-acp_sdk/server/telemetry.py,sha256=lbB2ppijUcqbHUOn0e-15LGcVvT_qrMguq8qBokICac,2016
-acp_sdk/server/types.py,sha256=gLb5wCkMYhmu2laj_ymK-TPfN9LSjRgKOP1H_893UzA,304
-acp_sdk/server/utils.py,sha256=BYSn4Bd95Bn-oEH1W1yE_pWpYUOdtYPh-vMnou4nsdk,2721
-acp_sdk/server/store/__init__.py,sha256=zzKic0byQTM86cyC2whwZeNP4prfy_HZrbSriTaV5j8,282
-acp_sdk/server/store/memory_store.py,sha256=9hOoJiHdaDz-0hNHWhO_qZpp-I_pnTqYBIhQnlWilu4,1194
-acp_sdk/server/store/postgresql_store.py,sha256=bHyAgf4vSn_07wGXXq6juFwm3JldYNOjU9RARcDSYQo,2717
-acp_sdk/server/store/redis_store.py,sha256=IKXvDseOFMcoGjVYPOkOBhPnJAchy_RyeMayKLoVCGA,1378
-acp_sdk/server/store/store.py,sha256=jGmYy9oiuVjhYYJY8QRo4g2J2Qyt1HLTmq_eHy4aI7c,1806
-acp_sdk/server/store/utils.py,sha256=JumEOMs1h1uGlnHnUGeguee-srGzT7_Y2NVEYt01QuY,92
-acp_sdk-0.10.1.dist-info/METADATA,sha256=2CkcWAS4e-6bIeoFsv2eyxLcbeTSgy15gq3VCP1dxbE,1685
-acp_sdk-0.10.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-acp_sdk-0.10.1.dist-info/RECORD,,