acp-sdk 0.12.2__tar.gz → 0.13.0__tar.gz

{acp_sdk-0.12.2 → acp_sdk-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acp-sdk
-Version: 0.12.2
+Version: 0.13.0
 Summary: Agent Communication Protocol SDK
 Author: IBM Corp.
 Maintainer-email: Tomas Pilar <thomas7pilar@gmail.com>

{acp_sdk-0.12.2 → acp_sdk-0.13.0}/pyproject.toml

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

{acp_sdk-0.12.2 → acp_sdk-0.13.0}/src/acp_sdk/client/client.py

@@ -252,15 +252,10 @@ class Client:
                 base_url=base_url or self._session_last_refresh_base_url,
             )
 
-            try:
-                response = await self._client.get(url, timeout=timeout)
-                response = SessionReadResponse.model_validate(response.json())
-                self._session = Session(**response.model_dump())
-            except ACPError as e:
-                if e.error.code == ErrorCode.NOT_FOUND:
-                    pass
-                raise e
-
+            response = await self._client.get(url, timeout=timeout)
+            self._raise_error(response)
+            response = SessionReadResponse.model_validate(response.json())
+            self._session = Session(**response.model_dump())
             return self._session
 
     async def _validate_stream(
@@ -304,13 +299,11 @@ class Client:
 
         target_base_url = self._create_base_url(base_url=base_url)
         try:
-            if not self._session_last_refresh_base_url:
-                return {"session": self._session}
             if self._session_last_refresh_base_url == target_base_url:
                 # Same server, no need to forward session
                 return {"session_id": self._session.id}
 
-            session = await self.refresh_session()
+            session = await self.refresh_session(base_url=self._session_last_refresh_base_url or target_base_url)
             return {"session": session}
         except ACPError as e:
             if e.error.code == ErrorCode.NOT_FOUND:

{acp_sdk-0.12.2 → acp_sdk-0.13.0}/src/acp_sdk/models/models.py

@@ -118,6 +118,33 @@ class CitationMetadata(BaseModel):
     description: Optional[str]
 
 
+class TrajectoryMetadata(BaseModel):
+    """
+    Represents trajectory information for an agent's reasoning or tool execution
+    steps. This metadata helps track the agent's decision-making process and
+    provides transparency into how the agent arrived at its response.
+
+    TrajectoryMetadata can capture either:
+    1. A reasoning step with a message
+    2. A tool execution with tool name, input, and output
+
+    This information can be used for debugging, audit trails, and providing
+    users with insight into the agent's thought process.
+
+    Properties:
+    - message: A reasoning step or thought in the agent's decision process.
+    - tool_name: Name of the tool that was executed.
+    - tool_input: Input parameters passed to the tool.
+    - tool_output: Output or result returned by the tool.
+    """
+
+    kind: Literal["trajectory"] = "trajectory"
+    message: Optional[str] = None
+    tool_name: Optional[str] = None
+    tool_input: Optional[AnyModel] = None
+    tool_output: Optional[AnyModel] = None
+
+
 class MessagePart(BaseModel):
     name: Optional[str] = None
     content_type: Optional[str] = "text/plain"
@@ -127,7 +154,7 @@ class MessagePart(BaseModel):
 
     model_config = ConfigDict(extra="allow")
 
-    metadata: Optional[CitationMetadata] = Field(discriminator="kind", default=None)
+    metadata: Optional[CitationMetadata | TrajectoryMetadata] = Field(discriminator="kind", default=None)
 
     def model_post_init(self, __context: Any) -> None:
         if self.content is not None and self.content_url is not None:

{acp_sdk-0.12.2 → acp_sdk-0.13.0}/src/acp_sdk/server/server.py

@@ -331,14 +331,14 @@ class Server:
         request_data = {
             "location": f"http://{host}:{self.server.config.port}",
         }
-        await async_request_with_retry(lambda client, data=request_data: client.get(f"{url}/api/v1/providers"))
         try:
+            await async_request_with_retry(lambda client, data=request_data: client.get(f"{url}/api/v1/providers"))
             await async_request_with_retry(
                 lambda client, data=request_data: client.post(
                     f"{url}/api/v1/providers", json=data, params={"auto_remove": True}
                 )
             )
-            logger.info("Agent registered to the beeai server.")
+            logger.debug("Agent registered to the beeai server.")
 
             # check missing env keyes
             envs_request = await async_request_with_retry(lambda client: client.get(f"{url}/api/v1/variables"))
@@ -361,17 +361,17 @@ class Server:
                     elif env.get("required"):
                         missing_keyes.append(env)
                 if len(missing_keyes):
-                    logger.error(f"Can not run agent, missing required env variables: {missing_keyes}")
+                    logger.debug(f"Can not run agent, missing required env variables: {missing_keyes}")
                     raise Exception("Missing env variables")
 
         except requests.exceptions.ConnectionError as e:
-            logger.warning(f"Can not reach server, check if running on {url} : {e}")
+            logger.debug(f"Can not reach server, check if running on {url} : {e}")
         except (requests.exceptions.HTTPError, Exception) as e:
             try:
                 error_message = e.response.json().get("detail")
                 if error_message:
-                    logger.warning(f"Agent can not be registered to beeai server: {error_message}")
+                    logger.debug(f"Agent can not be registered to beeai server: {error_message}")
                 else:
-                    logger.warning(f"Agent can not be registered to beeai server: {e}")
+                    logger.debug(f"Agent can not be registered to beeai server: {e}")
             except Exception:
-                logger.warning(f"Agent can not be registered to beeai server: {e}")
+                logger.debug(f"Agent can not be registered to beeai server: {e}")

{acp_sdk-0.12.2 → acp_sdk-0.13.0}/tests/e2e/test_suites/test_sessions.py

@@ -6,6 +6,7 @@ from acp_sdk.models import (
     Message,
     MessagePart,
 )
+from acp_sdk.models.models import Session
 from acp_sdk.server import Server
 
 agent = "history_echo"
@@ -31,6 +32,20 @@ async def test_session_refresh(server: Server, client: Client) -> None:
         assert len(sess.history) == len(input) * 2
 
 
+@pytest.mark.asyncio
+async def test_session_multi_client(server: Server, client: Client) -> None:
+    session = Session()
+
+    async with client.session(session) as session_client:
+        run = await session_client.run_sync(input, agent=agent)
+        assert run.output == output
+        print(run.session_id)
+
+    async with client.session(session) as session_client:
+        run = await session_client.run_sync(input, agent=agent)
+        assert run.output == output * 3
+
+
 @pytest.mark.asyncio
 async def test_distributed_session(multi_server: tuple[Server, Server]) -> None:
     one, two = multi_server

{acp_sdk-0.12.2 → acp_sdk-0.13.0}/tests/unit/client/test_client.py

@@ -176,23 +176,28 @@ async def test_run_events(httpx_mock: HTTPXMock) -> None:
 @pytest.mark.asyncio
 async def test_session(httpx_mock: HTTPXMock) -> None:
     httpx_mock.add_response(url="http://test/runs", method="POST", content=mock_run.model_dump_json(), is_reusable=True)
+    httpx_mock.add_response(
+        url=f"http://test/sessions/{mock_session.id}",
+        method="GET",
+        content=mock_session.model_dump_json(),
+        is_reusable=True,
+    )
 
-    async with Client(base_url="http://test") as client, client.session(Session(id=mock_run.session_id)) as session:
-        assert session._session.id == mock_run.session_id
+    async with Client(base_url="http://test") as client, client.session(mock_session) as session:
         await session.run_sync("Howdy!", agent=mock_run.agent_name)
         await session.run_sync("Howdy!", agent=mock_run.agent_name)
         await client.run_sync("Howdy!", agent=mock_run.agent_name)
 
     requests = httpx_mock.get_requests()
-    body = json.loads(requests[0].content)
+    body = json.loads(requests[1].content)
     # First request gets full session
     assert body["session"]["id"] == str(mock_run.session_id)
 
-    body = json.loads(requests[1].content)
+    body = json.loads(requests[2].content)
     # Second sends just the ID
     assert body["session_id"] == str(mock_run.session_id)
 
-    body = json.loads(requests[2].content)
+    body = json.loads(requests[3].content)
     assert body["session_id"] is None
     assert body["session"] is None