acp-sdk 0.1.0rc5__tar.gz → 0.1.0rc6__tar.gz

{acp_sdk-0.1.0rc5 → acp_sdk-0.1.0rc6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acp-sdk
-Version: 0.1.0rc5
+Version: 0.1.0rc6
 Summary: Agent Communication Protocol SDK
 Requires-Python: <4.0,>=3.11
 Requires-Dist: opentelemetry-api>=1.31.1

{acp_sdk-0.1.0rc5 → acp_sdk-0.1.0rc6}/examples/servers/awaiting.py

@@ -20,4 +20,4 @@ async def awaiting(input: Message, context: Context) -> AsyncGenerator[Message |
     yield Message(TextMessagePart(content=f"Thanks for {data}"))
 
 
-server.run()
+server()

{acp_sdk-0.1.0rc5 → acp_sdk-0.1.0rc6}/examples/servers/echo.py

@@ -19,4 +19,4 @@ async def echo(input: Message, context: Context) -> AsyncGenerator[RunYield, Run
         yield Message(part)
 
 
-server.run()
+server()

{acp_sdk-0.1.0rc5 → acp_sdk-0.1.0rc6}/examples/servers/multi-echo.py

@@ -5,13 +5,11 @@ from acp_sdk.models import (
 )
 from acp_sdk.server import Agent, Context, RunYield, RunYieldResume, Server
 
-# This example showcases several ways to create echo agent using decoratos.
-
 server = Server()
 
 
 @server.agent()
-async def async_gen_echo(input: Message, context: Context) -> AsyncGenerator[RunYield, RunYieldResume]:
+async def async_gen_echo(input: Message) -> AsyncGenerator[RunYield, RunYieldResume]:
     """Echoes everything"""
     yield {"thought": "I should echo everyting"}
     yield input
@@ -25,7 +23,7 @@ async def async_echo(input: Message, context: Context) -> RunYield:
 
 
 @server.agent()
-def gen_echo(input: Message, context: Context) -> Generator[RunYield, RunYieldResume]:
+def gen_echo(input: Message) -> Generator[RunYield, RunYieldResume]:
     """Echoes everything"""
     yield {"thought": "I should echo everyting"}
     return input
@@ -41,7 +39,7 @@ def sync_echo(input: Message, context: Context) -> RunYield:
 class EchoAgent(Agent):
     @property
     def name(self) -> str:
-        return "class_echo"
+        return "instance_echo"
 
     @property
     def description(self) -> str:
@@ -56,4 +54,4 @@ class EchoAgent(Agent):
 server.register(EchoAgent())
 
 
-server.run()
+server()

{acp_sdk-0.1.0rc5 → acp_sdk-0.1.0rc6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "acp-sdk"
-version = "0.1.0rc5"
+version = "0.1.0rc6"
 description = "Agent Communication Protocol SDK"
 readme = "README.md"
 authors = []

{acp_sdk-0.1.0rc5 → acp_sdk-0.1.0rc6}/src/acp_sdk/server/server.py

@@ -19,19 +19,17 @@ class Server:
         """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 +45,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 +67,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 +82,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 +97,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()
 
@@ -109,7 +109,9 @@ class Server:
     def register(self, *agents: Agent) -> None:
         self.agents.extend(agents)
 
-    def run(self, configure_logger: bool = True, configure_telemetry: bool = False, **kwargs: dict[str, Any]) -> None:
+    def __call__(
+        self, configure_logger: bool = True, configure_telemetry: bool = False, **kwargs: dict[str, Any]
+    ) -> None:
         import uvicorn
 
         if configure_logger: