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

langchain_core/output_parsers/transform.py

@@ -20,7 +20,6 @@ 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
@@ -33,27 +32,23 @@ class BaseTransformOutputParser(BaseOutputParser[T]):
 
     def _transform(
         self,
-        input: Iterator[Union[str, BaseMessage, AIMessage]],
+        input: Iterator[Union[str, BaseMessage]],
     ) -> 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, AIMessage]],
+        input: AsyncIterator[Union[str, BaseMessage]],
     ) -> 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)]
@@ -62,7 +57,7 @@ class BaseTransformOutputParser(BaseOutputParser[T]):
     @override
     def transform(
         self,
-        input: Iterator[Union[str, BaseMessage, AIMessage]],
+        input: Iterator[Union[str, BaseMessage]],
         config: Optional[RunnableConfig] = None,
         **kwargs: Any,
     ) -> Iterator[T]:
@@ -83,7 +78,7 @@ class BaseTransformOutputParser(BaseOutputParser[T]):
     @override
     async def atransform(
         self,
-        input: AsyncIterator[Union[str, BaseMessage, AIMessage]],
+        input: AsyncIterator[Union[str, BaseMessage]],
         config: Optional[RunnableConfig] = None,
         **kwargs: Any,
     ) -> AsyncIterator[T]:
@@ -130,42 +125,23 @@ class BaseCumulativeTransformOutputParser(BaseTransformOutputParser[T]):
         raise NotImplementedError
 
     @override
-    def _transform(
-        self, input: Iterator[Union[str, BaseMessage, AIMessage]]
-    ) -> Iterator[Any]:
+    def _transform(self, input: Iterator[Union[str, BaseMessage]]) -> Iterator[Any]:
         prev_parsed = None
-        acc_gen: Union[GenerationChunk, ChatGenerationChunk, AIMessageChunk, None] = (
-            None
-        )
+        acc_gen: Union[GenerationChunk, ChatGenerationChunk, None] = None
         for chunk in input:
-            chunk_gen: Union[GenerationChunk, ChatGenerationChunk, AIMessageChunk]
+            chunk_gen: Union[GenerationChunk, ChatGenerationChunk]
             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]
 
-            if isinstance(acc_gen, AIMessageChunk):
-                parsed = self.parse_result(acc_gen, partial=True)
-            else:
-                parsed = self.parse_result([acc_gen], partial=True)
+            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)
@@ -175,41 +151,24 @@ class BaseCumulativeTransformOutputParser(BaseTransformOutputParser[T]):
 
     @override
     async def _atransform(
-        self, input: AsyncIterator[Union[str, BaseMessage, AIMessage]]
+        self, input: AsyncIterator[Union[str, BaseMessage]]
     ) -> AsyncIterator[T]:
         prev_parsed = None
-        acc_gen: Union[GenerationChunk, ChatGenerationChunk, AIMessageChunk, None] = (
-            None
-        )
+        acc_gen: Union[GenerationChunk, ChatGenerationChunk, None] = None
         async for chunk in input:
-            chunk_gen: Union[GenerationChunk, ChatGenerationChunk, AIMessageChunk]
+            chunk_gen: Union[GenerationChunk, ChatGenerationChunk]
             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]
 
-            if isinstance(acc_gen, AIMessageChunk):
-                parsed = await self.aparse_result(acc_gen, partial=True)
-            else:
-                parsed = await self.aparse_result([acc_gen], partial=True)
+            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,10 +12,8 @@ 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.
@@ -107,10 +105,11 @@ class _StreamingParser:
         self.buffer = ""
         # yield all events
         try:
-            for event, elem in self.pull_parser.read_events():
+            events = self.pull_parser.read_events()
+            for event, elem in events:  # type: ignore[misc]
                 if event == "start":
                     # update current path
-                    self.current_path.append(elem.tag)
+                    self.current_path.append(elem.tag)  # type: ignore[union-attr]
                     self.current_path_has_children = False
                 elif event == "end":
                     # remove last element from current path
@@ -118,7 +117,7 @@ class _StreamingParser:
                     self.current_path.pop()
                     # yield element
                     if not self.current_path_has_children:
-                        yield nested_element(self.current_path, elem)
+                        yield nested_element(self.current_path, elem)  # type: ignore[arg-type]
                     # prevent yielding of parent element
                     if self.current_path:
                         self.current_path_has_children = True
@@ -242,28 +241,21 @@ class XMLOutputParser(BaseTransformOutputParser):
 
     @override
     def _transform(
-        self, input: Iterator[Union[str, BaseMessage, AIMessage]]
+        self, input: Iterator[Union[str, BaseMessage]]
     ) -> Iterator[AddableDict]:
         streaming_parser = _StreamingParser(self.parser)
         for chunk in input:
-            if isinstance(chunk, AIMessage):
-                yield from streaming_parser.parse(convert_from_v1_message(chunk))
-            else:
-                yield from streaming_parser.parse(chunk)
+            yield from streaming_parser.parse(chunk)
         streaming_parser.close()
 
     @override
     async def _atransform(
-        self, input: AsyncIterator[Union[str, BaseMessage, AIMessage]]
+        self, input: AsyncIterator[Union[str, BaseMessage]]
     ) -> AsyncIterator[AddableDict]:
         streaming_parser = _StreamingParser(self.parser)
         async for chunk in input:
-            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
+            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/prompt_values.py

@@ -8,65 +8,17 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from collections.abc import Sequence
-from typing import Literal, Union, cast
+from typing import Literal, cast
 
-from typing_extensions import TypedDict, overload
+from typing_extensions import TypedDict
 
 from langchain_core.load.serializable import Serializable
 from langchain_core.messages import (
-    AIMessage,
     AnyMessage,
     BaseMessage,
     HumanMessage,
-    SystemMessage,
-    ToolMessage,
     get_buffer_string,
 )
-from langchain_core.messages import content_blocks as types
-from langchain_core.v1.messages import AIMessage as AIMessageV1
-from langchain_core.v1.messages import HumanMessage as HumanMessageV1
-from langchain_core.v1.messages import MessageV1, ResponseMetadata
-from langchain_core.v1.messages import SystemMessage as SystemMessageV1
-from langchain_core.v1.messages import ToolMessage as ToolMessageV1
-
-
-def _convert_to_v1(message: BaseMessage) -> MessageV1:
-    """Best-effort conversion of a V0 AIMessage to V1."""
-    if isinstance(message.content, str):
-        content: list[types.ContentBlock] = []
-        if message.content:
-            content = [{"type": "text", "text": message.content}]
-    else:
-        content = []
-        for block in message.content:
-            if isinstance(block, str):
-                content.append({"type": "text", "text": block})
-            elif isinstance(block, dict):
-                content.append(cast("types.ContentBlock", block))
-            else:
-                pass
-
-    if isinstance(message, HumanMessage):
-        return HumanMessageV1(content=content)
-    if isinstance(message, AIMessage):
-        for tool_call in message.tool_calls:
-            content.append(tool_call)
-        return AIMessageV1(
-            content=content,
-            usage_metadata=message.usage_metadata,
-            response_metadata=cast("ResponseMetadata", message.response_metadata),
-            tool_calls=message.tool_calls,
-        )
-    if isinstance(message, SystemMessage):
-        return SystemMessageV1(content=content)
-    if isinstance(message, ToolMessage):
-        return ToolMessageV1(
-            tool_call_id=message.tool_call_id,
-            content=content,
-            artifact=message.artifact,
-        )
-    error_message = f"Unsupported message type: {type(message)}"
-    raise TypeError(error_message)
 
 
 class PromptValue(Serializable, ABC):
@@ -94,18 +46,8 @@ class PromptValue(Serializable, ABC):
     def to_string(self) -> str:
         """Return prompt value as string."""
 
-    @overload
-    def to_messages(
-        self, message_version: Literal["v0"] = "v0"
-    ) -> list[BaseMessage]: ...
-
-    @overload
-    def to_messages(self, message_version: Literal["v1"]) -> list[MessageV1]: ...
-
     @abstractmethod
-    def to_messages(
-        self, message_version: Literal["v0", "v1"] = "v0"
-    ) -> Union[Sequence[BaseMessage], Sequence[MessageV1]]:
+    def to_messages(self) -> list[BaseMessage]:
         """Return prompt as a list of Messages."""
 
 
@@ -129,20 +71,8 @@ class StringPromptValue(PromptValue):
         """Return prompt as string."""
         return self.text
 
-    @overload
-    def to_messages(
-        self, message_version: Literal["v0"] = "v0"
-    ) -> list[BaseMessage]: ...
-
-    @overload
-    def to_messages(self, message_version: Literal["v1"]) -> list[MessageV1]: ...
-
-    def to_messages(
-        self, message_version: Literal["v0", "v1"] = "v0"
-    ) -> Union[Sequence[BaseMessage], Sequence[MessageV1]]:
+    def to_messages(self) -> list[BaseMessage]:
         """Return prompt as messages."""
-        if message_version == "v1":
-            return [HumanMessageV1(content=self.text)]
         return [HumanMessage(content=self.text)]
 
 
@@ -159,24 +89,8 @@ class ChatPromptValue(PromptValue):
         """Return prompt as string."""
         return get_buffer_string(self.messages)
 
-    @overload
-    def to_messages(
-        self, message_version: Literal["v0"] = "v0"
-    ) -> list[BaseMessage]: ...
-
-    @overload
-    def to_messages(self, message_version: Literal["v1"]) -> list[MessageV1]: ...
-
-    def to_messages(
-        self, message_version: Literal["v0", "v1"] = "v0"
-    ) -> Union[Sequence[BaseMessage], Sequence[MessageV1]]:
-        """Return prompt as a list of messages.
-
-        Args:
-            message_version: The output version, either "v0" (default) or "v1".
-        """
-        if message_version == "v1":
-            return [_convert_to_v1(m) for m in self.messages]
+    def to_messages(self) -> list[BaseMessage]:
+        """Return prompt as a list of messages."""
         return list(self.messages)
 
     @classmethod
@@ -209,28 +123,10 @@ class ImagePromptValue(PromptValue):
 
     def to_string(self) -> str:
         """Return prompt (image URL) as string."""
-        return self.image_url["url"]
-
-    @overload
-    def to_messages(
-        self, message_version: Literal["v0"] = "v0"
-    ) -> list[BaseMessage]: ...
-
-    @overload
-    def to_messages(self, message_version: Literal["v1"]) -> list[MessageV1]: ...
+        return self.image_url.get("url", "")
 
-    def to_messages(
-        self, message_version: Literal["v0", "v1"] = "v0"
-    ) -> Union[Sequence[BaseMessage], Sequence[MessageV1]]:
+    def to_messages(self) -> list[BaseMessage]:
         """Return prompt (image URL) as messages."""
-        if message_version == "v1":
-            block: types.ImageContentBlock = {
-                "type": "image",
-                "url": self.image_url["url"],
-            }
-            if "detail" in self.image_url:
-                block["detail"] = self.image_url["detail"]
-            return [HumanMessageV1(content=[block])]
         return [HumanMessage(content=[cast("dict", self.image_url)])]
 
 

langchain_core/prompts/chat.py

@@ -155,9 +155,7 @@ class MessagesPlaceholder(BaseMessagePromptTemplate):
         """
         # mypy can't detect the init which is defined in the parent class
         # b/c these are BaseModel classes.
-        super().__init__(  # type: ignore[call-arg]
-            variable_name=variable_name, optional=optional, **kwargs
-        )
+        super().__init__(variable_name=variable_name, optional=optional, **kwargs)
 
     def format_messages(self, **kwargs: Any) -> list[BaseMessage]:
         """Format messages from kwargs.