acp-sdk 0.2.3__tar.gz → 0.2.5__tar.gz

{acp_sdk-0.2.3 → acp_sdk-0.2.5}/PKG-INFO

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

{acp_sdk-0.2.3 → acp_sdk-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "acp-sdk"
-version = "0.2.3"
+version = "0.2.5"
 description = "Agent Communication Protocol SDK"
 license = "Apache-2.0"
 readme = "README.md"

{acp_sdk-0.2.3 → acp_sdk-0.2.5}/src/acp_sdk/client/client.py

@@ -9,6 +9,7 @@ from httpx_sse import EventSource, aconnect_sse
 from opentelemetry.instrumentation.httpx import HTTPXClientInstrumentor
 from pydantic import TypeAdapter
 
+from acp_sdk.instrumentation import get_tracer
 from acp_sdk.models import (
     ACPError,
     Agent,
@@ -37,17 +38,20 @@ class Client:
         self,
         *,
         base_url: httpx.URL | str = "",
+        timeout: httpx.Timeout | None = None,
         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 = client or httpx.AsyncClient(base_url=self.base_url)
+        self._session_id = session_id
+        self._client = client or httpx.AsyncClient(base_url=base_url, timeout=timeout)
         if instrument:
             HTTPXClientInstrumentor.instrument_client(self._client)
 
+    @property
+    def client(self) -> httpx.AsyncClient:
+        return self._client
+
     async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
@@ -62,7 +66,9 @@ 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(), instrument=False)
+        session_id = session_id or uuid.uuid4()
+        with get_tracer().start_as_current_span("session", attributes={"acp.session": str(session_id)}):
+            yield Client(client=self._client, session_id=session_id, instrument=False)
 
     async def agents(self) -> AsyncIterator[Agent]:
         response = await self._client.get("/agents")
@@ -82,7 +88,7 @@ class Client:
                 agent_name=agent,
                 inputs=inputs,
                 mode=RunMode.SYNC,
-                session_id=self.session_id,
+                session_id=self._session_id,
             ).model_dump_json(),
         )
         self._raise_error(response)
@@ -97,7 +103,7 @@ class Client:
                 agent_name=agent,
                 inputs=inputs,
                 mode=RunMode.ASYNC,
-                session_id=self.session_id,
+                session_id=self._session_id,
             ).model_dump_json(),
         )
         self._raise_error(response)
@@ -114,7 +120,7 @@ class Client:
                 agent_name=agent,
                 inputs=inputs,
                 mode=RunMode.STREAM,
-                session_id=self.session_id,
+                session_id=self._session_id,
             ).model_dump_json(),
         ) as event_source:
             async for event in self._validate_stream(event_source):
@@ -135,7 +141,7 @@ class Client:
     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_resume, mode=RunMode.SYNC).model_dump(),
+            content=RunResumeRequest(await_resume=await_resume, mode=RunMode.SYNC).model_dump_json(),
         )
         self._raise_error(response)
         return RunResumeResponse.model_validate(response.json())
@@ -143,7 +149,7 @@ class Client:
     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_resume, mode=RunMode.ASYNC).model_dump(),
+            content=RunResumeRequest(await_resume=await_resume, mode=RunMode.ASYNC).model_dump_json(),
         )
         self._raise_error(response)
         return RunResumeResponse.model_validate(response.json())
@@ -153,7 +159,7 @@ class Client:
             self._client,
             "POST",
             f"/runs/{run_id}",
-            json=RunResumeRequest(await_resume=await_resume, mode=RunMode.STREAM).model_dump(),
+            content=RunResumeRequest(await_resume=await_resume, mode=RunMode.STREAM).model_dump_json(),
         ) as event_source:
             async for event in self._validate_stream(event_source):
                 yield event
@@ -162,6 +168,9 @@ class Client:
         self,
         event_source: EventSource,
     ) -> AsyncIterator[Event]:
+        if event_source.response.is_error:
+            await event_source.response.aread()
+            self._raise_error(event_source.response)
         async for event in event_source.aiter_sse():
             event = TypeAdapter(Event).validate_json(event.data)
             yield event
@@ -173,4 +182,4 @@ class Client:
             raise ACPError(Error.model_validate(response.json()))
 
     def _set_session(self, run: Run) -> None:
-        self.session_id = run.session_id
+        self._session_id = run.session_id

acp_sdk-0.2.5/src/acp_sdk/instrumentation.py

@@ -0,0 +1,7 @@
+from opentelemetry import trace
+
+from acp_sdk.version import __version__
+
+
+def get_tracer() -> trace.Tracer:
+    return trace.get_tracer("acp-sdk", __version__)

{acp_sdk-0.2.3 → acp_sdk-0.2.5}/src/acp_sdk/server/bundle.py

@@ -5,6 +5,7 @@ from concurrent.futures import ThreadPoolExecutor
 
 from pydantic import ValidationError
 
+from acp_sdk.instrumentation import get_tracer
 from acp_sdk.models import (
     ACPError,
     AnyModel,
@@ -30,7 +31,6 @@ from acp_sdk.models import (
 )
 from acp_sdk.server.agent import Agent
 from acp_sdk.server.logging import logger
-from acp_sdk.server.telemetry import get_tracer
 
 
 class RunBundle:
@@ -127,6 +127,8 @@ class RunBundle:
                         await_resume = await self.await_()
                         await self.emit(RunInProgressEvent(run=self.run))
                         run_logger.info("Run resumed")
+                    elif isinstance(next, Error):
+                        raise ACPError(error=next)
                     else:
                         try:
                             generic = AnyModel.model_validate(next)

{acp_sdk-0.2.3 → acp_sdk-0.2.5}/src/acp_sdk/server/errors.py

@@ -32,7 +32,9 @@ def status_code_to_error_code(status_code: int) -> ErrorCode:
 
 async def acp_error_handler(request: Request, exc: ACPError, *, status_code: int | None = None) -> JSONResponse:
     error = exc.error
-    return JSONResponse(status_code=status_code or error_code_to_status_code(error.code), content=error.model_dump())
+    return JSONResponse(
+        status_code=status_code or error_code_to_status_code(error.code), content=error.model_dump_json()
+    )
 
 
 async def http_exception_handler(request: Request, exc: StarletteHTTPException) -> JSONResponse:

{acp_sdk-0.2.3 → acp_sdk-0.2.5}/src/acp_sdk/server/telemetry.py

@@ -51,7 +51,3 @@ def configure_telemetry() -> None:
     processor = BatchLogRecordProcessor(OTLPLogExporter())
     logger_provider.add_log_record_processor(processor)
     root_logger.addHandler(LoggingHandler(logger_provider=logger_provider))
-
-
-def get_tracer() -> trace.Tracer:
-    return trace.get_tracer("acp-sdk", __version__)

{acp_sdk-0.2.3 → acp_sdk-0.2.5}/tests/e2e/fixtures/server.py

@@ -4,7 +4,7 @@ from collections.abc import AsyncGenerator, AsyncIterator, Generator
 from threading import Thread
 
 import pytest
-from acp_sdk.models import ACPError, Artifact, AwaitRequest, AwaitResume, Error, ErrorCode, Message, MessagePart
+from acp_sdk.models import Artifact, AwaitRequest, AwaitResume, Error, ErrorCode, Message, MessagePart
 from acp_sdk.server import Context, Server
 
 from e2e.config import Config
@@ -26,7 +26,7 @@ def server() -> Generator[None]:
 
     @server.agent()
     async def failer(inputs: list[Message], context: Context) -> AsyncIterator[Message]:
-        raise ACPError(Error(code=ErrorCode.INVALID_INPUT, message="Wrong question buddy!"))
+        yield Error(code=ErrorCode.INVALID_INPUT, message="Wrong question buddy!")
 
     @server.agent()
     async def sessioner(inputs: list[Message], context: Context) -> AsyncIterator[Message]: