diff --git a/src/backend/base/langflow/components/data/APIRequest.py b/src/backend/base/langflow/components/data/APIRequest.py index ba9855cd5..5bc0b83bf 100644 --- a/src/backend/base/langflow/components/data/APIRequest.py +++ b/src/backend/base/langflow/components/data/APIRequest.py @@ -7,7 +7,7 @@ from loguru import logger from langflow.base.curl.parse import parse_context from langflow.custom import Component -from langflow.inputs import DropdownInput, IntInput, NestedDictInput, StrInput +from langflow.inputs import DropdownInput, IntInput, NestedDictInput, TextInput from langflow.schema import Data from langflow.schema.dotdict import dotdict from langflow.template import Output @@ -19,13 +19,13 @@ class APIRequestComponent(Component): icon = "Globe" inputs = [ - StrInput( + TextInput( name="urls", display_name="URLs", is_list=True, info="Enter one or more URLs, separated by commas.", ), - StrInput( + TextInput( name="curl", display_name="Curl", info="Paste a curl command to populate the fields.", diff --git a/src/backend/base/langflow/components/data/Directory.py b/src/backend/base/langflow/components/data/Directory.py index 6da1511e9..405af4b69 100644 --- a/src/backend/base/langflow/components/data/Directory.py +++ b/src/backend/base/langflow/components/data/Directory.py @@ -2,7 +2,7 @@ from typing import List, Optional from langflow.base.data.utils import parallel_load_data, parse_text_file_to_data, retrieve_file_paths from langflow.custom import Component -from langflow.inputs import StrInput, IntInput, BoolInput +from langflow.inputs import TextInput, IntInput, BoolInput from langflow.template import Output from langflow.schema import Data @@ -13,12 +13,12 @@ class DirectoryComponent(Component): icon = "folder" inputs = [ - StrInput( + TextInput( name="path", display_name="Path", info="Path to the directory to load files from.", ), - StrInput( + TextInput( name="types", display_name="Types", info="File types to load. Leave empty to load all types.", diff --git a/src/backend/base/langflow/components/data/URL.py b/src/backend/base/langflow/components/data/URL.py index 5155ac4aa..db905b061 100644 --- a/src/backend/base/langflow/components/data/URL.py +++ b/src/backend/base/langflow/components/data/URL.py @@ -1,12 +1,12 @@ +import re + from langchain_community.document_loaders.web_base import WebBaseLoader from langflow.custom import Component -from langflow.inputs import StrInput +from langflow.inputs import TextInput from langflow.schema import Data from langflow.template import Output -import re - class URLComponent(Component): display_name = "URL" @@ -14,7 +14,7 @@ class URLComponent(Component): icon = "layout-template" inputs = [ - StrInput( + TextInput( name="urls", display_name="URLs", info="Enter one or more URLs, separated by commas.", diff --git a/src/backend/base/langflow/components/embeddings/OpenAIEmbeddings.py b/src/backend/base/langflow/components/embeddings/OpenAIEmbeddings.py index 94dd80251..6af0bd2c8 100644 --- a/src/backend/base/langflow/components/embeddings/OpenAIEmbeddings.py +++ b/src/backend/base/langflow/components/embeddings/OpenAIEmbeddings.py @@ -2,7 +2,7 @@ from langchain_openai.embeddings.base import OpenAIEmbeddings from langflow.base.models.model import LCModelComponent from langflow.field_typing import Embeddings -from langflow.inputs import BoolInput, DictInput, DropdownInput, FloatInput, IntInput, SecretStrInput, StrInput +from langflow.inputs import BoolInput, DictInput, DropdownInput, FloatInput, IntInput, SecretStrInput, TextInput from langflow.template import Output @@ -24,8 +24,8 @@ class OpenAIEmbeddingsComponent(LCModelComponent): info="Default query parameters to use for the API request.", ), IntInput(name="chunk_size", display_name="Chunk Size", advanced=True, value=1000), - StrInput(name="client", display_name="Client", advanced=True), - StrInput(name="deployment", display_name="Deployment", advanced=True), + TextInput(name="client", display_name="Client", advanced=True), + TextInput(name="deployment", display_name="Deployment", advanced=True), IntInput(name="embedding_ctx_length", display_name="Embedding Context Length", advanced=True, value=1536), IntInput(name="max_retries", display_name="Max Retries", value=3, advanced=True), DropdownInput( @@ -43,17 +43,17 @@ class OpenAIEmbeddingsComponent(LCModelComponent): SecretStrInput(name="openai_api_base", display_name="OpenAI API Base", advanced=True), SecretStrInput(name="openai_api_key", display_name="OpenAI API Key"), SecretStrInput(name="openai_api_type", display_name="OpenAI API Type", advanced=True), - StrInput(name="openai_api_version", display_name="OpenAI API Version", advanced=True), - StrInput( + TextInput(name="openai_api_version", display_name="OpenAI API Version", advanced=True), + TextInput( name="openai_organization", display_name="OpenAI Organization", advanced=True, ), - StrInput(name="openai_proxy", display_name="OpenAI Proxy", advanced=True), + TextInput(name="openai_proxy", display_name="OpenAI Proxy", advanced=True), FloatInput(name="request_timeout", display_name="Request Timeout", advanced=True), BoolInput(name="show_progress_bar", display_name="Show Progress Bar", advanced=True), BoolInput(name="skip_empty", display_name="Skip Empty", advanced=True), - StrInput( + TextInput( name="tiktoken_model_name", display_name="TikToken Model Name", advanced=True, diff --git a/src/backend/base/langflow/components/experimental/SelectivePassThrough.py b/src/backend/base/langflow/components/experimental/SelectivePassThrough.py index 9e623b3e6..a528c9dcb 100644 --- a/src/backend/base/langflow/components/experimental/SelectivePassThrough.py +++ b/src/backend/base/langflow/components/experimental/SelectivePassThrough.py @@ -1,20 +1,21 @@ from langflow.custom import Component from langflow.field_typing import Text -from langflow.inputs import BoolInput, DropdownInput, StrInput +from langflow.inputs import BoolInput, DropdownInput, TextInput from langflow.template import Output + class SelectivePassThroughComponent(Component): display_name = "Selective Pass Through" description = "Passes the specified value if a specified condition is met." icon = "filter" inputs = [ - StrInput( + TextInput( name="input_value", display_name="Input Value", info="The primary input value to evaluate.", ), - StrInput( + TextInput( name="comparison_value", display_name="Comparison Value", info="The value to compare against the input value.", @@ -25,7 +26,7 @@ class SelectivePassThroughComponent(Component): options=["equals", "not equals", "contains", "starts with", "ends with"], info="Condition to evaluate the input value.", ), - StrInput( + TextInput( name="value_to_pass", display_name="Value to Pass", info="The value to pass if the condition is met.", diff --git a/src/backend/base/langflow/components/experimental/SplitText.py b/src/backend/base/langflow/components/experimental/SplitText.py index 70c3969e5..632adb932 100644 --- a/src/backend/base/langflow/components/experimental/SplitText.py +++ b/src/backend/base/langflow/components/experimental/SplitText.py @@ -1,7 +1,7 @@ from typing import List from langflow.custom import Component -from langflow.inputs import IntInput, StrInput, HandleInput +from langflow.inputs import HandleInput, IntInput, TextInput from langflow.schema import Data from langflow.template import Output from langflow.utils.util import unescape_string @@ -13,45 +13,40 @@ class SplitContentComponent(Component): icon = "split" inputs = [ - HandleInput( - name="data", - display_name="Data", - info="Data with text to split.", - input_types=["Data"] - ), - StrInput( + HandleInput(name="data", display_name="Data", info="Data with text to split.", input_types=["Data"]), + TextInput( name="content_key", display_name="Content Key", info="The key to access the text content in the Data object.", value="content", ), - StrInput( + TextInput( name="separator", display_name="Separator", info='The character to split on. Defaults to "\n".', value="\n", - advanced=True + advanced=True, ), IntInput( name="chunk_size", display_name="Chunk Size", info="The target length (in number of characters) of each chunk.", value=0, - advanced=True + advanced=True, ), IntInput( name="min_chunk_size", display_name="Minimum Chunk Size", info="The minimum size of chunks. Smaller chunks will be merged.", value=0, - advanced=True + advanced=True, ), IntInput( name="max_chunk_size", display_name="Maximum Chunk Size", info="The maximum size of chunks. Larger chunks will be split.", value=0, - advanced=True + advanced=True, ), ] @@ -70,9 +65,9 @@ class SplitContentComponent(Component): buffer = "" for row in data: - content = row.data.get(content_key, '') + content = row.data.get(content_key, "") if chunk_size > 0: - chunks = [content[i:i + chunk_size] for i in range(0, len(content), chunk_size)] + chunks = [content[i : i + chunk_size] for i in range(0, len(content), chunk_size)] else: chunks = content.split(separator) diff --git a/src/backend/base/langflow/components/experimental/TextOperator.py b/src/backend/base/langflow/components/experimental/TextOperator.py index 84436e23b..7950849d0 100644 --- a/src/backend/base/langflow/components/experimental/TextOperator.py +++ b/src/backend/base/langflow/components/experimental/TextOperator.py @@ -1,6 +1,6 @@ from langflow.custom import Component from langflow.field_typing import Text -from langflow.inputs import BoolInput, DropdownInput, StrInput +from langflow.inputs import BoolInput, DropdownInput, TextInput from langflow.template import Output @@ -10,12 +10,12 @@ class TextOperatorComponent(Component): icon = "equal" inputs = [ - StrInput( + TextInput( name="input_text", display_name="Input Text", info="The primary text input for the operation.", ), - StrInput( + TextInput( name="match_text", display_name="Match Text", info="The text input to compare against.", @@ -33,13 +33,13 @@ class TextOperatorComponent(Component): value=False, advanced=True, ), - StrInput( + TextInput( name="true_output", display_name="True Output", info="The output to return or display when the comparison is true.", advanced=True, ), - StrInput( + TextInput( name="false_output", display_name="False Output", info="The output to return or display when the comparison is false.", diff --git a/src/backend/base/langflow/components/helpers/CombineText.py b/src/backend/base/langflow/components/helpers/CombineText.py index 641ab54ae..5c86e6b1c 100644 --- a/src/backend/base/langflow/components/helpers/CombineText.py +++ b/src/backend/base/langflow/components/helpers/CombineText.py @@ -1,6 +1,5 @@ from langflow.custom import Component -from langflow.field_typing import Text -from langflow.inputs import StrInput +from langflow.field_typing import Text, TextInput from langflow.template import Output @@ -10,17 +9,17 @@ class CombineTextComponent(Component): icon = "merge" inputs = [ - StrInput( + TextInput( name="text1", display_name="First Text", info="The first text input to concatenate.", ), - StrInput( + TextInput( name="text2", display_name="Second Text", info="The second text input to concatenate.", ), - StrInput( + TextInput( name="delimiter", display_name="Delimiter", info="A string used to separate the two text inputs. Defaults to a whitespace.", diff --git a/src/backend/base/langflow/components/helpers/CustomComponent.py b/src/backend/base/langflow/components/helpers/CustomComponent.py index 8da9b0004..f01bae58d 100644 --- a/src/backend/base/langflow/components/helpers/CustomComponent.py +++ b/src/backend/base/langflow/components/helpers/CustomComponent.py @@ -1,6 +1,6 @@ # from langflow.field_typing import Data from langflow.custom import Component -from langflow.inputs import StrInput +from langflow.inputs import TextInput from langflow.schema import Data from langflow.template import Output @@ -12,7 +12,7 @@ class CustomComponent(Component): icon = "custom_components" inputs = [ - StrInput(name="input_value", display_name="Input Value", value="Hello, World!"), + TextInput(name="input_value", display_name="Input Value", value="Hello, World!"), ] outputs = [ diff --git a/src/backend/base/langflow/components/helpers/FilterData.py b/src/backend/base/langflow/components/helpers/FilterData.py index 3d7cdbcec..7e457a24f 100644 --- a/src/backend/base/langflow/components/helpers/FilterData.py +++ b/src/backend/base/langflow/components/helpers/FilterData.py @@ -1,7 +1,7 @@ from typing import List from langflow.custom import Component -from langflow.inputs import StrInput, HandleInput +from langflow.inputs import HandleInput, TextInput from langflow.schema import Data from langflow.template import Output @@ -18,7 +18,7 @@ class FilterDataComponent(Component): info="Data object to filter.", input_types=["Message", "Data"], ), - StrInput( + TextInput( name="filter_criteria", display_name="Filter Criteria", info="List of keys to filter by.", diff --git a/src/backend/base/langflow/components/helpers/Memory.py b/src/backend/base/langflow/components/helpers/Memory.py index 480d019be..164415fcc 100644 --- a/src/backend/base/langflow/components/helpers/Memory.py +++ b/src/backend/base/langflow/components/helpers/Memory.py @@ -1,11 +1,11 @@ from typing import List from langflow.custom import Component -from langflow.inputs import DropdownInput, StrInput, IntInput -from langflow.template import Output +from langflow.field_typing import Text +from langflow.inputs import DropdownInput, IntInput, TextInput from langflow.memory import get_messages from langflow.schema import Data -from langflow.field_typing import Text +from langflow.template import Output class MemoryComponent(Component): @@ -22,7 +22,7 @@ class MemoryComponent(Component): info="Type of sender.", advanced=True, ), - StrInput( + TextInput( name="sender_name", display_name="Sender Name", info="Name of the sender.", @@ -35,7 +35,7 @@ class MemoryComponent(Component): info="Number of messages to retrieve.", advanced=True, ), - StrInput( + TextInput( name="session_id", display_name="Session ID", info="Session ID of the chat history.", diff --git a/src/backend/base/langflow/components/inputs/ChatInput.py b/src/backend/base/langflow/components/inputs/ChatInput.py index 641562fe3..3f2f8ac65 100644 --- a/src/backend/base/langflow/components/inputs/ChatInput.py +++ b/src/backend/base/langflow/components/inputs/ChatInput.py @@ -1,8 +1,8 @@ from langflow.base.io.chat import ChatComponent -from langflow.inputs import DropdownInput, StrInput +from langflow.field_typing import Text +from langflow.inputs import DropdownInput, TextInput from langflow.schema.message import Message from langflow.template import Output -from langflow.field_typing import Text class ChatInput(ChatComponent): @@ -11,7 +11,7 @@ class ChatInput(ChatComponent): icon = "ChatInput" inputs = [ - StrInput( + TextInput( name="input_value", display_name="Text", multiline=True, @@ -27,7 +27,7 @@ class ChatInput(ChatComponent): info="Type of sender.", advanced=True, ), - StrInput( + TextInput( name="sender_name", type=str, display_name="Sender Name", @@ -35,7 +35,7 @@ class ChatInput(ChatComponent): value="User", advanced=True, ), - StrInput( + TextInput( name="session_id", type=str, display_name="Session ID", info="Session ID for the message.", advanced=True ), ] diff --git a/src/backend/base/langflow/components/inputs/TextInput.py b/src/backend/base/langflow/components/inputs/TextInput.py index 70b34fc24..863bee47e 100644 --- a/src/backend/base/langflow/components/inputs/TextInput.py +++ b/src/backend/base/langflow/components/inputs/TextInput.py @@ -1,6 +1,6 @@ from langflow.base.io.text import TextComponent from langflow.field_typing import Text -from langflow.inputs import StrInput +from langflow.inputs import TextInput from langflow.template import Output @@ -10,7 +10,7 @@ class TextInputComponent(TextComponent): icon = "type" inputs = [ - StrInput( + TextInput( name="input_value", display_name="Text", info="Text to be passed as input.",