acp-sdk 0.8.2__py3-none-any.whl → 0.8.4__py3-none-any.whl

acp_sdk/models/models.py

@@ -1,3 +1,4 @@
+import asyncio
 import uuid
 from datetime import datetime, timezone
 from enum import Enum
@@ -5,7 +6,7 @@ from typing import Any, Literal, Optional, Union
 
 from pydantic import AnyUrl, BaseModel, ConfigDict, Field
 
-from acp_sdk.models.errors import Error
+from acp_sdk.models.errors import ACPError, Error
 
 
 class AnyModel(BaseModel):
@@ -95,7 +96,7 @@ class Artifact(MessagePart):
 
 class Message(BaseModel):
     parts: list[MessagePart]
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
+    created_at: datetime | None = Field(default_factory=lambda: datetime.now(timezone.utc))
     completed_at: datetime | None = Field(default_factory=lambda: datetime.now(timezone.utc))
 
     def __add__(self, other: "Message") -> "Message":
@@ -103,8 +104,10 @@ class Message(BaseModel):
             raise TypeError(f"Cannot concatenate Message with {type(other).__name__}")
         return Message(
             parts=self.parts + other.parts,
-            created_at=min(self.created_at, other.created_at),
-            completed_at=max(self.completed_at, other.completed_at),
+            created_at=min(self.created_at, other.created_at) if self.created_at and other.created_at else None,
+            completed_at=max(self.completed_at, other.completed_at)
+            if self.completed_at and other.completed_at
+            else None,
         )
 
     def __str__(self) -> str:
@@ -194,6 +197,15 @@ class Run(BaseModel):
     created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
     finished_at: datetime | None = None
 
+    def raise_for_status(self) -> "Run":
+        match self.status:
+            case RunStatus.CANCELLED:
+                raise asyncio.CancelledError()
+            case RunStatus.FAILED:
+                raise ACPError(error=self.error)
+            case _:
+                return self
+
 
 class MessageCreatedEvent(BaseModel):
     type: Literal["message.created"] = "message.created"

acp_sdk/server/agent.py

@@ -58,13 +58,13 @@ class Agent(abc.ABC):
             run = asyncio.get_running_loop().run_in_executor(executor, self._run_func, input, context)
 
         try:
-            while True:
+            while not run.done() or yield_queue.async_q.qsize() > 0:
                 value = yield await yield_queue.async_q.get()
+                if isinstance(value, Exception):
+                    raise value
                 await yield_resume_queue.async_q.put(value)
         except janus.AsyncQueueShutDown:
             pass
-        finally:
-            await run  # Raise exceptions
 
     async def _run_async_gen(self, input: list[Message], context: Context) -> None:
         try:
@@ -74,12 +74,16 @@ class Agent(abc.ABC):
                 value = await context.yield_async(await gen.asend(value))
         except StopAsyncIteration:
             pass
+        except Exception as e:
+            await context.yield_async(e)
         finally:
             context.shutdown()
 
     async def _run_coro(self, input: list[Message], context: Context) -> None:
         try:
             await context.yield_async(await self.run(input, context))
+        except Exception as e:
+            await context.yield_async(e)
         finally:
             context.shutdown()
 
@@ -91,12 +95,16 @@ class Agent(abc.ABC):
                 value = context.yield_sync(gen.send(value))
         except StopIteration:
             pass
+        except Exception as e:
+            context.yield_sync(e)
         finally:
             context.shutdown()
 
     def _run_func(self, input: list[Message], context: Context) -> None:
         try:
             context.yield_sync(self.run(input, context))
+        except Exception as e:
+            context.yield_sync(e)
         finally:
             context.shutdown()
 

acp_sdk/server/types.py

@@ -5,5 +5,5 @@ from pydantic import BaseModel
 from acp_sdk.models import AwaitRequest, AwaitResume, Message
 from acp_sdk.models.models import MessagePart
 
-RunYield = Message | MessagePart | str | AwaitRequest | BaseModel | dict[str | Any] | None
+RunYield = Message | MessagePart | str | AwaitRequest | BaseModel | dict[str | Any] | None | Exception
 RunYieldResume = AwaitResume | None

{acp_sdk-0.8.2.dist-info → acp_sdk-0.8.4.dist-info}/METADATA

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

{acp_sdk-0.8.2.dist-info → acp_sdk-0.8.4.dist-info}/RECORD

@@ -8,10 +8,10 @@ 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=6OEkTMdMsl3_IbiFmFG2ChEqY_KYTf3Bi_MW5p168GQ,7183
+acp_sdk/models/models.py,sha256=PSv3Vq07ahCi6JpvEMzEdEjHdUU7NT9KTf21CF9B3-g,7629
 acp_sdk/models/schemas.py,sha256=_ah7_zHsQJGxDXvnzsBvASdRsQHVphFQ7Sum6A04iRw,759
 acp_sdk/server/__init__.py,sha256=mxBBBFaZuMEUENRMLwp1XZkuLeT9QghcFmNvjnqvAAU,377
-acp_sdk/server/agent.py,sha256=wvwpi83osmW7zQWxVnzyVMXIvzOswAfhKWHscVIldhA,6245
+acp_sdk/server/agent.py,sha256=6VBKn_qVXqUl79G8T7grwhnuLMwr67d4UGagMGX1hMs,6586
 acp_sdk/server/app.py,sha256=1S1mxECioL5NeGjGo5C8u94x7Ybvj79L_Aauu2352vA,7117
 acp_sdk/server/bundle.py,sha256=5Rq6E4WgmuwPQ4u-sViaHeu5loCLEUgojWav9LAghX4,7036
 acp_sdk/server/context.py,sha256=MgnLV6qcDIhc_0BjW7r4Jj1tHts4ZuwpdTGIBnz2Mgo,1036
@@ -20,8 +20,8 @@ acp_sdk/server/logging.py,sha256=Oc8yZigCsuDnHHPsarRzu0RX3NKaLEgpELM2yovGKDI,411
 acp_sdk/server/server.py,sha256=JLQ2tyZpQaWvhZYw6-OWbKlSRNWezXLXhD5OFbKPysw,8014
 acp_sdk/server/session.py,sha256=ekz1o6Sy1tQZlpaoS_VgbvFuUQh2qpiHG71mvBdvhgc,662
 acp_sdk/server/telemetry.py,sha256=1BUxNg-xL_Vqgs27PDWNc3HikrQW2lidAtT_FKlp_Qk,1833
-acp_sdk/server/types.py,sha256=teBNRWSks8XP1SCQKGEtbNWQahVD3RAOPnysTxcQPxI,292
+acp_sdk/server/types.py,sha256=gLb5wCkMYhmu2laj_ymK-TPfN9LSjRgKOP1H_893UzA,304
 acp_sdk/server/utils.py,sha256=BhZKBNaLgczX6aYjxYva-6VI1bKmHtYQ5YDA5LrwF50,1831
-acp_sdk-0.8.2.dist-info/METADATA,sha256=fxSOTWcXIKK34252Vvn0leWfb9Gr9cwQw_LOh7vLGZw,1651
-acp_sdk-0.8.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-acp_sdk-0.8.2.dist-info/RECORD,,
+acp_sdk-0.8.4.dist-info/METADATA,sha256=AZFhr-FKotfSVMuKUCdixS18rg6d-fjePoy2hWw3SnY,1651
+acp_sdk-0.8.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+acp_sdk-0.8.4.dist-info/RECORD,,