merge

Author: Kludex

README.md

@@ -15,6 +15,7 @@
   <a href="https://pypi.python.org/pypi/pydantic-ai"><img src="https://img.shields.io/pypi/v/pydantic-ai.svg" alt="PyPI"></a>
   <a href="https://github.com/pydantic/pydantic-ai"><img src="https://img.shields.io/pypi/pyversions/pydantic-ai.svg" alt="versions"></a>
   <a href="https://github.com/pydantic/pydantic-ai/blob/main/LICENSE"><img src="https://img.shields.io/github/license/pydantic/pydantic-ai.svg?v" alt="license"></a>
+  <a href="https://logfire.pydantic.dev/docs/join-slack/"><img src="https://img.shields.io/badge/Slack-Join%20Slack-4A154B?logo=slack" alt="Join Slack" /></a>
 </div>
 
 ---

docs/.partials/index-header.html

@@ -23,6 +23,9 @@
   <a href="https://github.com/pydantic/pydantic-ai/blob/main/LICENSE">
     <img src="https://img.shields.io/github/license/pydantic/pydantic-ai.svg" alt="license">
   </a>
+  <a href="https://logfire.pydantic.dev/docs/join-slack/">
+    <img src="https://img.shields.io/badge/Slack-Join%20Slack-4A154B?logo=slack" alt="Join Slack" />
+  </a>
 </p>
 
 <p class="text-emphasis">

pydantic_ai_slim/pydantic_ai/_cli.py

@@ -284,7 +284,7 @@ async def ask_agent(
                         stack.enter_context(live)  # entering multiple times is idempotent
 
                         async for content in handle_stream.stream_output(debounce_by=None):
-                            live.update(Markdown(content, code_theme=code_theme))
+                            live.update(Markdown(str(content), code_theme=code_theme))
 
         assert agent_run.result is not None
         return agent_run.result.all_messages()

pydantic_ai_slim/pydantic_ai/_utils.py

@@ -205,7 +205,13 @@ def now_utc() -> datetime:
     return datetime.now(tz=timezone.utc)
 
 
-def guard_tool_call_id(t: _messages.ToolCallPart | _messages.ToolReturnPart | _messages.RetryPromptPart) -> str:
+def guard_tool_call_id(
+    t: _messages.ToolCallPart
+    | _messages.ToolReturnPart
+    | _messages.RetryPromptPart
+    | _messages.ServerToolCallPart
+    | _messages.ServerToolReturnPart,
+) -> str:
     """Type guard that either returns the tool call id or generates a new one if it's None."""
     return t.tool_call_id or generate_tool_call_id()
 

pydantic_ai_slim/pydantic_ai/agent.py

@@ -1766,9 +1766,13 @@ def to_a2a(
             lifespan=lifespan,
         )
 
-    async def to_cli(self: Self, deps: AgentDepsT = None) -> None:
+    async def to_cli(self: Self, deps: AgentDepsT = None, prog_name: str = 'pydantic-ai') -> None:
         """Run the agent in a CLI chat interface.
 
+        Args:
+            deps: The dependencies to pass to the agent.
+            prog_name: The name of the program to use for the CLI. Defaults to 'pydantic-ai'.
+
         Example:
         ```python {title="agent_to_cli.py" test="skip"}
         from pydantic_ai import Agent
@@ -1783,29 +1787,24 @@ async def main():
 
         from pydantic_ai._cli import run_chat
 
-        # TODO(Marcelo): We need to refactor the CLI code to be able to be able to just pass `agent`, `deps` and
-        # `prog_name` from here.
+        await run_chat(stream=True, agent=self, deps=deps, console=Console(), code_theme='monokai', prog_name=prog_name)
 
-        await run_chat(
-            stream=True,
-            agent=self,
-            deps=deps,
-            console=Console(),
-            code_theme='monokai',
-            prog_name='pydantic-ai',
-        )
-
-    def to_cli_sync(self: Self, deps: AgentDepsT = None) -> None:
+    def to_cli_sync(self: Self, deps: AgentDepsT = None, prog_name: str = 'pydantic-ai') -> None:
         """Run the agent in a CLI chat interface with the non-async interface.
 
+        Args:
+            deps: The dependencies to pass to the agent.
+            prog_name: The name of the program to use for the CLI. Defaults to 'pydantic-ai'.
+
         ```python {title="agent_to_cli_sync.py" test="skip"}
         from pydantic_ai import Agent
 
         agent = Agent('openai:gpt-4o', instructions='You always respond in Italian.')
         agent.to_cli_sync()
+        agent.to_cli_sync(prog_name='assistant')
         ```
         """
-        return get_event_loop().run_until_complete(self.to_cli(deps=deps))
+        return get_event_loop().run_until_complete(self.to_cli(deps=deps, prog_name=prog_name))
 
 
 @dataclasses.dataclass(repr=False)

pydantic_ai_slim/pydantic_ai/models/__init__.py

@@ -28,12 +28,25 @@
 KnownModelName = TypeAliasType(
     'KnownModelName',
     Literal[
-        'anthropic:claude-3-7-sonnet-latest',
+        'anthropic:claude-2.0',
+        'anthropic:claude-2.1',
+        'anthropic:claude-3-5-haiku-20241022',
         'anthropic:claude-3-5-haiku-latest',
+        'anthropic:claude-3-5-sonnet-20240620',
+        'anthropic:claude-3-5-sonnet-20241022',
         'anthropic:claude-3-5-sonnet-latest',
+        'anthropic:claude-3-7-sonnet-20250219',
+        'anthropic:claude-3-7-sonnet-latest',
+        'anthropic:claude-3-haiku-20240307',
+        'anthropic:claude-3-opus-20240229',
         'anthropic:claude-3-opus-latest',
-        'claude-3-7-sonnet-latest',
-        'claude-3-5-haiku-latest',
+        'anthropic:claude-3-sonnet-20240229',
+        'anthropic:claude-4-opus-20250514',
+        'anthropic:claude-4-sonnet-20250514',
+        'anthropic:claude-opus-4-0',
+        'anthropic:claude-opus-4-20250514',
+        'anthropic:claude-sonnet-4-0',
+        'anthropic:claude-sonnet-4-20250514',
         'bedrock:amazon.titan-tg1-large',
         'bedrock:amazon.titan-text-lite-v1',
         'bedrock:amazon.titan-text-express-v1',
@@ -77,8 +90,25 @@
         'bedrock:mistral.mixtral-8x7b-instruct-v0:1',
         'bedrock:mistral.mistral-large-2402-v1:0',
         'bedrock:mistral.mistral-large-2407-v1:0',
+        'claude-2.0',
+        'claude-2.1',
+        'claude-3-5-haiku-20241022',
+        'claude-3-5-haiku-latest',
+        'claude-3-5-sonnet-20240620',
+        'claude-3-5-sonnet-20241022',
         'claude-3-5-sonnet-latest',
+        'claude-3-7-sonnet-20250219',
+        'claude-3-7-sonnet-latest',
+        'claude-3-haiku-20240307',
+        'claude-3-opus-20240229',
         'claude-3-opus-latest',
+        'claude-3-sonnet-20240229',
+        'claude-4-opus-20250514',
+        'claude-4-sonnet-20250514',
+        'claude-opus-4-0',
+        'claude-opus-4-20250514',
+        'claude-sonnet-4-0',
+        'claude-sonnet-4-20250514',
         'cohere:c4ai-aya-expanse-32b',
         'cohere:c4ai-aya-expanse-8b',
         'cohere:command',
@@ -94,32 +124,26 @@
         'cohere:command-r7b-12-2024',
         'deepseek:deepseek-chat',
         'deepseek:deepseek-reasoner',
-        'google-gla:gemini-1.0-pro',
         'google-gla:gemini-1.5-flash',
         'google-gla:gemini-1.5-flash-8b',
         'google-gla:gemini-1.5-pro',
-        'google-gla:gemini-2.0-flash-exp',
-        'google-gla:gemini-2.0-flash-thinking-exp-01-21',
-        'google-gla:gemini-exp-1206',
+        'google-gla:gemini-1.0-pro',
         'google-gla:gemini-2.0-flash',
         'google-gla:gemini-2.0-flash-lite-preview-02-05',
         'google-gla:gemini-2.0-pro-exp-02-05',
-        'google-gla:gemini-2.5-flash-preview-04-17',
+        'google-gla:gemini-2.5-flash-preview-05-20',
         'google-gla:gemini-2.5-pro-exp-03-25',
-        'google-gla:gemini-2.5-pro-preview-03-25',
-        'google-vertex:gemini-1.0-pro',
+        'google-gla:gemini-2.5-pro-preview-05-06',
         'google-vertex:gemini-1.5-flash',
         'google-vertex:gemini-1.5-flash-8b',
         'google-vertex:gemini-1.5-pro',
-        'google-vertex:gemini-2.0-flash-exp',
-        'google-vertex:gemini-2.0-flash-thinking-exp-01-21',
-        'google-vertex:gemini-exp-1206',
+        'google-vertex:gemini-1.0-pro',
         'google-vertex:gemini-2.0-flash',
         'google-vertex:gemini-2.0-flash-lite-preview-02-05',
         'google-vertex:gemini-2.0-pro-exp-02-05',
-        'google-vertex:gemini-2.5-flash-preview-04-17',
+        'google-vertex:gemini-2.5-flash-preview-05-20',
         'google-vertex:gemini-2.5-pro-exp-03-25',
-        'google-vertex:gemini-2.5-pro-preview-03-25',
+        'google-vertex:gemini-2.5-pro-preview-05-06',
         'gpt-3.5-turbo',
         'gpt-3.5-turbo-0125',
         'gpt-3.5-turbo-0301',