From d10703b4b57f47e32716cdbbb6a39548dcaa2710 Mon Sep 17 00:00:00 2001 From: Eugene Yurtsev Date: Thu, 8 Aug 2024 17:25:55 -0400 Subject: [PATCH] more fixes --- libs/community/langchain_community/chat_models/hunyuan.py | 1 - libs/community/langchain_community/chat_models/litellm.py | 1 - libs/community/langchain_community/chat_models/octoai.py | 1 - libs/community/langchain_community/chat_models/openai.py | 2 -- libs/community/langchain_community/chat_models/snowflake.py | 1 - libs/community/langchain_community/embeddings/anyscale.py | 1 - libs/community/langchain_community/embeddings/ernie.py | 5 ++--- .../langchain_community/embeddings/octoai_embeddings.py | 1 - libs/community/langchain_community/embeddings/sambanova.py | 3 +-- libs/community/langchain_community/embeddings/volcengine.py | 5 ++--- libs/community/langchain_community/llms/anthropic.py | 1 - libs/community/langchain_community/llms/anyscale.py | 1 - libs/community/langchain_community/llms/baichuan.py | 1 - libs/community/langchain_community/llms/edenai.py | 3 +-- libs/community/langchain_community/llms/minimax.py | 1 - .../llms/oci_data_science_model_deployment_endpoint.py | 3 +-- libs/community/langchain_community/llms/octoai_endpoint.py | 1 - libs/community/langchain_community/llms/openai.py | 1 - libs/community/langchain_community/llms/pai_eas_endpoint.py | 3 +-- libs/community/langchain_community/llms/sambanova.py | 2 +- libs/community/langchain_community/llms/sparkllm.py | 3 +-- libs/community/langchain_community/retrievers/arcee.py | 3 +-- .../retrievers/google_cloud_documentai_warehouse.py | 3 +-- 23 files changed, 12 insertions(+), 35 deletions(-) diff --git a/libs/community/langchain_community/chat_models/hunyuan.py b/libs/community/langchain_community/chat_models/hunyuan.py index 1b79c1b201e..197ff6376df 100644 --- a/libs/community/langchain_community/chat_models/hunyuan.py +++ b/libs/community/langchain_community/chat_models/hunyuan.py @@ -26,7 +26,6 @@ from langchain_core.utils import ( get_pydantic_field_names, pre_init, ) -from pydantic import Field logger = logging.getLogger(__name__) diff --git a/libs/community/langchain_community/chat_models/litellm.py b/libs/community/langchain_community/chat_models/litellm.py index 1a23d3b7d54..7ce20fba965 100644 --- a/libs/community/langchain_community/chat_models/litellm.py +++ b/libs/community/langchain_community/chat_models/litellm.py @@ -57,7 +57,6 @@ from langchain_core.runnables import Runnable from langchain_core.tools import BaseTool from langchain_core.utils import from_env, get_from_dict_or_env, pre_init from langchain_core.utils.function_calling import convert_to_openai_tool -from pydantic import Field logger = logging.getLogger(__name__) diff --git a/libs/community/langchain_community/chat_models/octoai.py b/libs/community/langchain_community/chat_models/octoai.py index a536b51c772..e6905cc8b26 100644 --- a/libs/community/langchain_community/chat_models/octoai.py +++ b/libs/community/langchain_community/chat_models/octoai.py @@ -9,7 +9,6 @@ from langchain_core.utils import ( get_from_dict_or_env, pre_init, ) -from pydantic import Field from langchain_community.chat_models.openai import ChatOpenAI from langchain_community.utils.openai import is_openai_v1 diff --git a/libs/community/langchain_community/chat_models/openai.py b/libs/community/langchain_community/chat_models/openai.py index 810bb9d9ff2..3250a7ab589 100644 --- a/libs/community/langchain_community/chat_models/openai.py +++ b/libs/community/langchain_community/chat_models/openai.py @@ -48,11 +48,9 @@ from langchain_core.pydantic_v1 import BaseModel, Field, root_validator from langchain_core.runnables import Runnable from langchain_core.utils import ( from_env, - get_from_dict_or_env, get_pydantic_field_names, pre_init, ) -from pydantic import Field from langchain_community.adapters.openai import ( convert_dict_to_message, diff --git a/libs/community/langchain_community/chat_models/snowflake.py b/libs/community/langchain_community/chat_models/snowflake.py index 81b3e62fd5a..d2abfdd15ce 100644 --- a/libs/community/langchain_community/chat_models/snowflake.py +++ b/libs/community/langchain_community/chat_models/snowflake.py @@ -20,7 +20,6 @@ from langchain_core.utils import ( pre_init, ) from langchain_core.utils.utils import build_extra_kwargs -from pydantic import Field SUPPORTED_ROLES: List[str] = [ "system", diff --git a/libs/community/langchain_community/embeddings/anyscale.py b/libs/community/langchain_community/embeddings/anyscale.py index 964fb5d47e1..38c319090d4 100644 --- a/libs/community/langchain_community/embeddings/anyscale.py +++ b/libs/community/langchain_community/embeddings/anyscale.py @@ -11,7 +11,6 @@ from langchain_core.utils import ( get_from_dict_or_env, pre_init, ) -from pydantic import Field from langchain_community.embeddings.openai import OpenAIEmbeddings from langchain_community.utils.openai import is_openai_v1 diff --git a/libs/community/langchain_community/embeddings/ernie.py b/libs/community/langchain_community/embeddings/ernie.py index 8b27662395d..16b1a297915 100644 --- a/libs/community/langchain_community/embeddings/ernie.py +++ b/libs/community/langchain_community/embeddings/ernie.py @@ -6,10 +6,9 @@ from typing import Dict, List, Optional import requests from langchain_core._api.deprecation import deprecated from langchain_core.embeddings import Embeddings -from langchain_core.pydantic_v1 import BaseModel +from langchain_core.pydantic_v1 import BaseModel, Field from langchain_core.runnables.config import run_in_executor -from langchain_core.utils import from_env, get_from_dict_or_env, pre_init -from pydantic import Field +from langchain_core.utils import from_env, pre_init logger = logging.getLogger(__name__) diff --git a/libs/community/langchain_community/embeddings/octoai_embeddings.py b/libs/community/langchain_community/embeddings/octoai_embeddings.py index e73cf170ca0..5cd7f15a265 100644 --- a/libs/community/langchain_community/embeddings/octoai_embeddings.py +++ b/libs/community/langchain_community/embeddings/octoai_embeddings.py @@ -7,7 +7,6 @@ from langchain_core.utils import ( get_from_dict_or_env, pre_init, ) -from pydantic import Field from langchain_community.embeddings.openai import OpenAIEmbeddings from langchain_community.utils.openai import is_openai_v1 diff --git a/libs/community/langchain_community/embeddings/sambanova.py b/libs/community/langchain_community/embeddings/sambanova.py index 1e0d0f15168..b264ff7530b 100644 --- a/libs/community/langchain_community/embeddings/sambanova.py +++ b/libs/community/langchain_community/embeddings/sambanova.py @@ -3,9 +3,8 @@ from typing import Dict, Generator, List, Optional import requests from langchain_core.embeddings import Embeddings -from langchain_core.pydantic_v1 import BaseModel +from langchain_core.pydantic_v1 import BaseModel, Field from langchain_core.utils import from_env, get_from_dict_or_env, pre_init -from pydantic import Field class SambaStudioEmbeddings(BaseModel, Embeddings): diff --git a/libs/community/langchain_community/embeddings/volcengine.py b/libs/community/langchain_community/embeddings/volcengine.py index b15536bc828..6ccabe3b735 100644 --- a/libs/community/langchain_community/embeddings/volcengine.py +++ b/libs/community/langchain_community/embeddings/volcengine.py @@ -4,9 +4,8 @@ import logging from typing import Any, Dict, List, Optional from langchain_core.embeddings import Embeddings -from langchain_core.pydantic_v1 import BaseModel -from langchain_core.utils import from_env, get_from_dict_or_env, pre_init -from pydantic import Field +from langchain_core.pydantic_v1 import BaseModel, Field +from langchain_core.utils import from_env, pre_init logger = logging.getLogger(__name__) diff --git a/libs/community/langchain_community/llms/anthropic.py b/libs/community/langchain_community/llms/anthropic.py index dd557bb3240..cd9db81f139 100644 --- a/libs/community/langchain_community/llms/anthropic.py +++ b/libs/community/langchain_community/llms/anthropic.py @@ -29,7 +29,6 @@ from langchain_core.utils import ( pre_init, ) from langchain_core.utils.utils import build_extra_kwargs, convert_to_secret_str -from pydantic import Field class _AnthropicCommon(BaseLanguageModel): diff --git a/libs/community/langchain_community/llms/anyscale.py b/libs/community/langchain_community/llms/anyscale.py index 0c2eb63bb78..fb0557bda1c 100644 --- a/libs/community/langchain_community/llms/anyscale.py +++ b/libs/community/langchain_community/llms/anyscale.py @@ -21,7 +21,6 @@ from langchain_core.utils import ( get_from_dict_or_env, pre_init, ) -from pydantic import Field from langchain_community.llms.openai import ( BaseOpenAI, diff --git a/libs/community/langchain_community/llms/baichuan.py b/libs/community/langchain_community/llms/baichuan.py index ef0b6283ce8..07dfcaafdd5 100644 --- a/libs/community/langchain_community/llms/baichuan.py +++ b/libs/community/langchain_community/llms/baichuan.py @@ -14,7 +14,6 @@ from langchain_core.utils import ( get_from_dict_or_env, pre_init, ) -from pydantic import Field from langchain_community.llms.utils import enforce_stop_tokens diff --git a/libs/community/langchain_community/llms/edenai.py b/libs/community/langchain_community/llms/edenai.py index 634484a2448..846ad30945b 100644 --- a/libs/community/langchain_community/llms/edenai.py +++ b/libs/community/langchain_community/llms/edenai.py @@ -10,9 +10,8 @@ from langchain_core.callbacks import ( ) from langchain_core.language_models.llms import LLM from langchain_core.pydantic_v1 import Field, root_validator -from langchain_core.utils import from_env, get_from_dict_or_env, pre_init +from langchain_core.utils import from_env, pre_init from langchain_core.utils.pydantic import get_fields -from pydantic import Field from langchain_community.llms.utils import enforce_stop_tokens from langchain_community.utilities.requests import Requests diff --git a/libs/community/langchain_community/llms/minimax.py b/libs/community/langchain_community/llms/minimax.py index 2294f018218..1e5befcfc97 100644 --- a/libs/community/langchain_community/llms/minimax.py +++ b/libs/community/langchain_community/llms/minimax.py @@ -22,7 +22,6 @@ from langchain_core.utils import ( get_from_dict_or_env, pre_init, ) -from pydantic import Field from langchain_community.llms.utils import enforce_stop_tokens diff --git a/libs/community/langchain_community/llms/oci_data_science_model_deployment_endpoint.py b/libs/community/langchain_community/llms/oci_data_science_model_deployment_endpoint.py index 78c621dbed3..e133397b6e2 100644 --- a/libs/community/langchain_community/llms/oci_data_science_model_deployment_endpoint.py +++ b/libs/community/langchain_community/llms/oci_data_science_model_deployment_endpoint.py @@ -5,8 +5,7 @@ import requests from langchain_core.callbacks import CallbackManagerForLLMRun from langchain_core.language_models.llms import LLM from langchain_core.pydantic_v1 import Field -from langchain_core.utils import from_env, get_from_dict_or_env, pre_init -from pydantic import Field +from langchain_core.utils import from_env, pre_init logger = logging.getLogger(__name__) diff --git a/libs/community/langchain_community/llms/octoai_endpoint.py b/libs/community/langchain_community/llms/octoai_endpoint.py index da6ff3c4e95..c746dc4d4a8 100644 --- a/libs/community/langchain_community/llms/octoai_endpoint.py +++ b/libs/community/langchain_community/llms/octoai_endpoint.py @@ -7,7 +7,6 @@ from langchain_core.utils import ( get_from_dict_or_env, pre_init, ) -from pydantic import Field from langchain_community.llms.openai import BaseOpenAI from langchain_community.utils.openai import is_openai_v1 diff --git a/libs/community/langchain_community/llms/openai.py b/libs/community/langchain_community/llms/openai.py index c9006722334..a1c760e5289 100644 --- a/libs/community/langchain_community/llms/openai.py +++ b/libs/community/langchain_community/llms/openai.py @@ -37,7 +37,6 @@ from langchain_core.utils import ( ) from langchain_core.utils.pydantic import get_fields from langchain_core.utils.utils import build_extra_kwargs -from pydantic import Field from langchain_community.utils.openai import is_openai_v1 diff --git a/libs/community/langchain_community/llms/pai_eas_endpoint.py b/libs/community/langchain_community/llms/pai_eas_endpoint.py index 2b72e61b2c5..7f898e343be 100644 --- a/libs/community/langchain_community/llms/pai_eas_endpoint.py +++ b/libs/community/langchain_community/llms/pai_eas_endpoint.py @@ -6,8 +6,7 @@ import requests from langchain_core.callbacks import CallbackManagerForLLMRun from langchain_core.language_models.llms import LLM from langchain_core.outputs import GenerationChunk -from langchain_core.utils import from_env, get_from_dict_or_env, pre_init -from pydantic import Field +from langchain_core.utils import pre_init from langchain_community.llms.utils import enforce_stop_tokens diff --git a/libs/community/langchain_community/llms/sambanova.py b/libs/community/langchain_community/llms/sambanova.py index 9b31dd2a403..57c6902d398 100644 --- a/libs/community/langchain_community/llms/sambanova.py +++ b/libs/community/langchain_community/llms/sambanova.py @@ -5,8 +5,8 @@ import requests from langchain_core.callbacks.manager import CallbackManagerForLLMRun from langchain_core.language_models.llms import LLM from langchain_core.outputs import GenerationChunk +from langchain_core.pydantic_v1 import Field from langchain_core.utils import from_env, get_from_dict_or_env, pre_init -from pydantic import Field class SVEndpointHandler: diff --git a/libs/community/langchain_community/llms/sparkllm.py b/libs/community/langchain_community/llms/sparkllm.py index 8db5ef8638a..597ebb57b83 100644 --- a/libs/community/langchain_community/llms/sparkllm.py +++ b/libs/community/langchain_community/llms/sparkllm.py @@ -18,8 +18,7 @@ from langchain_core.callbacks import CallbackManagerForLLMRun from langchain_core.language_models.llms import LLM from langchain_core.outputs import GenerationChunk from langchain_core.pydantic_v1 import Field -from langchain_core.utils import from_env, get_from_dict_or_env, pre_init -from pydantic import Field +from langchain_core.utils import from_env, pre_init logger = logging.getLogger(__name__) diff --git a/libs/community/langchain_community/retrievers/arcee.py b/libs/community/langchain_community/retrievers/arcee.py index ed87a0f6251..5a069813b99 100644 --- a/libs/community/langchain_community/retrievers/arcee.py +++ b/libs/community/langchain_community/retrievers/arcee.py @@ -2,7 +2,7 @@ from typing import Any, Dict, List, Optional from langchain_core.callbacks import CallbackManagerForRetrieverRun from langchain_core.documents import Document -from langchain_core.pydantic_v1 import SecretStr +from langchain_core.pydantic_v1 import Field, SecretStr from langchain_core.retrievers import BaseRetriever from langchain_core.utils import ( convert_to_secret_str, @@ -10,7 +10,6 @@ from langchain_core.utils import ( get_from_dict_or_env, pre_init, ) -from pydantic import Field from langchain_community.utilities.arcee import ArceeWrapper, DALMFilter diff --git a/libs/community/langchain_community/retrievers/google_cloud_documentai_warehouse.py b/libs/community/langchain_community/retrievers/google_cloud_documentai_warehouse.py index 751f3fd1153..12b34f7836e 100644 --- a/libs/community/langchain_community/retrievers/google_cloud_documentai_warehouse.py +++ b/libs/community/langchain_community/retrievers/google_cloud_documentai_warehouse.py @@ -6,8 +6,7 @@ from langchain_core._api.deprecation import deprecated from langchain_core.callbacks import CallbackManagerForRetrieverRun from langchain_core.documents import Document from langchain_core.retrievers import BaseRetriever -from langchain_core.utils import from_env, get_from_dict_or_env, pre_init -from pydantic import Field +from langchain_core.utils import pre_init from langchain_community.utilities.vertexai import get_client_info