x

libs/core/langchain_core/tools/convert.py

@@ -1,8 +1,9 @@
 import inspect
 from typing import Any, Callable, Dict, Literal, Optional, Type, Union, get_type_hints
 
+from pydantic import BaseModel, Field, create_model
+
 from langchain_core.callbacks import Callbacks
-from langchain_core.pydantic_v1 import BaseModel, Field, create_model
 from langchain_core.runnables import Runnable
 from langchain_core.tools.base import BaseTool
 from langchain_core.tools.simple import Tool

libs/core/langchain_core/tools/structured.py

@@ -4,12 +4,13 @@ import textwrap
 from inspect import signature
 from typing import Any, Awaitable, Callable, Dict, List, Literal, Optional, Type, Union
 
+from pydantic import BaseModel, Field
+
 from langchain_core.callbacks import (
     AsyncCallbackManagerForToolRun,
     CallbackManagerForToolRun,
 )
 from langchain_core.messages import ToolCall
-from langchain_core.pydantic_v1 import BaseModel, Field
 from langchain_core.runnables import RunnableConfig, run_in_executor
 from langchain_core.tools.base import (
     FILTERED_ARGS,

libs/core/langchain_core/utils/pydantic.py

@@ -8,7 +8,8 @@ from functools import wraps
 from typing import Any, Callable, Dict, List, Optional, Type, TypeVar, Union, overload
 
 import pydantic  # pydantic: ignore
-from pydantic import BaseModel, FieldInfo, root_validator  # pydantic: ignore
+from pydantic import BaseModel, root_validator  # pydantic: ignore
+from pydantic.fields import FieldInfo
 from pydantic.json_schema import GenerateJsonSchema, JsonSchemaValue  # pydantic: ignore
 from pydantic_core import core_schema  # pydantic: ignore
 

libs/core/tests/unit_tests/utils/test_pydantic.py

@@ -183,7 +183,7 @@ def test_fields_pydantic_v2_proper() -> None:
 
 @pytest.mark.skipif(PYDANTIC_MAJOR_VERSION != 2, reason="Only tests Pydantic v2")
 def test_fields_pydantic_v1_from_2() -> None:
-    from pydantic.v1 import BaseModel  # pydantic: ignore
+    from pydantic import BaseModel  # pydantic: ignore
 
     class Foo(BaseModel):
         x: int

libs/core/tests/unit_tests/utils/test_utils.py

@@ -6,9 +6,9 @@ from typing import Any, Callable, Dict, Optional, Tuple, Type, Union
 from unittest.mock import patch
 
 import pytest
+from pydantic import SecretStr
 
 from langchain_core import utils
-from langchain_core.pydantic_v1 import SecretStr
 from langchain_core.utils import (
     check_package_version,
     from_env,
@@ -365,7 +365,7 @@ def test_secret_from_env_with_custom_error_message(
 def test_using_secret_from_env_as_default_factory(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    from langchain_core.pydantic_v1 import BaseModel, Field
+    from pydantic import BaseModel, Field
 
     class Foo(BaseModel):
         secret: SecretStr = Field(default_factory=secret_from_env("TEST_KEY"))