A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
fix schema drift for chat-ui (ai-sdk 6) (#8105)
Shahmir Varqha637d965f5002
diff --git a/marimo/_ai/llm/_impl.py b/marimo/_ai/llm/_impl.pyindex 31f8042e7f..f91064a7d1 100644--- a/marimo/_ai/llm/_impl.py+++ b/marimo/_ai/llm/_impl.py@@ -2,12 +2,14 @@from __future__ import annotationsimport dataclasses+import jsonimport osimport refrom typing import TYPE_CHECKING, Any, Callable, Optional, castfrom marimo import _loggersfrom marimo._ai._pydantic_ai_utils import generate_id+from marimo._plugins.ui._impl.chat.chat import AI_SDK_VERSION, DONE_CHUNKfrom marimo._plugins.utils import remove_none_valuesif TYPE_CHECKING:@@ -789,21 +791,37 @@ class pydantic_ai(ChatModel):) -> dict[str, Any] | None:"""Serialize vercel ai chunk to a dictionary. Skip "done" chunks - not part of Vercel AI SDK schema.-- by_alias=True: Use camelCase keys expected by Vercel AI SDK.- exclude_none=True: Remove null values which cause validation errors.+ We use encode as it uses Pydantic-AI's method of serializing dataclasses to JSON."""try:- serialized = chunk.model_dump(- mode="json", by_alias=True, exclude_none=True- )+ encoded = chunk.encode(sdk_version=AI_SDK_VERSION)+ if encoded == DONE_CHUNK:+ return None+ result = json.loads(encoded)+ if not isinstance(result, dict):+ LOGGER.debug(+ "Serialized vercel ai chunk is not a dictionary: %s",+ result,+ )+ return result # type: ignore[no-any-return]+ except TypeError:+ # Fallback for pydantic-ai < 1.52.0 which doesn't have sdk_version param+ try:+ # by_alias=True: Use camelCase keys expected by Vercel AI SDK.+ # exclude_none=True: Remove null values which cause validation errors.+ serialized = chunk.model_dump(+ mode="json", by_alias=True, exclude_none=True+ )+ except Exception as e:+ LOGGER.error("Error serializing vercel ai chunk: %s", e)+ return None+ else:+ if serialized.get("type") == "done":+ return None+ return serializedexcept Exception as e:LOGGER.error("Error serializing vercel ai chunk: %s", e)return None- else:- if serialized.get("type") == "done":- return None- return serializedasync def _stream_response(self, messages: list[ChatMessage], config: ChatModelConfigdiff --git a/marimo/_plugins/ui/_impl/chat/chat.py b/marimo/_plugins/ui/_impl/chat/chat.pyindex 9c3d25ca3b..9d8622c6b8 100644--- a/marimo/_plugins/ui/_impl/chat/chat.py+++ b/marimo/_plugins/ui/_impl/chat/chat.py@@ -2,9 +2,10 @@from __future__ import annotationsimport inspect+import jsonimport uuidfrom dataclasses import dataclass-from typing import Any, Callable, Final, Optional, Union, cast+from typing import Any, Callable, Final, Literal, Optional, Union, castfrom marimo import _loggersfrom marimo._ai._types import (@@ -34,6 +35,8 @@ DEFAULT_CONFIG = ChatModelConfigDict(presence_penalty=0,)+# The version of the Vercel AI SDK we use+AI_SDK_VERSION: Final[Literal[5, 6]] = 5DONE_CHUNK: Final[str] = "[DONE]"@@ -464,13 +467,16 @@ class ChunkSerializer:)if isinstance(chunk, BaseChunk):- # by_alias=True: Use camelCase keys expected by Vercel AI SDK.- # exclude_none=True: Remove null values which cause validation errors.- self.on_send_chunk(- chunk.model_dump(+ try:+ serialized = json.loads(+ chunk.encode(sdk_version=AI_SDK_VERSION)+ )+ except TypeError:+ # Fallback for pydantic-ai < 1.52.0 which doesn't have sdk_version param+ serialized = chunk.model_dump(mode="json", by_alias=True, exclude_none=True)- )+ self.on_send_chunk(serialized)return# Handle plain text chunksdiff --git a/marimo/_server/ai/providers.py b/marimo/_server/ai/providers.pyindex 4869109003..6d3791d148 100644--- a/marimo/_server/ai/providers.py+++ b/marimo/_server/ai/providers.py@@ -25,6 +25,7 @@ from marimo._ai._pydantic_ai_utils import (generate_id,)from marimo._dependencies.dependencies import Dependency, DependencyManager+from marimo._plugins.ui._impl.chat.chat import AI_SDK_VERSIONfrom marimo._server.ai.config import AnyProviderConfigfrom marimo._server.ai.ids import AiModelIdfrom marimo._server.ai.tools.tool_manager import get_tool_manager@@ -166,9 +167,17 @@ class PydanticProvider(ABC, Generic[ProviderT]):stream_options = stream_options or StreamOptions()vercel_adapter = self.get_vercel_adapter()- adapter = vercel_adapter(- agent=agent, run_input=run_input, accept=stream_options.accept- )+ if DependencyManager.pydantic_ai.has_at_version(min_version="1.52.0"):+ adapter = vercel_adapter(+ agent=agent,+ run_input=run_input,+ accept=stream_options.accept,+ sdk_version=AI_SDK_VERSION,+ )+ else:+ adapter = vercel_adapter(+ agent=agent, run_input=run_input, accept=stream_options.accept+ )event_stream = adapter.run_stream()return adapter.streaming_response(event_stream)diff --git a/pyproject.toml b/pyproject.tomlindex f5fef6f1ab..22c5991b3a 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -129,7 +129,7 @@ dev = [# For linting"ruff>=0.13.2",# For AI- "pydantic-ai-slim[openai]>=1.47.0",+ "pydantic-ai-slim[openai]>=1.52.0",]test = [@@ -186,7 +186,7 @@ test-optional = ["anywidget~=0.9.18","ipython~=8.12.3",# testing gen ai- "pydantic-ai-slim[google,anthropic,bedrock,openai]>=1.47.0",+ "pydantic-ai-slim[google,anthropic,bedrock,openai]>=1.52.0",# - google-auth uses cachetools, and cachetools<5.0.0 uses collections.MutableMapping (removed in Python 3.10)"cachetools>=5.0.0","boto3>=1.38.46",@@ -246,7 +246,7 @@ dependencies = ["matplotlib>=3.8.0","sqlglot[rs]>=26.2.0","sqlalchemy>=2.0.40",- "pydantic-ai-slim[google,anthropic,bedrock,openai]>=1.47.0",+ "pydantic-ai-slim[google,anthropic,bedrock,openai]>=1.52.0","loro>=1.5.0","pandas-stubs>=1.5.3.230321","pyiceberg>=0.9.0",diff --git a/tests/_ai/llm/test_impl.py b/tests/_ai/llm/test_impl.pyindex 4d7ed47314..02aedb0b6c 100644--- a/tests/_ai/llm/test_impl.py+++ b/tests/_ai/llm/test_impl.py@@ -1591,6 +1591,42 @@ class TestPydanticAI:"input": {"query": "test"},}+ def test_pydantic_ai_serialize_vercel_ai_chunk_v5(self) -> None:+ """Test that tool-input-start chunks exclude providerMetadata for SDK v5.++ The Vercel AI SDK v5 schema drifts from v6, so we need to use Pydantic's handling.++ For tool-input-start chunks, providerMetadata must be excluded.+ See: https://github.com/pydantic/pydantic-ai/pull/4166+ """+ from pydantic_ai.ui.vercel_ai.response_types import ToolInputStartChunk++ mock_agent = MagicMock()+ model = pydantic_ai(mock_agent)++ # Create chunk with providerMetadata (like Google Gemini produces)+ chunk = ToolInputStartChunk(+ tool_call_id="tc_1",+ tool_name="my_tool",+ provider_metadata={+ "pydantic_ai": {+ "id": "test_id",+ "provider_name": "google-gla",+ "provider_details": {+ "thought_signature": "encrypted_data"+ },+ }+ },+ )+ result = model._serialize_vercel_ai_chunk(chunk)++ # providerMetadata should be excluded for SDK v5 compatibility+ assert result == {+ "type": "tool-input-start",+ "toolCallId": "tc_1",+ "toolName": "my_tool",+ }+def test_pydantic_ai_serialize_vercel_ai_chunk_done_type(self) -> None:"""Test that 'done' type chunks are skipped."""from pydantic_ai.ui.vercel_ai.response_types import DoneChunkdiff --git a/tests/_plugins/ui/_impl/chat/test_chat.py b/tests/_plugins/ui/_impl/chat/test_chat.pyindex dc4a15afe3..52809907a7 100644--- a/tests/_plugins/ui/_impl/chat/test_chat.py+++ b/tests/_plugins/ui/_impl/chat/test_chat.py@@ -953,7 +953,6 @@ def test_serialize_pydantic_chunk():serializer = ChunkSerializer(on_send_chunk=on_send_chunk)- # Pydantic BaseChunk should be serialized with model_dumpchunk = TextDeltaChunk(id="text-1", delta="Hello")serializer.handle_chunk(chunk)@@ -963,6 +962,51 @@ def test_serialize_pydantic_chunk():]+ not DependencyManager.pydantic_ai.has(),+ reason="Pydantic AI is not installed",+)+def test_serialize_pydantic_v5():+ """Test ChunkSerializer excludes providerMetadata from tool-input-start for SDK v5.++ The Vercel AI SDK v5 schema drifts from v6, so we need to use Pydantic's handling.++ Since pydantic-ai uses toolCallId, providerMetadata must be excluded.+ See: https://github.com/pydantic/pydantic-ai/pull/4166+ """+ from pydantic_ai.ui.vercel_ai.response_types import ToolInputStartChunk++ sent_chunks: list[dict] = []++ def on_send_chunk(chunk: dict):+ sent_chunks.append(chunk)++ serializer = ChunkSerializer(on_send_chunk=on_send_chunk)++ # Create chunk with providerMetadata (like Google Gemini produces)+ chunk = ToolInputStartChunk(+ tool_call_id="tc_1",+ tool_name="my_tool",+ provider_metadata={+ "pydantic_ai": {+ "id": "test_id",+ "provider_name": "google-gla",+ "provider_details": {"thought_signature": "encrypted_data"},+ }+ },+ )+ serializer.handle_chunk(chunk)++ # providerMetadata should be excluded for SDK v5 compatibility+ assert sent_chunks == [+ {+ "type": "tool-input-start",+ "toolCallId": "tc_1",+ "toolName": "my_tool",+ }+ ]++@pytest.mark.skipif(not DependencyManager.pydantic_ai.has(),reason="Pydantic AI is not installed",