acp-sdk 0.3.1__tar.gz → 0.3.2__tar.gz

{acp_sdk-0.3.1 → acp_sdk-0.3.2}/PKG-INFO

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

{acp_sdk-0.3.1 → acp_sdk-0.3.2}/examples/clients/advanced.py

@@ -13,9 +13,7 @@ async def example() -> None:
             # Additional client configuration
         )
     ) as client:
-        run = await client.run_sync(
-            agent="echo", inputs=[Message(parts=[MessagePart(content="Howdy!", content_type="text/plain")])]
-        )
+        run = await client.run_sync(agent="echo", inputs=[Message(parts=[MessagePart(content="Howdy!")])])
         print(run)
 
 

acp_sdk-0.3.2/examples/clients/session.py

@@ -0,0 +1,18 @@
+import asyncio
+
+from acp_sdk.client import Client
+from acp_sdk.models import (
+    Message,
+    MessagePart,
+)
+
+
+async def example() -> None:
+    async with Client(base_url="http://localhost:8000") as client, client.session() as session:
+        run = await session.run_sync(agent="echo", inputs=[Message(parts=[MessagePart(content="Howdy!")])])
+        run = await session.run_sync(agent="echo", inputs=[Message(parts=[MessagePart(content="Howdy again!")])])
+        print(run)
+
+
+if __name__ == "__main__":
+    asyncio.run(example())

{acp_sdk-0.3.1 → acp_sdk-0.3.2}/examples/clients/simple.py

@@ -9,9 +9,7 @@ from acp_sdk.models import (
 
 async def example() -> None:
     async with Client(base_url="http://localhost:8000") as client:
-        run = await client.run_sync(
-            agent="echo", inputs=[Message(parts=[MessagePart(content="Howdy!", content_type="text/plain")])]
-        )
+        run = await client.run_sync(agent="echo", inputs=[Message(parts=[MessagePart(content="Howdy!")])])
         print(run)
 
 

{acp_sdk-0.3.1 → acp_sdk-0.3.2}/examples/clients/stream.py

@@ -6,9 +6,7 @@ from acp_sdk.models import Message, MessagePart
 
 async def example() -> None:
     async with Client(base_url="http://localhost:8000") as client:
-        async for event in client.run_stream(
-            agent="echo", inputs=[Message(parts=[MessagePart(content="Howdy!", content_type="text/plain")])]
-        ):
+        async for event in client.run_stream(agent="echo", inputs=[Message(parts=[MessagePart(content="Howdy!")])]):
             print(event)
 
 

{acp_sdk-0.3.1 → acp_sdk-0.3.2}/examples/servers/awaiting.py

@@ -15,14 +15,12 @@ server = Server()
 @server.agent()
 async def awaiting(inputs: list[Message], context: Context) -> AsyncGenerator[RunYield, RunYieldResume]:
     """Greets and awaits for more data"""
-    yield MessagePart(content="Hello!", content_type="text/plain")
+    yield MessagePart(content="Hello!")
     resume = yield MessageAwaitRequest(
-        message=Message(
-            parts=[MessagePart(content="Can you provide me with additional configuration?", content_type="text/plain")]
-        )
+        message=Message(parts=[MessagePart(content="Can you provide me with additional configuration?")])
     )
     assert isinstance(resume, MessageAwaitResume)
-    yield MessagePart(content=f"Thanks for config: {resume.message}", content_type="text/plain")
+    yield MessagePart(content=f"Thanks for config: {resume.message}")
 
 
 server.run()

{acp_sdk-0.3.1 → acp_sdk-0.3.2}/pyproject.toml

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

{acp_sdk-0.3.1 → acp_sdk-0.3.2}/src/acp_sdk/models/models.py

@@ -17,12 +17,12 @@ class AnyModel(BaseModel):
 
 class MessagePart(BaseModel):
     name: Optional[str] = None
-    content_type: str
+    content_type: Optional[str] = "text/plain"
     content: Optional[str] = None
     content_encoding: Optional[Literal["plain", "base64"]] = "plain"
     content_url: Optional[AnyUrl] = None
 
-    model_config = ConfigDict(extra="forbid")
+    model_config = ConfigDict(extra="allow")
 
     def model_post_init(self, __context: Any) -> None:
         if self.content is None and self.content_url is None:
@@ -48,6 +48,36 @@ class Message(BaseModel):
             part.content for part in self.parts if part.content is not None and part.content_type == "text/plain"
         )
 
+    def compress(self) -> "Message":
+        def can_be_joined(first: MessagePart, second: MessagePart) -> bool:
+            return (
+                first.name is None
+                and second.name is None
+                and first.content_type == "text/plain"
+                and second.content_type == "text/plain"
+                and first.content_encoding == "plain"
+                and second.content_encoding == "plain"
+                and first.content_url is None
+                and second.content_url is None
+            )
+
+        def join(first: MessagePart, second: MessagePart) -> MessagePart:
+            return MessagePart(
+                name=None,
+                content_type="text/plain",
+                content=first.content + second.content,
+                content_encoding="plain",
+                content_url=None,
+            )
+
+        parts: list[MessagePart] = []
+        for part in self.parts:
+            if len(parts) > 0 and can_be_joined(parts[-1], part):
+                parts[-1] = join(parts[-1], part)
+            else:
+                parts.append(part)
+        return Message(parts=parts)
+
 
 AgentName = str
 SessionId = uuid.UUID

{acp_sdk-0.3.1 → acp_sdk-0.3.2}/tests/e2e/test_suites/test_runs.py

@@ -16,7 +16,7 @@ from acp_sdk.models import (
 )
 from acp_sdk.server import Server
 
-inputs = [Message(parts=[MessagePart(content="Hello!", content_type="text/plain")])]
+inputs = [Message(parts=[MessagePart(content="Hello!")])]
 await_resume = MessageAwaitResume(message=Message(parts=[]))
 
 

acp_sdk-0.3.2/tests/unit/models/test_models.py

@@ -0,0 +1,37 @@
+import pytest
+from acp_sdk.models.models import Message, MessagePart
+
+
+@pytest.mark.parametrize(
+    "uncompressed,compressed",
+    [
+        (
+            Message(
+                parts=[
+                    MessagePart(content_type="text/plain", content="Foo"),
+                    MessagePart(content_type="text/plain", content="Bar"),
+                ]
+            ),
+            Message(parts=[MessagePart(content_type="text/plain", content="FooBar")]),
+        ),
+        (
+            Message(
+                parts=[
+                    MessagePart(content_type="text/plain", content="Foo"),
+                    MessagePart(content_type="text/html", content="<head>"),
+                    MessagePart(content_type="text/plain", content="Foo"),
+                    MessagePart(content_type="text/plain", content="Bar"),
+                ]
+            ),
+            Message(
+                parts=[
+                    MessagePart(content_type="text/plain", content="Foo"),
+                    MessagePart(content_type="text/html", content="<head>"),
+                    MessagePart(content_type="text/plain", content="FooBar"),
+                ]
+            ),
+        ),
+    ],
+)
+def test_message_compress(uncompressed: Message, compressed: Message) -> None:
+    assert uncompressed.compress() == compressed

acp_sdk-0.3.1/examples/clients/session.py

@@ -1,22 +0,0 @@
-import asyncio
-
-from acp_sdk.client import Client
-from acp_sdk.models import (
-    Message,
-    MessagePart,
-)
-
-
-async def example() -> None:
-    async with Client(base_url="http://localhost:8000") as client, client.session() as session:
-        run = await session.run_sync(
-            agent="echo", inputs=[Message(parts=[MessagePart(content="Howdy!", content_type="text/plain")])]
-        )
-        run = await session.run_sync(
-            agent="echo", inputs=[Message(parts=[MessagePart(content="Howdy again!", content_type="text/plain")])]
-        )
-        print(run)
-
-
-if __name__ == "__main__":
-    asyncio.run(example())