acp-sdk 0.2.2__tar.gz → 0.2.4__tar.gz

{acp_sdk-0.2.2 → acp_sdk-0.2.4}/PKG-INFO

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

{acp_sdk-0.2.2 → acp_sdk-0.2.4}/examples/clients/simple.py

@@ -12,7 +12,7 @@ async def example() -> None:
         run = await client.run_sync(
             agent="echo", inputs=[Message(parts=[MessagePart(content="Howdy!", content_type="text/plain")])]
         )
-        print(run.outputs)
+        print(run)
 
 
 if __name__ == "__main__":

{acp_sdk-0.2.2 → acp_sdk-0.2.4}/pyproject.toml

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

{acp_sdk-0.2.2 → acp_sdk-0.2.4}/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,
@@ -62,7 +63,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")

acp_sdk-0.2.4/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.2 → acp_sdk-0.2.4}/src/acp_sdk/server/bundle.py

@@ -5,15 +5,20 @@ from concurrent.futures import ThreadPoolExecutor
 
 from pydantic import ValidationError
 
+from acp_sdk.instrumentation import get_tracer
 from acp_sdk.models import (
+    ACPError,
     AnyModel,
     AwaitRequest,
     AwaitResume,
     Error,
+    ErrorCode,
     Event,
     GenericEvent,
     Message,
+    MessageCompletedEvent,
     MessageCreatedEvent,
+    MessagePart,
     MessagePartEvent,
     Run,
     RunAwaitingEvent,
@@ -24,11 +29,8 @@ 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
 
 
 class RunBundle:
@@ -125,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)
@@ -142,7 +146,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.2 → acp_sdk-0.2.4}/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.2 → acp_sdk-0.2.4}/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 Artifact, AwaitRequest, AwaitResume, 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 RuntimeError("Whoops")
+        yield Error(code=ErrorCode.INVALID_INPUT, message="Wrong question buddy!")
 
     @server.agent()
     async def sessioner(inputs: list[Message], context: Context) -> AsyncIterator[Message]:

{acp_sdk-0.2.2 → acp_sdk-0.2.4}/tests/e2e/test_suites/test_runs.py

@@ -5,6 +5,7 @@ from acp_sdk.client import Client
 from acp_sdk.models import (
     ArtifactEvent,
     AwaitResume,
+    ErrorCode,
     Message,
     MessageCreatedEvent,
     MessagePart,
@@ -50,6 +51,8 @@ async def test_run_status(server: Server, client: Client) -> None:
 async def test_failure(server: Server, client: Client) -> None:
     run = await client.run_sync(agent="failer", inputs=inputs)
     assert run.status == RunStatus.FAILED
+    assert run.error is not None
+    assert run.error.code == ErrorCode.INVALID_INPUT
 
 
 @pytest.mark.asyncio