acp-sdk 0.6.0__tar.gz → 0.7.1__tar.gz

{acp_sdk-0.6.0 → acp_sdk-0.7.1}/PKG-INFO

@@ -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 → acp_sdk-0.7.1}/README.md

@@ -23,9 +23,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)
@@ -35,7 +35,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 → acp_sdk-0.7.1}/docs/client.md

@@ -71,15 +71,15 @@ async with Client(base_url="http://localhost:8000") as client:
   message = Message(parts=[MessagePart(content="Hello")])
 
   # Async
-  run = await client.run_async(agent_name="agent", inputs=[message])
+  run = await client.run_async(agent_name="agent", input=[message])
   print(run.status)
 
   # Sync - waits for completion, failure, cancellation or await
-  run = await client.run_sync(agent_name="agent", inputs=[message])
-  print(run.outputs)
+  run = await client.run_sync(agent_name="agent", input=[message])
+  print(run.output)
   
   # Stream - as sync but also receives events
-  async for event in client.run_stream(agent_name="agent", inputs=[message])
+  async for event in client.run_stream(agent_name="agent", input=[message])
     print(event)
 ```
 
@@ -95,5 +95,5 @@ async with Client(base_url="http://localhost:8000" as client:
 
     async with client.session() as session:
         for agent in agents:
-            await session.run_sync(agent_name=agent.name, inputs=[Message(parts=[MessagePart(content="Hello!")])])
+            await session.run_sync(agent_name=agent.name, input=[Message(parts=[MessagePart(content="Hello!")])])
 ```

{acp_sdk-0.6.0 → acp_sdk-0.7.1}/docs/server.md

@@ -47,9 +47,9 @@ server = Server()
 
 
 @server.agent()
-async def echo(inputs: list[Message], context: Context) -> AsyncGenerator[RunYield, RunYieldResume]:
+async def echo(input: list[Message], context: Context) -> AsyncGenerator[RunYield, RunYieldResume]:
     """Echoes everything"""
-    for message in inputs:
+    for message in input:
         await asyncio.sleep(0.5)
         yield {"thought": "I should echo everything"}
         await asyncio.sleep(0.5)
@@ -81,9 +81,9 @@ from acp_sdk.server import RunYield, RunYieldResume, agent, create_app
 
 
 @agent()
-async def echo(inputs: list[Message]) -> AsyncGenerator[RunYield, RunYieldResume]:
+async def echo(input: list[Message]) -> AsyncGenerator[RunYield, RunYieldResume]:
     """Echoes everything"""
-    for message in inputs:
+    for message in input:
         yield message
 
 

{acp_sdk-0.6.0 → acp_sdk-0.7.1}/pyproject.toml

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

{acp_sdk-0.6.0 → acp_sdk-0.7.1}/src/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-0.7.1/src/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-0.7.1/src/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-0.6.0 → acp_sdk-0.7.1}/src/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-0.6.0 → acp_sdk-0.7.1}/src/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-0.6.0 → acp_sdk-0.7.1}/src/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-0.6.0 → acp_sdk-0.7.1}/src/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-0.6.0 → acp_sdk-0.7.1}/src/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-0.6.0 → acp_sdk-0.7.1}/src/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 → acp_sdk-0.7.1}/tests/e2e/fixtures/server.py

@@ -17,36 +17,36 @@ def server(request: pytest.FixtureRequest) -> Generator[None]:
     server = Server()
 
     @server.agent()
-    async def echo(inputs: list[Message], context: Context) -> AsyncIterator[Message]:
-        for message in inputs:
+    async def echo(input: list[Message], context: Context) -> AsyncIterator[Message]:
+        for message in input:
             yield message
 
     @server.agent()
     async def awaiter(
-        inputs: list[Message], context: Context
+        input: list[Message], context: Context
     ) -> AsyncGenerator[Message | MessageAwaitRequest, AwaitResume]:
         yield MessageAwaitRequest(message=Message(parts=[]))
         yield MessagePart(content="empty", content_type="text/plain")
 
     @server.agent()
-    async def failer(inputs: list[Message], context: Context) -> AsyncIterator[Message]:
+    async def failer(input: list[Message], context: Context) -> AsyncIterator[Message]:
         yield Error(code=ErrorCode.INVALID_INPUT, message="Wrong question buddy!")
 
     @server.agent()
-    async def sessioner(inputs: list[Message], context: Context) -> AsyncIterator[Message]:
+    async def sessioner(input: list[Message], context: Context) -> AsyncIterator[Message]:
         assert context.session_id is not None
 
         yield MessagePart(content=str(context.session_id), content_type="text/plain")
 
     @server.agent()
-    async def mime_types(inputs: list[Message], context: Context) -> AsyncIterator[Message]:
+    async def mime_types(input: list[Message], context: Context) -> AsyncIterator[Message]:
         yield MessagePart(content="<h1>HTML Content</h1>", content_type="text/html")
         yield MessagePart(content='{"key": "value"}', content_type="application/json")
         yield MessagePart(content="console.log('Hello');", content_type="application/javascript")
         yield MessagePart(content="body { color: red; }", content_type="text/css")
 
     @server.agent()
-    async def base64_encoding(inputs: list[Message], context: Context) -> AsyncIterator[Message]:
+    async def base64_encoding(input: list[Message], context: Context) -> AsyncIterator[Message]:
         yield Message(
             parts=[
                 MessagePart(
@@ -61,7 +61,7 @@ def server(request: pytest.FixtureRequest) -> Generator[None]:
         )
 
     @server.agent()
-    async def artifact_producer(inputs: list[Message], context: Context) -> AsyncGenerator[Message | Artifact, None]:
+    async def artifact_producer(input: list[Message], context: Context) -> AsyncGenerator[Message | Artifact, None]:
         yield MessagePart(content="Processing with artifacts", content_type="text/plain")
         yield Artifact(name="text-result.txt", content_type="text/plain", content="This is a text artifact result")
         yield Artifact(

acp_sdk-0.7.1/tests/e2e/test_suites/test_discovery.py

@@ -0,0 +1,18 @@
+import pytest
+from acp_sdk.client import Client
+from acp_sdk.models import Agent
+from acp_sdk.server import Server
+
+
+@pytest.mark.asyncio
+async def test_agents_list(server: Server, client: Client) -> None:
+    async for agent in client.agents():
+        assert isinstance(agent, Agent)
+
+
+@pytest.mark.asyncio
+async def test_agents_details(server: Server, client: Client) -> None:
+    agent_name = "echo"
+    agent = await client.agent(name=agent_name)
+    assert isinstance(agent, Agent)
+    assert agent.name == agent_name

{acp_sdk-0.6.0 → acp_sdk-0.7.1}/tests/e2e/test_suites/test_runs.py

@@ -19,33 +19,33 @@ from acp_sdk.models import (
 from acp_sdk.models.errors import ACPError
 from acp_sdk.server import Server
 
-inputs = [Message(parts=[MessagePart(content="Hello!")])]
+input = [Message(parts=[MessagePart(content="Hello!")])]
 await_resume = MessageAwaitResume(message=Message(parts=[]))
 
 
 @pytest.mark.asyncio
 async def test_run_sync(server: Server, client: Client) -> None:
-    run = await client.run_sync(agent="echo", input=inputs)
+    run = await client.run_sync(agent="echo", input=input)
     assert run.status == RunStatus.COMPLETED
-    assert run.outputs == inputs
+    assert run.output == input
 
 
 @pytest.mark.asyncio
 async def test_run_async(server: Server, client: Client) -> None:
-    run = await client.run_async(agent="echo", input=inputs)
+    run = await client.run_async(agent="echo", input=input)
     assert run.status == RunStatus.CREATED
 
 
 @pytest.mark.asyncio
 async def test_run_stream(server: Server, client: Client) -> None:
-    event_stream = [event async for event in client.run_stream(agent="echo", input=inputs)]
+    event_stream = [event async for event in client.run_stream(agent="echo", input=input)]
     assert isinstance(event_stream[0], RunCreatedEvent)
     assert isinstance(event_stream[-1], RunCompletedEvent)
 
 
 @pytest.mark.asyncio
 async def test_run_status(server: Server, client: Client) -> None:
-    run = await client.run_async(agent="echo", input=inputs)
+    run = await client.run_async(agent="echo", input=input)
     while run.status in (RunStatus.CREATED, RunStatus.IN_PROGRESS):
         run = await client.run_status(run_id=run.run_id)
     assert run.status == RunStatus.COMPLETED
@@ -53,7 +53,7 @@ async def test_run_status(server: Server, client: Client) -> None:
 
 @pytest.mark.asyncio
 async def test_failure(server: Server, client: Client) -> None:
-    run = await client.run_sync(agent="failer", input=inputs)
+    run = await client.run_sync(agent="failer", input=input)
     assert run.status == RunStatus.FAILED
     assert run.error is not None
     assert run.error.code == ErrorCode.INVALID_INPUT
@@ -61,7 +61,7 @@ async def test_failure(server: Server, client: Client) -> None:
 
 @pytest.mark.asyncio
 async def test_run_cancel(server: Server, client: Client) -> None:
-    run = await client.run_sync(agent="awaiter", input=inputs)
+    run = await client.run_sync(agent="awaiter", input=input)
     assert run.status == RunStatus.AWAITING
     run = await client.run_cancel(run_id=run.run_id)
     assert run.status == RunStatus.CANCELLING
@@ -69,7 +69,7 @@ async def test_run_cancel(server: Server, client: Client) -> None:
 
 @pytest.mark.asyncio
 async def test_run_resume_sync(server: Server, client: Client) -> None:
-    run = await client.run_sync(agent="awaiter", input=inputs)
+    run = await client.run_sync(agent="awaiter", input=input)
     assert run.status == RunStatus.AWAITING
     assert run.await_request is not None
 
@@ -79,7 +79,7 @@ async def test_run_resume_sync(server: Server, client: Client) -> None:
 
 @pytest.mark.asyncio
 async def test_run_resume_async(server: Server, client: Client) -> None:
-    run = await client.run_sync(agent="awaiter", input=inputs)
+    run = await client.run_sync(agent="awaiter", input=input)
     assert run.status == RunStatus.AWAITING
     assert run.await_request is not None
 
@@ -89,7 +89,7 @@ async def test_run_resume_async(server: Server, client: Client) -> None:
 
 @pytest.mark.asyncio
 async def test_run_resume_stream(server: Server, client: Client) -> None:
-    run = await client.run_sync(agent="awaiter", input=inputs)
+    run = await client.run_sync(agent="awaiter", input=input)
     assert run.status == RunStatus.AWAITING
     assert run.await_request is not None
 
@@ -101,19 +101,19 @@ async def test_run_resume_stream(server: Server, client: Client) -> None:
 @pytest.mark.asyncio
 async def test_run_session(server: Server, client: Client) -> None:
     async with client.session() as session:
-        run = await session.run_sync(agent="echo", input=inputs)
-        assert run.outputs == inputs
-        run = await session.run_sync(agent="echo", input=inputs)
-        assert run.outputs == inputs + inputs + inputs
+        run = await session.run_sync(agent="echo", input=input)
+        assert run.output == input
+        run = await session.run_sync(agent="echo", input=input)
+        assert run.output == input + input + input
 
 
 @pytest.mark.asyncio
 async def test_mime_types(server: Server, client: Client) -> None:
-    run = await client.run_sync(agent="mime_types", input=inputs)
+    run = await client.run_sync(agent="mime_types", input=input)
     assert run.status == RunStatus.COMPLETED
-    assert len(run.outputs) == 1
+    assert len(run.output) == 1
 
-    message_parts = run.outputs[0].parts
+    message_parts = run.output[0].parts
     content_types = [part.content_type for part in message_parts]
 
     assert "text/html" in content_types
@@ -130,11 +130,11 @@ async def test_mime_types(server: Server, client: Client) -> None:
 
 @pytest.mark.asyncio
 async def test_base64_encoding(server: Server, client: Client) -> None:
-    run = await client.run_sync(agent="base64_encoding", input=inputs)
+    run = await client.run_sync(agent="base64_encoding", input=input)
     assert run.status == RunStatus.COMPLETED
-    assert len(run.outputs) == 1
+    assert len(run.output) == 1
 
-    message_parts = run.outputs[0].parts
+    message_parts = run.output[0].parts
     assert len(message_parts) == 2
 
     base64_part = next((part for part in message_parts if part.content_encoding == "base64"), None)
@@ -150,17 +150,17 @@ async def test_base64_encoding(server: Server, client: Client) -> None:
 
 @pytest.mark.asyncio
 async def test_artifacts(server: Server, client: Client) -> None:
-    run = await client.run_sync(agent="artifact_producer", input=inputs)
+    run = await client.run_sync(agent="artifact_producer", input=input)
     assert run.status == RunStatus.COMPLETED
 
-    assert len(run.outputs) == 1
-    assert run.outputs[0].parts[0].content == "Processing with artifacts"
+    assert len(run.output) == 1
+    assert run.output[0].parts[0].content == "Processing with artifacts"
 
-    assert len(run.outputs[0].parts) == 4
+    assert len(run.output[0].parts) == 4
 
-    text_artifact = next((a for a in run.outputs[0].parts if a.name == "text-result.txt"), None)
-    json_artifact = next((a for a in run.outputs[0].parts if a.name == "data.json"), None)
-    image_artifact = next((a for a in run.outputs[0].parts if a.name == "image.png"), None)
+    text_artifact = next((a for a in run.output[0].parts if a.name == "text-result.txt"), None)
+    json_artifact = next((a for a in run.output[0].parts if a.name == "data.json"), None)
+    image_artifact = next((a for a in run.output[0].parts if a.name == "image.png"), None)
 
     assert text_artifact is not None
     assert text_artifact.content_type == "text/plain"
@@ -179,7 +179,7 @@ async def test_artifacts(server: Server, client: Client) -> None:
 
 @pytest.mark.asyncio
 async def test_artifact_streaming(server: Server, client: Client) -> None:
-    events = [event async for event in client.run_stream(agent="artifact_producer", input=inputs)]
+    events = [event async for event in client.run_stream(agent="artifact_producer", input=input)]
 
     assert isinstance(events[0], RunCreatedEvent)
     assert isinstance(events[-1], RunCompletedEvent)
@@ -201,7 +201,7 @@ async def test_artifact_streaming(server: Server, client: Client) -> None:
 @pytest.mark.asyncio
 @pytest.mark.parametrize("server", [timedelta(seconds=5)], indirect=True)
 async def test_run_ttl(server: Server, client: Client) -> None:
-    run = await client.run_async(agent="echo", input=inputs)
+    run = await client.run_async(agent="echo", input=input)
     run = await client.run_status(run_id=run.run_id)
     await asyncio.sleep(6)
     try:
@@ -218,10 +218,10 @@ async def test_run_ttl(server: Server, client: Client) -> None:
 @pytest.mark.parametrize("server", [timedelta(seconds=5)], indirect=True)
 async def test_session_ttl(server: Server, client: Client) -> None:
     async with client.session() as session:
-        run = await session.run_sync(agent="echo", input=inputs)
+        run = await session.run_sync(agent="echo", input=input)
         await asyncio.sleep(3)
-        run = await session.run_sync(agent="echo", input=inputs)
-        assert len(run.outputs) == 3
+        run = await session.run_sync(agent="echo", input=input)
+        assert len(run.output) == 3
         await asyncio.sleep(3)
-        run = await session.run_sync(agent="echo", input=inputs)
-        assert len(run.outputs) == 7  # First run shall be forgotten
+        run = await session.run_sync(agent="echo", input=input)
+        assert len(run.output) == 7  # First run shall be forgotten

{acp_sdk-0.6.0 → acp_sdk-0.7.1}/tests/unit/client/test_client.py

@@ -3,7 +3,7 @@ from acp_sdk.client import Client
 from acp_sdk.models import Message, MessagePart, Run, RunCompletedEvent
 from pytest_httpx import HTTPXMock
 
-mock_run = Run(agent_name="mock", outputs=[Message(parts=[MessagePart(content="Hello!")])])
+mock_run = Run(agent_name="mock", output=[Message(parts=[MessagePart(content="Hello!")])])
 
 
 @pytest.mark.asyncio

acp_sdk-0.7.1/tests/unit/client/test_utils.py

@@ -0,0 +1,30 @@
+import pytest
+from acp_sdk.client.types import Input
+from acp_sdk.client.utils import input_to_messages
+from acp_sdk.models import Message, MessagePart
+
+
+@pytest.mark.parametrize(
+    "input,messages",
+    [
+        ([], []),
+        ("Hello", [Message(parts=[MessagePart(content="Hello")])]),
+        (["Hello"], [Message(parts=[MessagePart(content="Hello")])]),
+        (MessagePart(content="Hello"), [Message(parts=[MessagePart(content="Hello")])]),
+        ([MessagePart(content="Hello")], [Message(parts=[MessagePart(content="Hello")])]),
+        (Message(parts=[MessagePart(content="Hello")]), [Message(parts=[MessagePart(content="Hello")])]),
+        ([Message(parts=[MessagePart(content="Hello")])], [Message(parts=[MessagePart(content="Hello")])]),
+    ],
+)
+def test_input_to_messages(input: Input, messages: list[Message]) -> None:
+    result = input_to_messages(input)
+    assert result == messages
+
+
+@pytest.mark.parametrize(
+    "input",
+    [["foo", Message(parts=[])], ["foo", MessagePart(content="foo")], [Message(parts=[]), MessagePart(content="foo")]],
+)
+def test_input_to_messages_mixed_input(input: Input) -> None:
+    with pytest.raises(TypeError):
+        input_to_messages(["foo", Message(parts=[])])