fix tests after cli adjustments

Author: dsfaccini

tests/models/test_cohere.py

@@ -543,5 +543,5 @@ async def test_cohere_model_thinking_part(allow_model_requests: None, co_api_key
 async def test_cohere_model_builtin_tools(allow_model_requests: None, co_api_key: str):
     m = CohereModel('command-r7b-12-2024', provider=CohereProvider(api_key=co_api_key))
     agent = Agent(m, builtin_tools=[WebSearchTool()])
-    with pytest.raises(UserError, match='Builtin tool WebSearchTool is not supported by this model'):
+    with pytest.raises(UserError, match=r"Builtin tool\(s\) \['WebSearchTool'\] not supported by this model"):
         await agent.run('Hello')

tests/models/test_openai.py

@@ -2301,7 +2301,7 @@ async def test_openai_web_search_tool_model_not_supported(allow_model_requests:
         m, instructions='You are a helpful assistant.', builtin_tools=[WebSearchTool(search_context_size='low')]
     )
 
-    with pytest.raises(UserError, match='Builtin tool WebSearchTool is not supported by this model'):
+    with pytest.raises(UserError, match=r"Builtin tool\(s\) \['WebSearchTool'\] not supported by this model"):
         await agent.run('What day is today?')
 
 

tests/test_cli.py

@@ -380,13 +380,13 @@ def test_clai_web_generic_agent(mocker: MockerFixture, env: TestEnv):
     env.set('OPENAI_API_KEY', 'test')
     mock_run_web = mocker.patch('pydantic_ai._cli.web.run_web_command', return_value=0)
 
-    assert cli(['web', '-m', 'gpt-5', '-t', 'web_search'], prog_name='clai') == 0
+    assert cli(['web', '-m', 'openai:gpt-5', '-t', 'web_search'], prog_name='clai') == 0
 
     mock_run_web.assert_called_once_with(
         agent_path=None,
         host='127.0.0.1',
         port=7932,
-        models=['gpt-5'],
+        models=['openai:gpt-5'],
         tools=['web_search'],
         instructions=None,
         mcp=None,
@@ -424,15 +424,26 @@ def test_clai_web_with_models(mocker: MockerFixture, create_test_module: Callabl
     create_test_module(custom_agent=test_agent)
 
     assert (
-        cli(['web', '--agent', 'test_module:custom_agent', '-m', 'gpt-5', '-m', 'claude-sonnet-4-5'], prog_name='clai')
+        cli(
+            [
+                'web',
+                '--agent',
+                'test_module:custom_agent',
+                '-m',
+                'openai:gpt-5',
+                '-m',
+                'anthropic:claude-sonnet-4-5',
+            ],
+            prog_name='clai',
+        )
         == 0
     )
 
     mock_run_web.assert_called_once_with(
         agent_path='test_module:custom_agent',
         host='127.0.0.1',
         port=7932,
-        models=['gpt-5', 'claude-sonnet-4-5'],
+        models=['openai:gpt-5', 'anthropic:claude-sonnet-4-5'],
         tools=None,
         instructions=None,
         mcp=None,
@@ -472,13 +483,13 @@ def test_clai_web_generic_with_instructions(mocker: MockerFixture, env: TestEnv)
 
     mock_run_web = mocker.patch('pydantic_ai._cli.web.run_web_command', return_value=0)
 
-    assert cli(['web', '-m', 'gpt-5', '-i', 'You are a helpful coding assistant'], prog_name='clai') == 0
+    assert cli(['web', '-m', 'openai:gpt-5', '-i', 'You are a helpful coding assistant'], prog_name='clai') == 0
 
     mock_run_web.assert_called_once_with(
         agent_path=None,
         host='127.0.0.1',
         port=7932,
-        models=['gpt-5'],
+        models=['openai:gpt-5'],
         tools=None,
         instructions='You are a helpful coding assistant',
         mcp=None,