adcp 1.0.2__py3-none-any.whl → 1.0.4__py3-none-any.whl

adcp/utils/response_parser.py

@@ -0,0 +1,122 @@
+from __future__ import annotations
+
+"""Utilities for parsing protocol responses into structured types."""
+
+import json
+import logging
+from typing import Any, TypeVar
+
+from pydantic import BaseModel, ValidationError
+
+logger = logging.getLogger(__name__)
+
+T = TypeVar("T", bound=BaseModel)
+
+
+def parse_mcp_content(content: list[dict[str, Any]], response_type: type[T]) -> T:
+    """
+    Parse MCP content array into structured response type.
+
+    MCP tools return content as a list of content items:
+    [{"type": "text", "text": "..."}, {"type": "resource", ...}]
+
+    The MCP adapter is responsible for serializing MCP SDK Pydantic objects
+    to plain dicts before calling this function.
+
+    For AdCP, we expect JSON data in text content items.
+
+    Args:
+        content: MCP content array (list of plain dicts)
+        response_type: Expected Pydantic model type
+
+    Returns:
+        Parsed and validated response object
+
+    Raises:
+        ValueError: If content cannot be parsed into expected type
+    """
+    if not content:
+        raise ValueError("Empty MCP content array")
+
+    # Look for text content items that might contain JSON
+    for item in content:
+        if item.get("type") == "text":
+            text = item.get("text", "")
+            if not text:
+                continue
+
+            try:
+                # Try parsing as JSON
+                data = json.loads(text)
+                # Validate against expected schema
+                return response_type.model_validate(data)
+            except json.JSONDecodeError:
+                # Not JSON, try next item
+                continue
+            except ValidationError as e:
+                logger.warning(
+                    f"MCP content doesn't match expected schema {response_type.__name__}: {e}"
+                )
+                raise ValueError(f"MCP response doesn't match expected schema: {e}") from e
+        elif item.get("type") == "resource":
+            # Resource content might have structured data
+            try:
+                return response_type.model_validate(item)
+            except ValidationError:
+                # Try next item
+                continue
+
+    # If we get here, no content item could be parsed
+    # Include content preview for debugging (first 2 items, max 500 chars each)
+    content_preview = json.dumps(content[:2], indent=2, default=str)
+    if len(content_preview) > 500:
+        content_preview = content_preview[:500] + "..."
+
+    raise ValueError(
+        f"No valid {response_type.__name__} data found in MCP content. "
+        f"Content types: {[item.get('type') for item in content]}. "
+        f"Content preview:\n{content_preview}"
+    )
+
+
+def parse_json_or_text(data: Any, response_type: type[T]) -> T:
+    """
+    Parse data that might be JSON string, dict, or other format.
+
+    Used by A2A adapter for flexible response parsing.
+
+    Args:
+        data: Response data (string, dict, or other)
+        response_type: Expected Pydantic model type
+
+    Returns:
+        Parsed and validated response object
+
+    Raises:
+        ValueError: If data cannot be parsed into expected type
+    """
+    # If already a dict, try direct validation
+    if isinstance(data, dict):
+        try:
+            return response_type.model_validate(data)
+        except ValidationError as e:
+            raise ValueError(
+                f"Response doesn't match expected schema {response_type.__name__}: {e}"
+            ) from e
+
+    # If string, try JSON parsing
+    if isinstance(data, str):
+        try:
+            parsed = json.loads(data)
+            return response_type.model_validate(parsed)
+        except json.JSONDecodeError as e:
+            raise ValueError(f"Response is not valid JSON: {e}") from e
+        except ValidationError as e:
+            raise ValueError(
+                f"Response doesn't match expected schema {response_type.__name__}: {e}"
+            ) from e
+
+    # Unsupported type
+    raise ValueError(
+        f"Cannot parse response of type {type(data).__name__} into {response_type.__name__}"
+    )

{adcp-1.0.2.dist-info → adcp-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: adcp
-Version: 1.0.2
+Version: 1.0.4
 Summary: Official Python client for the Ad Context Protocol (AdCP)
 Author-email: AdCP Community <maintainers@adcontextprotocol.org>
 License: Apache-2.0

adcp-1.0.4.dist-info/RECORD

@@ -0,0 +1,22 @@
+adcp/__init__.py,sha256=3ARviLlJxnjYaDMIRFLceNsaES6z9ft81qKRYeq6Eq4,2512
+adcp/__main__.py,sha256=4rjwH3i52Dsy-Pb0hw5hapQuEG8-bW2tTKKB0HsVsSs,12716
+adcp/client.py,sha256=iIZUy5j25H48gGYlR_VuVsB9zP6SF1HtRssdPs2VJkc,24232
+adcp/config.py,sha256=Vsy7ZPOI8G3fB_i5Nk-CHbC7wdasCUWuKlos0fwA0kY,2017
+adcp/exceptions.py,sha256=dNRMKV23DlkGKyB9Xmt6MtlhvDu1crjzD_en4nAEwDY,4399
+adcp/protocols/__init__.py,sha256=6UFwACQ0QadBUzy17wUROHqsJDp8ztPW2jzyl53Zh_g,262
+adcp/protocols/a2a.py,sha256=TN26ac98h2NUZTTs39Tyd6pVoS3k-sASuLKhLpdYV-A,12255
+adcp/protocols/base.py,sha256=Tdxg1hefWVDvRP7q3yYbtPlIfUr01luPG0oT773qi30,4906
+adcp/protocols/mcp.py,sha256=JNJdouaDQ66H9pUtsaZtV8FWoLGf28QM29tOLESDxsk,14664
+adcp/types/__init__.py,sha256=3E_TJUXqQQFcjmSZZSPLwqBP3s_ijsH2LDeuOU-MP30,402
+adcp/types/core.py,sha256=w6CLD2K0riAHUnrktYmQV7qnkO-6Ab4-CN67YSagAE4,4731
+adcp/types/generated.py,sha256=KoILEa5Gg0tsjMYoqDEWulKvPzS0333L3qj75AHr4yI,50855
+adcp/types/tasks.py,sha256=Ae9TSwG2F7oWXTcl4TvLhAzinbQkHNGF1Pc0q8RMNNM,23424
+adcp/utils/__init__.py,sha256=uetvSJB19CjQbtwEYZiTnumJG11GsafQmXm5eR3hL7E,153
+adcp/utils/operation_id.py,sha256=wQX9Bb5epXzRq23xoeYPTqzu5yLuhshg7lKJZihcM2k,294
+adcp/utils/response_parser.py,sha256=NQTLlbvmnM_tE4B5w3oB1Wshny1p-Uh8IWbghlwoNJc,4057
+adcp-1.0.4.dist-info/licenses/LICENSE,sha256=PF39NR3Ae8PLgBhg3Uxw6ju7iGVIf8hfv9LRWQdii_U,629
+adcp-1.0.4.dist-info/METADATA,sha256=ahZm1ty9AJ28PK5cC5_lrjkXPacgO3-3VMYn5ncfzJ4,12724
+adcp-1.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+adcp-1.0.4.dist-info/entry_points.txt,sha256=DQKpcGsJX8DtVI_SGApQ7tNvqUB4zkTLaTAEpFgmi3U,44
+adcp-1.0.4.dist-info/top_level.txt,sha256=T1_NF0GefncFU9v_k56oDwKSJREyCqIM8lAwNZf0EOs,5
+adcp-1.0.4.dist-info/RECORD,,

adcp-1.0.2.dist-info/RECORD

@@ -1,21 +0,0 @@
-adcp/__init__.py,sha256=P-Lws8JQAoeN82lIPhabzOPf5CSgTRDWNSQswb9aBK4,2512
-adcp/__main__.py,sha256=MR7hiJu0cM7wkBAMpJ9wq9IXWFjWeD5gEOvJOJawnW8,8900
-adcp/client.py,sha256=E7SEqZarXuT76nURHWG_O9thNauNW1yEesFlF2lVXjg,20900
-adcp/config.py,sha256=Vsy7ZPOI8G3fB_i5Nk-CHbC7wdasCUWuKlos0fwA0kY,2017
-adcp/exceptions.py,sha256=dNRMKV23DlkGKyB9Xmt6MtlhvDu1crjzD_en4nAEwDY,4399
-adcp/protocols/__init__.py,sha256=6UFwACQ0QadBUzy17wUROHqsJDp8ztPW2jzyl53Zh_g,262
-adcp/protocols/a2a.py,sha256=c5PZ1SlZe2TPzx-eFu-RH9P-h98CW4F5PBdgsU5k8HE,10281
-adcp/protocols/base.py,sha256=fG4tk4UMVSkBE3zv5b7bPEOSEXOCTI2oFyy9V6H406Y,1183
-adcp/protocols/mcp.py,sha256=Oo0i7jyTnmQPoLeKuP6YBCmCzi1WazUDf3SzxMAU6lA,11163
-adcp/types/__init__.py,sha256=3E_TJUXqQQFcjmSZZSPLwqBP3s_ijsH2LDeuOU-MP30,402
-adcp/types/core.py,sha256=w6CLD2K0riAHUnrktYmQV7qnkO-6Ab4-CN67YSagAE4,4731
-adcp/types/generated.py,sha256=5vbr113-rhNJSMePAEvQSPtqqEqiloVw1F8BeT4tk3o,49973
-adcp/types/tasks.py,sha256=iwNoV-1_BxH3PZxmfg2rgZHDUN-o_Ob7zgPNbKtyNPM,21553
-adcp/utils/__init__.py,sha256=uetvSJB19CjQbtwEYZiTnumJG11GsafQmXm5eR3hL7E,153
-adcp/utils/operation_id.py,sha256=wQX9Bb5epXzRq23xoeYPTqzu5yLuhshg7lKJZihcM2k,294
-adcp-1.0.2.dist-info/licenses/LICENSE,sha256=PF39NR3Ae8PLgBhg3Uxw6ju7iGVIf8hfv9LRWQdii_U,629
-adcp-1.0.2.dist-info/METADATA,sha256=q2TkYphUBt9eTOWTZ2e774Xj1cuzxjeOgEvvTAPtOZ8,12724
-adcp-1.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-adcp-1.0.2.dist-info/entry_points.txt,sha256=DQKpcGsJX8DtVI_SGApQ7tNvqUB4zkTLaTAEpFgmi3U,44
-adcp-1.0.2.dist-info/top_level.txt,sha256=T1_NF0GefncFU9v_k56oDwKSJREyCqIM8lAwNZf0EOs,5
-adcp-1.0.2.dist-info/RECORD,,