acp-sdk 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

acp_sdk/client/client.py

@@ -39,16 +39,14 @@ class Client:
         base_url: httpx.URL | str = "",
         session_id: SessionId | None = None,
         client: httpx.AsyncClient | None = None,
+        instrument: bool = True,
     ) -> None:
         self.base_url = base_url
         self.session_id = session_id
 
-        self._client = self._init_client(client)
-
-    def _init_client(self, client: httpx.AsyncClient | None = None) -> httpx.AsyncClient:
-        client = client or httpx.AsyncClient(base_url=self.base_url)
-        HTTPXClientInstrumentor.instrument_client(client)
-        return client
+        self._client = client or httpx.AsyncClient(base_url=self.base_url)
+        if instrument:
+            HTTPXClientInstrumentor.instrument_client(self._client)
 
     async def __aenter__(self) -> Self:
         await self._client.__aenter__()
@@ -64,7 +62,7 @@ class Client:
 
     @asynccontextmanager
     async def session(self, session_id: SessionId | None = None) -> AsyncGenerator[Self]:
-        yield Client(client=self._client, session_id=session_id or uuid.uuid4())
+        yield Client(client=self._client, session_id=session_id or uuid.uuid4(), instrument=False)
 
     async def agents(self) -> AsyncIterator[Agent]:
         response = await self._client.get("/agents")
@@ -134,28 +132,28 @@ class Client:
         self._raise_error(response)
         return RunCancelResponse.model_validate(response.json())
 
-    async def run_resume_sync(self, *, run_id: RunId, await_: AwaitResume) -> Run:
+    async def run_resume_sync(self, *, run_id: RunId, await_resume: AwaitResume) -> Run:
         response = await self._client.post(
             f"/runs/{run_id}",
-            json=RunResumeRequest(await_resume=await_, mode=RunMode.SYNC).model_dump(),
+            json=RunResumeRequest(await_resume=await_resume, mode=RunMode.SYNC).model_dump(),
         )
         self._raise_error(response)
         return RunResumeResponse.model_validate(response.json())
 
-    async def run_resume_async(self, *, run_id: RunId, await_: AwaitResume) -> Run:
+    async def run_resume_async(self, *, run_id: RunId, await_resume: AwaitResume) -> Run:
         response = await self._client.post(
             f"/runs/{run_id}",
-            json=RunResumeRequest(await_resume=await_, mode=RunMode.ASYNC).model_dump(),
+            json=RunResumeRequest(await_resume=await_resume, mode=RunMode.ASYNC).model_dump(),
         )
         self._raise_error(response)
         return RunResumeResponse.model_validate(response.json())
 
-    async def run_resume_stream(self, *, run_id: RunId, await_: AwaitResume) -> AsyncIterator[Event]:
+    async def run_resume_stream(self, *, run_id: RunId, await_resume: AwaitResume) -> AsyncIterator[Event]:
         async with aconnect_sse(
             self._client,
             "POST",
             f"/runs/{run_id}",
-            json=RunResumeRequest(await_resume=await_, mode=RunMode.STREAM).model_dump(),
+            json=RunResumeRequest(await_resume=await_resume, mode=RunMode.STREAM).model_dump(),
         ) as event_source:
             async for event in self._validate_stream(event_source):
                 yield event

acp_sdk/models/models.py

@@ -113,9 +113,9 @@ class MessageCompletedEvent(BaseModel):
     message: Message
 
 
-class AwaitEvent(BaseModel):
-    type: Literal["await"] = "await"
-    await_request: AwaitRequest | None = None
+class RunAwaitingEvent(BaseModel):
+    type: Literal["run.awaiting"] = "run.awaiting"
+    run: Run
 
 
 class GenericEvent(BaseModel):
@@ -155,7 +155,7 @@ Event = Union[
     ArtifactEvent,
     MessagePartEvent,
     MessageCompletedEvent,
-    AwaitEvent,
+    RunAwaitingEvent,
     GenericEvent,
     RunCancelledEvent,
     RunFailedEvent,

acp_sdk/server/bundle.py

@@ -6,17 +6,21 @@ from concurrent.futures import ThreadPoolExecutor
 from pydantic import ValidationError
 
 from acp_sdk.models import (
+    ACPError,
     AnyModel,
-    AwaitEvent,
     AwaitRequest,
     AwaitResume,
     Error,
+    ErrorCode,
     Event,
     GenericEvent,
     Message,
+    MessageCompletedEvent,
     MessageCreatedEvent,
+    MessagePart,
     MessagePartEvent,
     Run,
+    RunAwaitingEvent,
     RunCancelledEvent,
     RunCompletedEvent,
     RunCreatedEvent,
@@ -24,8 +28,6 @@ from acp_sdk.models import (
     RunInProgressEvent,
     RunStatus,
 )
-from acp_sdk.models.errors import ErrorCode
-from acp_sdk.models.models import MessageCompletedEvent, MessagePart
 from acp_sdk.server.agent import Agent
 from acp_sdk.server.logging import logger
 from acp_sdk.server.telemetry import get_tracer
@@ -120,15 +122,7 @@ class RunBundle:
                     elif isinstance(next, AwaitRequest):
                         self.run.await_request = next
                         self.run.status = RunStatus.AWAITING
-                        await self.emit(
-                            AwaitEvent.model_validate(
-                                {
-                                    "run_id": self.run.run_id,
-                                    "type": "await",
-                                    "await": next,
-                                }
-                            )
-                        )
+                        await self.emit(RunAwaitingEvent(run=self.run))
                         run_logger.info("Run awaited")
                         await_resume = await self.await_()
                         await self.emit(RunInProgressEvent(run=self.run))
@@ -150,7 +144,10 @@ class RunBundle:
                 await self.emit(RunCancelledEvent(run=self.run))
                 run_logger.info("Run cancelled")
             except Exception as e:
-                self.run.error = Error(code=ErrorCode.SERVER_ERROR, message=str(e))
+                if isinstance(e, ACPError):
+                    self.run.error = e.error
+                else:
+                    self.run.error = Error(code=ErrorCode.SERVER_ERROR, message=str(e))
                 self.run.status = RunStatus.FAILED
                 await self.emit(RunFailedEvent(run=self.run))
                 run_logger.exception("Run failed")

{acp_sdk-0.2.1.dist-info → acp_sdk-0.2.3.dist-info}/METADATA

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

{acp_sdk-0.2.1.dist-info → acp_sdk-0.2.3.dist-info}/RECORD

@@ -2,15 +2,15 @@ acp_sdk/__init__.py,sha256=tXdAUM9zcmdSKCAkVrOCrGcXcuVS-yuvQUoQwTe9pek,98
 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=yhw-rZlrN2558cPmCxuCVajh5CEQqBWQ-j6Iz10WQjE,6149
+acp_sdk/client/client.py,sha256=N3kkxtSFlz_BzDcnq4xQCGDiu66EWzTzZ9HTpzNEOBk,6113
 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=NCYYKKnWU1OSHQ0r1lSP_y4Z5cY3Agx-jmwfEwF3dLw,4001
+acp_sdk/models/models.py,sha256=Z8qgURpz18uPXpYDYmlbMQ3Du9-hrJUE3GVPf7ufdUY,3994
 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=BOOGuzEPS4bp6dhflcsQkyawllbsWoS3l6JqwKqI9n0,6312
+acp_sdk/server/bundle.py,sha256=89Iu6YjsaqGDmLcP4ScLPIP6oi08Lf2SFQr8WBQ9TK8,6078
 acp_sdk/server/context.py,sha256=MgnLV6qcDIhc_0BjW7r4Jj1tHts4ZuwpdTGIBnz2Mgo,1036
 acp_sdk/server/errors.py,sha256=fWlgVsQ5hs_AXwzc-wvy6QgoDWEMRUBlSrfJfhHHMyE,2085
 acp_sdk/server/logging.py,sha256=Oc8yZigCsuDnHHPsarRzu0RX3NKaLEgpELM2yovGKDI,411
@@ -19,6 +19,6 @@ acp_sdk/server/session.py,sha256=0cDr924HC5x2bBNbK9NSKVHAt5A_mi5dK8P4jP_ugq0,629
 acp_sdk/server/telemetry.py,sha256=WIEHK8syOTG9SyWi3Y-cos7CsCF5-IHGiyL9bCaUN0E,1921
 acp_sdk/server/types.py,sha256=1bqMCjwZM3JzvJ1h4aBHWzjbldMQ45HqcezBD6hUoYo,175
 acp_sdk/server/utils.py,sha256=EfrF9VCyVk3AM_ao-BIB9EzGbfTrh4V2Bz-VFr6f6Sg,351
-acp_sdk-0.2.1.dist-info/METADATA,sha256=XsctrgXBB8U1ZxaB5oe0qXuR5bYlLAbvNUtDQhU_gX8,3463
-acp_sdk-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-acp_sdk-0.2.1.dist-info/RECORD,,
+acp_sdk-0.2.3.dist-info/METADATA,sha256=LwqB-ZDr3k6tz5lzjD3rEzWz-h5Ccu4W9AI5-EpACGQ,3463
+acp_sdk-0.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+acp_sdk-0.2.3.dist-info/RECORD,,