acp-sdk 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

acp_sdk/models/models.py

@@ -17,12 +17,12 @@ class AnyModel(BaseModel):
 
 class MessagePart(BaseModel):
     name: Optional[str] = None
-    content_type: str
+    content_type: Optional[str] = "text/plain"
     content: Optional[str] = None
     content_encoding: Optional[Literal["plain", "base64"]] = "plain"
     content_url: Optional[AnyUrl] = None
 
-    model_config = ConfigDict(extra="forbid")
+    model_config = ConfigDict(extra="allow")
 
     def model_post_init(self, __context: Any) -> None:
         if self.content is None and self.content_url is None:
@@ -48,6 +48,36 @@ class Message(BaseModel):
             part.content for part in self.parts if part.content is not None and part.content_type == "text/plain"
         )
 
+    def compress(self) -> "Message":
+        def can_be_joined(first: MessagePart, second: MessagePart) -> bool:
+            return (
+                first.name is None
+                and second.name is None
+                and first.content_type == "text/plain"
+                and second.content_type == "text/plain"
+                and first.content_encoding == "plain"
+                and second.content_encoding == "plain"
+                and first.content_url is None
+                and second.content_url is None
+            )
+
+        def join(first: MessagePart, second: MessagePart) -> MessagePart:
+            return MessagePart(
+                name=None,
+                content_type="text/plain",
+                content=first.content + second.content,
+                content_encoding="plain",
+                content_url=None,
+            )
+
+        parts: list[MessagePart] = []
+        for part in self.parts:
+            if len(parts) > 0 and can_be_joined(parts[-1], part):
+                parts[-1] = join(parts[-1], part)
+            else:
+                parts.append(part)
+        return Message(parts=parts)
+
 
 AgentName = str
 SessionId = uuid.UUID
@@ -75,12 +105,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.3.0.dist-info → acp_sdk-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acp-sdk
-Version: 0.3.0
+Version: 0.3.2
 Summary: Agent Communication Protocol SDK
 Author: IBM Corp.
 Maintainer-email: Tomas Pilar <thomas7pilar@gmail.com>
@@ -28,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.3.0.dist-info → acp_sdk-0.3.2.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=J9hnaj5S8p4T3mlVb2iyGD1JuOw0R8JoKqBYDKeZXUw,5318
 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.3.0.dist-info/METADATA,sha256=7GnGZ92jFahL6u1NS9lKMg04V6zFjyprgwBUQota1iE,3265
-acp_sdk-0.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-acp_sdk-0.3.0.dist-info/RECORD,,
+acp_sdk-0.3.2.dist-info/METADATA,sha256=79mXTyM_99E4TYQIIMPEJ-R5WkImcl4IWSbhNe1fc5I,3119
+acp_sdk-0.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+acp_sdk-0.3.2.dist-info/RECORD,,