From 9b6aad68edf694b30575d9cbd248130901cbc248 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 22 Jul 2024 15:25:53 -0300 Subject: [PATCH 1/6] refactor: update import statements in create_assistant.py Refactor the import statements in the create_assistant.py file to improve readability and maintainability. Update the import order and add type hints for better code organization. This change ensures consistency with the recent repository commits and follows established conventions. --- .../components/astra_assistants/create_assistant.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/backend/base/langflow/components/astra_assistants/create_assistant.py b/src/backend/base/langflow/components/astra_assistants/create_assistant.py index 50df68e781d..37725a93f4e 100644 --- a/src/backend/base/langflow/components/astra_assistants/create_assistant.py +++ b/src/backend/base/langflow/components/astra_assistants/create_assistant.py @@ -1,6 +1,9 @@ -from langflow.custom import CustomComponent +from typing import Optional + +from astra_assistants import patch # type: ignore from openai import OpenAI -from astra_assistants import patch + +from langflow.custom import CustomComponent class AssistantsCreateAssistant(CustomComponent): @@ -35,8 +38,7 @@ def build_config(self): }, } - def build(self, name: str, instructions: str, model: str, env_set: str = None) -> str: - print(f"env_set is {env_set}") + def build(self, name: str, instructions: str, model: str, env_set: Optional[str] = None) -> str: if env_set is None: raise Exception("Environment variables not set") client = patch(OpenAI()) From fa5865dabc5a26b1c2067870c5f72fe5ef075b59 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 22 Jul 2024 15:25:59 -0300 Subject: [PATCH 2/6] refactor: update import statements in create_thread.py Refactor the import statements in the create_thread.py file to improve readability and maintainability. Update the import order and add type hints for better code organization. This change ensures consistency with the recent repository commits and follows established conventions. --- .../components/astra_assistants/create_thread.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/backend/base/langflow/components/astra_assistants/create_thread.py b/src/backend/base/langflow/components/astra_assistants/create_thread.py index 5c6b26aa2c3..3d68e6e3e0c 100644 --- a/src/backend/base/langflow/components/astra_assistants/create_thread.py +++ b/src/backend/base/langflow/components/astra_assistants/create_thread.py @@ -1,6 +1,9 @@ -from langflow.custom import CustomComponent +from typing import Optional + +from astra_assistants import patch # type: ignore from openai import OpenAI -from astra_assistants import patch + +from langflow.custom import CustomComponent class AssistantsCreateThread(CustomComponent): @@ -16,7 +19,7 @@ def build_config(self): }, } - def build(self, env_set: str = None) -> str: + def build(self, env_set: Optional[str] = None) -> str: client = patch(OpenAI()) thread = client.beta.threads.create() From a82f9f841ba8ce37f484a08d05163cdc26ad5d0d Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 22 Jul 2024 15:26:05 -0300 Subject: [PATCH 3/6] refactor: improve dotenv component Refactor the dotenv component to improve code organization and error handling. Update the import statements and add type hints for better readability and maintainability. This change ensures consistency with recent repository commits and follows established conventions. --- .../base/langflow/components/astra_assistants/dotenv.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/backend/base/langflow/components/astra_assistants/dotenv.py b/src/backend/base/langflow/components/astra_assistants/dotenv.py index d4abf81472d..d9fc27a85b2 100644 --- a/src/backend/base/langflow/components/astra_assistants/dotenv.py +++ b/src/backend/base/langflow/components/astra_assistants/dotenv.py @@ -1,5 +1,7 @@ import io + from dotenv import load_dotenv + from langflow.custom import CustomComponent @@ -23,6 +25,6 @@ def build(self, dotenv_file_content: str) -> str: try: fake_file = io.StringIO(dotenv_file_content) result = load_dotenv(stream=fake_file, override=True) - return result + return "Loaded .env" if result else "No variables found in .env" except Exception as e: raise e From 2cf72eada34393d0eab227d1424b8a1295271011 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 22 Jul 2024 15:26:10 -0300 Subject: [PATCH 4/6] refactor: update import statements in get_assistant.py Refactor the import statements in the get_assistant.py file to improve readability and maintainability. Update the import order and add type hints for better code organization. This change ensures consistency with the recent repository commits and follows established conventions. --- .../langflow/components/astra_assistants/get_assistant.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/backend/base/langflow/components/astra_assistants/get_assistant.py b/src/backend/base/langflow/components/astra_assistants/get_assistant.py index ab8b7f0da7f..0d2d193da88 100644 --- a/src/backend/base/langflow/components/astra_assistants/get_assistant.py +++ b/src/backend/base/langflow/components/astra_assistants/get_assistant.py @@ -1,6 +1,8 @@ -from langflow.custom import CustomComponent +from typing import Optional +from astra_assistants import patch # type: ignore from openai import OpenAI -from astra_assistants import patch + +from langflow.custom import CustomComponent class AssistantsGetAssistantName(CustomComponent): @@ -20,7 +22,7 @@ def build_config(self): }, } - def build(self, assistant_id: str, env_set: str = None) -> str: + def build(self, assistant_id: str, env_set: Optional[str] = None) -> str: client = patch(OpenAI()) assistant = client.beta.assistants.retrieve( assistant_id=assistant_id, From d4f6338ba856b6c8c6ddbc046f146ea8ce1c659e Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 22 Jul 2024 15:26:15 -0300 Subject: [PATCH 5/6] refactor: update import statements in list_assistants.py Refactor the import statements in the list_assistants.py file to improve readability and maintainability. Update the import order and add type hints for better code organization. This change ensures consistency with the recent repository commits and follows established conventions. --- .../langflow/components/astra_assistants/list_assistants.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/backend/base/langflow/components/astra_assistants/list_assistants.py b/src/backend/base/langflow/components/astra_assistants/list_assistants.py index e6608a63cee..f0cb5ba5fc2 100644 --- a/src/backend/base/langflow/components/astra_assistants/list_assistants.py +++ b/src/backend/base/langflow/components/astra_assistants/list_assistants.py @@ -1,7 +1,9 @@ from typing import List -from langflow.custom import CustomComponent + +from astra_assistants import patch # type: ignore from openai import OpenAI -from astra_assistants import patch + +from langflow.custom import CustomComponent class AssistantsListAssistants(CustomComponent): From a31bf7244e42454c6610ea9e346d3a0555f83768 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 22 Jul 2024 15:26:19 -0300 Subject: [PATCH 6/6] refactor: update import statements in run.py Refactor the import statements in the run.py file to improve readability and maintainability. Update the import order and add type hints for better code organization. This change ensures consistency with the recent repository commits and follows established conventions. --- .../base/langflow/components/astra_assistants/run.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/backend/base/langflow/components/astra_assistants/run.py b/src/backend/base/langflow/components/astra_assistants/run.py index 5afaaf716a4..d502463127b 100644 --- a/src/backend/base/langflow/components/astra_assistants/run.py +++ b/src/backend/base/langflow/components/astra_assistants/run.py @@ -1,7 +1,9 @@ -from langflow.custom import CustomComponent +from typing import Optional +from astra_assistants import patch # type: ignore from openai import OpenAI from openai.lib.streaming import AssistantEventHandler -from astra_assistants import patch + +from langflow.custom import CustomComponent class AssistantsRun(CustomComponent): @@ -35,7 +37,9 @@ def build_config(self): }, } - def build(self, assistant_id: str, user_message: str, thread_id: str = None, env_set: str = None) -> str: + def build( + self, assistant_id: str, user_message: str, thread_id: Optional[str] = None, env_set: Optional[str] = None + ) -> str: text = "" client = patch(OpenAI())