Revert change to cohere and fix mcp tests naming

Author: medaminezghal

pydantic_ai_slim/pydantic_ai/models/cohere.py

@@ -111,6 +111,7 @@ def __init__(
         *,
         provider: Literal['cohere'] | Provider[AsyncClientV2] = 'cohere',
         profile: ModelProfileSpec | None = None,
+        settings: ModelSettings | None = None,
     ):
         """Initialize an Cohere model.
 
@@ -121,6 +122,7 @@ def __init__(
                 'cohere' or an instance of `Provider[AsyncClientV2]`. If not provided, a new provider will be
                 created using the other parameters.
             profile: The model profile to use. Defaults to a profile picked by the provider based on the model name.
+            settings: Model-specific settings that will be used as defaults for this model.
         """
         self._model_name = model_name
 
@@ -129,6 +131,8 @@ def __init__(
         self.client = provider.client
         self._profile = profile or provider.model_profile
 
+        super().__init__(settings=settings, profile=profile or provider.model_profile)
+
     @property
     def base_url(self) -> str:
         client_wrapper = self.client._client_wrapper  # type: ignore

tests/mcp_server.py

@@ -59,7 +59,7 @@ async def get_image_resource() -> EmbeddedResource:
 
 
 @mcp.tool()
-async def get_image_resource_1() -> ResourceLink:
+async def get_image_resource_link() -> ResourceLink:
     return ResourceLink(
         type='resource_link',
         uri=AnyUrl(Path(__file__).parent.joinpath('assets/kiwi.png').absolute().as_uri()),
@@ -81,7 +81,7 @@ async def get_audio_resource() -> EmbeddedResource:
 
 
 @mcp.tool()
-async def get_audio_resource_1() -> ResourceLink:
+async def get_audio_resource_link() -> ResourceLink:
     return ResourceLink(
         type='resource_link',
         uri=AnyUrl(Path(__file__).parent.joinpath('assets/marcelo.mp3').absolute().as_uri()),
@@ -101,7 +101,7 @@ async def get_product_name() -> EmbeddedResource:
 
 
 @mcp.tool()
-async def get_product_name_1() -> ResourceLink:
+async def get_product_name_link() -> ResourceLink:
     return ResourceLink(
         type='resource_link',
         uri=AnyUrl(Path(__file__).parent.joinpath('assets/product_name.txt').absolute().as_uri()),

tests/models/cassettes/test_model_names/test_known_model_names.yaml

@@ -15,7 +15,7 @@ interactions:
   response:
     headers:
       content-length:
-      - '545'
+      - '550'
       content-security-policy:
       - default-src 'none'; frame-ancestors 'none'
       content-type:
@@ -46,6 +46,7 @@ interactions:
       - text-to-text
     - model_id: claude-4-sonnet
       regions:
+      - eu
       - us
       type:
       - text-to-text

tests/test_mcp.py

@@ -441,8 +441,8 @@ async def test_tool_returning_text_resource(allow_model_requests: None, agent: A
 
 
 @pytest.mark.vcr()
-async def test_tool_returning_text_resource_1(allow_model_requests: None, agent: Agent):
-    async with agent.run_mcp_servers():
+async def test_tool_returning_text_resource_link(allow_model_requests: None, agent: Agent):
+    async with agent:
         result = await agent.run('Get me the product name')
         assert result.output == snapshot('The product name is "PydanticAI".')
         assert result.all_messages() == snapshot(
@@ -458,7 +458,7 @@ async def test_tool_returning_text_resource_1(allow_model_requests: None, agent:
                 ModelResponse(
                     parts=[
                         ToolCallPart(
-                            tool_name='get_product_name_1',
+                            tool_name='get_product_name_link',
                             args='{}',
                             tool_call_id='call_LaiWltzI39sdquflqeuF0EyE',
                         )
@@ -483,7 +483,7 @@ async def test_tool_returning_text_resource_1(allow_model_requests: None, agent:
                 ModelRequest(
                     parts=[
                         ToolReturnPart(
-                            tool_name='get_product_name_1',
+                            tool_name='get_product_name_link',
                             content='PydanticAI',
                             tool_call_id='call_LaiWltzI39sdquflqeuF0EyE',
                             timestamp=IsDatetime(),
@@ -594,8 +594,10 @@ async def test_tool_returning_image_resource(allow_model_requests: None, agent:
 
 
 @pytest.mark.vcr()
-async def test_tool_returning_image_resource_1(allow_model_requests: None, agent: Agent, image_content: BinaryContent):
-    async with agent.run_mcp_servers():
+async def test_tool_returning_image_resource_link(
+    allow_model_requests: None, agent: Agent, image_content: BinaryContent
+):
+    async with agent:
         result = await agent.run('Get me the image resource')
         assert result.output == snapshot(
             'This is an image of a sliced kiwi with a vibrant green interior and black seeds.'
@@ -613,7 +615,7 @@ async def test_tool_returning_image_resource_1(allow_model_requests: None, agent
                 ModelResponse(
                     parts=[
                         ToolCallPart(
-                            tool_name='get_image_resource_1',
+                            tool_name='get_image_resource_link',
                             args='{}',
                             tool_call_id='call_nFsDHYDZigO0rOHqmChZ3pmt',
                         )
@@ -638,7 +640,7 @@ async def test_tool_returning_image_resource_1(allow_model_requests: None, agent
                 ModelRequest(
                     parts=[
                         ToolReturnPart(
-                            tool_name='get_image_resource_1',
+                            tool_name='get_image_resource_link',
                             content='See file 1c8566',
                             tool_call_id='call_nFsDHYDZigO0rOHqmChZ3pmt',
                             timestamp=IsDatetime(),
@@ -728,11 +730,11 @@ async def test_tool_returning_audio_resource(
 
 
 @pytest.mark.vcr()
-async def test_tool_returning_audio_resource_1(
+async def test_tool_returning_audio_resource_link(
     allow_model_requests: None, agent: Agent, audio_content: BinaryContent, gemini_api_key: str
 ):
     model = GoogleModel('gemini-2.5-pro-preview-03-25', provider=GoogleProvider(api_key=gemini_api_key))
-    async with agent.run_mcp_servers():
+    async with agent:
         result = await agent.run("What's the content of the audio resource?", model=model)
         assert result.output == snapshot('The audio resource contains a voice saying "Hello, my name is Marcelo."')
         assert result.all_messages() == snapshot(
@@ -741,7 +743,7 @@ async def test_tool_returning_audio_resource_1(
                     parts=[UserPromptPart(content="What's the content of the audio resource?", timestamp=IsDatetime())]
                 ),
                 ModelResponse(
-                    parts=[ToolCallPart(tool_name='get_audio_resource_1', args={}, tool_call_id=IsStr())],
+                    parts=[ToolCallPart(tool_name='get_audio_resource_link', args={}, tool_call_id=IsStr())],
                     usage=Usage(
                         requests=1,
                         request_tokens=383,
@@ -756,7 +758,7 @@ async def test_tool_returning_audio_resource_1(
                 ModelRequest(
                     parts=[
                         ToolReturnPart(
-                            tool_name='get_audio_resource_1',
+                            tool_name='get_audio_resource_link',
                             content='See file 2d36ae',
                             tool_call_id=IsStr(),
                             timestamp=IsDatetime(),