acp-sdk 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

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/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/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/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.dist-info → acp_sdk-0.2.4.dist-info}/METADATA

@@ -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.dist-info → acp_sdk-0.2.4.dist-info}/RECORD

@@ -1,8 +1,9 @@
 acp_sdk/__init__.py,sha256=tXdAUM9zcmdSKCAkVrOCrGcXcuVS-yuvQUoQwTe9pek,98
+acp_sdk/instrumentation.py,sha256=JqSyvILN3sGAfOZrmckQq4-M_4_5alyPn95DK0o5lfA,161
 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=N3kkxtSFlz_BzDcnq4xQCGDiu66EWzTzZ9HTpzNEOBk,6113
+acp_sdk/client/client.py,sha256=5aA078pJxedVSGhhJ-NTTfjc19atSkdTyfR8LO6jgyM,6301
 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
@@ -10,15 +11,15 @@ 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=GXmYzn9PlKQ-acu8y6TwUxAXZ1XVlYQiGRi2UUEbe4w,6003
+acp_sdk/server/bundle.py,sha256=VchPUW8URH83-qJo9kRQsYCBcuLKbxGXHB3sw9CK0cc,6178
 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
 acp_sdk/server/server.py,sha256=-eT3fmnEsBUN44Spi2EP2eV0l4RAlKa8bzqxnhz16SM,5399
 acp_sdk/server/session.py,sha256=0cDr924HC5x2bBNbK9NSKVHAt5A_mi5dK8P4jP_ugq0,629
-acp_sdk/server/telemetry.py,sha256=WIEHK8syOTG9SyWi3Y-cos7CsCF5-IHGiyL9bCaUN0E,1921
+acp_sdk/server/telemetry.py,sha256=1BUxNg-xL_Vqgs27PDWNc3HikrQW2lidAtT_FKlp_Qk,1833
 acp_sdk/server/types.py,sha256=1bqMCjwZM3JzvJ1h4aBHWzjbldMQ45HqcezBD6hUoYo,175
 acp_sdk/server/utils.py,sha256=EfrF9VCyVk3AM_ao-BIB9EzGbfTrh4V2Bz-VFr6f6Sg,351
-acp_sdk-0.2.2.dist-info/METADATA,sha256=NkTtKLlosgCY5bEAXLne3FVOJyw6sb-V4la74zFlMnI,3463
-acp_sdk-0.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-acp_sdk-0.2.2.dist-info/RECORD,,
+acp_sdk-0.2.4.dist-info/METADATA,sha256=JCfcw8ZueUe0WzIBTrfQMcn4yRPIShxt0woTWN0M9sk,3463
+acp_sdk-0.2.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+acp_sdk-0.2.4.dist-info/RECORD,,