langchain-core 1.0.0a6__py3-none-any.whl → 1.0.4__py3-none-any.whl

langchain_core/messages/base.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Optional, Union, cast, overload
+from typing import TYPE_CHECKING, Any, cast, overload
 
 from pydantic import ConfigDict, Field
 from typing_extensions import Self
@@ -22,7 +22,7 @@ if TYPE_CHECKING:
 
 def _extract_reasoning_from_additional_kwargs(
     message: BaseMessage,
-) -> Optional[types.ReasoningContentBlock]:
+) -> types.ReasoningContentBlock | None:
     """Extract `reasoning_content` from `additional_kwargs`.
 
     Handles reasoning content stored in various formats:
@@ -34,13 +34,11 @@ def _extract_reasoning_from_additional_kwargs(
     Returns:
         A `ReasoningContentBlock` if reasoning content is found, None otherwise.
     """
-    from langchain_core.messages.content import create_reasoning_block  # noqa: PLC0415
-
     additional_kwargs = getattr(message, "additional_kwargs", {})
 
     reasoning_content = additional_kwargs.get("reasoning_content")
     if reasoning_content is not None and isinstance(reasoning_content, str):
-        return create_reasoning_block(reasoning=reasoning_content)
+        return {"type": "reasoning", "reasoning": reasoning_content}
 
     return None
 
@@ -50,13 +48,13 @@ class TextAccessor(str):
 
     Exists to maintain backward compatibility while transitioning from method-based to
     property-based text access in message objects. In LangChain <v1.0, message text was
-    accessed via ``.text()`` method calls. In v1.0=<, the preferred pattern is property
-    access via ``.text``.
+    accessed via `.text()` method calls. In v1.0=<, the preferred pattern is property
+    access via `.text`.
 
-    Rather than breaking existing code immediately, ``TextAccessor`` allows both
+    Rather than breaking existing code immediately, `TextAccessor` allows both
     patterns:
-    - Modern property access: ``message.text`` (returns string directly)
-    - Legacy method access: ``message.text()`` (callable, emits deprecation warning)
+    - Modern property access: `message.text` (returns string directly)
+    - Legacy method access: `message.text()` (callable, emits deprecation warning)
 
     """
 
@@ -69,12 +67,12 @@ class TextAccessor(str):
     def __call__(self) -> str:
         """Enable method-style text access for backward compatibility.
 
-        This method exists solely to support legacy code that calls ``.text()``
-        as a method. New code should use property access (``.text``) instead.
+        This method exists solely to support legacy code that calls `.text()`
+        as a method. New code should use property access (`.text`) instead.
 
-        .. deprecated:: 1.0.0
-            Calling ``.text()`` as a method is deprecated. Use ``.text`` as a property
-            instead. This method will be removed in 2.0.0.
+        !!! deprecated
+            As of `langchain-core` 1.0.0, calling `.text()` as a method is deprecated.
+            Use `.text` as a property instead. This method will be removed in 2.0.0.
 
         Returns:
             The string content, identical to property access.
@@ -94,11 +92,15 @@ class TextAccessor(str):
 class BaseMessage(Serializable):
     """Base abstract message class.
 
-    Messages are the inputs and outputs of ``ChatModel``s.
+    Messages are the inputs and outputs of a chat model.
+
+    Examples include [`HumanMessage`][langchain.messages.HumanMessage],
+    [`AIMessage`][langchain.messages.AIMessage], and
+    [`SystemMessage`][langchain.messages.SystemMessage].
     """
 
-    content: Union[str, list[Union[str, dict]]]
-    """The string contents of the message."""
+    content: str | list[str | dict]
+    """The contents of the message."""
 
     additional_kwargs: dict = Field(default_factory=dict)
     """Reserved for additional payload data associated with the message.
@@ -119,7 +121,7 @@ class BaseMessage(Serializable):
 
     """
 
-    name: Optional[str] = None
+    name: str | None = None
     """An optional name for the message.
 
     This can be used to provide a human-readable name for the message.
@@ -129,7 +131,7 @@ class BaseMessage(Serializable):
 
     """
 
-    id: Optional[str] = Field(default=None, coerce_numbers_to_str=True)
+    id: str | None = Field(default=None, coerce_numbers_to_str=True)
     """An optional unique identifier for the message.
 
     This should ideally be provided by the provider/model which created the message.
@@ -143,32 +145,32 @@ class BaseMessage(Serializable):
     @overload
     def __init__(
         self,
-        content: Union[str, list[Union[str, dict]]],
+        content: str | list[str | dict],
         **kwargs: Any,
     ) -> None: ...
 
     @overload
     def __init__(
         self,
-        content: Optional[Union[str, list[Union[str, dict]]]] = None,
-        content_blocks: Optional[list[types.ContentBlock]] = None,
+        content: str | list[str | dict] | None = None,
+        content_blocks: list[types.ContentBlock] | None = None,
         **kwargs: Any,
     ) -> None: ...
 
     def __init__(
         self,
-        content: Optional[Union[str, list[Union[str, dict]]]] = None,
-        content_blocks: Optional[list[types.ContentBlock]] = None,
+        content: str | list[str | dict] | None = None,
+        content_blocks: list[types.ContentBlock] | None = None,
         **kwargs: Any,
     ) -> None:
-        """Initialize ``BaseMessage``.
+        """Initialize a `BaseMessage`.
 
-        Specify ``content`` as positional arg or ``content_blocks`` for typing.
+        Specify `content` as positional arg or `content_blocks` for typing.
 
         Args:
-            content: The string contents of the message.
+            content: The contents of the message.
             content_blocks: Typed standard content.
-            kwargs: Additional arguments to pass to the parent class.
+            **kwargs: Additional arguments to pass to the parent class.
         """
         if content_blocks is not None:
             super().__init__(content=content_blocks, **kwargs)
@@ -177,7 +179,7 @@ class BaseMessage(Serializable):
 
     @classmethod
     def is_lc_serializable(cls) -> bool:
-        """``BaseMessage`` is serializable.
+        """`BaseMessage` is serializable.
 
         Returns:
             True
@@ -186,10 +188,10 @@ class BaseMessage(Serializable):
 
     @classmethod
     def get_lc_namespace(cls) -> list[str]:
-        """Get the namespace of the langchain object.
+        """Get the namespace of the LangChain object.
 
         Returns:
-            ``["langchain", "schema", "messages"]``
+            `["langchain", "schema", "messages"]`
         """
         return ["langchain", "schema", "messages"]
 
@@ -197,7 +199,7 @@ class BaseMessage(Serializable):
     def content_blocks(self) -> list[types.ContentBlock]:
         r"""Load content blocks from the message content.
 
-        .. versionadded:: 1.0.0
+        !!! version-added "Added in `langchain-core` 1.0.0"
 
         """
         # Needed here to avoid circular import, as these classes import BaseMessages
@@ -261,11 +263,11 @@ class BaseMessage(Serializable):
     def text(self) -> TextAccessor:
         """Get the text content of the message as a string.
 
-        Can be used as both property (``message.text``) and method (``message.text()``).
+        Can be used as both property (`message.text`) and method (`message.text()`).
 
-        .. deprecated:: 1.0.0
-            Calling ``.text()`` as a method is deprecated. Use ``.text`` as a property
-            instead. This method will be removed in 2.0.0.
+        !!! deprecated
+            As of `langchain-core` 1.0.0, calling `.text()` as a method is deprecated.
+            Use `.text` as a property instead. This method will be removed in 2.0.0.
 
         Returns:
             The text content of the message.
@@ -308,8 +310,8 @@ class BaseMessage(Serializable):
         """Get a pretty representation of the message.
 
         Args:
-            html: Whether to format the message as HTML. If True, the message will be
-                formatted with HTML tags. Default is False.
+            html: Whether to format the message as HTML. If `True`, the message will be
+                formatted with HTML tags.
 
         Returns:
             A pretty representation of the message.
@@ -327,20 +329,20 @@ class BaseMessage(Serializable):
 
 
 def merge_content(
-    first_content: Union[str, list[Union[str, dict]]],
-    *contents: Union[str, list[Union[str, dict]]],
-) -> Union[str, list[Union[str, dict]]]:
+    first_content: str | list[str | dict],
+    *contents: str | list[str | dict],
+) -> str | list[str | dict]:
     """Merge multiple message contents.
 
     Args:
-        first_content: The first ``content``. Can be a string or a list.
-        contents: The other ``content``s. Can be a string or a list.
+        first_content: The first `content`. Can be a string or a list.
+        contents: The other `content`s. Can be a string or a list.
 
     Returns:
         The merged content.
 
     """
-    merged: Union[str, list[Union[str, dict]]]
+    merged: str | list[str | dict]
     merged = "" if first_content is None else first_content
 
     for content in contents:
@@ -390,9 +392,9 @@ class BaseMessageChunk(BaseMessage):
 
         For example,
 
-        ``AIMessageChunk(content="Hello") + AIMessageChunk(content=" World")``
+        `AIMessageChunk(content="Hello") + AIMessageChunk(content=" World")`
 
-        will give ``AIMessageChunk(content="Hello World")``
+        will give `AIMessageChunk(content="Hello World")`
 
         """
         if isinstance(other, BaseMessageChunk):
@@ -441,8 +443,8 @@ def message_to_dict(message: BaseMessage) -> dict:
         message: Message to convert.
 
     Returns:
-        Message as a dict. The dict will have a ``type`` key with the message type
-        and a ``data`` key with the message data as a dict.
+        Message as a dict. The dict will have a `type` key with the message type
+        and a `data` key with the message data as a dict.
 
     """
     return {"type": message.type, "data": message.model_dump()}
@@ -452,7 +454,7 @@ def messages_to_dict(messages: Sequence[BaseMessage]) -> list[dict]:
     """Convert a sequence of Messages to a list of dictionaries.
 
     Args:
-        messages: Sequence of messages (as ``BaseMessage``s) to convert.
+        messages: Sequence of messages (as `BaseMessage`s) to convert.
 
     Returns:
         List of messages as dicts.
@@ -466,7 +468,7 @@ def get_msg_title_repr(title: str, *, bold: bool = False) -> str:
 
     Args:
         title: The title.
-        bold: Whether to bold the title. Default is False.
+        bold: Whether to bold the title.
 
     Returns:
         The title representation.

langchain_core/messages/block_translators/__init__.py

@@ -1,18 +1,19 @@
 """Derivations of standard content blocks from provider content.
 
-``AIMessage`` will first attempt to use a provider-specific translator if
-``model_provider`` is set in ``response_metadata`` on the message. Consequently, each
+`AIMessage` will first attempt to use a provider-specific translator if
+`model_provider` is set in `response_metadata` on the message. Consequently, each
 provider translator must handle all possible content response types from the provider,
 including text.
 
 If no provider is set, or if the provider does not have a registered translator,
-``AIMessage`` will fall back to best-effort parsing of the content into blocks using
-the implementation in ``BaseMessage``.
+`AIMessage` will fall back to best-effort parsing of the content into blocks using
+the implementation in `BaseMessage`.
 """
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Callable
+from collections.abc import Callable
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from langchain_core.messages import AIMessage, AIMessageChunk
@@ -22,15 +23,15 @@ if TYPE_CHECKING:
 PROVIDER_TRANSLATORS: dict[str, dict[str, Callable[..., list[types.ContentBlock]]]] = {}
 """Map model provider names to translator functions.
 
-The dictionary maps provider names (e.g. ``'openai'``, ``'anthropic'``) to another
+The dictionary maps provider names (e.g. `'openai'`, `'anthropic'`) to another
 dictionary with two keys:
-- ``'translate_content'``: Function to translate ``AIMessage`` content.
-- ``'translate_content_chunk'``: Function to translate ``AIMessageChunk`` content.
+- `'translate_content'`: Function to translate `AIMessage` content.
+- `'translate_content_chunk'`: Function to translate `AIMessageChunk` content.
 
-When calling `.content_blocks` on an ``AIMessage`` or ``AIMessageChunk``, if
-``model_provider`` is set in ``response_metadata``, the corresponding translator
+When calling `content_blocks` on an `AIMessage` or `AIMessageChunk`, if
+`model_provider` is set in `response_metadata`, the corresponding translator
 functions will be used to parse the content into blocks. Otherwise, best-effort parsing
-in ``BaseMessage`` will be used.
+in `BaseMessage` will be used.
 """
 
 
@@ -42,9 +43,9 @@ def register_translator(
     """Register content translators for a provider in `PROVIDER_TRANSLATORS`.
 
     Args:
-        provider: The model provider name (e.g. ``'openai'``, ``'anthropic'``).
-        translate_content: Function to translate ``AIMessage`` content.
-        translate_content_chunk: Function to translate ``AIMessageChunk`` content.
+        provider: The model provider name (e.g. `'openai'`, `'anthropic'`).
+        translate_content: Function to translate `AIMessage` content.
+        translate_content_chunk: Function to translate `AIMessageChunk` content.
     """
     PROVIDER_TRANSLATORS[provider] = {
         "translate_content": translate_content,
@@ -61,9 +62,9 @@ def get_translator(
         provider: The model provider name.
 
     Returns:
-        Dictionary with ``'translate_content'`` and ``'translate_content_chunk'``
+        Dictionary with `'translate_content'` and `'translate_content_chunk'`
         functions, or None if no translator is registered for the provider. In such
-        case, best-effort parsing in ``BaseMessage`` will be used.
+        case, best-effort parsing in `BaseMessage` will be used.
     """
     return PROVIDER_TRANSLATORS.get(provider)
 
@@ -71,10 +72,10 @@ def get_translator(
 def _register_translators() -> None:
     """Register all translators in langchain-core.
 
-    A unit test ensures all modules in ``block_translators`` are represented here.
+    A unit test ensures all modules in `block_translators` are represented here.
 
     For translators implemented outside langchain-core, they can be registered by
-    calling ``register_translator`` from within the integration package.
+    calling `register_translator` from within the integration package.
     """
     from langchain_core.messages.block_translators.anthropic import (  # noqa: PLC0415
         _register_anthropic_translator,
@@ -94,9 +95,6 @@ def _register_translators() -> None:
     from langchain_core.messages.block_translators.groq import (  # noqa: PLC0415
         _register_groq_translator,
     )
-    from langchain_core.messages.block_translators.ollama import (  # noqa: PLC0415
-        _register_ollama_translator,
-    )
     from langchain_core.messages.block_translators.openai import (  # noqa: PLC0415
         _register_openai_translator,
     )
@@ -107,7 +105,6 @@ def _register_translators() -> None:
     _register_google_genai_translator()
     _register_google_vertexai_translator()
     _register_groq_translator()
-    _register_ollama_translator()
     _register_openai_translator()
 
 

langchain_core/messages/block_translators/anthropic.py

@@ -2,7 +2,7 @@
 
 import json
 from collections.abc import Iterable
-from typing import Any, Optional, Union, cast
+from typing import Any, cast
 
 from langchain_core.messages import AIMessage, AIMessageChunk
 from langchain_core.messages import content as types
@@ -31,12 +31,12 @@ def _convert_to_v1_from_anthropic_input(
 ) -> list[types.ContentBlock]:
     """Convert Anthropic format blocks to v1 format.
 
-    During the `.content_blocks` parsing process, we wrap blocks not recognized as a v1
-    block as a ``'non_standard'`` block with the original block stored in the ``value``
+    During the `content_blocks` parsing process, we wrap blocks not recognized as a v1
+    block as a `'non_standard'` block with the original block stored in the `value`
     field. This function attempts to unpack those blocks and convert any blocks that
     might be Anthropic format to v1 ContentBlocks.
 
-    If conversion fails, the block is left as a ``'non_standard'`` block.
+    If conversion fails, the block is left as a `'non_standard'` block.
 
     Args:
         content: List of content blocks to process.
@@ -200,7 +200,7 @@ def _convert_citation_to_v1(citation: dict[str, Any]) -> types.Annotation:
 def _convert_to_v1_from_anthropic(message: AIMessage) -> list[types.ContentBlock]:
     """Convert Anthropic message content to v1 format."""
     if isinstance(message.content, str):
-        content: list[Union[str, dict]] = [{"type": "text", "text": message.content}]
+        content: list[str | dict] = [{"type": "text", "text": message.content}]
     else:
         content = message.content
 
@@ -252,7 +252,7 @@ def _convert_to_v1_from_anthropic(message: AIMessage) -> list[types.ContentBlock
                         tool_call_chunk["type"] = "tool_call_chunk"
                     yield tool_call_chunk
                 else:
-                    tool_call_block: Optional[types.ToolCall] = None
+                    tool_call_block: types.ToolCall | None = None
                     # Non-streaming or gathered chunk
                     if len(message.tool_calls) == 1:
                         tool_call_block = {

langchain_core/messages/block_translators/bedrock_converse.py

@@ -2,7 +2,7 @@
 
 import base64
 from collections.abc import Iterable
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 from langchain_core.messages import AIMessage, AIMessageChunk
 from langchain_core.messages import content as types
@@ -35,12 +35,12 @@ def _convert_to_v1_from_converse_input(
 ) -> list[types.ContentBlock]:
     """Convert Bedrock Converse format blocks to v1 format.
 
-    During the `.content_blocks` parsing process, we wrap blocks not recognized as a v1
-    block as a ``'non_standard'`` block with the original block stored in the ``value``
+    During the `content_blocks` parsing process, we wrap blocks not recognized as a v1
+    block as a `'non_standard'` block with the original block stored in the `value`
     field. This function attempts to unpack those blocks and convert any blocks that
     might be Converse format to v1 ContentBlocks.
 
-    If conversion fails, the block is left as a ``'non_standard'`` block.
+    If conversion fails, the block is left as a `'non_standard'` block.
 
     Args:
         content: List of content blocks to process.
@@ -216,7 +216,7 @@ def _convert_to_v1_from_converse(message: AIMessage) -> list[types.ContentBlock]
                         tool_call_chunk["type"] = "tool_call_chunk"
                     yield tool_call_chunk
                 else:
-                    tool_call_block: Optional[types.ToolCall] = None
+                    tool_call_block: types.ToolCall | None = None
                     # Non-streaming or gathered chunk
                     if len(message.tool_calls) == 1:
                         tool_call_block = {

langchain_core/messages/block_translators/google_genai.py

@@ -105,12 +105,12 @@ def _convert_to_v1_from_genai_input(
     Called when message isn't an `AIMessage` or `model_provider` isn't set on
     `response_metadata`.
 
-    During the `.content_blocks` parsing process, we wrap blocks not recognized as a v1
-    block as a ``'non_standard'`` block with the original block stored in the ``value``
+    During the `content_blocks` parsing process, we wrap blocks not recognized as a v1
+    block as a `'non_standard'` block with the original block stored in the `value`
     field. This function attempts to unpack those blocks and convert any blocks that
     might be GenAI format to v1 ContentBlocks.
 
-    If conversion fails, the block is left as a ``'non_standard'`` block.
+    If conversion fails, the block is left as a `'non_standard'` block.
 
     Args:
         content: List of content blocks to process.
@@ -282,7 +282,7 @@ def _convert_to_v1_from_genai(message: AIMessage) -> list[types.ContentBlock]:
     standard content blocks for returning.
 
     Args:
-        message: The AIMessage or AIMessageChunk to convert.
+        message: The `AIMessage` or `AIMessageChunk` to convert.
 
     Returns:
         List of standard content blocks derived from the message content.
@@ -368,7 +368,7 @@ def _convert_to_v1_from_genai(message: AIMessage) -> list[types.ContentBlock]:
                     else:
                         # Assume it's raw base64 without data URI
                         try:
-                            # Validate base64 and decode for mime type detection
+                            # Validate base64 and decode for MIME type detection
                             decoded_bytes = base64.b64decode(url, validate=True)
 
                             image_url_b64_block = {
@@ -379,7 +379,7 @@ def _convert_to_v1_from_genai(message: AIMessage) -> list[types.ContentBlock]:
                             try:
                                 import filetype  # type: ignore[import-not-found] # noqa: PLC0415
 
-                                # Guess mime type based on file bytes
+                                # Guess MIME type based on file bytes
                                 mime_type = None
                                 kind = filetype.guess(decoded_bytes)
                                 if kind:
@@ -453,10 +453,13 @@ def _convert_to_v1_from_genai(message: AIMessage) -> list[types.ContentBlock]:
                     "status": status,  # type: ignore[typeddict-item]
                     "output": item.get("code_execution_result", ""),
                 }
+                server_tool_result_block["extras"] = {"block_type": item_type}
                 # Preserve original outcome in extras
                 if outcome is not None:
-                    server_tool_result_block["extras"] = {"outcome": outcome}
+                    server_tool_result_block["extras"]["outcome"] = outcome
                 converted_blocks.append(server_tool_result_block)
+            elif item_type == "text":
+                converted_blocks.append(cast("types.TextContentBlock", item))
             else:
                 # Unknown type, preserve as non-standard
                 converted_blocks.append({"type": "non_standard", "value": item})

langchain_core/messages/block_translators/google_vertexai.py

@@ -1,37 +1,9 @@
 """Derivations of standard content blocks from Google (VertexAI) content."""
 
-import warnings
-
-from langchain_core.messages import AIMessage, AIMessageChunk
-from langchain_core.messages import content as types
-
-WARNED = False
-
-
-def translate_content(message: AIMessage) -> list[types.ContentBlock]:  # noqa: ARG001
-    """Derive standard content blocks from a message with Google (VertexAI) content."""
-    global WARNED  # noqa: PLW0603
-    if not WARNED:
-        warning_message = (
-            "Content block standardization is not yet fully supported for Google "
-            "VertexAI."
-        )
-        warnings.warn(warning_message, stacklevel=2)
-        WARNED = True
-    raise NotImplementedError
-
-
-def translate_content_chunk(message: AIMessageChunk) -> list[types.ContentBlock]:  # noqa: ARG001
-    """Derive standard content blocks from a chunk with Google (VertexAI) content."""
-    global WARNED  # noqa: PLW0603
-    if not WARNED:
-        warning_message = (
-            "Content block standardization is not yet fully supported for Google "
-            "VertexAI."
-        )
-        warnings.warn(warning_message, stacklevel=2)
-        WARNED = True
-    raise NotImplementedError
+from langchain_core.messages.block_translators.google_genai import (
+    translate_content,
+    translate_content_chunk,
+)
 
 
 def _register_google_vertexai_translator() -> None: