From c811e5f0454c5b59d873edddce88315fab88b322 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Thu, 20 Jun 2024 18:21:47 -0300 Subject: [PATCH] apply ruff --- .../embeddings/AmazonBedrockEmbeddings.py | 4 +- .../embeddings/AzureOpenAIEmbeddings.py | 1 - .../components/embeddings/CohereEmbeddings.py | 2 +- .../embeddings/HuggingFaceEmbeddings.py | 2 - .../HuggingFaceInferenceAPIEmbeddings.py | 4 +- .../components/embeddings/OllamaEmbeddings.py | 2 - .../embeddings/VertexAIEmbeddings.py | 2 - .../model_specs/ChatAnthropicSpecs.py | 86 ------------------- .../components/models/AmazonBedrockModel.py | 2 +- .../components/models/AzureOpenAIModel.py | 2 +- .../models/GoogleGenerativeAIModel.py | 2 +- .../RecursiveCharacterTextSplitter.py | 6 +- .../components/vectorstores/Cassandra.py | 1 - .../components/vectorstores/Chroma.py | 2 +- .../components/vectorstores/Couchbase.py | 1 - .../vectorstores/MongoDBAtlasVector.py | 2 - .../components/vectorstores/Qdrant.py | 1 - .../vectorstores/SupabaseVectorStore.py | 1 - .../components/vectorstores/Upstash.py | 1 - .../components/vectorstores/Weaviate.py | 1 - .../components/vectorstores/pgvector.py | 2 - src/backend/base/langflow/graph/graph/base.py | 1 - .../base/langflow/template/template/base.py | 1 - 23 files changed, 10 insertions(+), 119 deletions(-) delete mode 100644 src/backend/base/langflow/components/model_specs/ChatAnthropicSpecs.py diff --git a/src/backend/base/langflow/components/embeddings/AmazonBedrockEmbeddings.py b/src/backend/base/langflow/components/embeddings/AmazonBedrockEmbeddings.py index ab0ae3fff..2c1c8bd48 100644 --- a/src/backend/base/langflow/components/embeddings/AmazonBedrockEmbeddings.py +++ b/src/backend/base/langflow/components/embeddings/AmazonBedrockEmbeddings.py @@ -1,9 +1,7 @@ -from typing import Optional - from langchain_community.embeddings import BedrockEmbeddings from langflow.base.models.model import LCModelComponent from langflow.field_typing import Embeddings -from langflow.io import DropdownInput, Output, SecretStrInput, TextInput +from langflow.io import DropdownInput, Output, TextInput class AmazonBedrockEmbeddingsComponent(LCModelComponent): diff --git a/src/backend/base/langflow/components/embeddings/AzureOpenAIEmbeddings.py b/src/backend/base/langflow/components/embeddings/AzureOpenAIEmbeddings.py index a31ffaac4..927520c75 100644 --- a/src/backend/base/langflow/components/embeddings/AzureOpenAIEmbeddings.py +++ b/src/backend/base/langflow/components/embeddings/AzureOpenAIEmbeddings.py @@ -1,4 +1,3 @@ -from typing import Optional from langchain_openai import AzureOpenAIEmbeddings from pydantic.v1 import SecretStr diff --git a/src/backend/base/langflow/components/embeddings/CohereEmbeddings.py b/src/backend/base/langflow/components/embeddings/CohereEmbeddings.py index f5cb7a3b4..7f4f6a513 100644 --- a/src/backend/base/langflow/components/embeddings/CohereEmbeddings.py +++ b/src/backend/base/langflow/components/embeddings/CohereEmbeddings.py @@ -2,7 +2,7 @@ from langchain_community.embeddings.cohere import CohereEmbeddings from langflow.base.models.model import LCModelComponent from langflow.field_typing import Embeddings -from langflow.io import BoolInput, DictInput, DropdownInput, FloatInput, IntInput, Output, SecretStrInput, TextInput +from langflow.io import DropdownInput, FloatInput, IntInput, Output, SecretStrInput, TextInput class CohereEmbeddingsComponent(LCModelComponent): diff --git a/src/backend/base/langflow/components/embeddings/HuggingFaceEmbeddings.py b/src/backend/base/langflow/components/embeddings/HuggingFaceEmbeddings.py index aa54b9047..86a6d909c 100644 --- a/src/backend/base/langflow/components/embeddings/HuggingFaceEmbeddings.py +++ b/src/backend/base/langflow/components/embeddings/HuggingFaceEmbeddings.py @@ -1,5 +1,3 @@ -from typing import Dict, Optional - from langchain_community.embeddings.huggingface import HuggingFaceEmbeddings from langflow.base.models.model import LCModelComponent diff --git a/src/backend/base/langflow/components/embeddings/HuggingFaceInferenceAPIEmbeddings.py b/src/backend/base/langflow/components/embeddings/HuggingFaceInferenceAPIEmbeddings.py index 648f178ed..6fef75ef1 100644 --- a/src/backend/base/langflow/components/embeddings/HuggingFaceInferenceAPIEmbeddings.py +++ b/src/backend/base/langflow/components/embeddings/HuggingFaceInferenceAPIEmbeddings.py @@ -1,11 +1,9 @@ -from typing import Dict, Optional - from langchain_community.embeddings.huggingface import HuggingFaceInferenceAPIEmbeddings from pydantic.v1.types import SecretStr from langflow.base.models.model import LCModelComponent from langflow.field_typing import Embeddings -from langflow.io import BoolInput, DictInput, FloatInput, Output, SecretStrInput, TextInput +from langflow.io import BoolInput, DictInput, Output, SecretStrInput, TextInput class HuggingFaceInferenceAPIEmbeddingsComponent(LCModelComponent): diff --git a/src/backend/base/langflow/components/embeddings/OllamaEmbeddings.py b/src/backend/base/langflow/components/embeddings/OllamaEmbeddings.py index 7764c2d02..a9f832dee 100644 --- a/src/backend/base/langflow/components/embeddings/OllamaEmbeddings.py +++ b/src/backend/base/langflow/components/embeddings/OllamaEmbeddings.py @@ -1,5 +1,3 @@ -from typing import Optional - from langchain_community.embeddings import OllamaEmbeddings from langflow.base.models.model import LCModelComponent from langflow.field_typing import Embeddings diff --git a/src/backend/base/langflow/components/embeddings/VertexAIEmbeddings.py b/src/backend/base/langflow/components/embeddings/VertexAIEmbeddings.py index 30f1eda02..28b1f1c7c 100644 --- a/src/backend/base/langflow/components/embeddings/VertexAIEmbeddings.py +++ b/src/backend/base/langflow/components/embeddings/VertexAIEmbeddings.py @@ -1,5 +1,3 @@ -from typing import List, Optional - from langflow.base.models.model import LCModelComponent from langflow.field_typing import Embeddings from langflow.io import BoolInput, DictInput, FileInput, FloatInput, IntInput, Output, TextInput diff --git a/src/backend/base/langflow/components/model_specs/ChatAnthropicSpecs.py b/src/backend/base/langflow/components/model_specs/ChatAnthropicSpecs.py deleted file mode 100644 index 6f8583a9d..000000000 --- a/src/backend/base/langflow/components/model_specs/ChatAnthropicSpecs.py +++ /dev/null @@ -1,86 +0,0 @@ -from typing import Optional - -from langchain_anthropic import ChatAnthropic -from pydantic.v1.types import SecretStr - -from langflow.field_typing import LanguageModel - - -class AnthropicLLM(CustomComponent): - display_name: str = "Anthropic" - description: str = "Generate text using Anthropic Chat&Completion LLMs." - icon = "Anthropic" - - field_order = [ - "model", - "anthropic_api_key", - "max_tokens", - "temperature", - "anthropic_api_url", - ] - - def build_config(self): - return { - "model": { - "display_name": "Model Name", - "options": [ - "claude-3-opus-20240229", - "claude-3-sonnet-20240229", - "claude-3-haiku-20240307", - "claude-2.1", - "claude-2.0", - "claude-instant-1.2", - "claude-instant-1", - ], - "info": "Name of the model to use.", - "required": True, - "value": "claude-3-opus-20240229", - }, - "anthropic_api_key": { - "display_name": "Anthropic API Key", - "required": True, - "password": True, - "info": "Your Anthropic API key.", - }, - "max_tokens": { - "display_name": "Max Tokens", - "advanced": True, - "info": "The maximum number of tokens to generate. Set to 0 for unlimited tokens.", - }, - "temperature": { - "display_name": "Temperature", - "field_type": "float", - "value": 0.1, - }, - "anthropic_api_url": { - "display_name": "Anthropic API URL", - "advanced": True, - "info": "Endpoint of the Anthropic API. Defaults to 'https://api.anthropic.com' if not specified.", - }, - "code": {"show": False}, - } - - def build( - self, - model: str, - anthropic_api_key: Optional[str] = None, - max_tokens: Optional[int] = 1000, - temperature: Optional[float] = None, - anthropic_api_url: Optional[str] = None, - ) -> LanguageModel: - # Set default API endpoint if not provided - if not anthropic_api_url: - anthropic_api_url = "https://api.anthropic.com" - - try: - output = ChatAnthropic( - model_name=model, - anthropic_api_key=(SecretStr(anthropic_api_key) if anthropic_api_key else None), - max_tokens_to_sample=max_tokens, # type: ignore - temperature=temperature, - anthropic_api_url=anthropic_api_url, - ) - except Exception as e: - raise ValueError("Could not connect to Anthropic API.") from e - - return output diff --git a/src/backend/base/langflow/components/models/AmazonBedrockModel.py b/src/backend/base/langflow/components/models/AmazonBedrockModel.py index ef4f8450b..ba06c6723 100644 --- a/src/backend/base/langflow/components/models/AmazonBedrockModel.py +++ b/src/backend/base/langflow/components/models/AmazonBedrockModel.py @@ -2,7 +2,7 @@ from langchain_aws import ChatBedrock from langflow.base.constants import STREAM_INFO_TEXT from langflow.base.models.model import LCModelComponent -from langflow.field_typing import LanguageModel, Text +from langflow.field_typing import LanguageModel from langflow.io import BoolInput, DictInput, DropdownInput, MessageInput, Output, StrInput diff --git a/src/backend/base/langflow/components/models/AzureOpenAIModel.py b/src/backend/base/langflow/components/models/AzureOpenAIModel.py index 65b5e23fd..9a2ebbbe0 100644 --- a/src/backend/base/langflow/components/models/AzureOpenAIModel.py +++ b/src/backend/base/langflow/components/models/AzureOpenAIModel.py @@ -3,7 +3,7 @@ from pydantic.v1 import SecretStr from langflow.base.constants import STREAM_INFO_TEXT from langflow.base.models.model import LCModelComponent -from langflow.field_typing import LanguageModel, Text +from langflow.field_typing import LanguageModel from langflow.io import BoolInput, DropdownInput, FloatInput, IntInput, MessageInput, Output, SecretStrInput, StrInput diff --git a/src/backend/base/langflow/components/models/GoogleGenerativeAIModel.py b/src/backend/base/langflow/components/models/GoogleGenerativeAIModel.py index 33684e8da..377e307a9 100644 --- a/src/backend/base/langflow/components/models/GoogleGenerativeAIModel.py +++ b/src/backend/base/langflow/components/models/GoogleGenerativeAIModel.py @@ -2,7 +2,7 @@ from pydantic.v1 import SecretStr from langflow.base.constants import STREAM_INFO_TEXT from langflow.base.models.model import LCModelComponent -from langflow.field_typing import LanguageModel, Text +from langflow.field_typing import LanguageModel from langflow.io import BoolInput, DropdownInput, FloatInput, IntInput, MessageInput, Output, SecretStrInput, StrInput diff --git a/src/backend/base/langflow/components/textsplitters/RecursiveCharacterTextSplitter.py b/src/backend/base/langflow/components/textsplitters/RecursiveCharacterTextSplitter.py index fc5057409..138a491aa 100644 --- a/src/backend/base/langflow/components/textsplitters/RecursiveCharacterTextSplitter.py +++ b/src/backend/base/langflow/components/textsplitters/RecursiveCharacterTextSplitter.py @@ -47,7 +47,7 @@ class RecursiveCharacterTextSplitterComponent(Component): Split text into chunks of a specified length. Args: - separators (list[str]): The characters to split on. + separators (list[str] | None): The characters to split on. chunk_size (int): The maximum length of each chunk. chunk_overlap (int): The amount of overlap between chunks. @@ -63,9 +63,9 @@ class RecursiveCharacterTextSplitterComponent(Component): self.separators = [unescape_string(x) for x in self.separators] # Make sure chunk_size and chunk_overlap are ints - if isinstance(self.chunk_size, str): + if self.chunk_size: self.chunk_size = int(self.chunk_size) - if isinstance(self.chunk_overlap, str): + if self.chunk_overlap: self.chunk_overlap = int(self.chunk_overlap) splitter = RecursiveCharacterTextSplitter( separators=self.separators, diff --git a/src/backend/base/langflow/components/vectorstores/Cassandra.py b/src/backend/base/langflow/components/vectorstores/Cassandra.py index 04d80bdec..4446feabe 100644 --- a/src/backend/base/langflow/components/vectorstores/Cassandra.py +++ b/src/backend/base/langflow/components/vectorstores/Cassandra.py @@ -7,7 +7,6 @@ from langflow.custom import Component from langflow.helpers.data import docs_to_data from langflow.io import BoolInput, DropdownInput, HandleInput, IntInput, Output, SecretStrInput, StrInput from langflow.schema import Data -from langflow.field_typing import Retriever class CassandraVectorStoreComponent(Component): diff --git a/src/backend/base/langflow/components/vectorstores/Chroma.py b/src/backend/base/langflow/components/vectorstores/Chroma.py index 3b3a8abd5..a8b25a5c0 100644 --- a/src/backend/base/langflow/components/vectorstores/Chroma.py +++ b/src/backend/base/langflow/components/vectorstores/Chroma.py @@ -1,5 +1,5 @@ from copy import deepcopy -from typing import TYPE_CHECKING, List +from typing import TYPE_CHECKING from chromadb.config import Settings from langchain_chroma.vectorstores import Chroma diff --git a/src/backend/base/langflow/components/vectorstores/Couchbase.py b/src/backend/base/langflow/components/vectorstores/Couchbase.py index aa264d424..deac2b478 100644 --- a/src/backend/base/langflow/components/vectorstores/Couchbase.py +++ b/src/backend/base/langflow/components/vectorstores/Couchbase.py @@ -8,7 +8,6 @@ from langflow.custom import Component from langflow.helpers.data import docs_to_data from langflow.io import BoolInput, HandleInput, IntInput, Output, SecretStrInput, StrInput from langflow.schema import Data -from langflow.field_typing import Retriever class CouchbaseVectorStoreComponent(Component): diff --git a/src/backend/base/langflow/components/vectorstores/MongoDBAtlasVector.py b/src/backend/base/langflow/components/vectorstores/MongoDBAtlasVector.py index a679f2303..68ced0269 100644 --- a/src/backend/base/langflow/components/vectorstores/MongoDBAtlasVector.py +++ b/src/backend/base/langflow/components/vectorstores/MongoDBAtlasVector.py @@ -8,8 +8,6 @@ from langflow.helpers.data import docs_to_data from langflow.io import BoolInput, HandleInput, IntInput, Output, StrInput from langflow.schema import Data -from langflow.field_typing import Retriever - class MongoVectorStoreComponent(Component): display_name = "MongoDB Atlas" diff --git a/src/backend/base/langflow/components/vectorstores/Qdrant.py b/src/backend/base/langflow/components/vectorstores/Qdrant.py index d90d44f68..f1c25aa57 100644 --- a/src/backend/base/langflow/components/vectorstores/Qdrant.py +++ b/src/backend/base/langflow/components/vectorstores/Qdrant.py @@ -4,7 +4,6 @@ from langchain_community.vectorstores import Qdrant from langchain_core.retrievers import BaseRetriever from langflow.custom import Component -from langflow.field_typing import Retriever from langflow.helpers.data import docs_to_data from langflow.io import BoolInput, DropdownInput, HandleInput, IntInput, Output, SecretStrInput, StrInput from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorstores/SupabaseVectorStore.py b/src/backend/base/langflow/components/vectorstores/SupabaseVectorStore.py index 151ebee86..f3b8ef273 100644 --- a/src/backend/base/langflow/components/vectorstores/SupabaseVectorStore.py +++ b/src/backend/base/langflow/components/vectorstores/SupabaseVectorStore.py @@ -5,7 +5,6 @@ from langchain_core.retrievers import BaseRetriever from supabase.client import Client, create_client from langflow.custom import Component -from langflow.field_typing import Retriever from langflow.helpers.data import docs_to_data from langflow.io import HandleInput, IntInput, Output, StrInput from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorstores/Upstash.py b/src/backend/base/langflow/components/vectorstores/Upstash.py index 6850f7f5c..3793254a6 100644 --- a/src/backend/base/langflow/components/vectorstores/Upstash.py +++ b/src/backend/base/langflow/components/vectorstores/Upstash.py @@ -4,7 +4,6 @@ from langchain_community.vectorstores import UpstashVectorStore from langchain_core.retrievers import BaseRetriever from langflow.custom import Component -from langflow.field_typing import Retriever from langflow.helpers.data import docs_to_data from langflow.io import BoolInput, HandleInput, IntInput, Output, StrInput from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorstores/Weaviate.py b/src/backend/base/langflow/components/vectorstores/Weaviate.py index 3ebb0e236..a1a988875 100644 --- a/src/backend/base/langflow/components/vectorstores/Weaviate.py +++ b/src/backend/base/langflow/components/vectorstores/Weaviate.py @@ -5,7 +5,6 @@ from langchain_community.vectorstores import Weaviate from langchain_core.retrievers import BaseRetriever from langflow.custom import Component -from langflow.field_typing import Retriever from langflow.helpers.data import docs_to_data from langflow.io import BoolInput, HandleInput, IntInput, Output, SecretStrInput, StrInput from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorstores/pgvector.py b/src/backend/base/langflow/components/vectorstores/pgvector.py index 1e6006413..48f8ac13c 100644 --- a/src/backend/base/langflow/components/vectorstores/pgvector.py +++ b/src/backend/base/langflow/components/vectorstores/pgvector.py @@ -8,8 +8,6 @@ from langflow.helpers.data import docs_to_data from langflow.io import BoolInput, HandleInput, IntInput, Output, StrInput from langflow.schema import Data -from langflow.field_typing import Retriever - class PGVectorStoreComponent(Component): display_name = "PGVector" diff --git a/src/backend/base/langflow/graph/graph/base.py b/src/backend/base/langflow/graph/graph/base.py index 038791a2f..be71519f0 100644 --- a/src/backend/base/langflow/graph/graph/base.py +++ b/src/backend/base/langflow/graph/graph/base.py @@ -6,7 +6,6 @@ from itertools import chain from typing import TYPE_CHECKING, Dict, Generator, List, Optional, Tuple, Type, Union from loguru import logger -from langflow.exceptions.component import ComponentBuildException from langflow.exceptions.component import ComponentBuildException from langflow.graph.edge.base import ContractEdge from langflow.graph.graph.constants import lazy_load_vertex_dict diff --git a/src/backend/base/langflow/template/template/base.py b/src/backend/base/langflow/template/template/base.py index bbedd14b2..7c0c7fa0f 100644 --- a/src/backend/base/langflow/template/template/base.py +++ b/src/backend/base/langflow/template/template/base.py @@ -11,7 +11,6 @@ class Template(BaseModel): type_name: str = Field(serialization_alias="_type") fields: list[Union[Input, InputTypes]] - def process_fields( self, format_field_func: Union[Callable, None] = None,