x

libs/core/langchain_core/documents/compressor.py

@@ -5,7 +5,7 @@ from typing import Optional, Sequence
 
 from langchain_core.callbacks import Callbacks
 from langchain_core.documents import Document
-from langchain_core.pydantic_v1 import BaseModel
+from langchain_core.pydantic import BaseModel
 from langchain_core.runnables import run_in_executor
 
 

libs/core/langchain_core/language_models/base.py

@@ -26,7 +26,8 @@ from langchain_core.messages import (
     get_buffer_string,
 )
 from langchain_core.prompt_values import PromptValue
-from langchain_core.pydantic_v1 import BaseModel, Field, validator
+from langchain_core.pydantic import BaseModel, Field
+from langchain_core.pydantic_v1 import validator
 from langchain_core.runnables import Runnable, RunnableSerializable
 from langchain_core.utils import get_pydantic_field_names
 

libs/core/langchain_core/load/serializable.py

@@ -12,7 +12,7 @@ from typing import (
 
 from typing_extensions import NotRequired
 
-from langchain_core.pydantic_v1 import BaseModel, PrivateAttr
+from langchain_core.pydantic import BaseModel, PrivateAttr
 
 
 class BaseSerialized(TypedDict):

libs/core/langchain_core/prompts/base.py

@@ -25,7 +25,8 @@ from langchain_core.prompt_values import (
     PromptValue,
     StringPromptValue,
 )
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
+from langchain_core.pydantic import BaseModel, Field
+from langchain_core.pydantic_v1 import root_validator
 from langchain_core.runnables import RunnableConfig, RunnableSerializable
 from langchain_core.runnables.config import ensure_config
 from langchain_core.runnables.utils import create_model

libs/core/langchain_core/pydantic/__init__.py

@@ -5,17 +5,18 @@ from .config import _PYDANTIC_MAJOR_VERSION, _PYDANTIC_VERSION, USE_PYDANTIC_V2
 # or pydantic 1
 try:
     if USE_PYDANTIC_V2:
-        from pydantic import BaseModel, Field  # noqa: F403 # type: ignore
+        from pydantic import BaseModel, Field, PrivateAttr
     else:
-        from pydantic.v1 import BaseModel, Field  # noqa: F403 # type: ignore
+        from pydantic.v1 import BaseModel, Field, PrivateAttr
 except ImportError:
-    from pydantic import BaseModel, Field  # noqa: F403 # type: ignore
+    from pydantic import BaseModel, Field, PrivateAttr
 
 # Only expose things that are common across all pydantic versions
 __all__ = [  # noqa: F405
-    "USE_PYDANTIC_V2",
     "BaseModel",
     "Field",
-    "_PYDANTIC_VERSION",
+    "PrivateAttr",
     "_PYDANTIC_MAJOR_VERSION",
+    "_PYDANTIC_VERSION",
+    "USE_PYDANTIC_V2",
 ]

libs/core/langchain_core/pydantic/dataclasses.py

@@ -1,9 +0,0 @@
-from .config import USE_PYDANTIC_V2
-
-try:
-    if USE_PYDANTIC_V2:
-        from pydantic import *  # noqa: F403
-    else:
-        from pydantic.v1.dataclasses import *  # noqa: F403
-except ImportError:
-    from pydantic.dataclasses import *  # noqa: F403

libs/core/langchain_core/pydantic/main.py

@@ -1,9 +0,0 @@
-from .config import USE_PYDANTIC_V2
-
-try:
-    if USE_PYDANTIC_V2:
-        from pydantic import *  # noqa: F403 # type: ignore
-    else:
-        from pydantic.v1.main import *  # noqa: F403
-except ImportError:
-    from pydantic.main import *  # noqa: F403

libs/core/langchain_core/tools.py

@@ -34,10 +34,9 @@ from langchain_core.callbacks import (
     Callbacks,
 )
 from langchain_core.load.serializable import Serializable
+from langchain_core.pydantic import BaseModel, Field
 from langchain_core.pydantic_v1 import (
-    BaseModel,
     Extra,
-    Field,
     ValidationError,
     create_model,
     root_validator,