langchain-core 0.4.0.dev0__py3-none-any.whl → 1.0.0a2__py3-none-any.whl

langchain_core/output_parsers/base.py

@@ -11,7 +11,6 @@ from typing import (
     Optional,
     TypeVar,
     Union,
-    cast,
 )
 
 from typing_extensions import override
@@ -21,22 +20,19 @@ from langchain_core.messages import AnyMessage, BaseMessage
 from langchain_core.outputs import ChatGeneration, Generation
 from langchain_core.runnables import Runnable, RunnableConfig, RunnableSerializable
 from langchain_core.runnables.config import run_in_executor
-from langchain_core.v1.messages import AIMessage, MessageV1, MessageV1Types
 
 if TYPE_CHECKING:
     from langchain_core.prompt_values import PromptValue
 
 T = TypeVar("T")
-OutputParserLike = Runnable[Union[LanguageModelOutput, AIMessage], T]
+OutputParserLike = Runnable[LanguageModelOutput, T]
 
 
 class BaseLLMOutputParser(ABC, Generic[T]):
     """Abstract base class for parsing the outputs of a model."""
 
     @abstractmethod
-    def parse_result(
-        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
-    ) -> T:
+    def parse_result(self, result: list[Generation], *, partial: bool = False) -> T:
         """Parse a list of candidate model Generations into a specific format.
 
         Args:
@@ -50,7 +46,7 @@ class BaseLLMOutputParser(ABC, Generic[T]):
         """
 
     async def aparse_result(
-        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
+        self, result: list[Generation], *, partial: bool = False
     ) -> T:
         """Async parse a list of candidate model Generations into a specific format.
 
@@ -75,7 +71,7 @@ class BaseGenerationOutputParser(
     @override
     def InputType(self) -> Any:
         """Return the input type for the parser."""
-        return Union[str, AnyMessage, MessageV1]
+        return Union[str, AnyMessage]
 
     @property
     @override
@@ -88,7 +84,7 @@ class BaseGenerationOutputParser(
     @override
     def invoke(
         self,
-        input: Union[str, BaseMessage, MessageV1],
+        input: Union[str, BaseMessage],
         config: Optional[RunnableConfig] = None,
         **kwargs: Any,
     ) -> T:
@@ -101,16 +97,9 @@ class BaseGenerationOutputParser(
                 config,
                 run_type="parser",
             )
-        if isinstance(input, MessageV1Types):
-            return self._call_with_config(
-                lambda inner_input: self.parse_result(inner_input),
-                input,
-                config,
-                run_type="parser",
-            )
         return self._call_with_config(
             lambda inner_input: self.parse_result([Generation(text=inner_input)]),
-            cast("str", input),
+            input,
             config,
             run_type="parser",
         )
@@ -131,13 +120,6 @@ class BaseGenerationOutputParser(
                 config,
                 run_type="parser",
             )
-        if isinstance(input, MessageV1Types):
-            return await self._acall_with_config(
-                lambda inner_input: self.aparse_result(inner_input),
-                input,
-                config,
-                run_type="parser",
-            )
         return await self._acall_with_config(
             lambda inner_input: self.aparse_result([Generation(text=inner_input)]),
             input,
@@ -147,7 +129,7 @@ class BaseGenerationOutputParser(
 
 
 class BaseOutputParser(
-    BaseLLMOutputParser, RunnableSerializable[Union[LanguageModelOutput, AIMessage], T]
+    BaseLLMOutputParser, RunnableSerializable[LanguageModelOutput, T]
 ):
     """Base class to parse the output of an LLM call.
 
@@ -180,7 +162,7 @@ class BaseOutputParser(
     @override
     def InputType(self) -> Any:
         """Return the input type for the parser."""
-        return Union[str, AnyMessage, MessageV1]
+        return Union[str, AnyMessage]
 
     @property
     @override
@@ -207,7 +189,7 @@ class BaseOutputParser(
     @override
     def invoke(
         self,
-        input: Union[str, BaseMessage, MessageV1],
+        input: Union[str, BaseMessage],
         config: Optional[RunnableConfig] = None,
         **kwargs: Any,
     ) -> T:
@@ -220,16 +202,9 @@ class BaseOutputParser(
                 config,
                 run_type="parser",
             )
-        if isinstance(input, MessageV1Types):
-            return self._call_with_config(
-                lambda inner_input: self.parse_result(inner_input),
-                input,
-                config,
-                run_type="parser",
-            )
         return self._call_with_config(
             lambda inner_input: self.parse_result([Generation(text=inner_input)]),
-            cast("str", input),
+            input,
             config,
             run_type="parser",
         )
@@ -237,7 +212,7 @@ class BaseOutputParser(
     @override
     async def ainvoke(
         self,
-        input: Union[str, BaseMessage, MessageV1],
+        input: Union[str, BaseMessage],
         config: Optional[RunnableConfig] = None,
         **kwargs: Optional[Any],
     ) -> T:
@@ -250,24 +225,15 @@ class BaseOutputParser(
                 config,
                 run_type="parser",
             )
-        if isinstance(input, MessageV1Types):
-            return await self._acall_with_config(
-                lambda inner_input: self.aparse_result(inner_input),
-                input,
-                config,
-                run_type="parser",
-            )
         return await self._acall_with_config(
             lambda inner_input: self.aparse_result([Generation(text=inner_input)]),
-            cast("str", input),
+            input,
             config,
             run_type="parser",
         )
 
     @override
-    def parse_result(
-        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
-    ) -> T:
+    def parse_result(self, result: list[Generation], *, partial: bool = False) -> T:
         """Parse a list of candidate model Generations into a specific format.
 
         The return value is parsed from only the first Generation in the result, which
@@ -282,8 +248,6 @@ class BaseOutputParser(
         Returns:
             Structured output.
         """
-        if isinstance(result, AIMessage):
-            return self.parse(result.text)
         return self.parse(result[0].text)
 
     @abstractmethod
@@ -298,7 +262,7 @@ class BaseOutputParser(
         """
 
     async def aparse_result(
-        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
+        self, result: list[Generation], *, partial: bool = False
     ) -> T:
         """Async parse a list of candidate model Generations into a specific format.
 

langchain_core/output_parsers/json.py

@@ -21,7 +21,6 @@ from langchain_core.utils.json import (
     parse_json_markdown,
     parse_partial_json,
 )
-from langchain_core.v1.messages import AIMessage
 
 # Union type needs to be last assignment to PydanticBaseModel to make mypy happy.
 PydanticBaseModel = Union[BaseModel, pydantic.BaseModel]
@@ -54,9 +53,7 @@ class JsonOutputParser(BaseCumulativeTransformOutputParser[Any]):
             return pydantic_object.schema()
         return None
 
-    def parse_result(
-        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
-    ) -> Any:
+    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
         """Parse the result of an LLM call to a JSON object.
 
         Args:
@@ -73,7 +70,7 @@ class JsonOutputParser(BaseCumulativeTransformOutputParser[Any]):
         Raises:
             OutputParserException: If the output is not valid JSON.
         """
-        text = result.text if isinstance(result, AIMessage) else result[0].text
+        text = result[0].text
         text = text.strip()
         if partial:
             try:

langchain_core/output_parsers/list.py

@@ -13,7 +13,6 @@ 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
@@ -72,7 +71,7 @@ class ListOutputParser(BaseTransformOutputParser[list[str]]):
 
     @override
     def _transform(
-        self, input: Iterator[Union[str, BaseMessage, AIMessage]]
+        self, input: Iterator[Union[str, BaseMessage]]
     ) -> Iterator[list[str]]:
         buffer = ""
         for chunk in input:
@@ -82,8 +81,6 @@ 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
@@ -108,7 +105,7 @@ class ListOutputParser(BaseTransformOutputParser[list[str]]):
 
     @override
     async def _atransform(
-        self, input: AsyncIterator[Union[str, BaseMessage, AIMessage]]
+        self, input: AsyncIterator[Union[str, BaseMessage]]
     ) -> AsyncIterator[list[str]]:
         buffer = ""
         async for chunk in input:
@@ -118,8 +115,6 @@ 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,7 +17,6 @@ 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]):
@@ -27,9 +26,7 @@ class OutputFunctionsParser(BaseGenerationOutputParser[Any]):
     """Whether to only return the arguments to the function call."""
 
     @override
-    def parse_result(
-        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
-    ) -> Any:
+    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
         """Parse the result of an LLM call to a JSON object.
 
         Args:
@@ -42,12 +39,6 @@ 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."
@@ -86,9 +77,7 @@ 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: Union[list[Generation], AIMessage], *, partial: bool = False
-    ) -> Any:
+    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
         """Parse the result of an LLM call to a JSON object.
 
         Args:
@@ -101,12 +90,6 @@ 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)
@@ -177,9 +160,7 @@ class JsonKeyOutputFunctionsParser(JsonOutputFunctionsParser):
     key_name: str
     """The name of the key to return."""
 
-    def parse_result(
-        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
-    ) -> Any:
+    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
         """Parse the result of an LLM call to a JSON object.
 
         Args:
@@ -273,9 +254,7 @@ class PydanticOutputFunctionsParser(OutputFunctionsParser):
         return values
 
     @override
-    def parse_result(
-        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
-    ) -> Any:
+    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
         """Parse the result of an LLM call to a JSON object.
 
         Args:
@@ -315,9 +294,7 @@ class PydanticAttrOutputFunctionsParser(PydanticOutputFunctionsParser):
     """The name of the attribute to return."""
 
     @override
-    def parse_result(
-        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
-    ) -> Any:
+    def parse_result(self, result: list[Generation], *, 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, Union
+from typing import Annotated, Any, Optional
 
 from pydantic import SkipValidation, ValidationError
 
@@ -16,7 +16,6 @@ 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__)
 
@@ -157,9 +156,7 @@ class JsonOutputToolsParser(BaseCumulativeTransformOutputParser[Any]):
     If no tool calls are found, None will be returned.
     """
 
-    def parse_result(
-        self, result: Union[list[Generation], AIMessageV1], *, partial: bool = False
-    ) -> Any:
+    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
         """Parse the result of an LLM call to a list of tool calls.
 
         Args:
@@ -176,45 +173,31 @@ class JsonOutputToolsParser(BaseCumulativeTransformOutputParser[Any]):
         Raises:
             OutputParserException: If the output is not valid JSON.
         """
-        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]
+        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]
             for tool_call in tool_calls:
                 if not self.return_id:
                     _ = tool_call.pop("id")
         else:
-            return []
-
+            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,
+            )
         # 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
@@ -237,9 +220,7 @@ class JsonOutputKeyToolsParser(JsonOutputToolsParser):
     key_name: str
     """The type of tools to return."""
 
-    def parse_result(
-        self, result: Union[list[Generation], AIMessageV1], *, partial: bool = False
-    ) -> Any:
+    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
         """Parse the result of an LLM call to a list of tool calls.
 
         Args:
@@ -253,47 +234,34 @@ class JsonOutputKeyToolsParser(JsonOutputToolsParser):
         Returns:
             The parsed 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]
+        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:
-            if self.first_tool_only:
-                return None
-            return []
-
+            try:
+                # This exists purely for backward compatibility / cached messages
+                # All new messages should use `message.tool_calls`
+                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,
+            )
         # 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)
@@ -333,9 +301,7 @@ 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: Union[list[Generation], AIMessageV1], *, partial: bool = False
-    ) -> Any:
+    def parse_result(self, result: list[Generation], *, partial: bool = False) -> Any:
         """Parse the result of an LLM call to a list of Pydantic objects.
 
         Args:
@@ -373,19 +339,12 @@ class PydanticToolsParser(JsonOutputToolsParser):
             except (ValidationError, ValueError):
                 if partial:
                     continue
-                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"
-                    )
+                has_max_tokens_stop_reason = any(
+                    generation.message.response_metadata.get("stop_reason")
+                    == "max_tokens"
+                    for generation in result
+                    if isinstance(generation, ChatGeneration)
+                )
                 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, Union
+from typing import Annotated, Generic, Optional
 
 import pydantic
 from pydantic import SkipValidation
@@ -14,7 +14,6 @@ from langchain_core.utils.pydantic import (
     PydanticBaseModel,
     TBaseModel,
 )
-from langchain_core.v1.messages import AIMessage
 
 
 class PydanticOutputParser(JsonOutputParser, Generic[TBaseModel]):
@@ -44,7 +43,7 @@ class PydanticOutputParser(JsonOutputParser, Generic[TBaseModel]):
         return OutputParserException(msg, llm_output=json_string)
 
     def parse_result(
-        self, result: Union[list[Generation], AIMessage], *, partial: bool = False
+        self, result: list[Generation], *, partial: bool = False
     ) -> Optional[TBaseModel]:
         """Parse the result of an LLM call to a pydantic object.