langchain 0.2.16__py3-none-any.whl → 0.3.0__py3-none-any.whl

langchain/agents/agent.py

@@ -40,11 +40,12 @@ from langchain_core.output_parsers import BaseOutputParser
 from langchain_core.prompts import BasePromptTemplate
 from langchain_core.prompts.few_shot import FewShotPromptTemplate
 from langchain_core.prompts.prompt import PromptTemplate
-from langchain_core.pydantic_v1 import BaseModel, root_validator
 from langchain_core.runnables import Runnable, RunnableConfig, ensure_config
 from langchain_core.runnables.utils import AddableDict
 from langchain_core.tools import BaseTool
 from langchain_core.utils.input import get_color_mapping
+from pydantic import BaseModel, ConfigDict, model_validator
+from typing_extensions import Self
 
 from langchain.agents.agent_iterator import AgentExecutorIterator
 from langchain.agents.agent_types import AgentType
@@ -175,7 +176,7 @@ class BaseSingleActionAgent(BaseModel):
         Returns:
             Dict: Dictionary representation of agent.
         """
-        _dict = super().dict()
+        _dict = super().model_dump()
         try:
             _type = self._agent_type
         except NotImplementedError:
@@ -323,7 +324,7 @@ class BaseMultiActionAgent(BaseModel):
 
     def dict(self, **kwargs: Any) -> Dict:
         """Return dictionary representation of agent."""
-        _dict = super().dict()
+        _dict = super().model_dump()
         try:
             _dict["_type"] = str(self._agent_type)
         except NotImplementedError:
@@ -420,8 +421,9 @@ class RunnableAgent(BaseSingleActionAgent):
         individual LLM tokens will not be available in stream_log.
     """
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+    )
 
     @property
     def return_values(self) -> List[str]:
@@ -528,8 +530,9 @@ class RunnableMultiActionAgent(BaseMultiActionAgent):
         individual LLM tokens will not be available in stream_log.
     """
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+    )
 
     @property
     def return_values(self) -> List[str]:
@@ -854,8 +857,8 @@ class Agent(BaseSingleActionAgent):
         """
         return list(set(self.llm_chain.input_keys) - {"agent_scratchpad"})
 
-    @root_validator(pre=False, skip_on_failure=True)
-    def validate_prompt(cls, values: Dict) -> Dict:
+    @model_validator(mode="after")
+    def validate_prompt(self) -> Self:
         """Validate that prompt matches format.
 
         Args:
@@ -868,7 +871,7 @@ class Agent(BaseSingleActionAgent):
             ValueError: If `agent_scratchpad` is not in prompt.input_variables
              and prompt is not a FewShotPromptTemplate or a PromptTemplate.
         """
-        prompt = values["llm_chain"].prompt
+        prompt = self.llm_chain.prompt
         if "agent_scratchpad" not in prompt.input_variables:
             logger.warning(
                 "`agent_scratchpad` should be a variable in prompt.input_variables."
@@ -881,7 +884,7 @@ class Agent(BaseSingleActionAgent):
                 prompt.suffix += "\n{agent_scratchpad}"
             else:
                 raise ValueError(f"Got unexpected prompt type {type(prompt)}")
-        return values
+        return self
 
     @property
     @abstractmethod
@@ -1120,8 +1123,8 @@ class AgentExecutor(Chain):
             **kwargs,
         )
 
-    @root_validator(pre=False, skip_on_failure=True)
-    def validate_tools(cls, values: Dict) -> Dict:
+    @model_validator(mode="after")
+    def validate_tools(self) -> Self:
         """Validate that tools are compatible with agent.
 
         Args:
@@ -1133,19 +1136,20 @@ class AgentExecutor(Chain):
         Raises:
             ValueError: If allowed tools are different than provided tools.
         """
-        agent = values["agent"]
-        tools = values["tools"]
-        allowed_tools = agent.get_allowed_tools()
+        agent = self.agent
+        tools = self.tools
+        allowed_tools = agent.get_allowed_tools()  # type: ignore
         if allowed_tools is not None:
             if set(allowed_tools) != set([tool.name for tool in tools]):
                 raise ValueError(
                     f"Allowed tools ({allowed_tools}) different than "
                     f"provided tools ({[tool.name for tool in tools]})"
                 )
-        return values
+        return self
 
-    @root_validator(pre=True)
-    def validate_runnable_agent(cls, values: Dict) -> Dict:
+    @model_validator(mode="before")
+    @classmethod
+    def validate_runnable_agent(cls, values: Dict) -> Any:
         """Convert runnable to agent if passed in.
 
         Args:

langchain/agents/agent_toolkits/vectorstore/toolkit.py

@@ -3,10 +3,10 @@
 from typing import List
 
 from langchain_core.language_models import BaseLanguageModel
-from langchain_core.pydantic_v1 import BaseModel, Field
 from langchain_core.tools import BaseTool
 from langchain_core.tools.base import BaseToolkit
 from langchain_core.vectorstores import VectorStore
+from pydantic import BaseModel, ConfigDict, Field
 
 
 class VectorStoreInfo(BaseModel):
@@ -16,8 +16,9 @@ class VectorStoreInfo(BaseModel):
     name: str
     description: str
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+    )
 
 
 class VectorStoreToolkit(BaseToolkit):
@@ -26,8 +27,9 @@ class VectorStoreToolkit(BaseToolkit):
     vectorstore_info: VectorStoreInfo = Field(exclude=True)
     llm: BaseLanguageModel
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+    )
 
     def get_tools(self) -> List[BaseTool]:
         """Get the tools in the toolkit."""
@@ -67,8 +69,9 @@ class VectorStoreRouterToolkit(BaseToolkit):
     vectorstores: List[VectorStoreInfo] = Field(exclude=True)
     llm: BaseLanguageModel
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+    )
 
     def get_tools(self) -> List[BaseTool]:
         """Get the tools in the toolkit."""

langchain/agents/chat/base.py

@@ -10,8 +10,8 @@ from langchain_core.prompts.chat import (
     HumanMessagePromptTemplate,
     SystemMessagePromptTemplate,
 )
-from langchain_core.pydantic_v1 import Field
 from langchain_core.tools import BaseTool
+from pydantic import Field
 
 from langchain.agents.agent import Agent, AgentOutputParser
 from langchain.agents.chat.output_parser import ChatOutputParser

langchain/agents/conversational/base.py

@@ -8,8 +8,8 @@ from langchain_core._api import deprecated
 from langchain_core.callbacks import BaseCallbackManager
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.prompts import PromptTemplate
-from langchain_core.pydantic_v1 import Field
 from langchain_core.tools import BaseTool
+from pydantic import Field
 
 from langchain.agents.agent import Agent, AgentOutputParser
 from langchain.agents.agent_types import AgentType

langchain/agents/conversational_chat/base.py

@@ -17,8 +17,8 @@ from langchain_core.prompts.chat import (
     MessagesPlaceholder,
     SystemMessagePromptTemplate,
 )
-from langchain_core.pydantic_v1 import Field
 from langchain_core.tools import BaseTool
+from pydantic import Field
 
 from langchain.agents.agent import Agent, AgentOutputParser
 from langchain.agents.conversational_chat.output_parser import ConvoOutputParser

langchain/agents/mrkl/base.py

@@ -8,9 +8,9 @@ from langchain_core._api import deprecated
 from langchain_core.callbacks import BaseCallbackManager
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.prompts import PromptTemplate
-from langchain_core.pydantic_v1 import Field
 from langchain_core.tools import BaseTool, Tool
 from langchain_core.tools.render import render_text_description
+from pydantic import Field
 
 from langchain.agents.agent import Agent, AgentExecutor, AgentOutputParser
 from langchain.agents.agent_types import AgentType

langchain/agents/openai_assistant/base.py

@@ -20,10 +20,11 @@ from typing import (
 from langchain_core.agents import AgentAction, AgentFinish
 from langchain_core.callbacks import CallbackManager
 from langchain_core.load import dumpd
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
 from langchain_core.runnables import RunnableConfig, RunnableSerializable, ensure_config
 from langchain_core.tools import BaseTool
 from langchain_core.utils.function_calling import convert_to_openai_tool
+from pydantic import BaseModel, Field, model_validator
+from typing_extensions import Self
 
 if TYPE_CHECKING:
     import openai
@@ -232,14 +233,14 @@ class OpenAIAssistantRunnable(RunnableSerializable[Dict, OutputType]):
     as_agent: bool = False
     """Use as a LangChain agent, compatible with the AgentExecutor."""
 
-    @root_validator(pre=False, skip_on_failure=True)
-    def validate_async_client(cls, values: dict) -> dict:
-        if values["async_client"] is None:
+    @model_validator(mode="after")
+    def validate_async_client(self) -> Self:
+        if self.async_client is None:
             import openai
 
-            api_key = values["client"].api_key
-            values["async_client"] = openai.AsyncOpenAI(api_key=api_key)
-        return values
+            api_key = self.client.api_key
+            self.async_client = openai.AsyncOpenAI(api_key=api_key)
+        return self
 
     @classmethod
     def create_assistant(

langchain/agents/openai_functions_agent/base.py

@@ -17,10 +17,11 @@ from langchain_core.prompts.chat import (
     HumanMessagePromptTemplate,
     MessagesPlaceholder,
 )
-from langchain_core.pydantic_v1 import root_validator
 from langchain_core.runnables import Runnable, RunnablePassthrough
 from langchain_core.tools import BaseTool
 from langchain_core.utils.function_calling import convert_to_openai_function
+from pydantic import model_validator
+from typing_extensions import Self
 
 from langchain.agents import BaseSingleActionAgent
 from langchain.agents.format_scratchpad.openai_functions import (
@@ -58,8 +59,8 @@ class OpenAIFunctionsAgent(BaseSingleActionAgent):
         """Get allowed tools."""
         return [t.name for t in self.tools]
 
-    @root_validator(pre=False, skip_on_failure=True)
-    def validate_prompt(cls, values: dict) -> dict:
+    @model_validator(mode="after")
+    def validate_prompt(self) -> Self:
         """Validate prompt.
 
         Args:
@@ -71,13 +72,13 @@ class OpenAIFunctionsAgent(BaseSingleActionAgent):
         Raises:
             ValueError: If `agent_scratchpad` is not in the prompt.
         """
-        prompt: BasePromptTemplate = values["prompt"]
+        prompt: BasePromptTemplate = self.prompt
         if "agent_scratchpad" not in prompt.input_variables:
             raise ValueError(
                 "`agent_scratchpad` should be one of the variables in the prompt, "
                 f"got {prompt.input_variables}"
             )
-        return values
+        return self
 
     @property
     def input_keys(self) -> List[str]:

langchain/agents/openai_functions_multi_agent/base.py

@@ -21,8 +21,9 @@ from langchain_core.prompts.chat import (
     HumanMessagePromptTemplate,
     MessagesPlaceholder,
 )
-from langchain_core.pydantic_v1 import root_validator
 from langchain_core.tools import BaseTool
+from pydantic import model_validator
+from typing_extensions import Self
 
 from langchain.agents import BaseMultiActionAgent
 from langchain.agents.format_scratchpad.openai_functions import (
@@ -115,15 +116,15 @@ class OpenAIMultiFunctionsAgent(BaseMultiActionAgent):
         """Get allowed tools."""
         return [t.name for t in self.tools]
 
-    @root_validator(pre=False, skip_on_failure=True)
-    def validate_prompt(cls, values: dict) -> dict:
-        prompt: BasePromptTemplate = values["prompt"]
+    @model_validator(mode="after")
+    def validate_prompt(self) -> Self:
+        prompt: BasePromptTemplate = self.prompt
         if "agent_scratchpad" not in prompt.input_variables:
             raise ValueError(
                 "`agent_scratchpad` should be one of the variables in the prompt, "
                 f"got {prompt.input_variables}"
             )
-        return values
+        return self
 
     @property
     def input_keys(self) -> List[str]:

langchain/agents/react/base.py

@@ -8,8 +8,8 @@ from langchain_core._api import deprecated
 from langchain_core.documents import Document
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.prompts import BasePromptTemplate
-from langchain_core.pydantic_v1 import Field
 from langchain_core.tools import BaseTool, Tool
+from pydantic import Field
 
 from langchain.agents.agent import Agent, AgentExecutor, AgentOutputParser
 from langchain.agents.agent_types import AgentType

langchain/agents/self_ask_with_search/base.py

@@ -7,9 +7,9 @@ from typing import TYPE_CHECKING, Any, Sequence, Union
 from langchain_core._api import deprecated
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.prompts import BasePromptTemplate
-from langchain_core.pydantic_v1 import Field
 from langchain_core.runnables import Runnable, RunnablePassthrough
 from langchain_core.tools import BaseTool, Tool
+from pydantic import Field
 
 from langchain.agents.agent import Agent, AgentExecutor, AgentOutputParser
 from langchain.agents.agent_types import AgentType

langchain/agents/structured_chat/base.py

@@ -11,10 +11,10 @@ from langchain_core.prompts.chat import (
     HumanMessagePromptTemplate,
     SystemMessagePromptTemplate,
 )
-from langchain_core.pydantic_v1 import Field
 from langchain_core.runnables import Runnable, RunnablePassthrough
 from langchain_core.tools import BaseTool
 from langchain_core.tools.render import ToolsRenderer
+from pydantic import Field
 
 from langchain.agents.agent import Agent, AgentOutputParser
 from langchain.agents.format_scratchpad import format_log_to_str

langchain/agents/structured_chat/output_parser.py

@@ -8,7 +8,7 @@ from typing import Optional, Pattern, Union
 from langchain_core.agents import AgentAction, AgentFinish
 from langchain_core.exceptions import OutputParserException
 from langchain_core.language_models import BaseLanguageModel
-from langchain_core.pydantic_v1 import Field
+from pydantic import Field
 
 from langchain.agents.agent import AgentOutputParser
 from langchain.agents.structured_chat.prompt import FORMAT_INSTRUCTIONS

langchain/chains/api/base.py

@@ -12,7 +12,8 @@ from langchain_core.callbacks import (
 )
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.prompts import BasePromptTemplate
-from langchain_core.pydantic_v1 import Field, root_validator
+from pydantic import Field, model_validator
+from typing_extensions import Self
 
 from langchain.chains.api.prompt import API_RESPONSE_PROMPT, API_URL_PROMPT
 from langchain.chains.base import Chain
@@ -197,7 +198,7 @@ try:
         api_docs: str
         question_key: str = "question"  #: :meta private:
         output_key: str = "output"  #: :meta private:
-        limit_to_domains: Optional[Sequence[str]]
+        limit_to_domains: Optional[Sequence[str]] = Field(default_factory=list)
         """Use to limit the domains that can be accessed by the API chain.
         
         * For example, to limit to just the domain `https://www.example.com`, set
@@ -227,19 +228,20 @@ try:
             """
             return [self.output_key]
 
-        @root_validator(pre=False, skip_on_failure=True)
-        def validate_api_request_prompt(cls, values: Dict) -> Dict:
+        @model_validator(mode="after")
+        def validate_api_request_prompt(self) -> Self:
             """Check that api request prompt expects the right variables."""
-            input_vars = values["api_request_chain"].prompt.input_variables
+            input_vars = self.api_request_chain.prompt.input_variables
             expected_vars = {"question", "api_docs"}
             if set(input_vars) != expected_vars:
                 raise ValueError(
                     f"Input variables should be {expected_vars}, got {input_vars}"
                 )
-            return values
+            return self
 
-        @root_validator(pre=True)
-        def validate_limit_to_domains(cls, values: Dict) -> Dict:
+        @model_validator(mode="before")
+        @classmethod
+        def validate_limit_to_domains(cls, values: Dict) -> Any:
             """Check that allowed domains are valid."""
             # This check must be a pre=True check, so that a default of None
             # won't be set to limit_to_domains if it's not provided.
@@ -258,16 +260,16 @@ try:
                 )
             return values
 
-        @root_validator(pre=False, skip_on_failure=True)
-        def validate_api_answer_prompt(cls, values: Dict) -> Dict:
+        @model_validator(mode="after")
+        def validate_api_answer_prompt(self) -> Self:
             """Check that api answer prompt expects the right variables."""
-            input_vars = values["api_answer_chain"].prompt.input_variables
+            input_vars = self.api_answer_chain.prompt.input_variables
             expected_vars = {"question", "api_docs", "api_url", "api_response"}
             if set(input_vars) != expected_vars:
                 raise ValueError(
                     f"Input variables should be {expected_vars}, got {input_vars}"
                 )
-            return values
+            return self
 
         def _call(
             self,

langchain/chains/base.py

@@ -18,10 +18,8 @@ from langchain_core.callbacks import (
     CallbackManagerForChainRun,
     Callbacks,
 )
-from langchain_core.load.dump import dumpd
 from langchain_core.memory import BaseMemory
 from langchain_core.outputs import RunInfo
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator, validator
 from langchain_core.runnables import (
     RunnableConfig,
     RunnableSerializable,
@@ -29,6 +27,13 @@ from langchain_core.runnables import (
     run_in_executor,
 )
 from langchain_core.runnables.utils import create_model
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    field_validator,
+    model_validator,
+)
 
 from langchain.schema import RUN_KEY
 
@@ -96,8 +101,9 @@ class Chain(RunnableSerializable[Dict[str, Any], Dict[str, Any]], ABC):
     callback_manager: Optional[BaseCallbackManager] = Field(default=None, exclude=True)
     """[DEPRECATED] Use `callbacks` instead."""
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+    )
 
     def get_input_schema(
         self, config: Optional[RunnableConfig] = None
@@ -143,7 +149,7 @@ class Chain(RunnableSerializable[Dict[str, Any], Dict[str, Any]], ABC):
         new_arg_supported = inspect.signature(self._call).parameters.get("run_manager")
 
         run_manager = callback_manager.on_chain_start(
-            dumpd(self),
+            None,
             inputs,
             run_id,
             name=run_name,
@@ -195,7 +201,7 @@ class Chain(RunnableSerializable[Dict[str, Any], Dict[str, Any]], ABC):
         )
         new_arg_supported = inspect.signature(self._acall).parameters.get("run_manager")
         run_manager = await callback_manager.on_chain_start(
-            dumpd(self),
+            None,
             inputs,
             run_id,
             name=run_name,
@@ -223,8 +229,9 @@ class Chain(RunnableSerializable[Dict[str, Any], Dict[str, Any]], ABC):
     def _chain_type(self) -> str:
         raise NotImplementedError("Saving not supported for this chain type.")
 
-    @root_validator(pre=True)
-    def raise_callback_manager_deprecation(cls, values: Dict) -> Dict:
+    @model_validator(mode="before")
+    @classmethod
+    def raise_callback_manager_deprecation(cls, values: Dict) -> Any:
         """Raise deprecation warning if callback_manager is used."""
         if values.get("callback_manager") is not None:
             if values.get("callbacks") is not None:
@@ -240,7 +247,8 @@ class Chain(RunnableSerializable[Dict[str, Any], Dict[str, Any]], ABC):
             values["callbacks"] = values.pop("callback_manager", None)
         return values
 
-    @validator("verbose", pre=True, always=True)
+    @field_validator("verbose", mode="before")
+    @classmethod
     def set_verbose(cls, verbose: Optional[bool]) -> bool:
         """Set the chain verbosity.
 

langchain/chains/combine_documents/base.py

@@ -10,10 +10,10 @@ from langchain_core.callbacks import (
 )
 from langchain_core.documents import Document
 from langchain_core.prompts import BasePromptTemplate, PromptTemplate
-from langchain_core.pydantic_v1 import BaseModel, Field
 from langchain_core.runnables.config import RunnableConfig
 from langchain_core.runnables.utils import create_model
 from langchain_text_splitters import RecursiveCharacterTextSplitter, TextSplitter
+from pydantic import BaseModel, Field
 
 from langchain.chains.base import Chain
 

langchain/chains/combine_documents/map_reduce.py

@@ -6,9 +6,9 @@ from typing import Any, Dict, List, Optional, Tuple, Type
 
 from langchain_core.callbacks import Callbacks
 from langchain_core.documents import Document
-from langchain_core.pydantic_v1 import BaseModel, root_validator
 from langchain_core.runnables.config import RunnableConfig
 from langchain_core.runnables.utils import create_model
+from pydantic import BaseModel, ConfigDict, model_validator
 
 from langchain.chains.combine_documents.base import BaseCombineDocumentsChain
 from langchain.chains.combine_documents.reduce import ReduceDocumentsChain
@@ -126,12 +126,14 @@ class MapReduceDocumentsChain(BaseCombineDocumentsChain):
             _output_keys = _output_keys + ["intermediate_steps"]
         return _output_keys
 
-    class Config:
-        arbitrary_types_allowed = True
-        extra = "forbid"
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+        extra="forbid",
+    )
 
-    @root_validator(pre=True)
-    def get_reduce_chain(cls, values: Dict) -> Dict:
+    @model_validator(mode="before")
+    @classmethod
+    def get_reduce_chain(cls, values: Dict) -> Any:
         """For backwards compatibility."""
         if "combine_document_chain" in values:
             if "reduce_documents_chain" in values:
@@ -153,16 +155,18 @@ class MapReduceDocumentsChain(BaseCombineDocumentsChain):
 
         return values
 
-    @root_validator(pre=True)
-    def get_return_intermediate_steps(cls, values: Dict) -> Dict:
+    @model_validator(mode="before")
+    @classmethod
+    def get_return_intermediate_steps(cls, values: Dict) -> Any:
         """For backwards compatibility."""
         if "return_map_steps" in values:
             values["return_intermediate_steps"] = values["return_map_steps"]
             del values["return_map_steps"]
         return values
 
-    @root_validator(pre=True)
-    def get_default_document_variable_name(cls, values: Dict) -> Dict:
+    @model_validator(mode="before")
+    @classmethod
+    def get_default_document_variable_name(cls, values: Dict) -> Any:
         """Get default document variable name, if not provided."""
         if "llm_chain" not in values:
             raise ValueError("llm_chain must be provided")

langchain/chains/combine_documents/map_rerank.py

@@ -6,9 +6,10 @@ from typing import Any, Dict, List, Optional, Sequence, Tuple, Type, Union, cast
 
 from langchain_core.callbacks import Callbacks
 from langchain_core.documents import Document
-from langchain_core.pydantic_v1 import BaseModel, root_validator
 from langchain_core.runnables.config import RunnableConfig
 from langchain_core.runnables.utils import create_model
+from pydantic import BaseModel, ConfigDict, model_validator
+from typing_extensions import Self
 
 from langchain.chains.combine_documents.base import BaseCombineDocumentsChain
 from langchain.chains.llm import LLMChain
@@ -74,9 +75,10 @@ class MapRerankDocumentsChain(BaseCombineDocumentsChain):
     """Return intermediate steps.
     Intermediate steps include the results of calling llm_chain on each document."""
 
-    class Config:
-        arbitrary_types_allowed = True
-        extra = "forbid"
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+        extra="forbid",
+    )
 
     def get_output_schema(
         self, config: Optional[RunnableConfig] = None
@@ -104,30 +106,31 @@ class MapRerankDocumentsChain(BaseCombineDocumentsChain):
             _output_keys += self.metadata_keys
         return _output_keys
 
-    @root_validator(pre=False, skip_on_failure=True)
-    def validate_llm_output(cls, values: Dict) -> Dict:
+    @model_validator(mode="after")
+    def validate_llm_output(self) -> Self:
         """Validate that the combine chain outputs a dictionary."""
-        output_parser = values["llm_chain"].prompt.output_parser
+        output_parser = self.llm_chain.prompt.output_parser
         if not isinstance(output_parser, RegexParser):
             raise ValueError(
                 "Output parser of llm_chain should be a RegexParser,"
                 f" got {output_parser}"
             )
         output_keys = output_parser.output_keys
-        if values["rank_key"] not in output_keys:
+        if self.rank_key not in output_keys:
             raise ValueError(
-                f"Got {values['rank_key']} as key to rank on, but did not find "
+                f"Got {self.rank_key} as key to rank on, but did not find "
                 f"it in the llm_chain output keys ({output_keys})"
             )
-        if values["answer_key"] not in output_keys:
+        if self.answer_key not in output_keys:
             raise ValueError(
-                f"Got {values['answer_key']} as key to return, but did not find "
+                f"Got {self.answer_key} as key to return, but did not find "
                 f"it in the llm_chain output keys ({output_keys})"
             )
-        return values
+        return self
 
-    @root_validator(pre=True)
-    def get_default_document_variable_name(cls, values: Dict) -> Dict:
+    @model_validator(mode="before")
+    @classmethod
+    def get_default_document_variable_name(cls, values: Dict) -> Any:
         """Get default document variable name, if not provided."""
         if "llm_chain" not in values:
             raise ValueError("llm_chain must be provided")