acp-sdk 0.1.0rc5__py3-none-any.whl → 0.1.0rc7__py3-none-any.whl

acp_sdk/models/models.py

@@ -58,8 +58,8 @@ class Message(RootModel):
 
 
 AgentName = str
-SessionId = str
-RunId = str
+SessionId = uuid.UUID
+RunId = uuid.UUID
 
 
 class RunMode(str, Enum):
@@ -92,7 +92,7 @@ class AwaitResume(BaseModel):
 
 
 class Run(BaseModel):
-    run_id: RunId = str(uuid.uuid4())
+    run_id: RunId = Field(default_factory=uuid.uuid4)
     agent_name: AgentName
     session_id: SessionId | None = None
     status: RunStatus = RunStatus.CREATED

acp_sdk/models/schemas.py

@@ -1,4 +1,4 @@
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 from acp_sdk.models.models import Agent, AgentName, AwaitResume, Message, Run, RunMode, SessionId
 
@@ -26,6 +26,8 @@ class RunResumeRequest(BaseModel):
     await_: AwaitResume = Field(alias="await")
     mode: RunMode
 
+    model_config = ConfigDict(populate_by_name=True)
+
 
 class RunResumeResponse(Run):
     pass

acp_sdk/server/app.py

@@ -2,8 +2,10 @@ import asyncio
 from collections.abc import AsyncGenerator
 from concurrent.futures import ThreadPoolExecutor
 from contextlib import asynccontextmanager
+from enum import Enum
 
 from fastapi import FastAPI, HTTPException, status
+from fastapi.encoders import jsonable_encoder
 from fastapi.responses import JSONResponse, StreamingResponse
 from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
 
@@ -39,6 +41,10 @@ from acp_sdk.server.errors import (
 from acp_sdk.server.utils import stream_sse
 
 
+class Headers(str, Enum):
+    RUN_ID = "Run-ID"
+
+
 def create_app(*agents: Agent) -> FastAPI:
     executor: ThreadPoolExecutor
 
@@ -102,19 +108,26 @@ def create_app(*agents: Agent) -> FastAPI:
         bundle.task = asyncio.create_task(bundle.execute(request.input, executor=executor))
         runs[bundle.run.run_id] = bundle
 
+        headers = {Headers.RUN_ID: str(bundle.run.run_id)}
+
         match request.mode:
             case RunMode.STREAM:
                 return StreamingResponse(
                     stream_sse(bundle),
+                    headers=headers,
                     media_type="text/event-stream",
                 )
             case RunMode.SYNC:
                 await bundle.join()
-                return bundle.run
+                return JSONResponse(
+                    headers=headers,
+                    content=jsonable_encoder(bundle.run),
+                )
             case RunMode.ASYNC:
                 return JSONResponse(
                     status_code=status.HTTP_202_ACCEPTED,
-                    content=bundle.run.model_dump(),
+                    headers=headers,
+                    content=jsonable_encoder(bundle.run),
                 )
             case _:
                 raise NotImplementedError()
@@ -141,7 +154,7 @@ def create_app(*agents: Agent) -> FastAPI:
             case RunMode.ASYNC:
                 return JSONResponse(
                     status_code=status.HTTP_202_ACCEPTED,
-                    content=bundle.run.model_dump(),
+                    content=jsonable_encoder(bundle.run),
                 )
             case _:
                 raise NotImplementedError()
@@ -156,6 +169,6 @@ def create_app(*agents: Agent) -> FastAPI:
             )
         bundle.task.cancel()
         bundle.run.status = RunStatus.CANCELLING
-        return JSONResponse(status_code=status.HTTP_202_ACCEPTED, content=bundle.run.model_dump())
+        return JSONResponse(status_code=status.HTTP_202_ACCEPTED, content=jsonable_encoder(bundle.run))
 
     return app

acp_sdk/server/bundle.py

@@ -70,7 +70,7 @@ class RunBundle:
 
     async def execute(self, input: Message, *, executor: ThreadPoolExecutor) -> None:
         with trace.get_tracer(__name__).start_as_current_span("execute"):
-            run_logger = logging.LoggerAdapter(logger, {"run_id": self.run.run_id})
+            run_logger = logging.LoggerAdapter(logger, {"run_id": str(self.run.run_id)})
 
             await self.emit(CreatedEvent(run=self.run))
             try:

acp_sdk/server/server.py

@@ -1,7 +1,12 @@
+import asyncio
 import inspect
-from collections.abc import AsyncGenerator, Coroutine, Generator
+import os
+from collections.abc import AsyncGenerator, Awaitable, Coroutine, Generator
 from typing import Any, Callable
 
+import uvicorn
+import uvicorn.config
+
 from acp_sdk.models import Message
 from acp_sdk.server.agent import Agent
 from acp_sdk.server.app import create_app
@@ -13,25 +18,24 @@ from acp_sdk.server.types import RunYield, RunYieldResume
 
 class Server:
     def __init__(self) -> None:
-        self.agents: list[Agent] = []
+        self._agents: list[Agent] = []
+        self._server: uvicorn.Server | None = None
 
     def agent(self, name: str | None = None, description: str | None = None) -> Callable:
         """Decorator to register an agent."""
 
         def decorator(fn: Callable) -> Callable:
-            # check agent's function signature
             signature = inspect.signature(fn)
             parameters = list(signature.parameters.values())
 
-            # validate agent's function
-            if inspect.isasyncgenfunction(fn):
-                if len(parameters) != 2:
-                    raise TypeError(
-                        "The agent generator function must have one 'input' argument and one 'context' argument"
-                    )
-            else:
-                if len(parameters) != 2:
-                    raise TypeError("The agent function must have one 'input' argument and one 'context' argument")
+            if len(parameters) == 0:
+                raise TypeError("The agent function must have at least 'input' argument")
+            if len(parameters) > 2:
+                raise TypeError("The agent function must have only 'input' and 'context' arguments")
+            if len(parameters) == 2 and parameters[1].name != "context":
+                raise TypeError("The second argument of the agent function must be 'context'")
+
+            has_context_param = len(parameters) == 2
 
             agent: Agent
             if inspect.isasyncgenfunction(fn):
@@ -47,7 +51,9 @@ class Server:
 
                     async def run(self, input: Message, context: Context) -> AsyncGenerator[RunYield, RunYieldResume]:
                         try:
-                            gen: AsyncGenerator[RunYield, RunYieldResume] = fn(input, context)
+                            gen: AsyncGenerator[RunYield, RunYieldResume] = (
+                                fn(input, context) if has_context_param else fn(input)
+                            )
                             value = None
                             while True:
                                 value = yield await gen.asend(value)
@@ -67,7 +73,7 @@ class Server:
                         return description or fn.__doc__ or ""
 
                     async def run(self, input: Message, context: Context) -> Coroutine[RunYield]:
-                        return await fn(input, context)
+                        return await (fn(input, context) if has_context_param else fn(input))
 
                 agent = DecoratedAgent()
             elif inspect.isgeneratorfunction(fn):
@@ -82,7 +88,7 @@ class Server:
                         return description or fn.__doc__ or ""
 
                     def run(self, input: Message, context: Context) -> Generator[RunYield, RunYieldResume]:
-                        yield from fn(input, context)
+                        yield from (fn(input, context) if has_context_param else fn(input))
 
                 agent = DecoratedAgent()
             else:
@@ -97,7 +103,7 @@ class Server:
                         return description or fn.__doc__ or ""
 
                     def run(self, input: Message, context: Context) -> RunYield:
-                        return fn(input, context)
+                        return fn(input, context) if has_context_param else fn(input)
 
                 agent = DecoratedAgent()
 
@@ -107,9 +113,67 @@ class Server:
         return decorator
 
     def register(self, *agents: Agent) -> None:
-        self.agents.extend(agents)
+        self._agents.extend(agents)
+
+    def run(
+        self,
+        configure_logger: bool = True,
+        configure_telemetry: bool = False,
+        host: str = "127.0.0.1",
+        port: int = 8000,
+        uds: str | None = None,
+        fd: int | None = None,
+        loop: uvicorn.config.LoopSetupType = "auto",
+        http: type[asyncio.Protocol] | uvicorn.config.HTTPProtocolType = "auto",
+        ws: type[asyncio.Protocol] | uvicorn.config.WSProtocolType = "auto",
+        ws_max_size: int = 16 * 1024 * 1024,
+        ws_max_queue: int = 32,
+        ws_ping_interval: float | None = 20.0,
+        ws_ping_timeout: float | None = 20.0,
+        ws_per_message_deflate: bool = True,
+        lifespan: uvicorn.config.LifespanType = "auto",
+        env_file: str | os.PathLike[str] | None = None,
+        log_config: dict[str, Any]
+        | str
+        | uvicorn.config.RawConfigParser
+        | uvicorn.config.IO[Any]
+        | None = uvicorn.config.LOGGING_CONFIG,
+        log_level: str | int | None = None,
+        access_log: bool = True,
+        use_colors: bool | None = None,
+        interface: uvicorn.config.InterfaceType = "auto",
+        reload: bool = False,
+        reload_dirs: list[str] | str | None = None,
+        reload_delay: float = 0.25,
+        reload_includes: list[str] | str | None = None,
+        reload_excludes: list[str] | str | None = None,
+        workers: int | None = None,
+        proxy_headers: bool = True,
+        server_header: bool = True,
+        date_header: bool = True,
+        forwarded_allow_ips: list[str] | str | None = None,
+        root_path: str = "",
+        limit_concurrency: int | None = None,
+        limit_max_requests: int | None = None,
+        backlog: int = 2048,
+        timeout_keep_alive: int = 5,
+        timeout_notify: int = 30,
+        timeout_graceful_shutdown: int | None = None,
+        callback_notify: Callable[..., Awaitable[None]] | None = None,
+        ssl_keyfile: str | os.PathLike[str] | None = None,
+        ssl_certfile: str | os.PathLike[str] | None = None,
+        ssl_keyfile_password: str | None = None,
+        ssl_version: int = uvicorn.config.SSL_PROTOCOL_VERSION,
+        ssl_cert_reqs: int = uvicorn.config.ssl.CERT_NONE,
+        ssl_ca_certs: str | None = None,
+        ssl_ciphers: str = "TLSv1",
+        headers: list[tuple[str, str]] | None = None,
+        factory: bool = False,
+        h11_max_incomplete_event_size: int | None = None,
+    ) -> None:
+        if self._server:
+            raise RuntimeError("The server is already running")
 
-    def run(self, configure_logger: bool = True, configure_telemetry: bool = False, **kwargs: dict[str, Any]) -> None:
         import uvicorn
 
         if configure_logger:
@@ -117,4 +181,63 @@ class Server:
         if configure_telemetry:
             configure_telemetry_func()
 
-        uvicorn.run(create_app(*self.agents), **kwargs)
+        config = uvicorn.Config(
+            create_app(*self._agents),
+            host,
+            port,
+            uds,
+            fd,
+            loop,
+            http,
+            ws,
+            ws_max_size,
+            ws_max_queue,
+            ws_ping_interval,
+            ws_ping_timeout,
+            ws_per_message_deflate,
+            lifespan,
+            env_file,
+            log_config,
+            log_level,
+            access_log,
+            use_colors,
+            interface,
+            reload,
+            reload_dirs,
+            reload_delay,
+            reload_includes,
+            reload_excludes,
+            workers,
+            proxy_headers,
+            server_header,
+            date_header,
+            forwarded_allow_ips,
+            root_path,
+            limit_concurrency,
+            limit_max_requests,
+            backlog,
+            timeout_keep_alive,
+            timeout_notify,
+            timeout_graceful_shutdown,
+            callback_notify,
+            ssl_keyfile,
+            ssl_certfile,
+            ssl_keyfile_password,
+            ssl_version,
+            ssl_cert_reqs,
+            ssl_ca_certs,
+            ssl_ciphers,
+            headers,
+            factory,
+            h11_max_incomplete_event_size,
+        )
+        self._server = uvicorn.Server(config)
+        self._server.run()
+
+    @property
+    def should_exit(self) -> bool:
+        return self._server.should_exit if self._server else False
+
+    @should_exit.setter
+    def should_exit(self, value: bool) -> None:
+        self._server.should_exit = value

{acp_sdk-0.1.0rc5.dist-info → acp_sdk-0.1.0rc7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acp-sdk
-Version: 0.1.0rc5
+Version: 0.1.0rc7
 Summary: Agent Communication Protocol SDK
 Requires-Python: <4.0,>=3.11
 Requires-Dist: opentelemetry-api>=1.31.1
@@ -56,23 +56,19 @@ async with Client(base_url="http://localhost:8000") as client:
 The `server` submodule exposes [fastapi] application factory that makes it easy to expose any agent over ACP.
 
 ```python
-class EchoAgent(Agent):
-    @property
-    def name(self) -> str:
-        return "echo"
+server = Server()
 
-    @property
-    def description(self) -> str:
-        return "Echoes everything"
+@server.agent()
+async def echo(input: Message, context: Context) -> AsyncGenerator[RunYield, RunYieldResume]:
+    """Echoes everything"""
+    for part in input:
+        await asyncio.sleep(0.5)
+        yield {"thought": "I should echo everyting"}
+        await asyncio.sleep(0.5)
+        yield Message(part)
 
-    async def run(self, input: Message, *, context: Context) -> AsyncGenerator[Message | Await, AwaitResume]:
-        for part in input:
-            await asyncio.sleep(0.5)
-            yield {"thought": "I should echo everyting"}
-            yield Message(part)
 
-
-serve(EchoAgent())
+server.run()
 ```
 
 ➡️ Explore more in our [examples library](/python/examples).

{acp_sdk-0.1.0rc5.dist-info → acp_sdk-0.1.0rc7.dist-info}/RECORD

@@ -4,19 +4,19 @@ acp_sdk/client/__init__.py,sha256=Bca1DORrswxzZsrR2aUFpATuNG2xNSmYvF1Z2WJaVbc,51
 acp_sdk/client/client.py,sha256=W6iXxH65UUODnvt3tnvgdqT_pP1meZUF2HwJpWCM0BM,5029
 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=ACZPQp-wm43tdlx83hrX7QmdtBRWVXvU5bsotUOidHM,3908
-acp_sdk/models/schemas.py,sha256=a0T29vfy93uVIce3ikbd3GSTdKBokMmfXWNVRJD3Eb8,662
+acp_sdk/models/models.py,sha256=JhjI_M9GO-1lMrpZJo0IChDVrzUfnDyH5R5hFcqkXEE,3936
+acp_sdk/models/schemas.py,sha256=TM_0aRsBj_9G__zzWPYDx4wAXsGs2RUH57IOTi4--Ek,728
 acp_sdk/server/__init__.py,sha256=CowMcwN_WSsnO_-ZoqWQKtNVfa21MW3X3trZ9haJjaA,329
 acp_sdk/server/agent.py,sha256=SZfJK634d4s8fRh0u1Tc56l58XCRHAh3hq5Hcabh6tI,3442
-acp_sdk/server/app.py,sha256=7alacNo9y_f0-BjZI0dm_rzSweW-n5YiuY0hrVtEIR8,5420
-acp_sdk/server/bundle.py,sha256=ZVkIOwWfYgi-VyGYSMKr9WrG_WzYbej-LD-YPUWQdeg,4982
+acp_sdk/server/app.py,sha256=rf8I2qcaaXoM-36Za8vs3Re7gygcTSMs4MXbMUBJENU,5803
+acp_sdk/server/bundle.py,sha256=LZzinifpbKxEBivoxOSdxUmzEcu3XNAkCiIJc2Ivveg,4987
 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=xSS_TjxQ5xi_X9RJDNjFsU0JEytLlCCSqbp6sBVXXhY,4442
+acp_sdk/server/server.py,sha256=B1XGptw2kTgaB52klI4aNqDAlmyT2rNpMtKDSCxyVc4,8665
 acp_sdk/server/telemetry.py,sha256=EwmtUrWMYid7XHiX76V1J6CigJPa2NrzEPOX0fBoY3o,1838
 acp_sdk/server/types.py,sha256=2yJPkfUzjVIhHmc0SegGTMqDROe2uFgycb-7CATvYVw,161
 acp_sdk/server/utils.py,sha256=EfrF9VCyVk3AM_ao-BIB9EzGbfTrh4V2Bz-VFr6f6Sg,351
-acp_sdk-0.1.0rc5.dist-info/METADATA,sha256=laguwvWACy9Yslwj_Wh2p25rfEciRu217HEGGXTIOKg,2147
-acp_sdk-0.1.0rc5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-acp_sdk-0.1.0rc5.dist-info/RECORD,,
+acp_sdk-0.1.0rc7.dist-info/METADATA,sha256=IoDvdN2USySSWbm7I05iIuuRz-7vCzaBtsnilmgW5IQ,2033
+acp_sdk-0.1.0rc7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+acp_sdk-0.1.0rc7.dist-info/RECORD,,