Update cohere and MCP, add support for MCP ResourceLink returned from tools

docs/logfire.md

@@ -283,17 +283,17 @@ Note that the OpenTelemetry Semantic Conventions are still experimental and are
 
 ### Setting OpenTelemetry SDK providers
 
-By default, the global `TracerProvider` and `EventLoggerProvider` are used. These are set automatically by `logfire.configure()`. They can also be set by the `set_tracer_provider` and `set_event_logger_provider` functions in the OpenTelemetry Python SDK. You can set custom providers with [`InstrumentationSettings`][pydantic_ai.models.instrumented.InstrumentationSettings].
+By default, the global `TracerProvider` and `LoggerProvider` are used. These are set automatically by `logfire.configure()`. They can also be set by the `set_tracer_provider` and `set_event_logger_provider` functions in the OpenTelemetry Python SDK. You can set custom providers with [`InstrumentationSettings`][pydantic_ai.models.instrumented.InstrumentationSettings].
 
 ```python {title="instrumentation_settings_providers.py"}
-from opentelemetry.sdk._events import EventLoggerProvider
+from opentelemetry.sdk._logs import LoggerProvider
 from opentelemetry.sdk.trace import TracerProvider
 
 from pydantic_ai.agent import Agent, InstrumentationSettings
 
 instrumentation_settings = InstrumentationSettings(
     tracer_provider=TracerProvider(),
-    event_logger_provider=EventLoggerProvider(),
+    event_logger_provider=LoggerProvider(),
 )
 
 agent = Agent('gpt-4o', instrument=instrumentation_settings)

docs/mcp/server.md

@@ -117,7 +117,10 @@ async def sampling_callback(
         SamplingMessage(
             role='user',
             content=TextContent(
-                type='text', text='write a poem about socks', annotations=None
+                type='text',
+                text='write a poem about socks',
+                annotations=None,
+                meta=None,
             ),
         )
     ]

pydantic_ai_slim/pydantic_ai/mcp.py

@@ -148,7 +148,7 @@ async def direct_call_tool(
             except McpError as e:
                 raise exceptions.ModelRetry(e.error.message)
 
-        content = [self._map_tool_result_part(part) for part in result.content]
+        content = [await self._map_tool_result_part(part) for part in result.content]
 
         if result.isError:
             text = '\n'.join(str(part) for part in content)
@@ -258,8 +258,8 @@ async def _sampling_callback(
             model=self.sampling_model.model_name,
         )
 
-    def _map_tool_result_part(
-        self, part: mcp_types.Content
+    async def _map_tool_result_part(
+        self, part: mcp_types.ContentBlock
     ) -> str | messages.BinaryContent | dict[str, Any] | list[Any]:
         # See https://github.com/jlowin/fastmcp/blob/main/docs/servers/tools.mdx#return-values
 
@@ -281,18 +281,28 @@ def _map_tool_result_part(
             )  # pragma: no cover
         elif isinstance(part, mcp_types.EmbeddedResource):
             resource = part.resource
-            if isinstance(resource, mcp_types.TextResourceContents):
-                return resource.text
-            elif isinstance(resource, mcp_types.BlobResourceContents):
-                return messages.BinaryContent(
-                    data=base64.b64decode(resource.blob),
-                    media_type=resource.mimeType or 'application/octet-stream',
-                )
+            return self._get_content(resource)
+        elif isinstance(part, mcp_types.ResourceLink):
+            resource_result: mcp_types.ReadResourceResult = await self._client.read_resource(part.uri)
+            if len(resource_result.contents) > 1:
+                return [self._get_content(resource) for resource in resource_result.contents]
             else:
-                assert_never(resource)
+                return self._get_content(resource_result.contents[0])
         else:
             assert_never(part)
 
+    def _get_content(
+        self, resource: mcp_types.TextResourceContents | mcp_types.BlobResourceContents
+    ) -> str | messages.BinaryContent:
+        if isinstance(resource, mcp_types.TextResourceContents):
+            return resource.text
+        elif isinstance(resource, mcp_types.BlobResourceContents):
+            return messages.BinaryContent(
+                data=base64.b64decode(resource.blob), media_type=resource.mimeType or 'application/octet-stream'
+            )
+        else:
+            assert_never(resource)
+
 
 @dataclass
 class MCPServerStdio(MCPServer):

pydantic_ai_slim/pydantic_ai/messages.py

@@ -10,7 +10,7 @@
 
 import pydantic
 import pydantic_core
-from opentelemetry._events import Event  # pyright: ignore[reportPrivateImportUsage]
+from opentelemetry._logs import LogRecord  # pyright: ignore[reportPrivateImportUsage]
 from typing_extensions import TypeAlias, deprecated
 
 from . import _utils
@@ -76,9 +76,9 @@ class SystemPromptPart:
     part_kind: Literal['system-prompt'] = 'system-prompt'
     """Part type identifier, this is available on all parts as a discriminator."""
 
-    def otel_event(self, settings: InstrumentationSettings) -> Event:
-        return Event(
-            'gen_ai.system.message',
+    def otel_event(self, settings: InstrumentationSettings) -> LogRecord:
+        return LogRecord(
+            event_name='gen_ai.system.message',
             body={'role': 'system', **({'content': self.content} if settings.include_content else {})},
         )
 
@@ -410,7 +410,7 @@ class UserPromptPart:
     part_kind: Literal['user-prompt'] = 'user-prompt'
     """Part type identifier, this is available on all parts as a discriminator."""
 
-    def otel_event(self, settings: InstrumentationSettings) -> Event:
+    def otel_event(self, settings: InstrumentationSettings) -> LogRecord:
         content: str | list[dict[str, Any] | str] | dict[str, Any]
         if isinstance(self.content, str):
             content = self.content if settings.include_content else {'kind': 'text'}
@@ -428,7 +428,7 @@ def otel_event(self, settings: InstrumentationSettings) -> Event:
                     content.append(converted_part)
                 else:
                     content.append({'kind': part.kind})  # pragma: no cover
-        return Event('gen_ai.user.message', body={'content': content, 'role': 'user'})
+        return LogRecord(event_name='gen_ai.user.message', body={'content': content, 'role': 'user'})
 
     __repr__ = _utils.dataclasses_no_defaults_repr
 
@@ -475,9 +475,9 @@ def model_response_object(self) -> dict[str, Any]:
         else:
             return {'return_value': tool_return_ta.dump_python(self.content, mode='json')}
 
-    def otel_event(self, settings: InstrumentationSettings) -> Event:
-        return Event(
-            'gen_ai.tool.message',
+    def otel_event(self, settings: InstrumentationSettings) -> LogRecord:
+        return LogRecord(
+            event_name='gen_ai.tool.message',
             body={
                 **({'content': self.content} if settings.include_content else {}),
                 'role': 'tool',
@@ -542,12 +542,12 @@ def model_response(self) -> str:
             description = f'{len(self.content)} validation errors: {json_errors.decode()}'
         return f'{description}\n\nFix the errors and try again.'
 
-    def otel_event(self, settings: InstrumentationSettings) -> Event:
+    def otel_event(self, settings: InstrumentationSettings) -> LogRecord:
         if self.tool_name is None:
-            return Event('gen_ai.user.message', body={'content': self.model_response(), 'role': 'user'})
+            return LogRecord(event_name='gen_ai.user.message', body={'content': self.model_response(), 'role': 'user'})
         else:
-            return Event(
-                'gen_ai.tool.message',
+            return LogRecord(
+                event_name='gen_ai.tool.message',
                 body={
                     **({'content': self.model_response()} if settings.include_content else {}),
                     'role': 'tool',
@@ -726,13 +726,13 @@ class ModelResponse:
     vendor_id: str | None = None
     """Vendor ID as specified by the model provider. This can be used to track the specific request to the model."""
 
-    def otel_events(self, settings: InstrumentationSettings) -> list[Event]:
+    def otel_events(self, settings: InstrumentationSettings) -> list[LogRecord]:
         """Return OpenTelemetry events for the response."""
-        result: list[Event] = []
+        result: list[LogRecord] = []
 
         def new_event_body():
             new_body: dict[str, Any] = {'role': 'assistant'}
-            ev = Event('gen_ai.assistant.message', body=new_body)
+            ev = LogRecord(event_name='gen_ai.assistant.message', body=new_body)
             result.append(ev)
             return new_body
 

pydantic_ai_slim/pydantic_ai/models/cohere.py

@@ -40,7 +40,7 @@
         ChatMessageV2,
         ChatResponse,
         SystemChatMessageV2,
-        TextAssistantMessageContentItem,
+        TextAssistantMessageV2ContentItem,
         ToolCallV2,
         ToolCallV2Function,
         ToolChatMessageV2,
@@ -227,7 +227,7 @@ def _map_messages(self, messages: list[ModelMessage]) -> list[ChatMessageV2]:
                         assert_never(item)
                 message_param = AssistantChatMessageV2(role='assistant')
                 if texts:
-                    message_param.content = [TextAssistantMessageContentItem(text='\n\n'.join(texts))]
+                    message_param.content = [TextAssistantMessageV2ContentItem(text='\n\n'.join(texts))]
                 if tool_calls:
                     message_param.tool_calls = tool_calls
                 cohere_messages.append(message_param)

pydantic_ai_slim/pydantic_ai/models/instrumented.py

@@ -7,11 +7,11 @@
 from typing import Any, Callable, Literal
 from urllib.parse import urlparse
 
-from opentelemetry._events import (
-    Event,  # pyright: ignore[reportPrivateImportUsage]
-    EventLogger,  # pyright: ignore[reportPrivateImportUsage]
-    EventLoggerProvider,  # pyright: ignore[reportPrivateImportUsage]
-    get_event_logger_provider,  # pyright: ignore[reportPrivateImportUsage]
+from opentelemetry._logs import (
+    Logger,  # pyright: ignore[reportPrivateImportUsage]
+    LoggerProvider,  # pyright: ignore[reportPrivateImportUsage]
+    LogRecord,  # pyright: ignore[reportPrivateImportUsage]
+    get_logger_provider,  # pyright: ignore[reportPrivateImportUsage]
 )
 from opentelemetry.metrics import MeterProvider, get_meter_provider
 from opentelemetry.trace import Span, Tracer, TracerProvider, get_tracer_provider
@@ -80,7 +80,7 @@ class InstrumentationSettings:
     """
 
     tracer: Tracer = field(repr=False)
-    event_logger: EventLogger = field(repr=False)
+    event_logger: Logger = field(repr=False)
     event_mode: Literal['attributes', 'logs'] = 'attributes'
     include_binary_content: bool = True
 
@@ -90,7 +90,7 @@ def __init__(
         event_mode: Literal['attributes', 'logs'] = 'attributes',
         tracer_provider: TracerProvider | None = None,
         meter_provider: MeterProvider | None = None,
-        event_logger_provider: EventLoggerProvider | None = None,
+        event_logger_provider: LoggerProvider | None = None,
         include_binary_content: bool = True,
         include_content: bool = True,
     ):
@@ -117,11 +117,11 @@ def __init__(
 
         tracer_provider = tracer_provider or get_tracer_provider()
         meter_provider = meter_provider or get_meter_provider()
-        event_logger_provider = event_logger_provider or get_event_logger_provider()
+        event_logger_provider = event_logger_provider or get_logger_provider()
         scope_name = 'pydantic-ai'
         self.tracer = tracer_provider.get_tracer(scope_name, __version__)
         self.meter = meter_provider.get_meter(scope_name, __version__)
-        self.event_logger = event_logger_provider.get_event_logger(scope_name, __version__)
+        self.event_logger = event_logger_provider.get_logger(scope_name, __version__)
         self.event_mode = event_mode
         self.include_binary_content = include_binary_content
         self.include_content = include_content
@@ -144,7 +144,7 @@ def __init__(
                 **tokens_histogram_kwargs,  # pyright: ignore
             )
 
-    def messages_to_otel_events(self, messages: list[ModelMessage]) -> list[Event]:
+    def messages_to_otel_events(self, messages: list[ModelMessage]) -> list[LogRecord]:
         """Convert a list of model messages to OpenTelemetry events.
 
         Args:
@@ -153,13 +153,15 @@ def messages_to_otel_events(self, messages: list[ModelMessage]) -> list[Event]:
         Returns:
             A list of OpenTelemetry events.
         """
-        events: list[Event] = []
+        events: list[LogRecord] = []
         instructions = InstrumentedModel._get_instructions(messages)  # pyright: ignore [reportPrivateUsage]
         if instructions is not None:
-            events.append(Event('gen_ai.system.message', body={'content': instructions, 'role': 'system'}))
+            events.append(
+                LogRecord(event_name='gen_ai.system.message', body={'content': instructions, 'role': 'system'})
+            )
 
         for message_index, message in enumerate(messages):
-            message_events: list[Event] = []
+            message_events: list[LogRecord] = []
             if isinstance(message, ModelRequest):
                 for part in message.parts:
                     if hasattr(part, 'otel_event'):
@@ -297,8 +299,8 @@ def _record_metrics():
                     events = self.instrumentation_settings.messages_to_otel_events(messages)
                     for event in self.instrumentation_settings.messages_to_otel_events([response]):
                         events.append(
-                            Event(
-                                'gen_ai.choice',
+                            LogRecord(
+                                event_name='gen_ai.choice',
                                 body={
                                     # TODO finish_reason
                                     'index': 0,
@@ -327,7 +329,7 @@ def _record_metrics():
                 # to prevent them from being redundantly recorded in the span itself by logfire.
                 record_metrics()
 
-    def _emit_events(self, span: Span, events: list[Event]) -> None:
+    def _emit_events(self, span: Span, events: list[LogRecord]) -> None:
         if self.instrumentation_settings.event_mode == 'logs':
             for event in events:
                 self.instrumentation_settings.event_logger.emit(event)
@@ -368,11 +370,11 @@ def model_attributes(model: Model):
         return attributes
 
     @staticmethod
-    def event_to_dict(event: Event) -> dict[str, Any]:
+    def event_to_dict(event: LogRecord) -> dict[str, Any]:
         if not event.body:
             body = {}  # pragma: no cover
         elif isinstance(event.body, Mapping):
-            body = event.body  # type: ignore
+            body = event.body
         else:
             body = {'body': event.body}
         return {**body, **(event.attributes or {})}

pydantic_ai_slim/pyproject.toml

@@ -54,7 +54,7 @@ dependencies = [
     "pydantic>=2.10",
     "pydantic-graph=={{ version }}",
     "exceptiongroup; python_version < '3.11'",
-    "opentelemetry-api>=1.28.0",
+    "opentelemetry-api>=1.35.0",
     "typing-inspection>=0.4.0",
 ]
 
@@ -63,7 +63,7 @@ dependencies = [
 logfire = ["logfire>=3.11.0"]
 # Models
 openai = ["openai>=1.92.0"]
-cohere = ["cohere>=5.13.11; platform_system != 'Emscripten'"]
+cohere = ["cohere>=5.16.0; platform_system != 'Emscripten'"]
 vertexai = ["google-auth>=2.36.0", "requests>=2.32.2"]
 google = ["google-genai>=1.24.0"]
 anthropic = ["anthropic>=0.52.0"]
@@ -77,7 +77,7 @@ tavily = ["tavily-python>=0.5.0"]
 # CLI
 cli = ["rich>=13", "prompt-toolkit>=3", "argcomplete>=3.5.0"]
 # MCP
-mcp = ["mcp>=1.9.4; python_version >= '3.10'"]
+mcp = ["mcp>=1.10.0; python_version >= '3.10'"]
 # Evals
 evals = ["pydantic-evals=={{ version }}"]
 # A2A

tests/assets/product_name.txt

@@ -0,0 +1 @@
+Pydantic AI