Skip to content

The agent engineering platform.

fix(core): replace `Iterable` with `Iterator` for block iteration (#34934)

Mason Daugherty638c33f65dbf
diff --git a/libs/core/langchain_core/messages/block_translators/anthropic.py b/libs/core/langchain_core/messages/block_translators/anthropic.py
index a02658856d..eab2163f07 100644
--- a/libs/core/langchain_core/messages/block_translators/anthropic.py
+++ b/libs/core/langchain_core/messages/block_translators/anthropic.py
@@ -1,7 +1,7 @@
"""Derivations of standard content blocks from Anthropic content."""
import json
-from collections.abc import Iterable
+from collections.abc import Iterator
from typing import Any, cast
from langchain_core.messages import AIMessage, AIMessageChunk
@@ -45,7 +45,7 @@ def _convert_to_v1_from_anthropic_input(
Updated list with Anthropic blocks converted to v1 format.
"""
- def _iter_blocks() -> Iterable[types.ContentBlock]:
+ def _iter_blocks() -> Iterator[types.ContentBlock]:
blocks: list[dict[str, Any]] = [
cast("dict[str, Any]", block)
if block.get("type") != "non_standard"
@@ -202,7 +202,7 @@ def _convert_to_v1_from_anthropic(message: AIMessage) -> list[types.ContentBlock
else:
content = message.content
- def _iter_blocks() -> Iterable[types.ContentBlock]:
+ def _iter_blocks() -> Iterator[types.ContentBlock]:
for block in content:
if not isinstance(block, dict):
continue
diff --git a/libs/core/langchain_core/messages/block_translators/bedrock_converse.py b/libs/core/langchain_core/messages/block_translators/bedrock_converse.py
index dfb38b9037..d2407e72fa 100644
--- a/libs/core/langchain_core/messages/block_translators/bedrock_converse.py
+++ b/libs/core/langchain_core/messages/block_translators/bedrock_converse.py
@@ -1,7 +1,7 @@
"""Derivations of standard content blocks from Amazon (Bedrock Converse) content."""
import base64
-from collections.abc import Iterable
+from collections.abc import Iterator
from typing import Any, cast
from langchain_core.messages import AIMessage, AIMessageChunk
@@ -49,7 +49,7 @@ def _convert_to_v1_from_converse_input(
Updated list with Converse blocks converted to v1 format.
"""
- def _iter_blocks() -> Iterable[types.ContentBlock]:
+ def _iter_blocks() -> Iterator[types.ContentBlock]:
blocks: list[dict[str, Any]] = [
cast("dict[str, Any]", block)
if block.get("type") != "non_standard"
@@ -162,7 +162,7 @@ def _convert_to_v1_from_converse(message: AIMessage) -> list[types.ContentBlock]
if isinstance(message.content, str):
message.content = [{"type": "text", "text": message.content}]
- def _iter_blocks() -> Iterable[types.ContentBlock]:
+ def _iter_blocks() -> Iterator[types.ContentBlock]:
for block in message.content:
if not isinstance(block, dict):
continue
diff --git a/libs/core/langchain_core/messages/block_translators/google_genai.py b/libs/core/langchain_core/messages/block_translators/google_genai.py
index dab6377c38..321de2f2df 100644
--- a/libs/core/langchain_core/messages/block_translators/google_genai.py
+++ b/libs/core/langchain_core/messages/block_translators/google_genai.py
@@ -2,7 +2,7 @@
import base64
import re
-from collections.abc import Iterable
+from collections.abc import Iterator
from typing import Any, cast
from langchain_core.messages import AIMessage, AIMessageChunk
@@ -141,7 +141,7 @@ def _convert_to_v1_from_genai_input(
Updated list with GenAI blocks converted to v1 format.
"""
- def _iter_blocks() -> Iterable[types.ContentBlock]:
+ def _iter_blocks() -> Iterator[types.ContentBlock]:
blocks: list[dict[str, Any]] = [
cast("dict[str, Any]", block)
if block.get("type") != "non_standard"
diff --git a/libs/core/langchain_core/messages/block_translators/openai.py b/libs/core/langchain_core/messages/block_translators/openai.py
index 593e004c38..32e10cb14e 100644
--- a/libs/core/langchain_core/messages/block_translators/openai.py
+++ b/libs/core/langchain_core/messages/block_translators/openai.py
@@ -14,7 +14,7 @@ from langchain_core.messages import AIMessageChunk
from langchain_core.messages import content as types
if TYPE_CHECKING:
- from collections.abc import Iterable
+ from collections.abc import Iterator
from langchain_core.messages import AIMessage
@@ -607,7 +607,7 @@ def _convert_annotation_to_v1(annotation: dict[str, Any]) -> types.Annotation:
return non_standard_annotation
-def _explode_reasoning(block: dict[str, Any]) -> Iterable[types.ReasoningContentBlock]:
+def _explode_reasoning(block: dict[str, Any]) -> Iterator[types.ReasoningContentBlock]:
if "summary" not in block:
yield cast("types.ReasoningContentBlock", block)
return
@@ -652,7 +652,7 @@ def _explode_reasoning(block: dict[str, Any]) -> Iterable[types.ReasoningContent
def _convert_to_v1_from_responses(message: AIMessage) -> list[types.ContentBlock]:
"""Convert a Responses message to v1 format."""
- def _iter_blocks() -> Iterable[types.ContentBlock]:
+ def _iter_blocks() -> Iterator[types.ContentBlock]:
for raw_block in message.content:
if not isinstance(raw_block, dict):
continue