Merge branch 'master' into ruff-core-preview-3

Author: mdrxy

.github/workflows/_lint.yml

@@ -47,11 +47,11 @@ jobs:
           cache-suffix: lint-${{ inputs.working-directory }}
           working-directory: ${{ inputs.working-directory }}
 
-      - name: "🔒 Verify Lockfile is Up-to-Date"
-        working-directory: ${{ inputs.working-directory }}
-        run: |
-          unset UV_FROZEN
-          uv lock --check
+      # - name: "🔒 Verify Lockfile is Up-to-Date"
+      #   working-directory: ${{ inputs.working-directory }}
+      #   run: |
+      #     unset UV_FROZEN
+      #     uv lock --check
 
       - name: "📦 Install Lint & Typing Dependencies"
         working-directory: ${{ inputs.working-directory }}

libs/core/langchain_core/messages/block_translators/anthropic.py

@@ -461,12 +461,26 @@ def _iter_blocks() -> Iterable[types.ContentBlock]:
 
 
 def translate_content(message: AIMessage) -> list[types.ContentBlock]:
-    """Derive standard content blocks from a message with Anthropic content."""
+    """Derive standard content blocks from a message with Anthropic content.
+
+    Args:
+        message: The message to translate.
+
+    Returns:
+        The derived content blocks.
+    """
     return _convert_to_v1_from_anthropic(message)
 
 
 def translate_content_chunk(message: AIMessageChunk) -> list[types.ContentBlock]:
-    """Derive standard content blocks from a message chunk with Anthropic content."""
+    """Derive standard content blocks from a message chunk with Anthropic content.
+
+    Args:
+        message: The message chunk to translate.
+
+    Returns:
+        The derived content blocks.
+    """
     return _convert_to_v1_from_anthropic(message)
 
 

libs/core/langchain_core/messages/block_translators/bedrock.py

@@ -65,14 +65,28 @@ def _convert_to_v1_from_bedrock_chunk(
 
 
 def translate_content(message: AIMessage) -> list[types.ContentBlock]:
-    """Derive standard content blocks from a message with Bedrock content."""
+    """Derive standard content blocks from a message with Bedrock content.
+
+    Args:
+        message: The message to translate.
+
+    Returns:
+        The derived content blocks.
+    """
     if "claude" not in message.response_metadata.get("model_name", "").lower():
         raise NotImplementedError  # fall back to best-effort parsing
     return _convert_to_v1_from_bedrock(message)
 
 
 def translate_content_chunk(message: AIMessageChunk) -> list[types.ContentBlock]:
-    """Derive standard content blocks from a message chunk with Bedrock content."""
+    """Derive standard content blocks from a message chunk with Bedrock content.
+
+    Args:
+        message: The message chunk to translate.
+
+    Returns:
+        The derived content blocks.
+    """
     # TODO: add model_name to all Bedrock chunks and update core merging logic
     # to not append during aggregation. Then raise NotImplementedError here if
     # not an Anthropic model to fall back to best-effort parsing.

libs/core/langchain_core/messages/block_translators/bedrock_converse.py

@@ -281,12 +281,26 @@ def _iter_blocks() -> Iterable[types.ContentBlock]:
 
 
 def translate_content(message: AIMessage) -> list[types.ContentBlock]:
-    """Derive standard content blocks from a message with Bedrock Converse content."""
+    """Derive standard content blocks from a message with Bedrock Converse content.
+
+    Args:
+        message: The message to translate.
+
+    Returns:
+        The derived content blocks.
+    """
     return _convert_to_v1_from_converse(message)
 
 
 def translate_content_chunk(message: AIMessageChunk) -> list[types.ContentBlock]:
-    """Derive standard content blocks from a chunk with Bedrock Converse content."""
+    """Derive standard content blocks from a chunk with Bedrock Converse content.
+
+    Args:
+        message: The message chunk to translate.
+
+    Returns:
+        The derived content blocks.
+    """
     return _convert_to_v1_from_converse(message)
 
 

libs/core/langchain_core/messages/block_translators/google_genai.py

@@ -526,12 +526,26 @@ def _convert_to_v1_from_genai(message: AIMessage) -> list[types.ContentBlock]:
 
 
 def translate_content(message: AIMessage) -> list[types.ContentBlock]:
-    """Derive standard content blocks from a message with Google (GenAI) content."""
+    """Derive standard content blocks from a message with Google (GenAI) content.
+
+    Args:
+        message: The message to translate.
+
+    Returns:
+        The derived content blocks.
+    """
     return _convert_to_v1_from_genai(message)
 
 
 def translate_content_chunk(message: AIMessageChunk) -> list[types.ContentBlock]:
-    """Derive standard content blocks from a chunk with Google (GenAI) content."""
+    """Derive standard content blocks from a chunk with Google (GenAI) content.
+
+    Args:
+        message: The message chunk to translate.
+
+    Returns:
+        The derived content blocks.
+    """
     return _convert_to_v1_from_genai(message)
 
 

libs/core/langchain_core/messages/block_translators/groq.py

@@ -119,12 +119,26 @@ def _convert_to_v1_from_groq(message: AIMessage) -> list[types.ContentBlock]:
 
 
 def translate_content(message: AIMessage) -> list[types.ContentBlock]:
-    """Derive standard content blocks from a message with groq content."""
+    """Derive standard content blocks from a message with groq content.
+
+    Args:
+        message: The message to translate.
+
+    Returns:
+        The derived content blocks.
+    """
     return _convert_to_v1_from_groq(message)
 
 
 def translate_content_chunk(message: AIMessageChunk) -> list[types.ContentBlock]:
-    """Derive standard content blocks from a message chunk with groq content."""
+    """Derive standard content blocks from a message chunk with groq content.
+
+    Args:
+        message: The message chunk to translate.
+
+    Returns:
+        The derived content blocks.
+    """
     return _convert_to_v1_from_groq(message)
 
 

libs/core/langchain_core/messages/block_translators/openai.py

@@ -19,7 +19,18 @@
 
 
 def convert_to_openai_image_block(block: dict[str, Any]) -> dict:
-    """Convert `ImageContentBlock` to format expected by OpenAI Chat Completions."""
+    """Convert `ImageContentBlock` to format expected by OpenAI Chat Completions.
+
+    Args:
+        block: The image content block to convert.
+
+    Raises:
+        ValueError: If required keys are missing.
+        ValueError: If source type is unsupported.
+
+    Returns:
+        The formatted image content block.
+    """
     if "url" in block:
         return {
             "type": "image_url",
@@ -50,6 +61,18 @@ def convert_to_openai_data_block(
 
     "Standard data content block" can include old-style LangChain v0 blocks
     (URLContentBlock, Base64ContentBlock, IDContentBlock) or new ones.
+
+    Args:
+        block: The content block to convert.
+        api: The OpenAI API being targeted. Either "chat/completions" or "responses".
+
+    Raises:
+        ValueError: If required keys are missing.
+        ValueError: If file URLs are used with Chat Completions API.
+        ValueError: If block type is unsupported.
+
+    Returns:
+        The formatted content block.
     """
     if block["type"] == "image":
         chat_completions_block = convert_to_openai_image_block(block)
@@ -973,15 +996,29 @@ def _iter_blocks() -> Iterable[types.ContentBlock]:
 
 
 def translate_content(message: AIMessage) -> list[types.ContentBlock]:
-    """Derive standard content blocks from a message with OpenAI content."""
+    """Derive standard content blocks from a message with OpenAI content.
+
+    Args:
+        message: The message to translate.
+
+    Returns:
+        The derived content blocks.
+    """
     if isinstance(message.content, str):
         return _convert_to_v1_from_chat_completions(message)
     message = _convert_from_v03_ai_message(message)
     return _convert_to_v1_from_responses(message)
 
 
 def translate_content_chunk(message: AIMessageChunk) -> list[types.ContentBlock]:
-    """Derive standard content blocks from a message chunk with OpenAI content."""
+    """Derive standard content blocks from a message chunk with OpenAI content.
+
+    Args:
+        message: The message chunk to translate.
+
+    Returns:
+        The derived content blocks.
+    """
     if isinstance(message.content, str):
         return _convert_to_v1_from_chat_completions_chunk(message)
     message = _convert_from_v03_ai_message(message)  # type: ignore[assignment]

libs/core/langchain_core/messages/utils.py

@@ -1049,6 +1049,7 @@ def convert_to_openai_messages(
     *,
     text_format: Literal["string", "block"] = "string",
     include_id: bool = False,
+    pass_through_unknown_blocks: bool = True,
 ) -> dict | list[dict]:
     """Convert LangChain messages into OpenAI message dicts.
 
@@ -1068,6 +1069,9 @@ def convert_to_openai_messages(
                 content blocks these are left as is.
         include_id: Whether to include message IDs in the openai messages, if they
             are present in the source messages.
+        pass_through_unknown_blocks: Whether to include content blocks with unknown
+            formats in the output. If `False`, an error is raised if an unknown
+            content block is encountered.
 
     Raises:
         ValueError: if an unrecognized `text_format` is specified, or if a message
@@ -1317,6 +1321,36 @@ def convert_to_openai_messages(
                                 },
                             }
                         )
+                elif block.get("type") == "function_call":  # OpenAI Responses
+                    if not any(
+                        tool_call["id"] == block.get("call_id")
+                        for tool_call in cast("AIMessage", message).tool_calls
+                    ):
+                        if missing := [
+                            k
+                            for k in ("call_id", "name", "arguments")
+                            if k not in block
+                        ]:
+                            err = (
+                                f"Unrecognized content block at "
+                                f"messages[{i}].content[{j}] has 'type': "
+                                f"'tool_use', but is missing expected key(s) "
+                                f"{missing}. Full content block:\n\n{block}"
+                            )
+                            raise ValueError(err)
+                        oai_msg["tool_calls"] = oai_msg.get("tool_calls", [])
+                        oai_msg["tool_calls"].append(
+                            {
+                                "type": "function",
+                                "id": block.get("call_id"),
+                                "function": {
+                                    "name": block.get("name"),
+                                    "arguments": block.get("arguments"),
+                                },
+                            }
+                        )
+                    if pass_through_unknown_blocks:
+                        content.append(block)
                 elif block.get("type") == "tool_result":
                     if missing := [
                         k for k in ("content", "tool_use_id") if k not in block
@@ -1397,7 +1431,10 @@ def convert_to_openai_messages(
                             },
                         }
                     )
-                elif block.get("type") in {"thinking", "reasoning"}:
+                elif (
+                    block.get("type") in {"thinking", "reasoning"}
+                    or pass_through_unknown_blocks
+                ):
                     content.append(block)
                 else:
                     err = (

libs/core/langchain_core/output_parsers/openai_functions.py

@@ -37,7 +37,7 @@ def parse_result(self, result: list[Generation], *, partial: bool = False) -> An
             The parsed JSON object.
 
         Raises:
-            `OutputParserException`: If the output is not valid JSON.
+            OutputParserException: If the output is not valid JSON.
         """
         generation = result[0]
         if not isinstance(generation, ChatGeneration):
@@ -88,7 +88,7 @@ def parse_result(self, result: list[Generation], *, partial: bool = False) -> An
             The parsed JSON object.
 
         Raises:
-            OutputParserExcept`ion: If the output is not valid JSON.
+            OutputParserException: If the output is not valid JSON.
         """
         if len(result) != 1:
             msg = f"Expected exactly one result, but got {len(result)}"

libs/core/langchain_core/output_parsers/pydantic.py

@@ -54,7 +54,7 @@ def parse_result(
                 all the keys that have been returned so far.
 
         Raises:
-            `OutputParserException`: If the result is not valid JSON
+            OutputParserException: If the result is not valid JSON
                 or does not conform to the Pydantic model.
 
         Returns: