acp-sdk 0.2.5__py3-none-any.whl → 0.3.1__py3-none-any.whl

acp_sdk/models/models.py

@@ -75,12 +75,18 @@ class RunStatus(str, Enum):
         return self in terminal_states
 
 
-class AwaitRequest(BaseModel):
-    type: Literal["placeholder"] = "placeholder"
+class MessageAwaitRequest(BaseModel):
+    type: Literal["message"] = "message"
+    message: Message
+
+
+class MessageAwaitResume(BaseModel):
+    type: Literal["message"] = "message"
+    message: Message
 
 
-class AwaitResume(BaseModel):
-    pass
+AwaitRequest = Union[MessageAwaitRequest]
+AwaitResume = Union[MessageAwaitResume]
 
 
 class Run(BaseModel):

acp_sdk/server/app.py

@@ -144,6 +144,16 @@ def create_app(*agents: Agent) -> FastAPI:
     @app.post("/runs/{run_id}")
     async def resume_run(run_id: RunId, request: RunResumeRequest) -> RunResumeResponse:
         bundle = find_run_bundle(run_id)
+
+        if bundle.run.await_request is None:
+            raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=f"Run {run_id} has no await request")
+
+        if bundle.run.await_request.type != request.await_resume.type:
+            raise HTTPException(
+                status_code=status.HTTP_403_FORBIDDEN,
+                detail=f"Run {run_id} is expecting resume of type {bundle.run.await_request.type}",
+            )
+
         await bundle.resume(request.await_resume)
         match request.mode:
             case RunMode.STREAM:

acp_sdk/server/bundle.py

@@ -129,6 +129,8 @@ class RunBundle:
                         run_logger.info("Run resumed")
                     elif isinstance(next, Error):
                         raise ACPError(error=next)
+                    elif next is None:
+                        pass  # Do nothing
                     else:
                         try:
                             generic = AnyModel.model_validate(next)

acp_sdk/server/types.py

@@ -2,5 +2,5 @@ from typing import Any
 
 from acp_sdk.models import AwaitRequest, AwaitResume, Message
 
-RunYield = Message | AwaitRequest | dict[str | Any]
+RunYield = Message | AwaitRequest | dict[str | Any] | None
 RunYieldResume = AwaitResume | None

{acp_sdk-0.2.5.dist-info → acp_sdk-0.3.1.dist-info}/METADATA

@@ -1,23 +1,21 @@
 Metadata-Version: 2.4
 Name: acp-sdk
-Version: 0.2.5
+Version: 0.3.1
 Summary: Agent Communication Protocol SDK
 Author: IBM Corp.
 Maintainer-email: Tomas Pilar <thomas7pilar@gmail.com>
 License-Expression: Apache-2.0
 Requires-Python: <4.0,>=3.11
+Requires-Dist: fastapi[standard]>=0.115.8
+Requires-Dist: httpx-sse>=0.4.0
+Requires-Dist: httpx>=0.28.1
+Requires-Dist: janus>=2.0.0
 Requires-Dist: opentelemetry-api>=1.31.1
+Requires-Dist: opentelemetry-exporter-otlp-proto-http>=1.31.1
+Requires-Dist: opentelemetry-instrumentation-fastapi>=0.52b1
+Requires-Dist: opentelemetry-instrumentation-httpx>=0.52b1
+Requires-Dist: opentelemetry-sdk>=1.31.1
 Requires-Dist: pydantic>=2.11.1
-Provides-Extra: client
-Requires-Dist: httpx-sse>=0.4.0; extra == 'client'
-Requires-Dist: httpx>=0.28.1; extra == 'client'
-Requires-Dist: opentelemetry-instrumentation-httpx>=0.52b1; extra == 'client'
-Provides-Extra: server
-Requires-Dist: fastapi[standard]>=0.115.8; extra == 'server'
-Requires-Dist: janus>=2.0.0; extra == 'server'
-Requires-Dist: opentelemetry-exporter-otlp-proto-http>=1.31.1; extra == 'server'
-Requires-Dist: opentelemetry-instrumentation-fastapi>=0.52b1; extra == 'server'
-Requires-Dist: opentelemetry-sdk>=1.31.1; extra == 'server'
 Description-Content-Type: text/markdown
 
 # Agent Communication Protocol SDK for Python
@@ -30,19 +28,7 @@ Agent Communication Protocol SDK for Python provides allows developers to serve
 
 ## Installation
 
-Install to use client:
-
-```shell
-pip install acp-sdk[client]
-```
-
-Install to use server:
-
-```shell
-pip install acp-sdk[server]
-```
-
-Install to use models only:
+Install with:
 
 ```shell
 pip install acp-sdk

{acp_sdk-0.2.5.dist-info → acp_sdk-0.3.1.dist-info}/RECORD

@@ -6,20 +6,20 @@ acp_sdk/client/__init__.py,sha256=Bca1DORrswxzZsrR2aUFpATuNG2xNSmYvF1Z2WJaVbc,51
 acp_sdk/client/client.py,sha256=lEUs0Oc7MZbKkTF2E6e8Wn3dTW5cMVj6fD8TbuEOMDk,6584
 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=Z8qgURpz18uPXpYDYmlbMQ3Du9-hrJUE3GVPf7ufdUY,3994
+acp_sdk/models/models.py,sha256=GjsVvP5NVlW_9pbi47vBZA94WRL8bcMzbWIebwZuJGs,4158
 acp_sdk/models/schemas.py,sha256=Kj7drJSR8d-N3KHzu_qTnLdagrMtAyhid5swluuhHTw,645
 acp_sdk/server/__init__.py,sha256=mxBBBFaZuMEUENRMLwp1XZkuLeT9QghcFmNvjnqvAAU,377
 acp_sdk/server/agent.py,sha256=fGky5MIuknw-Gy-THqhWLt9I9-gUyNIar8qEAvZb3uQ,6195
-acp_sdk/server/app.py,sha256=qLeQ1STgX8_7cRtG-7Be6V5vS9ooBq6O89cQryqBdII,5903
-acp_sdk/server/bundle.py,sha256=VchPUW8URH83-qJo9kRQsYCBcuLKbxGXHB3sw9CK0cc,6178
+acp_sdk/server/app.py,sha256=3QJzGi05DKoIKyTeYYKKQhcYz4qorQKmVI94_guVkEY,6340
+acp_sdk/server/bundle.py,sha256=6LZnxsP1rawxic9CwDAQCsOV1v31qNI9meKXMty_yWg,6260
 acp_sdk/server/context.py,sha256=MgnLV6qcDIhc_0BjW7r4Jj1tHts4ZuwpdTGIBnz2Mgo,1036
 acp_sdk/server/errors.py,sha256=IGtpPpb2ChtYvCac8kf_P-RkcY71gBvX0yq97uZWa-w,2104
 acp_sdk/server/logging.py,sha256=Oc8yZigCsuDnHHPsarRzu0RX3NKaLEgpELM2yovGKDI,411
 acp_sdk/server/server.py,sha256=-eT3fmnEsBUN44Spi2EP2eV0l4RAlKa8bzqxnhz16SM,5399
 acp_sdk/server/session.py,sha256=0cDr924HC5x2bBNbK9NSKVHAt5A_mi5dK8P4jP_ugq0,629
 acp_sdk/server/telemetry.py,sha256=1BUxNg-xL_Vqgs27PDWNc3HikrQW2lidAtT_FKlp_Qk,1833
-acp_sdk/server/types.py,sha256=1bqMCjwZM3JzvJ1h4aBHWzjbldMQ45HqcezBD6hUoYo,175
+acp_sdk/server/types.py,sha256=E0_9xWwgGzyvJjxtbeBBmSbIPhbbTSXLpHFL5dZDzxI,182
 acp_sdk/server/utils.py,sha256=EfrF9VCyVk3AM_ao-BIB9EzGbfTrh4V2Bz-VFr6f6Sg,351
-acp_sdk-0.2.5.dist-info/METADATA,sha256=ovtFlDH-TAiF1iW3-elh0-69d9A5h-Poaw1yheSrFvM,3463
-acp_sdk-0.2.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-acp_sdk-0.2.5.dist-info/RECORD,,
+acp_sdk-0.3.1.dist-info/METADATA,sha256=Eng_oiR7OIfJK3XDKIAjlmlFX8eHoVqxkd_6XIVpXlQ,3119
+acp_sdk-0.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+acp_sdk-0.3.1.dist-info/RECORD,,