langchain 0.2.5__tar.gz → 0.2.6__tar.gz

{langchain-0.2.5 → langchain-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain
-Version: 0.2.5
+Version: 0.2.6
 Summary: Building applications with LLMs through composability
 Home-page: https://github.com/langchain-ai/langchain
 License: MIT
@@ -15,14 +15,14 @@ Requires-Dist: PyYAML (>=5.3)
 Requires-Dist: SQLAlchemy (>=1.4,<3)
 Requires-Dist: aiohttp (>=3.8.3,<4.0.0)
 Requires-Dist: async-timeout (>=4.0.0,<5.0.0) ; python_version < "3.11"
-Requires-Dist: langchain-core (>=0.2.7,<0.3.0)
+Requires-Dist: langchain-core (>=0.2.10,<0.3.0)
 Requires-Dist: langchain-text-splitters (>=0.2.0,<0.3.0)
 Requires-Dist: langsmith (>=0.1.17,<0.2.0)
 Requires-Dist: numpy (>=1,<2) ; python_version < "3.12"
 Requires-Dist: numpy (>=1.26.0,<2.0.0) ; python_version >= "3.12"
 Requires-Dist: pydantic (>=1,<3)
 Requires-Dist: requests (>=2,<3)
-Requires-Dist: tenacity (>=8.1.0,<9.0.0)
+Requires-Dist: tenacity (>=8.1.0,<9.0.0,!=8.4.0)
 Project-URL: Repository, https://github.com/langchain-ai/langchain
 Description-Content-Type: text/markdown
 

{langchain-0.2.5 → langchain-0.2.6}/langchain/_api/module_import.py

@@ -101,7 +101,7 @@ def create_importer(
                                 f">> from {new_module} import {name}\n"
                                 "You can use the langchain cli to **automatically** "
                                 "upgrade many imports. Please see documentation here "
-                                "https://python.langchain.com/v0.2/docs/versions/v0_2/ "
+                                "<https://python.langchain.com/v0.2/docs/versions/v0_2/>"
                             ),
                         )
                 return result
@@ -133,7 +133,7 @@ def create_importer(
                                 f">> from {fallback_module} import {name}\n"
                                 "You can use the langchain cli to **automatically** "
                                 "upgrade many imports. Please see documentation here "
-                                "https://python.langchain.com/v0.2/docs/versions/v0_2/ "
+                                "<https://python.langchain.com/v0.2/docs/versions/v0_2/>"
                             ),
                         )
                 return result

{langchain-0.2.5 → langchain-0.2.6}/langchain/agents/json_chat/base.py

@@ -122,8 +122,8 @@ def create_json_chat_agent(
 
             ```json
             {{
-                "action": string, \ The action to take. Must be one of {tool_names}
-                "action_input": string \ The input to the action
+                "action": string, \\ The action to take. Must be one of {tool_names}
+                "action_input": string \\ The input to the action
             }}
             ```
 
@@ -134,7 +134,7 @@ def create_json_chat_agent(
             ```json
             {{
                 "action": "Final Answer",
-                "action_input": string \ You should put what you want to return to use here
+                "action_input": string \\ You should put what you want to return to use here
             }}
             ```
 

{langchain-0.2.5 → langchain-0.2.6}/langchain/agents/tool_calling_agent/base.py

@@ -1,6 +1,8 @@
-from typing import Sequence
+from typing import Callable, List, Sequence, Tuple
 
+from langchain_core.agents import AgentAction
 from langchain_core.language_models import BaseLanguageModel
+from langchain_core.messages import BaseMessage
 from langchain_core.prompts.chat import ChatPromptTemplate
 from langchain_core.runnables import Runnable, RunnablePassthrough
 from langchain_core.tools import BaseTool
@@ -10,9 +12,15 @@ from langchain.agents.format_scratchpad.tools import (
 )
 from langchain.agents.output_parsers.tools import ToolsAgentOutputParser
 
+MessageFormatter = Callable[[Sequence[Tuple[AgentAction, str]]], List[BaseMessage]]
+
 
 def create_tool_calling_agent(
-    llm: BaseLanguageModel, tools: Sequence[BaseTool], prompt: ChatPromptTemplate
+    llm: BaseLanguageModel,
+    tools: Sequence[BaseTool],
+    prompt: ChatPromptTemplate,
+    *,
+    message_formatter: MessageFormatter = format_to_tool_messages,
 ) -> Runnable:
     """Create an agent that uses tools.
 
@@ -21,6 +29,8 @@ def create_tool_calling_agent(
         tools: Tools this agent has access to.
         prompt: The prompt to use. See Prompt section below for more on the expected
             input variables.
+        message_formatter: Formatter function to convert (AgentAction, tool output)
+            tuples into FunctionMessages.
 
     Returns:
         A Runnable sequence representing an agent. It takes as input all the same input
@@ -89,7 +99,7 @@ def create_tool_calling_agent(
 
     agent = (
         RunnablePassthrough.assign(
-            agent_scratchpad=lambda x: format_to_tool_messages(x["intermediate_steps"])
+            agent_scratchpad=lambda x: message_formatter(x["intermediate_steps"])
         )
         | prompt
         | llm_with_tools

{langchain-0.2.5 → langchain-0.2.6}/langchain/chains/llm.py

@@ -38,7 +38,7 @@ from langchain.chains.base import Chain
 @deprecated(
     since="0.1.17",
     alternative="RunnableSequence, e.g., `prompt | llm`",
-    removal="0.3.0",
+    removal="1.0",
 )
 class LLMChain(Chain):
     """Chain to run queries against LLMs.
@@ -48,6 +48,7 @@ class LLMChain(Chain):
 
         .. code-block:: python
 
+            from langchain_core.output_parsers import StrOutputParser
             from langchain_core.prompts import PromptTemplate
             from langchain_openai import OpenAI
 
@@ -56,7 +57,7 @@ class LLMChain(Chain):
                 input_variables=["adjective"], template=prompt_template
             )
             llm = OpenAI()
-            chain = prompt | llm
+            chain = prompt | llm | StrOutputParser()
 
             chain.invoke("your adjective here")
 

{langchain-0.2.5 → langchain-0.2.6}/langchain/chains/openai_functions/extraction.py

@@ -50,13 +50,13 @@ Passage:
         "LangChain has introduced a method called `with_structured_output` that"
         "is available on ChatModels capable of tool calling."
         "You can read more about the method here: "
-        "https://python.langchain.com/docs/modules/model_io/chat/structured_output/"
+        "<https://python.langchain.com/docs/modules/model_io/chat/structured_output/>. "
         "Please follow our extraction use case documentation for more guidelines"
         "on how to do information extraction with LLMs."
-        "https://python.langchain.com/docs/use_cases/extraction/."
+        "<https://python.langchain.com/docs/use_cases/extraction/>. "
         "If you notice other issues, please provide "
         "feedback here:"
-        "https://github.com/langchain-ai/langchain/discussions/18154"
+        "<https://github.com/langchain-ai/langchain/discussions/18154>"
     ),
     removal="0.3.0",
     alternative=(
@@ -120,13 +120,13 @@ def create_extraction_chain(
         "LangChain has introduced a method called `with_structured_output` that"
         "is available on ChatModels capable of tool calling."
         "You can read more about the method here: "
-        "https://python.langchain.com/docs/modules/model_io/chat/structured_output/"
+        "<https://python.langchain.com/docs/modules/model_io/chat/structured_output/>. "
         "Please follow our extraction use case documentation for more guidelines"
         "on how to do information extraction with LLMs."
-        "https://python.langchain.com/docs/use_cases/extraction/."
+        "<https://python.langchain.com/docs/use_cases/extraction/>. "
         "If you notice other issues, please provide "
         "feedback here:"
-        "https://github.com/langchain-ai/langchain/discussions/18154"
+        "<https://github.com/langchain-ai/langchain/discussions/18154>"
     ),
     removal="0.3.0",
     alternative=(

{langchain-0.2.5 → langchain-0.2.6}/langchain/chains/openai_tools/extraction.py

@@ -20,14 +20,14 @@ If a property is not present and is not required in the function parameters, do
         "LangChain has introduced a method called `with_structured_output` that"
         "is available on ChatModels capable of tool calling."
         "You can read more about the method here: "
-        "https://python.langchain.com/docs/modules/model_io/chat/structured_output/"
+        "<https://python.langchain.com/docs/modules/model_io/chat/structured_output/>. "
         "Please follow our extraction use case documentation for more guidelines"
         "on how to do information extraction with LLMs."
-        "https://python.langchain.com/docs/use_cases/extraction/."
+        "<https://python.langchain.com/docs/use_cases/extraction/>. "
         "with_structured_output does not currently support a list of pydantic schemas. "
         "If this is a blocker or if you notice other issues, please provide "
         "feedback here:"
-        "https://github.com/langchain-ai/langchain/discussions/18154"
+        "<https://github.com/langchain-ai/langchain/discussions/18154>"
     ),
     removal="0.3.0",
     alternative=(

{langchain-0.2.5 → langchain-0.2.6}/langchain/chains/structured_output/base.py

@@ -32,13 +32,13 @@ from langchain_core.utils.function_calling import (
         "LangChain has introduced a method called `with_structured_output` that "
         "is available on ChatModels capable of tool calling. "
         "You can read more about the method here: "
-        "https://python.langchain.com/docs/modules/model_io/chat/structured_output/ "
+        "<https://python.langchain.com/docs/modules/model_io/chat/structured_output/>. "
         "Please follow our extraction use case documentation for more guidelines "
         "on how to do information extraction with LLMs. "
-        "https://python.langchain.com/docs/use_cases/extraction/. "
+        "<https://python.langchain.com/docs/use_cases/extraction/>. "
         "If you notice other issues, please provide "
         "feedback here: "
-        "https://github.com/langchain-ai/langchain/discussions/18154"
+        "<https://github.com/langchain-ai/langchain/discussions/18154>"
     ),
     removal="0.3.0",
     alternative=(
@@ -150,13 +150,13 @@ def create_openai_fn_runnable(
         "LangChain has introduced a method called `with_structured_output` that "
         "is available on ChatModels capable of tool calling. "
         "You can read more about the method here: "
-        "https://python.langchain.com/docs/modules/model_io/chat/structured_output/ "
+        "<https://python.langchain.com/docs/modules/model_io/chat/structured_output/>."
         "Please follow our extraction use case documentation for more guidelines "
         "on how to do information extraction with LLMs. "
-        "https://python.langchain.com/docs/use_cases/extraction/. "
+        "<https://python.langchain.com/docs/use_cases/extraction/>. "
         "If you notice other issues, please provide "
         "feedback here: "
-        "https://github.com/langchain-ai/langchain/discussions/18154"
+        "<https://github.com/langchain-ai/langchain/discussions/18154>"
     ),
     removal="0.3.0",
     alternative=(

{langchain-0.2.5 → langchain-0.2.6}/langchain/indexes/_sql_record_manager.py

@@ -13,6 +13,7 @@ allow it to work with a variety of SQL as a backend.
 * Keys can be listed based on the updated at field.
 * Keys can be deleted.
 """
+
 import contextlib
 import decimal
 import uuid
@@ -20,9 +21,7 @@ from typing import Any, AsyncGenerator, Dict, Generator, List, Optional, Sequenc
 
 from langchain_core.indexing import RecordManager
 from sqlalchemy import (
-    URL,
     Column,
-    Engine,
     Float,
     Index,
     String,
@@ -33,15 +32,21 @@ from sqlalchemy import (
     select,
     text,
 )
+from sqlalchemy.engine import URL, Engine
 from sqlalchemy.ext.asyncio import (
     AsyncEngine,
     AsyncSession,
-    async_sessionmaker,
     create_async_engine,
 )
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import Query, Session, sessionmaker
 
+try:
+    from sqlalchemy.ext.asyncio import async_sessionmaker
+except ImportError:
+    # dummy for sqlalchemy < 2
+    async_sessionmaker = type("async_sessionmaker", (type,), {})  # type: ignore
+
 Base = declarative_base()
 
 

{langchain-0.2.5 → langchain-0.2.6}/langchain/output_parsers/combining.py

@@ -6,7 +6,7 @@ from langchain_core.output_parsers import BaseOutputParser
 from langchain_core.pydantic_v1 import root_validator
 
 
-class CombiningOutputParser(BaseOutputParser):
+class CombiningOutputParser(BaseOutputParser[Dict[str, Any]]):
     """Combine multiple output parsers into one."""
 
     parsers: List[BaseOutputParser]

{langchain-0.2.5 → langchain-0.2.6}/langchain/output_parsers/enum.py

@@ -1,12 +1,12 @@
 from enum import Enum
-from typing import Any, Dict, List, Type
+from typing import Dict, List, Type
 
 from langchain_core.exceptions import OutputParserException
 from langchain_core.output_parsers import BaseOutputParser
 from langchain_core.pydantic_v1 import root_validator
 
 
-class EnumOutputParser(BaseOutputParser):
+class EnumOutputParser(BaseOutputParser[Enum]):
     """Parse an output that is one of a set of values."""
 
     enum: Type[Enum]
@@ -23,7 +23,7 @@ class EnumOutputParser(BaseOutputParser):
     def _valid_values(self) -> List[str]:
         return [e.value for e in self.enum]
 
-    def parse(self, response: str) -> Any:
+    def parse(self, response: str) -> Enum:
         try:
             return self.enum(response.strip())
         except ValueError:
@@ -34,3 +34,7 @@ class EnumOutputParser(BaseOutputParser):
 
     def get_format_instructions(self) -> str:
         return f"Select one of the following options: {', '.join(self._valid_values)}"
+
+    @property
+    def OutputType(self) -> Type[Enum]:
+        return self.enum

langchain-0.2.6/langchain/output_parsers/fix.py

@@ -0,0 +1,138 @@
+from __future__ import annotations
+
+from typing import Any, TypeVar, Union
+
+from langchain_core.exceptions import OutputParserException
+from langchain_core.language_models import BaseLanguageModel
+from langchain_core.output_parsers import BaseOutputParser
+from langchain_core.prompts import BasePromptTemplate
+from langchain_core.runnables import RunnableSerializable
+
+from langchain.output_parsers.prompts import NAIVE_FIX_PROMPT
+
+T = TypeVar("T")
+
+
+class OutputFixingParser(BaseOutputParser[T]):
+    """Wrap a parser and try to fix parsing errors."""
+
+    @classmethod
+    def is_lc_serializable(cls) -> bool:
+        return True
+
+    parser: BaseOutputParser[T]
+    """The parser to use to parse the output."""
+    # Should be an LLMChain but we want to avoid top-level imports from langchain.chains
+    retry_chain: Union[RunnableSerializable, Any]
+    """The RunnableSerializable to use to retry the completion (Legacy: LLMChain)."""
+    max_retries: int = 1
+    """The maximum number of times to retry the parse."""
+    legacy: bool = True
+    """Whether to use the run or arun method of the retry_chain."""
+
+    @classmethod
+    def from_llm(
+        cls,
+        llm: BaseLanguageModel,
+        parser: BaseOutputParser[T],
+        prompt: BasePromptTemplate = NAIVE_FIX_PROMPT,
+        max_retries: int = 1,
+    ) -> OutputFixingParser[T]:
+        """Create an OutputFixingParser from a language model and a parser.
+
+        Args:
+            llm: llm to use for fixing
+            parser: parser to use for parsing
+            prompt: prompt to use for fixing
+            max_retries: Maximum number of retries to parse.
+
+        Returns:
+            OutputFixingParser
+        """
+        chain = prompt | llm
+        return cls(parser=parser, retry_chain=chain, max_retries=max_retries)
+
+    def parse(self, completion: str) -> T:
+        retries = 0
+
+        while retries <= self.max_retries:
+            try:
+                return self.parser.parse(completion)
+            except OutputParserException as e:
+                if retries == self.max_retries:
+                    raise e
+                else:
+                    retries += 1
+                    if self.legacy and hasattr(self.retry_chain, "run"):
+                        completion = self.retry_chain.run(
+                            instructions=self.parser.get_format_instructions(),
+                            completion=completion,
+                            error=repr(e),
+                        )
+                    else:
+                        try:
+                            completion = self.retry_chain.invoke(
+                                dict(
+                                    instructions=self.parser.get_format_instructions(),  # noqa: E501
+                                    input=completion,
+                                    error=repr(e),
+                                )
+                            )
+                        except (NotImplementedError, AttributeError):
+                            # Case: self.parser does not have get_format_instructions  # noqa: E501
+                            completion = self.retry_chain.invoke(
+                                dict(
+                                    input=completion,
+                                    error=repr(e),
+                                )
+                            )
+
+        raise OutputParserException("Failed to parse")
+
+    async def aparse(self, completion: str) -> T:
+        retries = 0
+
+        while retries <= self.max_retries:
+            try:
+                return await self.parser.aparse(completion)
+            except OutputParserException as e:
+                if retries == self.max_retries:
+                    raise e
+                else:
+                    retries += 1
+                    if self.legacy and hasattr(self.retry_chain, "arun"):
+                        completion = await self.retry_chain.arun(
+                            instructions=self.parser.get_format_instructions(),  # noqa: E501
+                            completion=completion,
+                            error=repr(e),
+                        )
+                    else:
+                        try:
+                            completion = await self.retry_chain.ainvoke(
+                                dict(
+                                    instructions=self.parser.get_format_instructions(),  # noqa: E501
+                                    input=completion,
+                                    error=repr(e),
+                                )
+                            )
+                        except (NotImplementedError, AttributeError):
+                            # Case: self.parser does not have get_format_instructions  # noqa: E501
+                            completion = await self.retry_chain.ainvoke(
+                                dict(
+                                    input=completion,
+                                    error=repr(e),
+                                )
+                            )
+
+        raise OutputParserException("Failed to parse")
+
+    def get_format_instructions(self) -> str:
+        return self.parser.get_format_instructions()
+
+    @property
+    def _type(self) -> str:
+        return "output_fixing"
+
+    @property
+    def OutputType(self) -> type[T]:
+        return self.parser.OutputType

{langchain-0.2.5 → langchain-0.2.6}/langchain/output_parsers/pandas_dataframe.py

@@ -10,7 +10,7 @@ from langchain.output_parsers.format_instructions import (
 )
 
 
-class PandasDataFrameOutputParser(BaseOutputParser):
+class PandasDataFrameOutputParser(BaseOutputParser[Dict[str, Any]]):
     """Parse an output using Pandas DataFrame format."""
 
     """The Pandas DataFrame to parse."""

{langchain-0.2.5 → langchain-0.2.6}/langchain/output_parsers/regex.py

@@ -6,7 +6,7 @@ from typing import Dict, List, Optional
 from langchain_core.output_parsers import BaseOutputParser
 
 
-class RegexParser(BaseOutputParser):
+class RegexParser(BaseOutputParser[Dict[str, str]]):
     """Parse the output of an LLM call using a regex."""
 
     @classmethod

{langchain-0.2.5 → langchain-0.2.6}/langchain/output_parsers/regex_dict.py

@@ -6,7 +6,7 @@ from typing import Dict, Optional
 from langchain_core.output_parsers import BaseOutputParser
 
 
-class RegexDictParser(BaseOutputParser):
+class RegexDictParser(BaseOutputParser[Dict[str, str]]):
     """Parse the output of an LLM call into a Dictionary using a regex."""
 
     regex_pattern: str = r"{}:\s?([^.'\n']*)\.?"  # : :meta private:

{langchain-0.2.5 → langchain-0.2.6}/langchain/output_parsers/retry.py

@@ -1,12 +1,13 @@
 from __future__ import annotations
 
-from typing import Any, TypeVar
+from typing import Any, TypeVar, Union
 
 from langchain_core.exceptions import OutputParserException
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.output_parsers import BaseOutputParser
 from langchain_core.prompt_values import PromptValue
 from langchain_core.prompts import BasePromptTemplate, PromptTemplate
+from langchain_core.runnables import RunnableSerializable
 
 NAIVE_COMPLETION_RETRY = """Prompt:
 {prompt}
@@ -43,10 +44,12 @@ class RetryOutputParser(BaseOutputParser[T]):
     parser: BaseOutputParser[T]
     """The parser to use to parse the output."""
     # Should be an LLMChain but we want to avoid top-level imports from langchain.chains
-    retry_chain: Any
-    """The LLMChain to use to retry the completion."""
+    retry_chain: Union[RunnableSerializable, Any]
+    """The RunnableSerializable to use to retry the completion (Legacy: LLMChain)."""
     max_retries: int = 1
     """The maximum number of times to retry the parse."""
+    legacy: bool = True
+    """Whether to use the run or arun method of the retry_chain."""
 
     @classmethod
     def from_llm(
@@ -67,9 +70,7 @@ class RetryOutputParser(BaseOutputParser[T]):
         Returns:
             RetryOutputParser
         """
-        from langchain.chains.llm import LLMChain
-
-        chain = LLMChain(llm=llm, prompt=prompt)
+        chain = prompt | llm
         return cls(parser=parser, retry_chain=chain, max_retries=max_retries)
 
     def parse_with_prompt(self, completion: str, prompt_value: PromptValue) -> T:
@@ -92,9 +93,19 @@ class RetryOutputParser(BaseOutputParser[T]):
                     raise e
                 else:
                     retries += 1
-                    completion = self.retry_chain.run(
-                        prompt=prompt_value.to_string(), completion=completion
-                    )
+                    if self.legacy and hasattr(self.retry_chain, "run"):
+                        completion = self.retry_chain.run(
+                            prompt=prompt_value.to_string(),
+                            completion=completion,
+                            error=repr(e),
+                        )
+                    else:
+                        completion = self.retry_chain.invoke(
+                            dict(
+                                prompt=prompt_value.to_string(),
+                                input=completion,
+                            )
+                        )
 
         raise OutputParserException("Failed to parse")
 
@@ -118,9 +129,19 @@ class RetryOutputParser(BaseOutputParser[T]):
                     raise e
                 else:
                     retries += 1
-                    completion = await self.retry_chain.arun(
-                        prompt=prompt_value.to_string(), completion=completion
-                    )
+                    if self.legacy and hasattr(self.retry_chain, "arun"):
+                        completion = await self.retry_chain.arun(
+                            prompt=prompt_value.to_string(),
+                            completion=completion,
+                            error=repr(e),
+                        )
+                    else:
+                        completion = await self.retry_chain.ainvoke(
+                            dict(
+                                prompt=prompt_value.to_string(),
+                                input=completion,
+                            )
+                        )
 
         raise OutputParserException("Failed to parse")
 
@@ -136,6 +157,10 @@ class RetryOutputParser(BaseOutputParser[T]):
     def _type(self) -> str:
         return "retry"
 
+    @property
+    def OutputType(self) -> type[T]:
+        return self.parser.OutputType
+
 
 class RetryWithErrorOutputParser(BaseOutputParser[T]):
     """Wrap a parser and try to fix parsing errors.
@@ -149,11 +174,13 @@ class RetryWithErrorOutputParser(BaseOutputParser[T]):
 
     parser: BaseOutputParser[T]
     """The parser to use to parse the output."""
-    # Should be an LLMChain but we want to avoid top-level imports from langchain.chains
-    retry_chain: Any
-    """The LLMChain to use to retry the completion."""
+    # Should be an LLMChain but we want to avoid top-level imports from langchain.chains  # noqa: E501
+    retry_chain: Union[RunnableSerializable, Any]
+    """The RunnableSerializable to use to retry the completion (Legacy: LLMChain)."""
     max_retries: int = 1
     """The maximum number of times to retry the parse."""
+    legacy: bool = True
+    """Whether to use the run or arun method of the retry_chain."""
 
     @classmethod
     def from_llm(
@@ -174,12 +201,10 @@ class RetryWithErrorOutputParser(BaseOutputParser[T]):
         Returns:
             A RetryWithErrorOutputParser.
         """
-        from langchain.chains.llm import LLMChain
-
-        chain = LLMChain(llm=llm, prompt=prompt)
+        chain = prompt | llm
         return cls(parser=parser, retry_chain=chain, max_retries=max_retries)
 
-    def parse_with_prompt(self, completion: str, prompt_value: PromptValue) -> T:
+    def parse_with_prompt(self, completion: str, prompt_value: PromptValue) -> T:  # noqa: E501
         retries = 0
 
         while retries <= self.max_retries:
@@ -190,11 +215,20 @@ class RetryWithErrorOutputParser(BaseOutputParser[T]):
                     raise e
                 else:
                     retries += 1
-                    completion = self.retry_chain.run(
-                        prompt=prompt_value.to_string(),
-                        completion=completion,
-                        error=repr(e),
-                    )
+                    if self.legacy and hasattr(self.retry_chain, "run"):
+                        completion = self.retry_chain.run(
+                            prompt=prompt_value.to_string(),
+                            completion=completion,
+                            error=repr(e),
+                        )
+                    else:
+                        completion = self.retry_chain.invoke(
+                            dict(
+                                input=completion,
+                                prompt=prompt_value.to_string(),
+                                error=repr(e),
+                            )
+                        )
 
         raise OutputParserException("Failed to parse")
 
@@ -209,11 +243,20 @@ class RetryWithErrorOutputParser(BaseOutputParser[T]):
                     raise e
                 else:
                     retries += 1
-                    completion = await self.retry_chain.arun(
-                        prompt=prompt_value.to_string(),
-                        completion=completion,
-                        error=repr(e),
-                    )
+                    if self.legacy and hasattr(self.retry_chain, "arun"):
+                        completion = await self.retry_chain.arun(
+                            prompt=prompt_value.to_string(),
+                            completion=completion,
+                            error=repr(e),
+                        )
+                    else:
+                        completion = await self.retry_chain.ainvoke(
+                            dict(
+                                prompt=prompt_value.to_string(),
+                                input=completion,
+                                error=repr(e),
+                            )
+                        )
 
         raise OutputParserException("Failed to parse")
 
@@ -228,3 +271,7 @@ class RetryWithErrorOutputParser(BaseOutputParser[T]):
     @property
     def _type(self) -> str:
         return "retry_with_error"
+
+    @property
+    def OutputType(self) -> type[T]:
+        return self.parser.OutputType