acp-sdk 0.6.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

acp_sdk/client/client.py

@@ -11,6 +11,8 @@ from httpx_sse import EventSource, aconnect_sse
 from opentelemetry.instrumentation.httpx import HTTPXClientInstrumentor
 from pydantic import TypeAdapter
 
+from acp_sdk.client.types import Input
+from acp_sdk.client.utils import input_to_messages
 from acp_sdk.instrumentation import get_tracer
 from acp_sdk.models import (
     ACPError,
@@ -21,7 +23,6 @@ from acp_sdk.models import (
     AwaitResume,
     Error,
     Event,
-    Message,
     Run,
     RunCancelResponse,
     RunCreatedEvent,
@@ -33,9 +34,6 @@ from acp_sdk.models import (
     RunResumeResponse,
     SessionId,
 )
-from acp_sdk.models.models import MessagePart
-
-Input = list[Message] | Message | list[MessagePart] | MessagePart | list[str] | str
 
 
 class Client:
@@ -127,7 +125,7 @@ class Client:
             "/runs",
             content=RunCreateRequest(
                 agent_name=agent,
-                inputs=self._unify_inputs(input),
+                input=input_to_messages(input),
                 mode=RunMode.SYNC,
                 session_id=self._session_id,
             ).model_dump_json(),
@@ -142,7 +140,7 @@ class Client:
             "/runs",
             content=RunCreateRequest(
                 agent_name=agent,
-                inputs=self._unify_inputs(input),
+                input=input_to_messages(input),
                 mode=RunMode.ASYNC,
                 session_id=self._session_id,
             ).model_dump_json(),
@@ -159,7 +157,7 @@ class Client:
             "/runs",
             content=RunCreateRequest(
                 agent_name=agent,
-                inputs=self._unify_inputs(input),
+                input=input_to_messages(input),
                 mode=RunMode.STREAM,
                 session_id=self._session_id,
             ).model_dump_json(),
@@ -227,24 +225,3 @@ class Client:
 
     def _set_session(self, run: Run) -> None:
         self._session_id = run.session_id
-
-    def _unify_inputs(self, input: Input) -> list[Message]:
-        if isinstance(input, list):
-            if len(input) == 0:
-                return []
-            if all(isinstance(item, Message) for item in input):
-                return input
-            elif all(isinstance(item, MessagePart) for item in input):
-                return [Message(parts=input)]
-            elif all(isinstance(item, str) for item in input):
-                return [Message(parts=[MessagePart(content=content) for content in input])]
-            else:
-                raise RuntimeError("List with mixed types is not supported")
-        else:
-            if isinstance(input, str):
-                input = MessagePart(content=input)
-            if isinstance(input, MessagePart):
-                input = Message(parts=[input])
-            if isinstance(input, Message):
-                input = [input]
-            return input

acp_sdk/client/types.py

@@ -0,0 +1,3 @@
+from acp_sdk.models import Message, MessagePart
+
+Input = list[Message] | Message | list[MessagePart] | MessagePart | list[str] | str

acp_sdk/client/utils.py

@@ -0,0 +1,24 @@
+from acp_sdk.client.types import Input
+from acp_sdk.models.models import Message, MessagePart
+
+
+def input_to_messages(input: Input) -> list[Message]:
+    if isinstance(input, list):
+        if len(input) == 0:
+            return []
+        if all(isinstance(item, Message) for item in input):
+            return input
+        elif all(isinstance(item, MessagePart) for item in input):
+            return [Message(parts=input)]
+        elif all(isinstance(item, str) for item in input):
+            return [Message(parts=[MessagePart(content=content) for content in input])]
+        else:
+            raise TypeError("List with mixed types is not supported")
+    else:
+        if isinstance(input, str):
+            input = MessagePart(content=input)
+        if isinstance(input, MessagePart):
+            input = Message(parts=[input])
+        if isinstance(input, Message):
+            input = [input]
+        return input

acp_sdk/models/models.py

@@ -177,7 +177,7 @@ class Run(BaseModel):
     session_id: SessionId | None = None
     status: RunStatus = RunStatus.CREATED
     await_request: AwaitRequest | None = None
-    outputs: list[Message] = []
+    output: list[Message] = []
     error: Error | None = None
 
 

acp_sdk/models/schemas.py

@@ -14,7 +14,7 @@ class AgentReadResponse(Agent):
 class RunCreateRequest(BaseModel):
     agent_name: AgentName
     session_id: SessionId | None = None
-    inputs: list[Message]
+    input: list[Message]
     mode: RunMode = RunMode.SYNC
 
 

acp_sdk/server/agent.py

@@ -32,14 +32,14 @@ class Agent(abc.ABC):
 
     @abc.abstractmethod
     def run(
-        self, inputs: list[Message], context: Context
+        self, input: list[Message], context: Context
     ) -> (
         AsyncGenerator[RunYield, RunYieldResume] | Generator[RunYield, RunYieldResume] | Coroutine[RunYield] | RunYield
     ):
         pass
 
     async def execute(
-        self, inputs: list[Message], session_id: SessionId | None, executor: ThreadPoolExecutor
+        self, input: list[Message], session_id: SessionId | None, executor: ThreadPoolExecutor
     ) -> AsyncGenerator[RunYield, RunYieldResume]:
         yield_queue: janus.Queue[RunYield] = janus.Queue()
         yield_resume_queue: janus.Queue[RunYieldResume] = janus.Queue()
@@ -49,13 +49,13 @@ class Agent(abc.ABC):
         )
 
         if inspect.isasyncgenfunction(self.run):
-            run = asyncio.create_task(self._run_async_gen(inputs, context))
+            run = asyncio.create_task(self._run_async_gen(input, context))
         elif inspect.iscoroutinefunction(self.run):
-            run = asyncio.create_task(self._run_coro(inputs, context))
+            run = asyncio.create_task(self._run_coro(input, context))
         elif inspect.isgeneratorfunction(self.run):
-            run = asyncio.get_running_loop().run_in_executor(executor, self._run_gen, inputs, context)
+            run = asyncio.get_running_loop().run_in_executor(executor, self._run_gen, input, context)
         else:
-            run = asyncio.get_running_loop().run_in_executor(executor, self._run_func, inputs, context)
+            run = asyncio.get_running_loop().run_in_executor(executor, self._run_func, input, context)
 
         try:
             while True:
@@ -66,7 +66,7 @@ class Agent(abc.ABC):
         finally:
             await run  # Raise exceptions
 
-    async def _run_async_gen(self, input: Message, context: Context) -> None:
+    async def _run_async_gen(self, input: list[Message], context: Context) -> None:
         try:
             gen: AsyncGenerator[RunYield, RunYieldResume] = self.run(input, context)
             value = None
@@ -77,13 +77,13 @@ class Agent(abc.ABC):
         finally:
             context.shutdown()
 
-    async def _run_coro(self, input: Message, context: Context) -> None:
+    async def _run_coro(self, input: list[Message], context: Context) -> None:
         try:
             await context.yield_async(await self.run(input, context))
         finally:
             context.shutdown()
 
-    def _run_gen(self, input: Message, context: Context) -> None:
+    def _run_gen(self, input: list[Message], context: Context) -> None:
         try:
             gen: Generator[RunYield, RunYieldResume] = self.run(input, context)
             value = None
@@ -94,7 +94,7 @@ class Agent(abc.ABC):
         finally:
             context.shutdown()
 
-    def _run_func(self, input: Message, context: Context) -> None:
+    def _run_func(self, input: list[Message], context: Context) -> None:
         try:
             context.yield_sync(self.run(input, context))
         finally:
@@ -139,7 +139,7 @@ def agent(
         if inspect.isasyncgenfunction(fn):
 
             class AsyncGenDecoratorAgent(DecoratorAgentBase):
-                async def run(self, input: Message, context: Context) -> AsyncGenerator[RunYield, RunYieldResume]:
+                async def run(self, input: list[Message], context: Context) -> AsyncGenerator[RunYield, RunYieldResume]:
                     try:
                         gen: AsyncGenerator[RunYield, RunYieldResume] = (
                             fn(input, context) if has_context_param else fn(input)
@@ -154,21 +154,21 @@ def agent(
         elif inspect.iscoroutinefunction(fn):
 
             class CoroDecoratorAgent(DecoratorAgentBase):
-                async def run(self, input: Message, context: Context) -> Coroutine[RunYield]:
+                async def run(self, input: list[Message], context: Context) -> Coroutine[RunYield]:
                     return await (fn(input, context) if has_context_param else fn(input))
 
             agent = CoroDecoratorAgent()
         elif inspect.isgeneratorfunction(fn):
 
             class GenDecoratorAgent(DecoratorAgentBase):
-                def run(self, input: Message, context: Context) -> Generator[RunYield, RunYieldResume]:
+                def run(self, input: list[Message], context: Context) -> Generator[RunYield, RunYieldResume]:
                     yield from (fn(input, context) if has_context_param else fn(input))
 
             agent = GenDecoratorAgent()
         else:
 
             class FuncDecoratorAgent(DecoratorAgentBase):
-                def run(self, input: Message, context: Context) -> RunYield:
+                def run(self, input: list[Message], context: Context) -> RunYield:
                     return fn(input, context) if has_context_param else fn(input)
 
             agent = FuncDecoratorAgent()

acp_sdk/server/app.py

@@ -105,7 +105,7 @@ def create_app(*agents: Agent, run_limit: int = 1000, run_ttl: timedelta = timed
         bundle = RunBundle(
             agent=agent,
             run=Run(agent_name=agent.name, session_id=session.id),
-            inputs=request.inputs,
+            input=request.input,
             history=list(session.history()),
             executor=executor,
         )

acp_sdk/server/bundle.py

@@ -35,11 +35,11 @@ from acp_sdk.server.logging import logger
 
 class RunBundle:
     def __init__(
-        self, *, agent: Agent, run: Run, inputs: list[Message], history: list[Message], executor: ThreadPoolExecutor
+        self, *, agent: Agent, run: Run, input: list[Message], history: list[Message], executor: ThreadPoolExecutor
     ) -> None:
         self.agent = agent
         self.run = run
-        self.inputs = inputs
+        self.input = input
         self.history = history
 
         self.stream_queue: asyncio.Queue[Event] = asyncio.Queue()
@@ -47,7 +47,7 @@ class RunBundle:
         self.await_queue: asyncio.Queue[AwaitResume] = asyncio.Queue(maxsize=1)
         self.await_or_terminate_event = asyncio.Event()
 
-        self.task = asyncio.create_task(self._execute(inputs, executor=executor))
+        self.task = asyncio.create_task(self._execute(input, executor=executor))
 
     async def stream(self) -> AsyncGenerator[Event]:
         while True:
@@ -83,7 +83,7 @@ class RunBundle:
     async def join(self) -> None:
         await self.await_or_terminate_event.wait()
 
-    async def _execute(self, inputs: list[Message], *, executor: ThreadPoolExecutor) -> None:
+    async def _execute(self, input: list[Message], *, executor: ThreadPoolExecutor) -> None:
         with get_tracer().start_as_current_span("run"):
             run_logger = logging.LoggerAdapter(logger, {"run_id": str(self.run.run_id)})
 
@@ -92,14 +92,14 @@ class RunBundle:
             async def flush_message() -> None:
                 nonlocal in_message
                 if in_message:
-                    await self.emit(MessageCompletedEvent(message=self.run.outputs[-1]))
+                    await self.emit(MessageCompletedEvent(message=self.run.output[-1]))
                     in_message = False
 
             try:
                 await self.emit(RunCreatedEvent(run=self.run))
 
                 generator = self.agent.execute(
-                    inputs=self.history + inputs, session_id=self.run.session_id, executor=executor
+                    input=self.history + input, session_id=self.run.session_id, executor=executor
                 )
                 run_logger.info("Run started")
 
@@ -114,14 +114,14 @@ class RunBundle:
                         if isinstance(next, str):
                             next = MessagePart(content=next)
                         if not in_message:
-                            self.run.outputs.append(Message(parts=[]))
+                            self.run.output.append(Message(parts=[]))
                             in_message = True
-                            await self.emit(MessageCreatedEvent(message=self.run.outputs[-1]))
-                        self.run.outputs[-1].parts.append(next)
+                            await self.emit(MessageCreatedEvent(message=self.run.output[-1]))
+                        self.run.output[-1].parts.append(next)
                         await self.emit(MessagePartEvent(part=next))
                     elif isinstance(next, Message):
                         await flush_message()
-                        self.run.outputs.append(next)
+                        self.run.output.append(next)
                         await self.emit(MessageCreatedEvent(message=next))
                         for part in next.parts:
                             await self.emit(MessagePartEvent(part=part))

acp_sdk/server/session.py

@@ -17,5 +17,5 @@ class Session:
     def history(self) -> Iterator[Message]:
         for bundle in self.bundles:
             if bundle.run.status == RunStatus.COMPLETED:
-                yield from bundle.inputs
-                yield from bundle.run.outputs
+                yield from bundle.input
+                yield from bundle.run.output

{acp_sdk-0.6.0.dist-info → acp_sdk-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acp-sdk
-Version: 0.6.0
+Version: 0.7.1
 Summary: Agent Communication Protocol SDK
 Author: IBM Corp.
 Maintainer-email: Tomas Pilar <thomas7pilar@gmail.com>
@@ -44,9 +44,9 @@ Register an agent and run the server:
 server = Server()
 
 @server.agent()
-async def echo(inputs: list[Message]):
+async def echo(input: list[Message]):
     """Echoes everything"""
-    for message in inputs:
+    for message in input:
         yield message
 
 server.run(port=8000)
@@ -56,7 +56,7 @@ From another process, connect to the server and run the agent:
 
 ```py
 async with Client(base_url="http://localhost:8000") as client:
-    run = await client.run_sync(agent="echo", inputs=[Message(parts=[MessagePart(content="Howdy!")])])
+    run = await client.run_sync(agent="echo", input=[Message(parts=[MessagePart(content="Howdy!")])])
     print(run)
 
 ```

{acp_sdk-0.6.0.dist-info → acp_sdk-0.7.1.dist-info}/RECORD

@@ -3,23 +3,25 @@ acp_sdk/instrumentation.py,sha256=JqSyvILN3sGAfOZrmckQq4-M_4_5alyPn95DK0o5lfA,16
 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=CtH8dBEEKLjhPqCvxhEOPGnmNMMYsG22AH0OC5pWbpE,9310
+acp_sdk/client/client.py,sha256=uIHlnB5TR9qe2yqWgQoSQBmdXZhMmsmmygxuhtnL6ew,8336
+acp_sdk/client/types.py,sha256=_H6zYt-2OHOOYRtssRnbDIiwmgsl2-KIXc9lb-mJLFA,133
+acp_sdk/client/utils.py,sha256=2jhJyrPJmVFRoDJh0q_JMqOMlC3IxCh-6HXed-PIZS8,924
 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=eOoOfftPKbTaLlqZlE4gE1ZwDkrQ_FdRiDx4wSJILP4,6539
-acp_sdk/models/schemas.py,sha256=Kj7drJSR8d-N3KHzu_qTnLdagrMtAyhid5swluuhHTw,645
+acp_sdk/models/models.py,sha256=rQpc5eFSyDK_ALBXSjg6dTRNA6B0UFY3ssECY_1oIDc,6538
+acp_sdk/models/schemas.py,sha256=OQ2bEfwFFZ1D9mhpgzfPBCcnPNvbl4qRfCWChH2wCro,644
 acp_sdk/server/__init__.py,sha256=mxBBBFaZuMEUENRMLwp1XZkuLeT9QghcFmNvjnqvAAU,377
-acp_sdk/server/agent.py,sha256=DhcPDPDL9jpDST40K_bInvDXfpF1cwxIhqXzu8z0blU,6203
-acp_sdk/server/app.py,sha256=YcW5kEwmRER9LKRsLt2vNqFso4_nnbWabdjiN-4_0-0,6601
-acp_sdk/server/bundle.py,sha256=nLxQMUCSVzlmEgSUYRunnpD3jO2yE2w1XVvKW6NOTPE,6564
+acp_sdk/server/agent.py,sha256=wvwpi83osmW7zQWxVnzyVMXIvzOswAfhKWHscVIldhA,6245
+acp_sdk/server/app.py,sha256=IocQBnXn1K6MP7aUvGSTD3TfVCKy9DGRZA3liYlfdYk,6599
+acp_sdk/server/bundle.py,sha256=P3DfmzQOewsK8jr8yG8_RsGSrXQI4PsZCQbspVxKlus,6552
 acp_sdk/server/context.py,sha256=MgnLV6qcDIhc_0BjW7r4Jj1tHts4ZuwpdTGIBnz2Mgo,1036
 acp_sdk/server/errors.py,sha256=GSO8yYIqEeX8Y4Lz86ks35dMTHiQiXuOrLYYx0eXsbI,2110
 acp_sdk/server/logging.py,sha256=Oc8yZigCsuDnHHPsarRzu0RX3NKaLEgpELM2yovGKDI,411
 acp_sdk/server/server.py,sha256=6mIVyURgJvcZCPad1CV8TcgHC2mqyEFCGgGATGyP34Q,5548
-acp_sdk/server/session.py,sha256=0cDr924HC5x2bBNbK9NSKVHAt5A_mi5dK8P4jP_ugq0,629
+acp_sdk/server/session.py,sha256=fCRPHc2sQrz4G0n25I1S4LB7mI1wo0yYQJ1V9WRWH3g,627
 acp_sdk/server/telemetry.py,sha256=1BUxNg-xL_Vqgs27PDWNc3HikrQW2lidAtT_FKlp_Qk,1833
 acp_sdk/server/types.py,sha256=teBNRWSks8XP1SCQKGEtbNWQahVD3RAOPnysTxcQPxI,292
 acp_sdk/server/utils.py,sha256=EfrF9VCyVk3AM_ao-BIB9EzGbfTrh4V2Bz-VFr6f6Sg,351
-acp_sdk-0.6.0.dist-info/METADATA,sha256=K2qABevuRD1ydsvoqniFrrNVu_abbf5I3IQDS7TuAUM,1654
-acp_sdk-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-acp_sdk-0.6.0.dist-info/RECORD,,
+acp_sdk-0.7.1.dist-info/METADATA,sha256=akqHFFa6cRGdqOTalPhM_lO9f9LGyaMRotTocAjRw9E,1651
+acp_sdk-0.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+acp_sdk-0.7.1.dist-info/RECORD,,