Upgrade to Pydantic v2

docs/api_reference/conf.py

@@ -101,7 +101,6 @@ def setup(app):
 
 autodoc_pydantic_model_show_json = False
 autodoc_pydantic_field_list_validators = False
-autodoc_pydantic_config_members = False
 autodoc_pydantic_model_show_config_summary = False
 autodoc_pydantic_model_show_validator_members = False
 autodoc_pydantic_model_show_validator_summary = False

docs/api_reference/requirements.txt

@@ -1,5 +1,5 @@
 -e libs/langchain
-autodoc_pydantic==1.8.0
+autodoc_pydantic==2.0.0
 myst_parser
 nbsphinx==0.8.9
 sphinx==4.5.0

libs/experimental/langchain_experimental/autonomous_agents/baby_agi/baby_agi.py

@@ -6,7 +6,7 @@
 from langchain.chains.base import Chain
 from langchain.schema.language_model import BaseLanguageModel
 from langchain.vectorstores.base import VectorStore
-from pydantic import BaseModel, Field
+from pydantic import ConfigDict, BaseModel, Field
 
 from langchain_experimental.autonomous_agents.baby_agi.task_creation import (
     TaskCreationChain,
@@ -29,11 +29,7 @@ class BabyAGI(Chain, BaseModel):
     task_id_counter: int = Field(1)
     vectorstore: VectorStore = Field(init=False)
     max_iterations: Optional[int] = None
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
     def add_task(self, task: Dict) -> None:
         self.task_list.append(task)

libs/experimental/langchain_experimental/cpal/models.py

@@ -6,7 +6,7 @@
 import duckdb
 import pandas as pd
 from langchain.graphs.networkx_graph import NetworkxEntityGraph
-from pydantic import BaseModel, Field, PrivateAttr, root_validator, validator
+from pydantic import field_validator, ConfigDict, BaseModel, Field, PrivateAttr, root_validator
 
 from langchain_experimental.cpal.constants import Constant
 
@@ -20,7 +20,8 @@ class NarrativeModel(BaseModel):
     story_hypothetical: str
     story_plot: str  # causal stack of operations
 
-    @validator("*", pre=True)
+    @field_validator("*", mode="before")
+    @classmethod
     def empty_str_to_none(cls, v: str) -> Union[str, None]:
         """Empty strings are not allowed"""
         if v == "":
@@ -33,14 +34,10 @@ class EntityModel(BaseModel):
     code: str = Field(description="entity actions")
     value: float = Field(description="entity initial value")
     depends_on: list[str] = Field(default=[], description="ancestor entities")
+    model_config = ConfigDict(validate_assignment=True)
 
-    # TODO: generalize to multivariate math
-    # TODO: acyclic graph
-
-    class Config:
-        validate_assignment = True
-
-    @validator("name")
+    @field_validator("name")
+    @classmethod
     def lower_case_name(cls, v: str) -> str:
         v = v.lower()
         return v
@@ -64,7 +61,8 @@ class EntitySettingModel(BaseModel):
     attribute: str = Field(description="name of the attribute to be calculated")
     value: float = Field(description="entity's attribute value (calculated)")
 
-    @validator("name")
+    @field_validator("name")
+    @classmethod
     def lower_case_transform(cls, v: str) -> str:
         v = v.lower()
         return v
@@ -98,7 +96,8 @@ class InterventionModel(BaseModel):
     entity_settings: list[EntitySettingModel]
     system_settings: Optional[list[SystemSettingModel]] = None
 
-    @validator("system_settings")
+    @field_validator("system_settings")
+    @classmethod
     def lower_case_name(cls, v: str) -> Union[str, None]:
         if v is not None:
             raise NotImplementedError("system_setting is not implemented yet")

libs/experimental/langchain_experimental/generative_agents/generative_agent.py

@@ -5,7 +5,7 @@
 from langchain.chains import LLMChain
 from langchain.prompts import PromptTemplate
 from langchain.schema.language_model import BaseLanguageModel
-from pydantic import BaseModel, Field
+from pydantic import ConfigDict, BaseModel, Field
 
 from langchain_experimental.generative_agents.memory import GenerativeAgentMemory
 
@@ -38,11 +38,7 @@ class GenerativeAgent(BaseModel):
 
     daily_summaries: List[str] = Field(default_factory=list)  # : :meta private:
     """Summary of the events in the plan that the agent took."""
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
     # LLM-related methods
     @staticmethod

libs/experimental/langchain_experimental/pal_chain/base.py

@@ -17,7 +17,7 @@
 from langchain.schema import BasePromptTemplate
 from langchain.schema.language_model import BaseLanguageModel
 from langchain.utilities import PythonREPL
-from pydantic import Extra, Field, root_validator
+from pydantic import model_validator, ConfigDict, Field
 
 from langchain_experimental.pal_chain.colored_object_prompt import COLORED_OBJECT_PROMPT
 from langchain_experimental.pal_chain.math_prompt import MATH_PROMPT
@@ -114,14 +114,10 @@ class PALChain(Chain):
     """Validations to perform on the generated code."""
     timeout: Optional[int] = 10
     """Timeout in seconds for the generated code to execute."""
+    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True)
 
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
-        arbitrary_types_allowed = True
-
-    @root_validator(pre=True)
+    @model_validator(mode="before")
+    @classmethod
     def raise_deprecation(cls, values: Dict) -> Dict:
         if "llm" in values:
             warnings.warn(

libs/experimental/langchain_experimental/sql/base.py

@@ -12,7 +12,7 @@
 from langchain.schema.language_model import BaseLanguageModel
 from langchain.tools.sql_database.prompt import QUERY_CHECKER
 from langchain.utilities.sql_database import SQLDatabase
-from pydantic import Extra, Field, root_validator
+from pydantic import model_validator, ConfigDict, Field
 
 from langchain_experimental.sql.prompt import DECIDER_PROMPT, PROMPT, SQL_PROMPTS
 
@@ -53,14 +53,10 @@ class SQLDatabaseChain(Chain):
     to fix the initial SQL from the LLM."""
     query_checker_prompt: Optional[BasePromptTemplate] = None
     """The prompt template that should be used by the query checker"""
+    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True)
 
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
-        arbitrary_types_allowed = True
-
-    @root_validator(pre=True)
+    @model_validator(mode="before")
+    @classmethod
     def raise_deprecation(cls, values: Dict) -> Dict:
         if "llm" in values:
             warnings.warn(

libs/langchain/langchain/agents/agent.py

@@ -10,7 +10,7 @@
 from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union
 
 import yaml
-from pydantic import BaseModel, root_validator
+from pydantic import BaseModel, model_validator
 
 from langchain.agents.agent_iterator import AgentExecutorIterator
 from langchain.agents.agent_types import AgentType
@@ -494,7 +494,8 @@ def input_keys(self) -> List[str]:
         """
         return list(set(self.llm_chain.input_keys) - {"agent_scratchpad"})
 
-    @root_validator()
+    @model_validator()
+    @classmethod
     def validate_prompt(cls, values: Dict) -> Dict:
         """Validate that prompt matches format."""
         prompt = values["llm_chain"].prompt
@@ -693,7 +694,8 @@ def from_agent_and_tools(
             agent=agent, tools=tools, callback_manager=callback_manager, **kwargs
         )
 
-    @root_validator()
+    @model_validator()
+    @classmethod
     def validate_tools(cls, values: Dict) -> Dict:
         """Validate that tools are compatible with agent."""
         agent = values["agent"]
@@ -707,7 +709,8 @@ def validate_tools(cls, values: Dict) -> Dict:
                 )
         return values
 
-    @root_validator()
+    @model_validator()
+    @classmethod
     def validate_return_direct_tool(cls, values: Dict) -> Dict:
         """Validate that tools are compatible with agent."""
         agent = values["agent"]

libs/langchain/langchain/agents/agent_toolkits/amadeus/toolkit.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, List
 
-from pydantic import Field
+from pydantic import ConfigDict, Field
 
 from langchain.agents.agent_toolkits.base import BaseToolkit
 from langchain.tools import BaseTool
@@ -18,11 +18,7 @@ class AmadeusToolkit(BaseToolkit):
     """Toolkit for interacting with Office365."""
 
     client: Client = Field(default_factory=authenticate)
-
-    class Config:
-        """Pydantic config."""
-
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
     def get_tools(self) -> List[BaseTool]:
         """Get the tools in the toolkit."""

libs/langchain/langchain/agents/agent_toolkits/gmail/toolkit.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, List
 
-from pydantic import Field
+from pydantic import ConfigDict, Field
 
 from langchain.agents.agent_toolkits.base import BaseToolkit
 from langchain.tools import BaseTool
@@ -31,11 +31,7 @@ class GmailToolkit(BaseToolkit):
     """Toolkit for interacting with Gmail."""
 
     api_resource: Resource = Field(default_factory=build_resource_service)
-
-    class Config:
-        """Pydantic config."""
-
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
     def get_tools(self) -> List[BaseTool]:
         """Get the tools in the toolkit."""

libs/langchain/langchain/agents/agent_toolkits/office365/toolkit.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, List
 
-from pydantic import Field
+from pydantic import ConfigDict, Field
 
 from langchain.agents.agent_toolkits.base import BaseToolkit
 from langchain.tools import BaseTool
@@ -21,11 +21,7 @@ class O365Toolkit(BaseToolkit):
     """Toolkit for interacting with Office 365."""
 
     account: Account = Field(default_factory=authenticate)
-
-    class Config:
-        """Pydantic config."""
-
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
     def get_tools(self) -> List[BaseTool]:
         """Get the tools in the toolkit."""

libs/langchain/langchain/agents/agent_toolkits/playwright/toolkit.py

@@ -3,7 +3,7 @@
 
 from typing import TYPE_CHECKING, List, Optional, Type, cast
 
-from pydantic import Extra, root_validator
+from pydantic import ConfigDict, root_validator
 
 from langchain.agents.agent_toolkits.base import BaseToolkit
 from langchain.tools.base import BaseTool
@@ -36,12 +36,7 @@ class PlayWrightBrowserToolkit(BaseToolkit):
 
     sync_browser: Optional["SyncBrowser"] = None
     async_browser: Optional["AsyncBrowser"] = None
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True)
 
     @root_validator
     def validate_imports_and_browser_provided(cls, values: dict) -> dict:

libs/langchain/langchain/agents/agent_toolkits/powerbi/toolkit.py

@@ -1,7 +1,7 @@
 """Toolkit for interacting with a Power BI dataset."""
 from typing import List, Optional, Union
 
-from pydantic import Field
+from pydantic import ConfigDict, Field
 
 from langchain.agents.agent_toolkits.base import BaseToolkit
 from langchain.callbacks.base import BaseCallbackManager
@@ -38,11 +38,7 @@ class PowerBIToolkit(BaseToolkit):
     callback_manager: Optional[BaseCallbackManager] = None
     output_token_limit: Optional[int] = None
     tiktoken_model_name: Optional[str] = None
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
     def get_tools(self) -> List[BaseTool]:
         """Get the tools in the toolkit."""

libs/langchain/langchain/agents/agent_toolkits/spark_sql/toolkit.py

@@ -1,7 +1,7 @@
 """Toolkit for interacting with Spark SQL."""
 from typing import List
 
-from pydantic import Field
+from pydantic import ConfigDict, Field
 
 from langchain.agents.agent_toolkits.base import BaseToolkit
 from langchain.schema.language_model import BaseLanguageModel
@@ -20,11 +20,7 @@ class SparkSQLToolkit(BaseToolkit):
 
     db: SparkSQL = Field(exclude=True)
     llm: BaseLanguageModel = Field(exclude=True)
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
     def get_tools(self) -> List[BaseTool]:
         """Get the tools in the toolkit."""

libs/langchain/langchain/agents/agent_toolkits/sql/toolkit.py

@@ -1,7 +1,7 @@
 """Toolkit for interacting with an SQL database."""
 from typing import List
 
-from pydantic import Field
+from pydantic import ConfigDict, Field
 
 from langchain.agents.agent_toolkits.base import BaseToolkit
 from langchain.schema.language_model import BaseLanguageModel
@@ -26,10 +26,7 @@ def dialect(self) -> str:
         """Return string representation of SQL dialect to use."""
         return self.db.dialect
 
-    class Config:
-        """Configuration for this pydantic object."""
-
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
     def get_tools(self) -> List[BaseTool]:
         """Get the tools in the toolkit."""