langchain-core 0.3.72__py3-none-any.whl → 0.4.0.dev0__py3-none-any.whl

langchain_core/output_parsers/list.py

@@ -13,6 +13,7 @@ from typing_extensions import override
 
 from langchain_core.messages import BaseMessage
 from langchain_core.output_parsers.transform import BaseTransformOutputParser
+from langchain_core.v1.messages import AIMessage
 
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator, Iterator
@@ -71,7 +72,7 @@ class ListOutputParser(BaseTransformOutputParser[list[str]]):
 
     @override
     def _transform(
-        self, input: Iterator[Union[str, BaseMessage]]
+        self, input: Iterator[Union[str, BaseMessage, AIMessage]]
     ) -> Iterator[list[str]]:
         buffer = ""
         for chunk in input:
@@ -81,6 +82,8 @@ class ListOutputParser(BaseTransformOutputParser[list[str]]):
                 if not isinstance(chunk_content, str):
                     continue
                 buffer += chunk_content
+            elif isinstance(chunk, AIMessage):
+                buffer += chunk.text
             else:
                 # add current chunk to buffer
                 buffer += chunk
@@ -105,7 +108,7 @@ class ListOutputParser(BaseTransformOutputParser[list[str]]):
 
     @override
     async def _atransform(
-        self, input: AsyncIterator[Union[str, BaseMessage]]
+        self, input: AsyncIterator[Union[str, BaseMessage, AIMessage]]
     ) -> AsyncIterator[list[str]]:
         buffer = ""
         async for chunk in input:
@@ -115,6 +118,8 @@ class ListOutputParser(BaseTransformOutputParser[list[str]]):
                 if not isinstance(chunk_content, str):
                     continue
                 buffer += chunk_content
+            elif isinstance(chunk, AIMessage):
+                buffer += chunk.text
             else:
                 # add current chunk to buffer
                 buffer += chunk

langchain_core/output_parsers/openai_functions.py

@@ -17,6 +17,7 @@ from langchain_core.output_parsers import (
 )
 from langchain_core.output_parsers.json import parse_partial_json
 from langchain_core.outputs import ChatGeneration, Generation
+from langchain_core.v1.messages import AIMessage
 
 
 class OutputFunctionsParser(BaseGenerationOutputParser[Any]):
@@ -26,7 +27,9 @@ class OutputFunctionsParser(BaseGenerationOutputParser[Any]):
     """Whether to only return the arguments to the function call."""
 
     @override
-    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
+    def parse_result(
+        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
+    ) -> Any:
         """Parse the result of an LLM call to a JSON object.
 
         Args:
@@ -39,6 +42,12 @@ class OutputFunctionsParser(BaseGenerationOutputParser[Any]):
         Raises:
             OutputParserException: If the output is not valid JSON.
         """
+        if isinstance(result, AIMessage):
+            msg = (
+                "This output parser does not support v1 AIMessages. Use "
+                "JsonOutputToolsParser instead."
+            )
+            raise TypeError(msg)
         generation = result[0]
         if not isinstance(generation, ChatGeneration):
             msg = "This output parser can only be used with a chat generation."
@@ -77,7 +86,9 @@ class JsonOutputFunctionsParser(BaseCumulativeTransformOutputParser[Any]):
     def _diff(self, prev: Optional[Any], next: Any) -> Any:
         return jsonpatch.make_patch(prev, next).patch
 
-    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
+    def parse_result(
+        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
+    ) -> Any:
         """Parse the result of an LLM call to a JSON object.
 
         Args:
@@ -90,6 +101,12 @@ class JsonOutputFunctionsParser(BaseCumulativeTransformOutputParser[Any]):
         Raises:
             OutputParserException: If the output is not valid JSON.
         """
+        if isinstance(result, AIMessage):
+            msg = (
+                "This output parser does not support v1 AIMessages. Use "
+                "JsonOutputToolsParser instead."
+            )
+            raise TypeError(msg)
         if len(result) != 1:
             msg = f"Expected exactly one result, but got {len(result)}"
             raise OutputParserException(msg)
@@ -160,7 +177,9 @@ class JsonKeyOutputFunctionsParser(JsonOutputFunctionsParser):
     key_name: str
     """The name of the key to return."""
 
-    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
+    def parse_result(
+        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
+    ) -> Any:
         """Parse the result of an LLM call to a JSON object.
 
         Args:
@@ -214,6 +233,7 @@ class PydanticOutputFunctionsParser(OutputFunctionsParser):
                 pydantic_schema={"cookie": Cookie, "dog": Dog}
             )
             result = parser.parse_result([chat_generation])
+
     """
 
     pydantic_schema: Union[type[BaseModel], dict[str, type[BaseModel]]]
@@ -253,7 +273,9 @@ class PydanticOutputFunctionsParser(OutputFunctionsParser):
         return values
 
     @override
-    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
+    def parse_result(
+        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
+    ) -> Any:
         """Parse the result of an LLM call to a JSON object.
 
         Args:
@@ -293,7 +315,9 @@ class PydanticAttrOutputFunctionsParser(PydanticOutputFunctionsParser):
     """The name of the attribute to return."""
 
     @override
-    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
+    def parse_result(
+        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
+    ) -> Any:
         """Parse the result of an LLM call to a JSON object.
 
         Args:

langchain_core/output_parsers/openai_tools.py

@@ -4,7 +4,7 @@ import copy
 import json
 import logging
 from json import JSONDecodeError
-from typing import Annotated, Any, Optional
+from typing import Annotated, Any, Optional, Union
 
 from pydantic import SkipValidation, ValidationError
 
@@ -16,6 +16,7 @@ from langchain_core.output_parsers.transform import BaseCumulativeTransformOutpu
 from langchain_core.outputs import ChatGeneration, Generation
 from langchain_core.utils.json import parse_partial_json
 from langchain_core.utils.pydantic import TypeBaseModel
+from langchain_core.v1.messages import AIMessage as AIMessageV1
 
 logger = logging.getLogger(__name__)
 
@@ -156,7 +157,9 @@ class JsonOutputToolsParser(BaseCumulativeTransformOutputParser[Any]):
     If no tool calls are found, None will be returned.
     """
 
-    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
+    def parse_result(
+        self, result: Union[list[Generation], AIMessageV1], *, partial: bool = False
+    ) -> Any:
         """Parse the result of an LLM call to a list of tool calls.
 
         Args:
@@ -173,31 +176,45 @@ class JsonOutputToolsParser(BaseCumulativeTransformOutputParser[Any]):
         Raises:
             OutputParserException: If the output is not valid JSON.
         """
-        generation = result[0]
-        if not isinstance(generation, ChatGeneration):
-            msg = "This output parser can only be used with a chat generation."
-            raise OutputParserException(msg)
-        message = generation.message
-        if isinstance(message, AIMessage) and message.tool_calls:
-            tool_calls = [dict(tc) for tc in message.tool_calls]
+        if isinstance(result, list):
+            generation = result[0]
+            if not isinstance(generation, ChatGeneration):
+                msg = (
+                    "This output parser can only be used with a chat generation or "
+                    "v1 AIMessage."
+                )
+                raise OutputParserException(msg)
+            message = generation.message
+            if isinstance(message, AIMessage) and message.tool_calls:
+                tool_calls = [dict(tc) for tc in message.tool_calls]
+                for tool_call in tool_calls:
+                    if not self.return_id:
+                        _ = tool_call.pop("id")
+            else:
+                try:
+                    raw_tool_calls = copy.deepcopy(
+                        message.additional_kwargs["tool_calls"]
+                    )
+                except KeyError:
+                    return []
+                tool_calls = parse_tool_calls(
+                    raw_tool_calls,
+                    partial=partial,
+                    strict=self.strict,
+                    return_id=self.return_id,
+                )
+        elif result.tool_calls:
+            # v1 message
+            tool_calls = [dict(tc) for tc in result.tool_calls]
             for tool_call in tool_calls:
                 if not self.return_id:
                     _ = tool_call.pop("id")
         else:
-            try:
-                raw_tool_calls = copy.deepcopy(message.additional_kwargs["tool_calls"])
-            except KeyError:
-                return []
-            tool_calls = parse_tool_calls(
-                raw_tool_calls,
-                partial=partial,
-                strict=self.strict,
-                return_id=self.return_id,
-            )
+            return []
+
         # for backwards compatibility
         for tc in tool_calls:
             tc["type"] = tc.pop("name")
-
         if self.first_tool_only:
             return tool_calls[0] if tool_calls else None
         return tool_calls
@@ -220,7 +237,9 @@ class JsonOutputKeyToolsParser(JsonOutputToolsParser):
     key_name: str
     """The type of tools to return."""
 
-    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
+    def parse_result(
+        self, result: Union[list[Generation], AIMessageV1], *, partial: bool = False
+    ) -> Any:
         """Parse the result of an LLM call to a list of tool calls.
 
         Args:
@@ -234,32 +253,47 @@ class JsonOutputKeyToolsParser(JsonOutputToolsParser):
         Returns:
             The parsed tool calls.
         """
-        generation = result[0]
-        if not isinstance(generation, ChatGeneration):
-            msg = "This output parser can only be used with a chat generation."
-            raise OutputParserException(msg)
-        message = generation.message
-        if isinstance(message, AIMessage) and message.tool_calls:
-            parsed_tool_calls = [dict(tc) for tc in message.tool_calls]
+        if isinstance(result, list):
+            generation = result[0]
+            if not isinstance(generation, ChatGeneration):
+                msg = "This output parser can only be used with a chat generation."
+                raise OutputParserException(msg)
+            message = generation.message
+            if isinstance(message, AIMessage) and message.tool_calls:
+                parsed_tool_calls = [dict(tc) for tc in message.tool_calls]
+                for tool_call in parsed_tool_calls:
+                    if not self.return_id:
+                        _ = tool_call.pop("id")
+            else:
+                try:
+                    raw_tool_calls = copy.deepcopy(
+                        message.additional_kwargs["tool_calls"]
+                    )
+                except KeyError:
+                    if self.first_tool_only:
+                        return None
+                    return []
+                parsed_tool_calls = parse_tool_calls(
+                    raw_tool_calls,
+                    partial=partial,
+                    strict=self.strict,
+                    return_id=self.return_id,
+                )
+        elif result.tool_calls:
+            # v1 message
+            parsed_tool_calls = [dict(tc) for tc in result.tool_calls]
             for tool_call in parsed_tool_calls:
                 if not self.return_id:
                     _ = tool_call.pop("id")
         else:
-            try:
-                raw_tool_calls = copy.deepcopy(message.additional_kwargs["tool_calls"])
-            except KeyError:
-                if self.first_tool_only:
-                    return None
-                return []
-            parsed_tool_calls = parse_tool_calls(
-                raw_tool_calls,
-                partial=partial,
-                strict=self.strict,
-                return_id=self.return_id,
-            )
+            if self.first_tool_only:
+                return None
+            return []
+
         # For backwards compatibility
         for tc in parsed_tool_calls:
             tc["type"] = tc.pop("name")
+
         if self.first_tool_only:
             parsed_result = list(
                 filter(lambda x: x["type"] == self.key_name, parsed_tool_calls)
@@ -299,7 +333,9 @@ class PydanticToolsParser(JsonOutputToolsParser):
 
     # TODO: Support more granular streaming of objects. Currently only streams once all
     # Pydantic object fields are present.
-    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
+    def parse_result(
+        self, result: Union[list[Generation], AIMessageV1], *, partial: bool = False
+    ) -> Any:
         """Parse the result of an LLM call to a list of Pydantic objects.
 
         Args:
@@ -337,12 +373,19 @@ class PydanticToolsParser(JsonOutputToolsParser):
             except (ValidationError, ValueError):
                 if partial:
                     continue
-                has_max_tokens_stop_reason = any(
-                    generation.message.response_metadata.get("stop_reason")
-                    == "max_tokens"
-                    for generation in result
-                    if isinstance(generation, ChatGeneration)
-                )
+                has_max_tokens_stop_reason = False
+                if isinstance(result, list):
+                    has_max_tokens_stop_reason = any(
+                        generation.message.response_metadata.get("stop_reason")
+                        == "max_tokens"
+                        for generation in result
+                        if isinstance(generation, ChatGeneration)
+                    )
+                else:
+                    # v1 message
+                    has_max_tokens_stop_reason = (
+                        result.response_metadata.get("stop_reason") == "max_tokens"
+                    )
                 if has_max_tokens_stop_reason:
                     logger.exception(_MAX_TOKENS_ERROR)
                 raise

langchain_core/output_parsers/pydantic.py

@@ -1,7 +1,7 @@
 """Output parsers using Pydantic."""
 
 import json
-from typing import Annotated, Generic, Optional
+from typing import Annotated, Generic, Optional, Union
 
 import pydantic
 from pydantic import SkipValidation
@@ -14,6 +14,7 @@ from langchain_core.utils.pydantic import (
     PydanticBaseModel,
     TBaseModel,
 )
+from langchain_core.v1.messages import AIMessage
 
 
 class PydanticOutputParser(JsonOutputParser, Generic[TBaseModel]):
@@ -43,7 +44,7 @@ class PydanticOutputParser(JsonOutputParser, Generic[TBaseModel]):
         return OutputParserException(msg, llm_output=json_string)
 
     def parse_result(
-        self, result: list[Generation], *, partial: bool = False
+        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
     ) -> Optional[TBaseModel]:
         """Parse the result of an LLM call to a pydantic object.
 

langchain_core/output_parsers/transform.py

@@ -20,6 +20,7 @@ from langchain_core.outputs import (
     GenerationChunk,
 )
 from langchain_core.runnables.config import run_in_executor
+from langchain_core.v1.messages import AIMessage, AIMessageChunk
 
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator, Iterator
@@ -32,23 +33,27 @@ class BaseTransformOutputParser(BaseOutputParser[T]):
 
     def _transform(
         self,
-        input: Iterator[Union[str, BaseMessage]],  # noqa: A002
+        input: Iterator[Union[str, BaseMessage, AIMessage]],
     ) -> Iterator[T]:
         for chunk in input:
             if isinstance(chunk, BaseMessage):
                 yield self.parse_result([ChatGeneration(message=chunk)])
+            elif isinstance(chunk, AIMessage):
+                yield self.parse_result(chunk)
             else:
                 yield self.parse_result([Generation(text=chunk)])
 
     async def _atransform(
         self,
-        input: AsyncIterator[Union[str, BaseMessage]],  # noqa: A002
+        input: AsyncIterator[Union[str, BaseMessage, AIMessage]],
     ) -> AsyncIterator[T]:
         async for chunk in input:
             if isinstance(chunk, BaseMessage):
                 yield await run_in_executor(
                     None, self.parse_result, [ChatGeneration(message=chunk)]
                 )
+            elif isinstance(chunk, AIMessage):
+                yield await run_in_executor(None, self.parse_result, chunk)
             else:
                 yield await run_in_executor(
                     None, self.parse_result, [Generation(text=chunk)]
@@ -57,7 +62,7 @@ class BaseTransformOutputParser(BaseOutputParser[T]):
     @override
     def transform(
         self,
-        input: Iterator[Union[str, BaseMessage]],
+        input: Iterator[Union[str, BaseMessage, AIMessage]],
         config: Optional[RunnableConfig] = None,
         **kwargs: Any,
     ) -> Iterator[T]:
@@ -78,7 +83,7 @@ class BaseTransformOutputParser(BaseOutputParser[T]):
     @override
     async def atransform(
         self,
-        input: AsyncIterator[Union[str, BaseMessage]],
+        input: AsyncIterator[Union[str, BaseMessage, AIMessage]],
         config: Optional[RunnableConfig] = None,
         **kwargs: Any,
     ) -> AsyncIterator[T]:
@@ -125,23 +130,42 @@ class BaseCumulativeTransformOutputParser(BaseTransformOutputParser[T]):
         raise NotImplementedError
 
     @override
-    def _transform(self, input: Iterator[Union[str, BaseMessage]]) -> Iterator[Any]:
+    def _transform(
+        self, input: Iterator[Union[str, BaseMessage, AIMessage]]
+    ) -> Iterator[Any]:
         prev_parsed = None
-        acc_gen: Union[GenerationChunk, ChatGenerationChunk, None] = None
+        acc_gen: Union[GenerationChunk, ChatGenerationChunk, AIMessageChunk, None] = (
+            None
+        )
         for chunk in input:
-            chunk_gen: Union[GenerationChunk, ChatGenerationChunk]
+            chunk_gen: Union[GenerationChunk, ChatGenerationChunk, AIMessageChunk]
             if isinstance(chunk, BaseMessageChunk):
                 chunk_gen = ChatGenerationChunk(message=chunk)
             elif isinstance(chunk, BaseMessage):
                 chunk_gen = ChatGenerationChunk(
                     message=BaseMessageChunk(**chunk.model_dump())
                 )
+            elif isinstance(chunk, AIMessageChunk):
+                chunk_gen = chunk
+            elif isinstance(chunk, AIMessage):
+                chunk_gen = AIMessageChunk(
+                    content=chunk.content,
+                    id=chunk.id,
+                    name=chunk.name,
+                    lc_version=chunk.lc_version,
+                    response_metadata=chunk.response_metadata,
+                    usage_metadata=chunk.usage_metadata,
+                    parsed=chunk.parsed,
+                )
             else:
                 chunk_gen = GenerationChunk(text=chunk)
 
             acc_gen = chunk_gen if acc_gen is None else acc_gen + chunk_gen  # type: ignore[operator]
 
-            parsed = self.parse_result([acc_gen], partial=True)
+            if isinstance(acc_gen, AIMessageChunk):
+                parsed = self.parse_result(acc_gen, partial=True)
+            else:
+                parsed = self.parse_result([acc_gen], partial=True)
             if parsed is not None and parsed != prev_parsed:
                 if self.diff:
                     yield self._diff(prev_parsed, parsed)
@@ -151,24 +175,41 @@ class BaseCumulativeTransformOutputParser(BaseTransformOutputParser[T]):
 
     @override
     async def _atransform(
-        self, input: AsyncIterator[Union[str, BaseMessage]]
+        self, input: AsyncIterator[Union[str, BaseMessage, AIMessage]]
     ) -> AsyncIterator[T]:
         prev_parsed = None
-        acc_gen: Union[GenerationChunk, ChatGenerationChunk, None] = None
+        acc_gen: Union[GenerationChunk, ChatGenerationChunk, AIMessageChunk, None] = (
+            None
+        )
         async for chunk in input:
-            chunk_gen: Union[GenerationChunk, ChatGenerationChunk]
+            chunk_gen: Union[GenerationChunk, ChatGenerationChunk, AIMessageChunk]
             if isinstance(chunk, BaseMessageChunk):
                 chunk_gen = ChatGenerationChunk(message=chunk)
             elif isinstance(chunk, BaseMessage):
                 chunk_gen = ChatGenerationChunk(
                     message=BaseMessageChunk(**chunk.model_dump())
                 )
+            elif isinstance(chunk, AIMessageChunk):
+                chunk_gen = chunk
+            elif isinstance(chunk, AIMessage):
+                chunk_gen = AIMessageChunk(
+                    content=chunk.content,
+                    id=chunk.id,
+                    name=chunk.name,
+                    lc_version=chunk.lc_version,
+                    response_metadata=chunk.response_metadata,
+                    usage_metadata=chunk.usage_metadata,
+                    parsed=chunk.parsed,
+                )
             else:
                 chunk_gen = GenerationChunk(text=chunk)
 
             acc_gen = chunk_gen if acc_gen is None else acc_gen + chunk_gen  # type: ignore[operator]
 
-            parsed = await self.aparse_result([acc_gen], partial=True)
+            if isinstance(acc_gen, AIMessageChunk):
+                parsed = await self.aparse_result(acc_gen, partial=True)
+            else:
+                parsed = await self.aparse_result([acc_gen], partial=True)
             if parsed is not None and parsed != prev_parsed:
                 if self.diff:
                     yield await run_in_executor(None, self._diff, prev_parsed, parsed)

langchain_core/output_parsers/xml.py

@@ -12,8 +12,10 @@ from typing_extensions import override
 
 from langchain_core.exceptions import OutputParserException
 from langchain_core.messages import BaseMessage
+from langchain_core.messages.utils import convert_from_v1_message
 from langchain_core.output_parsers.transform import BaseTransformOutputParser
 from langchain_core.runnables.utils import AddableDict
+from langchain_core.v1.messages import AIMessage
 
 XML_FORMAT_INSTRUCTIONS = """The output should be formatted as a XML file.
 1. Output should conform to the tags below.
@@ -240,21 +242,28 @@ class XMLOutputParser(BaseTransformOutputParser):
 
     @override
     def _transform(
-        self, input: Iterator[Union[str, BaseMessage]]
+        self, input: Iterator[Union[str, BaseMessage, AIMessage]]
     ) -> Iterator[AddableDict]:
         streaming_parser = _StreamingParser(self.parser)
         for chunk in input:
-            yield from streaming_parser.parse(chunk)
+            if isinstance(chunk, AIMessage):
+                yield from streaming_parser.parse(convert_from_v1_message(chunk))
+            else:
+                yield from streaming_parser.parse(chunk)
         streaming_parser.close()
 
     @override
     async def _atransform(
-        self, input: AsyncIterator[Union[str, BaseMessage]]
+        self, input: AsyncIterator[Union[str, BaseMessage, AIMessage]]
     ) -> AsyncIterator[AddableDict]:
         streaming_parser = _StreamingParser(self.parser)
         async for chunk in input:
-            for output in streaming_parser.parse(chunk):
-                yield output
+            if isinstance(chunk, AIMessage):
+                for output in streaming_parser.parse(convert_from_v1_message(chunk)):
+                    yield output
+            else:
+                for output in streaming_parser.parse(chunk):
+                    yield output
         streaming_parser.close()
 
     def _root_to_dict(self, root: ET.Element) -> dict[str, Union[str, list[Any]]]:

langchain_core/outputs/llm_result.py

@@ -46,7 +46,10 @@ class LLMResult(BaseModel):
     relevant information from standardized fields present in AIMessage.
     """
     run: Optional[list[RunInfo]] = None
-    """List of metadata info for model call for each input."""
+    """List of metadata info for model call for each input.
+
+    See :class:`~langchain_core.outputs.run_info.RunInfo` for details.
+    """
 
     type: Literal["LLMResult"] = "LLMResult"
     """Type is used exclusively for serialization purposes."""