Merge branch 'main' into fallback-output-mode

Author: DouweM

examples/pydantic_ai_examples/rag.py

@@ -115,7 +115,7 @@ async def build_search_db():
     async with httpx.AsyncClient() as client:
         response = await client.get(DOCS_JSON)
         response.raise_for_status()
-    sections = sessions_ta.validate_json(response.content)
+    sections = sections_ta.validate_json(response.content)
 
     openai = AsyncOpenAI()
     logfire.instrument_openai(openai)
@@ -183,7 +183,7 @@ def embedding_content(self) -> str:
         return '\n\n'.join((f'path: {self.path}', f'title: {self.title}', self.content))
 
 
-sessions_ta = TypeAdapter(list[DocsSection])
+sections_ta = TypeAdapter(list[DocsSection])
 
 
 # pyright: reportUnknownMemberType=false

pydantic_ai_slim/pydantic_ai/common_tools/duckduckgo.py

@@ -10,7 +10,7 @@
 
 try:
     try:
-        from ddgs import DDGS
+        from ddgs.ddgs import DDGS
     except ImportError:  # Fallback for older versions of ddgs
         from duckduckgo_search import DDGS
 except ImportError as _import_error:

pydantic_ai_slim/pydantic_ai/mcp.py

@@ -726,9 +726,9 @@ async def client_streams(
             MemoryObjectReceiveStream[SessionMessage | Exception],
             MemoryObjectSendStream[SessionMessage],
         ]
-    ]:  # pragma: no cover
+    ]:
         if self.http_client and self.headers:
-            raise ValueError('`http_client` is mutually exclusive with `headers`.')
+            raise ValueError('`http_client` is mutually exclusive with `headers`.')  # pragma: no cover
 
         transport_client_partial = functools.partial(
             self._transport_client,
@@ -737,7 +737,7 @@ async def client_streams(
             sse_read_timeout=self.read_timeout,
         )
 
-        if self.http_client is not None:
+        if self.http_client is not None:  # pragma: no cover
 
             def httpx_client_factory(
                 headers: dict[str, str] | None = None,
@@ -866,7 +866,7 @@ def __get_pydantic_core_schema__(cls, _: Any, __: Any) -> CoreSchema:
 
     @property
     def _transport_client(self):
-        return streamablehttp_client  # pragma: no cover
+        return streamablehttp_client
 
     def __eq__(self, value: object, /) -> bool:
         return super().__eq__(value) and isinstance(value, MCPServerStreamableHTTP) and self.url == value.url

pydantic_graph/pydantic_graph/beta/graph.py

@@ -68,7 +68,7 @@ def serialize(cassette_dict: Any):  # pragma: lax no cover
                 if isinstance(body, dict):
                     # Responses will have the body under a field called 'string'
                     body = body.get('string')
-                if body is not None:
+                if body:
                     # NOTE(Marcelo): This doesn't handle gzip compression.
                     data['parsed_body'] = json.loads(body)  # pyright: ignore[reportUnknownArgumentType]
                     if 'access_token' in data['parsed_body']:

tests/cassettes/test_mcp/test_agent_run_stream_with_mcp_server_http.yaml

@@ -1489,3 +1489,16 @@ async def test_server_info(mcp_server: MCPServerStdio) -> None:
     async with mcp_server:
         assert mcp_server.server_info is not None
         assert mcp_server.server_info.name == 'Pydantic AI MCP Server'
+
+
+async def test_agent_run_stream_with_mcp_server_http(allow_model_requests: None, model: Model):
+    server = MCPServerStreamableHTTP(url='https://mcp.deepwiki.com/mcp', timeout=30)
+    agent = Agent(model, toolsets=[server], instructions='Be concise.')
+
+    # This should not raise an error.
+    # See https://github.com/pydantic/pydantic-ai/issues/2818#issuecomment-3476480829
+    async with agent.run_stream('Summarize the pydantic/pydantic-ai repo in one sentence') as result:
+        output = await result.get_output()
+    assert output == snapshot(
+        'The `pydantic/pydantic-ai` repository is a Python agent framework designed to facilitate the development of production-grade Generative AI applications and workflows with a focus on type-safety and an ergonomic developer experience.'
+    )