langchain-core 1.0.0a5__py3-none-any.whl → 1.0.0a7__py3-none-any.whl

langchain_core/load/load.py

@@ -3,7 +3,7 @@
 import importlib
 import json
 import os
-from typing import Any, Optional
+from typing import Any
 
 from langchain_core._api import beta
 from langchain_core.load.mapping import (
@@ -50,12 +50,11 @@ class Reviver:
 
     def __init__(
         self,
-        secrets_map: Optional[dict[str, str]] = None,
-        valid_namespaces: Optional[list[str]] = None,
+        secrets_map: dict[str, str] | None = None,
+        valid_namespaces: list[str] | None = None,
         secrets_from_env: bool = True,  # noqa: FBT001,FBT002
-        additional_import_mappings: Optional[
-            dict[tuple[str, ...], tuple[str, ...]]
-        ] = None,
+        additional_import_mappings: dict[tuple[str, ...], tuple[str, ...]]
+        | None = None,
         *,
         ignore_unserializable_fields: bool = False,
     ) -> None:
@@ -187,10 +186,10 @@ class Reviver:
 def loads(
     text: str,
     *,
-    secrets_map: Optional[dict[str, str]] = None,
-    valid_namespaces: Optional[list[str]] = None,
+    secrets_map: dict[str, str] | None = None,
+    valid_namespaces: list[str] | None = None,
     secrets_from_env: bool = True,
-    additional_import_mappings: Optional[dict[tuple[str, ...], tuple[str, ...]]] = None,
+    additional_import_mappings: dict[tuple[str, ...], tuple[str, ...]] | None = None,
     ignore_unserializable_fields: bool = False,
 ) -> Any:
     """Revive a LangChain class from a JSON string.
@@ -231,10 +230,10 @@ def loads(
 def load(
     obj: Any,
     *,
-    secrets_map: Optional[dict[str, str]] = None,
-    valid_namespaces: Optional[list[str]] = None,
+    secrets_map: dict[str, str] | None = None,
+    valid_namespaces: list[str] | None = None,
     secrets_from_env: bool = True,
-    additional_import_mappings: Optional[dict[tuple[str, ...], tuple[str, ...]]] = None,
+    additional_import_mappings: dict[tuple[str, ...], tuple[str, ...]] | None = None,
     ignore_unserializable_fields: bool = False,
 ) -> Any:
     """Revive a LangChain class from a JSON object.

langchain_core/load/mapping.py

@@ -413,11 +413,10 @@ SERIALIZABLE_MAPPING: dict[tuple[str, ...], tuple[str, ...]] = {
         "few_shot_with_templates",
         "FewShotPromptWithTemplates",
     ),
-    ("langchain", "prompts", "pipeline", "PipelinePromptTemplate"): (
+    ("langchain", "prompts", "pipeline"): (
         "langchain_core",
         "prompts",
         "pipeline",
-        "PipelinePromptTemplate",
     ),
     ("langchain", "prompts", "base", "StringPromptTemplate"): (
         "langchain_core",
@@ -846,11 +845,10 @@ OLD_CORE_NAMESPACES_MAPPING: dict[tuple[str, ...], tuple[str, ...]] = {
         "few_shot_with_templates",
         "FewShotPromptWithTemplates",
     ),
-    ("langchain_core", "prompts", "pipeline", "PipelinePromptTemplate"): (
+    ("langchain_core", "prompts", "pipeline"): (
         "langchain_core",
         "prompts",
         "pipeline",
-        "PipelinePromptTemplate",
     ),
     ("langchain_core", "prompts", "string", "StringPromptTemplate"): (
         "langchain_core",

langchain_core/load/serializable.py

@@ -6,9 +6,7 @@ from abc import ABC
 from typing import (
     Any,
     Literal,
-    Optional,
     TypedDict,
-    Union,
     cast,
 )
 
@@ -53,7 +51,7 @@ class SerializedNotImplemented(BaseSerialized):
 
     type: Literal["not_implemented"]
     """The type of the object. Must be ``'not_implemented'``."""
-    repr: Optional[str]
+    repr: str | None
     """The representation of the object. Optional."""
 
 
@@ -188,7 +186,7 @@ class Serializable(BaseModel, ABC):
             if (k not in type(self).model_fields or try_neq_default(v, k, self))
         ]
 
-    def to_json(self) -> Union[SerializedConstructor, SerializedNotImplemented]:
+    def to_json(self) -> SerializedConstructor | SerializedNotImplemented:
         """Serialize the object to JSON.
 
         Raises:

langchain_core/messages/ai.py

@@ -4,7 +4,7 @@ import json
 import logging
 import operator
 from collections.abc import Sequence
-from typing import Any, Literal, Optional, Union, cast, overload
+from typing import Any, Literal, cast, overload
 
 from pydantic import model_validator
 from typing_extensions import NotRequired, Self, TypedDict, override
@@ -48,7 +48,7 @@ class InputTokenDetails(TypedDict, total=False):
                 "cache_read": 100,
             }
 
-    .. versionadded:: 0.3.9
+    !!! version-added "Added in version 0.3.9"
 
     May also hold extra provider-specific keys.
 
@@ -83,7 +83,7 @@ class OutputTokenDetails(TypedDict, total=False):
                 "reasoning": 200,
             }
 
-    .. versionadded:: 0.3.9
+    !!! version-added "Added in version 0.3.9"
 
     """
 
@@ -121,8 +121,7 @@ class UsageMetadata(TypedDict):
                 },
             }
 
-    .. versionchanged:: 0.3.9
-
+    !!! warning "Behavior changed in 0.3.9"
         Added ``input_token_details`` and ``output_token_details``.
 
     """
@@ -161,7 +160,7 @@ class AIMessage(BaseMessage):
     """If provided, tool calls associated with the message."""
     invalid_tool_calls: list[InvalidToolCall] = []
     """If provided, tool calls with parsing errors associated with the message."""
-    usage_metadata: Optional[UsageMetadata] = None
+    usage_metadata: UsageMetadata | None = None
     """If provided, usage metadata for a message, such as token counts.
 
     This is a standard representation of token usage that is consistent across models.
@@ -174,22 +173,22 @@ class AIMessage(BaseMessage):
     @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 ``AIMessage``.
@@ -210,7 +209,7 @@ class AIMessage(BaseMessage):
                 kwargs["tool_calls"] = content_tool_calls
 
             super().__init__(
-                content=cast("Union[str, list[Union[str, dict]]]", content_blocks),
+                content=cast("str | list[str | dict]", content_blocks),
                 **kwargs,
             )
         else:
@@ -345,7 +344,7 @@ class AIMessage(BaseMessage):
         base = super().pretty_repr(html=html)
         lines = []
 
-        def _format_tool_args(tc: Union[ToolCall, InvalidToolCall]) -> list[str]:
+        def _format_tool_args(tc: ToolCall | InvalidToolCall) -> list[str]:
             lines = [
                 f"  {tc.get('name', 'Tool')} ({tc.get('id')})",
                 f" Call ID: {tc.get('id')}",
@@ -388,7 +387,7 @@ class AIMessageChunk(AIMessage, BaseMessageChunk):
     tool_call_chunks: list[ToolCallChunk] = []
     """If provided, tool call chunks associated with the message."""
 
-    chunk_position: Optional[Literal["last"]] = None
+    chunk_position: Literal["last"] | None = None
     """Optional span represented by an aggregated AIMessageChunk.
 
     If a chunk with ``chunk_position="last"`` is aggregated into a stream,
@@ -633,7 +632,7 @@ def add_ai_message_chunks(
 
     # Token usage
     if left.usage_metadata or any(o.usage_metadata is not None for o in others):
-        usage_metadata: Optional[UsageMetadata] = left.usage_metadata
+        usage_metadata: UsageMetadata | None = left.usage_metadata
         for other in others:
             usage_metadata = add_usage(usage_metadata, other.usage_metadata)
     else:
@@ -663,7 +662,7 @@ def add_ai_message_chunks(
                     chunk_id = id_
                     break
 
-    chunk_position: Optional[Literal["last"]] = (
+    chunk_position: Literal["last"] | None = (
         "last" if any(x.chunk_position == "last" for x in [left, *others]) else None
     )
 
@@ -678,9 +677,7 @@ def add_ai_message_chunks(
     )
 
 
-def add_usage(
-    left: Optional[UsageMetadata], right: Optional[UsageMetadata]
-) -> UsageMetadata:
+def add_usage(left: UsageMetadata | None, right: UsageMetadata | None) -> UsageMetadata:
     """Recursively add two UsageMetadata objects.
 
     Example:
@@ -741,7 +738,7 @@ def add_usage(
 
 
 def subtract_usage(
-    left: Optional[UsageMetadata], right: Optional[UsageMetadata]
+    left: UsageMetadata | None, right: UsageMetadata | None
 ) -> UsageMetadata:
     """Recursively subtract two ``UsageMetadata`` objects.
 

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
 
@@ -72,9 +70,9 @@ class TextAccessor(str):
         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,10 +92,10 @@ 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 ``ChatModel``.
     """
 
-    content: Union[str, list[Union[str, dict]]]
+    content: str | list[str | dict]
     """The string contents of the message."""
 
     additional_kwargs: dict = Field(default_factory=dict)
@@ -119,7 +117,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 +127,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,22 +141,22 @@ 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``.
@@ -197,7 +195,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 version 1.0.0"
 
         """
         # Needed here to avoid circular import, as these classes import BaseMessages
@@ -208,6 +206,9 @@ class BaseMessage(Serializable):
         from langchain_core.messages.block_translators.bedrock_converse import (  # noqa: PLC0415
             _convert_to_v1_from_converse_input,
         )
+        from langchain_core.messages.block_translators.google_genai import (  # noqa: PLC0415
+            _convert_to_v1_from_genai_input,
+        )
         from langchain_core.messages.block_translators.langchain_v0 import (  # noqa: PLC0415
             _convert_v0_multimodal_input_to_v1,
         )
@@ -243,11 +244,12 @@ class BaseMessage(Serializable):
                     blocks.append(cast("types.ContentBlock", item))
 
         # Subsequent passes: attempt to unpack non-standard blocks.
-        # The block is left as non-standard if conversion fails.
+        # This is the last stop - if we can't parse it here, it is left as non-standard
         for parsing_step in [
             _convert_v0_multimodal_input_to_v1,
             _convert_to_v1_from_chat_completions_input,
             _convert_to_v1_from_anthropic_input,
+            _convert_to_v1_from_genai_input,
             _convert_to_v1_from_converse_input,
         ]:
             blocks = parsing_step(blocks)
@@ -259,9 +261,9 @@ class BaseMessage(Serializable):
 
         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.
@@ -323,9 +325,9 @@ 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:
@@ -336,7 +338,7 @@ def merge_content(
         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:

langchain_core/messages/block_translators/__init__.py

@@ -12,7 +12,8 @@ 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
@@ -20,6 +21,18 @@ if TYPE_CHECKING:
 
 # Provider to translator mapping
 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
+dictionary with two keys:
+- ``'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
+functions will be used to parse the content into blocks. Otherwise, best-effort parsing
+in ``BaseMessage`` will be used.
+"""
 
 
 def register_translator(
@@ -27,7 +40,7 @@ def register_translator(
     translate_content: Callable[[AIMessage], list[types.ContentBlock]],
     translate_content_chunk: Callable[[AIMessageChunk], list[types.ContentBlock]],
 ) -> None:
-    """Register content translators for a provider.
+    """Register content translators for a provider in `PROVIDER_TRANSLATORS`.
 
     Args:
         provider: The model provider name (e.g. ``'openai'``, ``'anthropic'``).
@@ -50,7 +63,8 @@ def get_translator(
 
     Returns:
         Dictionary with ``'translate_content'`` and ``'translate_content_chunk'``
-        functions, or None if no translator is registered for the provider.
+        functions, or None if no translator is registered for the provider. In such
+        case, best-effort parsing in ``BaseMessage`` will be used.
     """
     return PROVIDER_TRANSLATORS.get(provider)
 
@@ -81,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,
     )
@@ -94,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
@@ -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
@@ -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 = {