diff --git a/libs/community/langchain_community/document_loaders/base_o365.py b/libs/community/langchain_community/document_loaders/base_o365.py index f5fb612d3e4..f49d518981f 100644 --- a/libs/community/langchain_community/document_loaders/base_o365.py +++ b/libs/community/langchain_community/document_loaders/base_o365.py @@ -12,12 +12,11 @@ from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Sequence, Union from pydantic import ( BaseModel, - ConfigDict, Field, FilePath, SecretStr, ) -from pydantic_settings import BaseSettings +from pydantic_settings import BaseSettings, SettingsConfigDict from langchain_community.document_loaders.base import BaseLoader from langchain_community.document_loaders.blob_loaders.file_system import ( @@ -38,10 +37,8 @@ class _O365Settings(BaseSettings): client_id: str = Field(..., env="O365_CLIENT_ID") client_secret: SecretStr = Field(..., env="O365_CLIENT_SECRET") - model_config = ConfigDict( - case_sentive=False, - env_file=".env", - env_prefix="", + model_config = SettingsConfigDict( + case_sentive=False, env_file=".env", env_prefix="" ) diff --git a/libs/community/langchain_community/vectorstores/apache_doris.py b/libs/community/langchain_community/vectorstores/apache_doris.py index 1cdd8477a38..07f72d1508d 100644 --- a/libs/community/langchain_community/vectorstores/apache_doris.py +++ b/libs/community/langchain_community/vectorstores/apache_doris.py @@ -9,8 +9,7 @@ from typing import Any, Dict, Iterable, List, Optional, Tuple from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from pydantic import ConfigDict -from pydantic_settings import BaseSettings +from pydantic_settings import BaseSettings, SettingsConfigDict logger = logging.getLogger() DEBUG = False @@ -62,10 +61,8 @@ class ApacheDorisSettings(BaseSettings): def __getitem__(self, item: str) -> Any: return getattr(self, item) - model_config = ConfigDict( - env_file=".env", - env_file_encoding="utf-8", - env_prefix="apache_doris_", + model_config = SettingsConfigDict( + env_file=".env", env_file_encoding="utf-8", env_prefix="apache_doris_" ) diff --git a/libs/community/langchain_community/vectorstores/clickhouse.py b/libs/community/langchain_community/vectorstores/clickhouse.py index d9f06aa3044..83f5af6698b 100644 --- a/libs/community/langchain_community/vectorstores/clickhouse.py +++ b/libs/community/langchain_community/vectorstores/clickhouse.py @@ -9,8 +9,7 @@ from typing import Any, Dict, Iterable, List, Optional, Tuple, Union from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from pydantic import ConfigDict -from pydantic_settings import BaseSettings +from pydantic_settings import BaseSettings, SettingsConfigDict logger = logging.getLogger() @@ -96,10 +95,8 @@ class ClickhouseSettings(BaseSettings): def __getitem__(self, item: str) -> Any: return getattr(self, item) - model_config = ConfigDict( - env_file=".env", - env_file_encoding="utf-8", - env_prefix="clickhouse_", + model_config = SettingsConfigDict( + env_file=".env", env_file_encoding="utf-8", env_prefix="clickhouse_" ) diff --git a/libs/community/langchain_community/vectorstores/kinetica.py b/libs/community/langchain_community/vectorstores/kinetica.py index ae480b329d0..464f71de2c5 100644 --- a/libs/community/langchain_community/vectorstores/kinetica.py +++ b/libs/community/langchain_community/vectorstores/kinetica.py @@ -15,8 +15,7 @@ import numpy as np from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from pydantic import ConfigDict -from pydantic_settings import BaseSettings +from pydantic_settings import BaseSettings, SettingsConfigDict from langchain_community.vectorstores.utils import maximal_marginal_relevance @@ -80,10 +79,8 @@ class KineticaSettings(BaseSettings): def __getitem__(self, item: str) -> Any: return getattr(self, item) - model_config = ConfigDict( - env_file=".env", - env_file_encoding="utf-8", - env_prefix="kinetica_", + model_config = SettingsConfigDict( + env_file=".env", env_file_encoding="utf-8", env_prefix="kinetica_" ) diff --git a/libs/community/langchain_community/vectorstores/manticore_search.py b/libs/community/langchain_community/vectorstores/manticore_search.py index a313425b3d4..4566189388f 100644 --- a/libs/community/langchain_community/vectorstores/manticore_search.py +++ b/libs/community/langchain_community/vectorstores/manticore_search.py @@ -9,8 +9,7 @@ from typing import Any, Dict, Iterable, List, Optional, Type from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from pydantic import ConfigDict -from pydantic_settings import BaseSettings +from pydantic_settings import BaseSettings, SettingsConfigDict logger = logging.getLogger() DEFAULT_K = 4 # Number of Documents to return. @@ -57,10 +56,8 @@ class ManticoreSearchSettings(BaseSettings): def __getitem__(self, item: str) -> Any: return getattr(self, item) - model_config = ConfigDict( - env_file=".env", - env_file_encoding="utf-8", - env_prefix="manticore_", + model_config = SettingsConfigDict( + env_file=".env", env_file_encoding="utf-8", env_prefix="manticore_" ) diff --git a/libs/community/langchain_community/vectorstores/myscale.py b/libs/community/langchain_community/vectorstores/myscale.py index 50cc1457456..8140840c6bb 100644 --- a/libs/community/langchain_community/vectorstores/myscale.py +++ b/libs/community/langchain_community/vectorstores/myscale.py @@ -9,8 +9,7 @@ from typing import Any, Dict, Iterable, List, Optional, Tuple from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from pydantic import ConfigDict -from pydantic_settings import BaseSettings +from pydantic_settings import BaseSettings, SettingsConfigDict logger = logging.getLogger() @@ -86,10 +85,8 @@ class MyScaleSettings(BaseSettings): def __getitem__(self, item: str) -> Any: return getattr(self, item) - model_config = ConfigDict( - env_file=".env", - env_file_encoding="utf-8", - env_prefix="myscale_", + model_config = SettingsConfigDict( + env_file=".env", env_file_encoding="utf-8", env_prefix="myscale_" ) diff --git a/libs/community/langchain_community/vectorstores/starrocks.py b/libs/community/langchain_community/vectorstores/starrocks.py index d057a3720f5..f17d7b650fd 100644 --- a/libs/community/langchain_community/vectorstores/starrocks.py +++ b/libs/community/langchain_community/vectorstores/starrocks.py @@ -9,8 +9,7 @@ from typing import Any, Dict, Iterable, List, Optional, Tuple from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from pydantic import ConfigDict -from pydantic_settings import BaseSettings +from pydantic_settings import BaseSettings, SettingsConfigDict logger = logging.getLogger() DEBUG = False @@ -113,10 +112,8 @@ class StarRocksSettings(BaseSettings): def __getitem__(self, item: str) -> Any: return getattr(self, item) - model_config = ConfigDict( - env_file=".env", - env_file_encoding="utf-8", - env_prefix="starrocks_", + model_config = SettingsConfigDict( + env_file=".env", env_file_encoding="utf-8", env_prefix="starrocks_" ) diff --git a/libs/community/tests/unit_tests/callbacks/fake_callback_handler.py b/libs/community/tests/unit_tests/callbacks/fake_callback_handler.py index a71d2197788..b6838b3c85c 100644 --- a/libs/community/tests/unit_tests/callbacks/fake_callback_handler.py +++ b/libs/community/tests/unit_tests/callbacks/fake_callback_handler.py @@ -254,7 +254,7 @@ class FakeCallbackHandler(BaseCallbackHandler, BaseFakeCallbackHandlerMixin): ) -> Any: self.on_retriever_error_common() - def __deepcopy__(self, memo: dict) -> "FakeCallbackHandler": + def __deepcopy__(self, memo: dict) -> "FakeCallbackHandler": # type: ignore return self @@ -388,5 +388,5 @@ class FakeAsyncCallbackHandler(AsyncCallbackHandler, BaseFakeCallbackHandlerMixi ) -> None: self.on_text_common() - def __deepcopy__(self, memo: dict) -> "FakeAsyncCallbackHandler": + def __deepcopy__(self, memo: dict) -> "FakeAsyncCallbackHandler": # type: ignore return self diff --git a/libs/community/tests/unit_tests/load/test_serializable.py b/libs/community/tests/unit_tests/load/test_serializable.py index 9b6dcc536d4..f86d2f70739 100644 --- a/libs/community/tests/unit_tests/load/test_serializable.py +++ b/libs/community/tests/unit_tests/load/test_serializable.py @@ -112,6 +112,14 @@ def test_serializable_mapping() -> None: "chat_models", "ChatGroq", ), + # TODO(0.3): For now we're skipping this test. Need to fix + # so that it only runs when langchain-aws is installed. + ("langchain", "chat_models", "bedrock", "ChatBedrock"): ( + "langchain_aws", + "chat_models", + "bedrock", + "ChatBedrock", + ), } serializable_modules = import_all_modules("langchain")