From c7ee03b4c0b596da1252a55ea1c3d7db3dd1c5b1 Mon Sep 17 00:00:00 2001 From: Konstantin Krestnikov Date: Mon, 7 Oct 2024 18:13:52 +0300 Subject: [PATCH] Linting --- .../langchain/agents/openai_assistant/base.py | 8 +++++--- libs/langchain/langchain/chains/moderation.py | 2 +- .../evaluation/embedding_distance/base.py | 13 ++++--------- libs/langchain/langchain/evaluation/loading.py | 17 +++++++---------- 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/libs/langchain/langchain/agents/openai_assistant/base.py b/libs/langchain/langchain/agents/openai_assistant/base.py index 71b065c251c2f..453c49043f2d1 100644 --- a/libs/langchain/langchain/agents/openai_assistant/base.py +++ b/libs/langchain/langchain/agents/openai_assistant/base.py @@ -27,7 +27,7 @@ if TYPE_CHECKING: import openai - from openai.types.beta.threads import ThreadMessage + from openai.types.beta.threads import ThreadMessage # type: ignore from openai.types.beta.threads.required_action_function_tool_call import ( RequiredActionFunctionToolCall, ) @@ -553,7 +553,8 @@ def _get_response(self, run: Any) -> Any: isinstance(content, openai.types.beta.threads.TextContentBlock) if version_gte_1_14 else isinstance( - content, openai.types.beta.threads.MessageContentText + content, + openai.types.beta.threads.MessageContentText, # type: ignore ) ) for content in answer @@ -683,7 +684,8 @@ async def _aget_response(self, run: Any) -> Any: isinstance(content, openai.types.beta.threads.TextContentBlock) if version_gte_1_14 else isinstance( - content, openai.types.beta.threads.MessageContentText + content, + openai.types.beta.threads.MessageContentText, # type: ignore ) ) for content in answer diff --git a/libs/langchain/langchain/chains/moderation.py b/libs/langchain/langchain/chains/moderation.py index a4b3551491c45..0f60941e7a78f 100644 --- a/libs/langchain/langchain/chains/moderation.py +++ b/libs/langchain/langchain/chains/moderation.py @@ -64,7 +64,7 @@ def validate_environment(cls, values: Dict) -> Dict: except ValueError: values["openai_pre_1_0"] = True if values["openai_pre_1_0"]: - values["client"] = openai.Moderation + values["client"] = openai.Moderation # type: ignore else: values["client"] = openai.OpenAI() values["async_client"] = openai.AsyncOpenAI() diff --git a/libs/langchain/langchain/evaluation/embedding_distance/base.py b/libs/langchain/langchain/evaluation/embedding_distance/base.py index d983c72fbf00f..f473571e5ac72 100644 --- a/libs/langchain/langchain/evaluation/embedding_distance/base.py +++ b/libs/langchain/langchain/evaluation/embedding_distance/base.py @@ -29,13 +29,10 @@ def _embedding_factory() -> Embeddings: try: from langchain_openai import OpenAIEmbeddings except ImportError: - try: - from langchain_community.embeddings.openai import OpenAIEmbeddings - except ImportError: - raise ImportError( - "Could not import OpenAIEmbeddings. Please install the " - "OpenAIEmbeddings package using `pip install langchain-openai`." - ) + raise ImportError( + "Could not import OpenAIEmbeddings. Please install the " + "OpenAIEmbeddings package using `pip install langchain-openai`." + ) return OpenAIEmbeddings() @@ -89,8 +86,6 @@ def _validate_tiktoken_installed(cls, values: Dict[str, Any]) -> Dict[str, Any]: pass try: - from langchain_community.embeddings.openai import OpenAIEmbeddings - types_.append(OpenAIEmbeddings) except ImportError: pass diff --git a/libs/langchain/langchain/evaluation/loading.py b/libs/langchain/langchain/evaluation/loading.py index a9a576911bfc6..127df5474316a 100644 --- a/libs/langchain/langchain/evaluation/loading.py +++ b/libs/langchain/langchain/evaluation/loading.py @@ -134,16 +134,13 @@ def load_evaluator( try: from langchain_openai import ChatOpenAI except ImportError: - try: - from langchain_community.chat_models.openai import ChatOpenAI - except ImportError: - raise ImportError( - "Could not import langchain_openai or fallback onto " - "langchain_community. Please install langchain_openai " - "or specify a language model explicitly. " - "It's recommended to install langchain_openai AND " - "specify a language model explicitly." - ) + raise ImportError( + "Could not import langchain_openai or fallback onto " + "langchain_community. Please install langchain_openai " + "or specify a language model explicitly. " + "It's recommended to install langchain_openai AND " + "specify a language model explicitly." + ) llm = llm or ChatOpenAI( # type: ignore[call-arg] model="gpt-4", seed=42, temperature=0