fix tests

libs/core/langchain_core/messages/__init__.py

@@ -47,11 +47,11 @@ if TYPE_CHECKING:
         NonStandardContentBlock,
         PlainTextContentBlock,
         ReasoningContentBlock,
-        SearchCall,
-        SearchResult,
         TextContentBlock,
         ToolCallContentBlock,
         VideoContentBlock,
+        WebSearchCall,
+        WebSearchResult,
         convert_to_openai_data_block,
         convert_to_openai_image_block,
         is_data_content_block,
@@ -110,8 +110,6 @@ __all__ = (
     "PlainTextContentBlock",
     "ReasoningContentBlock",
     "RemoveMessage",
-    "SearchCall",
-    "SearchResult",
     "SystemMessage",
     "SystemMessageChunk",
     "TextContentBlock",
@@ -121,6 +119,8 @@ __all__ = (
     "ToolMessage",
     "ToolMessageChunk",
     "VideoContentBlock",
+    "WebSearchCall",
+    "WebSearchResult",
     "_message_from_dict",
     "convert_to_messages",
     "convert_to_openai_data_block",
@@ -168,8 +168,8 @@ _dynamic_imports = {
     "RemoveMessage": "modifier",
     "SystemMessage": "system",
     "SystemMessageChunk": "system",
-    "SearchCall": "content_blocks",
+    "WebSearchCall": "content_blocks",
-    "SearchResult": "content_blocks",
+    "WebSearchResult": "content_blocks",
     "ImageContentBlock": "content_blocks",
     "InvalidToolCall": "tool",
     "TextContentBlock": "content_blocks",

libs/core/langchain_core/messages/content_blocks.py

@@ -80,7 +80,6 @@ The module defines several types of content blocks, including:
 import warnings
 from typing import Any, Literal, Union
 
-from pydantic import TypeAdapter, ValidationError
 from typing_extensions import NotRequired, TypedDict, get_args, get_origin
 
 # --- Text and annotations ---
@@ -212,10 +211,10 @@ class ToolCallContentBlock(TypedDict):
 
 
 # Web search
-class SearchCall(TypedDict):
+class WebSearchCall(TypedDict):
     """Content block for a built-in web search tool call."""
 
-    type: Literal["search_call"]
+    type: Literal["web_search_call"]
     """Type of the content block."""
 
     id: NotRequired[str]
@@ -229,10 +228,10 @@ class SearchCall(TypedDict):
     """The search query used in the web search tool call."""
 
 
-class SearchResult(TypedDict):
+class WebSearchResult(TypedDict):
-    """Content block for the result of a built-in search tool call."""
+    """Content block for the result of a built-in web search tool call."""
 
-    type: Literal["search_result"]
+    type: Literal["web_search_result"]
     """Type of the content block."""
 
     id: NotRequired[str]
@@ -603,8 +602,8 @@ ToolContentBlock = Union[
     CodeInterpreterCall,
     CodeInterpreterOutput,
     CodeInterpreterResult,
-    SearchCall,
+    WebSearchCall,
-    SearchResult,
+    WebSearchResult,
 ]
 
 ContentBlock = Union[
@@ -634,9 +633,6 @@ KNOWN_BLOCK_TYPES = {
     bt for bt in get_args(ContentBlock) for bt in get_args(bt.__annotations__["type"])
 }
 
-# Adapter for DataContentBlock
-_DataAdapter: TypeAdapter[DataContentBlock] = TypeAdapter(DataContentBlock)
-
 
 def is_data_content_block(block: dict) -> bool:
     """Check if the content block is a standard data content block.
@@ -647,12 +643,22 @@ def is_data_content_block(block: dict) -> bool:
     Returns:
         True if the content block is a data content block, False otherwise.
     """
-    try:
+    return block.get("type") in (
-        _DataAdapter.validate_python(block)
+        "audio",
-    except ValidationError:
+        "image",
-        return False
+        "video",
-    else:
+        "file",
-        return True
+        "text-plain",
+    ) and any(
+        key in block
+        for key in (
+            "url",
+            "base64",
+            "file_id",
+            "text",
+            "source_type",  # backwards compatibility
+        )
+    )
 
 
 # TODO: don't use `source_type` anymore

libs/core/tests/unit_tests/messages/test_imports.py

@@ -5,21 +5,29 @@ EXPECTED_ALL = [
     "_message_from_dict",
     "AIMessage",
     "AIMessageChunk",
+    "Annotation",
     "AnyMessage",
-    "Base64ContentBlock",
+    "AudioContentBlock",
     "BaseMessage",
     "BaseMessageChunk",
     "ContentBlock",
     "ChatMessage",
     "ChatMessageChunk",
-    "DocumentCitation",
+    "Citation",
+    "CodeInterpreterCall",
+    "CodeInterpreterOutput",
+    "CodeInterpreterResult",
+    "DataContentBlock",
+    "FileContentBlock",
     "FunctionMessage",
     "FunctionMessageChunk",
     "HumanMessage",
     "HumanMessageChunk",
+    "ImageContentBlock",
     "InvalidToolCall",
     "NonStandardAnnotation",
     "NonStandardContentBlock",
+    "PlainTextContentBlock",
     "SystemMessage",
     "SystemMessageChunk",
     "TextContentBlock",
@@ -28,7 +36,9 @@ EXPECTED_ALL = [
     "ToolCallContentBlock",
     "ToolMessage",
     "ToolMessageChunk",
-    "UrlCitation",
+    "VideoContentBlock",
+    "WebSearchCall",
+    "WebSearchResult",
     "ReasoningContentBlock",
     "RemoveMessage",
     "convert_to_messages",

libs/core/tests/unit_tests/test_messages.py

@@ -1112,23 +1112,20 @@ def test_is_data_content_block() -> None:
     assert is_data_content_block(
         {
             "type": "image",
-            "source_type": "url",
             "url": "https://...",
         }
     )
     assert is_data_content_block(
         {
             "type": "image",
-            "source_type": "base64",
+            "base64": "<base64 data>",
-            "data": "<base64 data>",
             "mime_type": "image/jpeg",
         }
     )
     assert is_data_content_block(
         {
             "type": "image",
-            "source_type": "base64",
+            "base64": "<base64 data>",
-            "data": "<base64 data>",
             "mime_type": "image/jpeg",
             "cache_control": {"type": "ephemeral"},
         }
@@ -1136,13 +1133,17 @@ def test_is_data_content_block() -> None:
     assert is_data_content_block(
         {
             "type": "image",
-            "source_type": "base64",
+            "base64": "<base64 data>",
-            "data": "<base64 data>",
             "mime_type": "image/jpeg",
             "metadata": {"cache_control": {"type": "ephemeral"}},
         }
     )
-
+    assert is_data_content_block(
+        {
+            "type": "image",
+            "source_type": "base64",  # backward compatibility
+        }
+    )
     assert not is_data_content_block(
         {
             "type": "text",
@@ -1155,12 +1156,6 @@ def test_is_data_content_block() -> None:
             "image_url": {"url": "https://..."},
         }
     )
-    assert not is_data_content_block(
-        {
-            "type": "image",
-            "source_type": "base64",
-        }
-    )
     assert not is_data_content_block(
         {
             "type": "image",
@@ -1203,10 +1198,17 @@ def test_convert_to_openai_image_block() -> None:
 def test_known_block_types() -> None:
     assert {
         "text",
+        "text-plain",
         "tool_call",
         "reasoning",
         "non_standard",
         "image",
         "audio",
         "file",
+        "video",
+        "code_interpreter_call",
+        "code_interpreter_output",
+        "code_interpreter_result",
+        "web_search_call",
+        "web_search_result",
     } == KNOWN_BLOCK_TYPES