From 2996cb726d9500cc48b7118f32f51beb4e548955 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Sat, 15 Jun 2024 20:15:50 -0300 Subject: [PATCH] fix: Fix typo in import statement for DocumentsToDataComponent --- .../langflow/components/helpers/__init__.py | 2 +- .../langflow/components/inputs/ChatInput.py | 6 +++++ .../langflow/components/inputs/TextInput.py | 11 ++------ .../langflow/components/models/__init__.py | 4 +-- .../langflow/components/outputs/ChatOutput.py | 26 ++++++++++--------- .../langflow/components/outputs/TextOutput.py | 19 ++++---------- 6 files changed, 30 insertions(+), 38 deletions(-) diff --git a/src/backend/base/langflow/components/helpers/__init__.py b/src/backend/base/langflow/components/helpers/__init__.py index c10b83dd9..1337aebd4 100644 --- a/src/backend/base/langflow/components/helpers/__init__.py +++ b/src/backend/base/langflow/components/helpers/__init__.py @@ -1,7 +1,7 @@ from .CreateData import CreateDataComponent from .CustomComponent import Component from .ParseData import ParseDataComponent -from .DocumentToData import DocumentsToDataComponent +from .DocumentsToData import DocumentsToDataComponent from .IDGenerator import UUIDGeneratorComponent from .UpdateData import UpdateDataComponent diff --git a/src/backend/base/langflow/components/inputs/ChatInput.py b/src/backend/base/langflow/components/inputs/ChatInput.py index 3ea68e6c7..9f9a47b8b 100644 --- a/src/backend/base/langflow/components/inputs/ChatInput.py +++ b/src/backend/base/langflow/components/inputs/ChatInput.py @@ -2,6 +2,7 @@ from langflow.base.io.chat import ChatComponent from langflow.inputs import DropdownInput, StrInput from langflow.schema.message import Message from langflow.template import Output +from langflow.field_typing import Text class ChatInput(ChatComponent): @@ -40,6 +41,7 @@ class ChatInput(ChatComponent): ] outputs = [ Output(display_name="Message", name="message", method="message_response"), + Output(display_name="Text", name="text", method="text_response"), ] def message_response(self) -> Message: @@ -53,3 +55,7 @@ class ChatInput(ChatComponent): self.store_message(message) self.status = message return message + + def text_response(self) -> Text: + text = self.message_response().text + return text diff --git a/src/backend/base/langflow/components/inputs/TextInput.py b/src/backend/base/langflow/components/inputs/TextInput.py index d1c8a0c91..70b34fc24 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 MultilineInput, StrInput +from langflow.inputs import StrInput from langflow.template import Output @@ -15,17 +15,10 @@ class TextInputComponent(TextComponent): display_name="Text", info="Text to be passed as input.", ), - MultilineInput( - name="data_template", - display_name="Data Template", - info="Template to convert Data to Text. If left empty, it will be dynamically set to the Data's text key.", - advanced=True, - value="{text}", - ), ] outputs = [ Output(display_name="Text", name="text", method="text_response"), ] def text_response(self) -> Text: - return self.build(input_value=self.input_value, data_template=self.data_template) + return self.build(input_value=self.input_value) diff --git a/src/backend/base/langflow/components/models/__init__.py b/src/backend/base/langflow/components/models/__init__.py index 9db6caa26..a348f230a 100644 --- a/src/backend/base/langflow/components/models/__init__.py +++ b/src/backend/base/langflow/components/models/__init__.py @@ -1,5 +1,5 @@ from .AmazonBedrockModel import AmazonBedrockComponent -from .AnthropicModel import AnthropicLLM +from .AnthropicModel import AnthropicModelComponent from .AzureOpenAIModel import AzureChatOpenAIComponent from .BaiduQianfanChatModel import QianfanChatEndpointComponent from .ChatLiteLLMModel import ChatLiteLLMModelComponent @@ -13,7 +13,7 @@ from .VertexAiModel import ChatVertexAIComponent __all__ = [ "ChatLiteLLMModelComponent", "AmazonBedrockComponent", - "AnthropicLLM", + "AnthropicModelComponent", "AzureChatOpenAIComponent", "QianfanChatEndpointComponent", "CohereComponent", diff --git a/src/backend/base/langflow/components/outputs/ChatOutput.py b/src/backend/base/langflow/components/outputs/ChatOutput.py index c028cfa0e..5a659e09e 100644 --- a/src/backend/base/langflow/components/outputs/ChatOutput.py +++ b/src/backend/base/langflow/components/outputs/ChatOutput.py @@ -1,7 +1,8 @@ from langflow.base.io.chat import ChatComponent -from langflow.inputs import BoolInput, DropdownInput, MultilineInput, StrInput +from langflow.inputs import BoolInput, DropdownInput, StrInput from langflow.schema.message import Message from langflow.template import Output +from langflow.field_typing import Text class ChatOutput(ChatComponent): @@ -10,11 +11,10 @@ class ChatOutput(ChatComponent): icon = "ChatOutput" inputs = [ - MultilineInput( + StrInput( name="input_value", display_name="Text", info="Message to be passed as output.", - input_types=["Text", "Message"], ), DropdownInput( name="sender", @@ -36,19 +36,21 @@ class ChatOutput(ChatComponent): ] outputs = [ Output(display_name="Message", name="message", method="message_response"), + Output(display_name="Text", name="text", method="text_response"), ] def message_response(self) -> Message: - if isinstance(self.input_value, Message): - message = self.input_value - else: - message = Message( - text=self.input_value, - sender=self.sender, - sender_name=self.sender_name, - session_id=self.session_id, - ) + message = Message( + text=self.input_value, + sender=self.sender, + sender_name=self.sender_name, + session_id=self.session_id, + ) if self.session_id and isinstance(message, Message) and isinstance(message.text, str): self.store_message(message) self.status = message return message + + def text_response(self) -> Text: + text = self.message_response().text + return text diff --git a/src/backend/base/langflow/components/outputs/TextOutput.py b/src/backend/base/langflow/components/outputs/TextOutput.py index f68d55b01..a4418201d 100644 --- a/src/backend/base/langflow/components/outputs/TextOutput.py +++ b/src/backend/base/langflow/components/outputs/TextOutput.py @@ -1,6 +1,7 @@ from langflow.base.io.text import TextComponent from langflow.field_typing import Text -from langflow.template import Input, Output +from langflow.template import Output +from langflow.inputs import StrInput class TextOutputComponent(TextComponent): @@ -9,20 +10,10 @@ class TextOutputComponent(TextComponent): icon = "type" inputs = [ - Input( + StrInput( name="input_value", - type=str, - display_name="Value", + display_name="Text", info="Text or Data to be passed as output.", - input_types=["Data", "Text"], - ), - Input( - name="data_template", - type=str, - display_name="Data Template", - multiline=True, - info="Template to convert Data to Text. If left empty, it will be dynamically set to the Data's text key.", - advanced=True, ), ] outputs = [ @@ -30,4 +21,4 @@ class TextOutputComponent(TextComponent): ] def text_response(self) -> Text: - return self.build(input_value=self.input_value, data_template=self.data_template) + return self.build(input_value=self.input_value)