From 6618efc4098c4d527e8988a33a1618cf3dcd55a0 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 3 Oct 2023 17:59:48 -0300 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=94=A8=20refactor(base.py):=20remove?= =?UTF-8?q?=20unused=20import=20from=20langchain=20module=20in=20base.py?= =?UTF-8?q?=20=F0=9F=94=A8=20refactor(base.py):=20remove=20unused=20import?= =?UTF-8?q?=20from=20langchain.utilities=20module=20in=20base.py=20?= =?UTF-8?q?=F0=9F=94=A8=20refactor(base.py):=20remove=20unused=20import=20?= =?UTF-8?q?from=20langchain.requests=20module=20in=20base.py=20?= =?UTF-8?q?=F0=9F=94=A8=20refactor(base.py):=20remove=20unused=20import=20?= =?UTF-8?q?from=20langchain.sql=5Fdatabase=20module=20in=20base.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/interface/utilities/base.py | 4 ++-- src/backend/langflow/interface/wrappers/base.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/langflow/interface/utilities/base.py b/src/backend/langflow/interface/utilities/base.py index 665143da2..bfc7cb11e 100644 --- a/src/backend/langflow/interface/utilities/base.py +++ b/src/backend/langflow/interface/utilities/base.py @@ -1,6 +1,6 @@ from typing import Dict, List, Optional, Type -from langchain import SQLDatabase, utilities +from langchain import utilities from langflow.custom.customs import get_custom_nodes from langflow.interface.base import LangChainTypeCreator @@ -32,7 +32,7 @@ class UtilityCreator(LangChainTypeCreator): utility_name: import_class(f"langchain.utilities.{utility_name}") for utility_name in utilities.__all__ } - self.type_dict["SQLDatabase"] = SQLDatabase + self.type_dict["SQLDatabase"] = utilities.SQLDatabase # Filter according to settings.utilities self.type_dict = { name: utility diff --git a/src/backend/langflow/interface/wrappers/base.py b/src/backend/langflow/interface/wrappers/base.py index c4399fb3e..de631101a 100644 --- a/src/backend/langflow/interface/wrappers/base.py +++ b/src/backend/langflow/interface/wrappers/base.py @@ -1,6 +1,6 @@ from typing import Dict, List, Optional -from langchain import requests, sql_database +from langchain.utilities import requests, sql_database from langflow.interface.base import LangChainTypeCreator from loguru import logger From 9c70a3fe20b7e1dbb41453a5d24a6408121660d4 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 3 Oct 2023 18:13:41 -0300 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9B=20fix(manager.py):=20add=20ins?= =?UTF-8?q?pector=20to=20check=20if=20table=20"flow"=20exists=20before=20c?= =?UTF-8?q?reating=20tables=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The change was made to fix a bug where the tables were being recreated even if they already existed. By adding an inspector to check if the table "flow" exists before recreating the tables, we can prevent unnecessary table creation and improve performance. --- src/backend/langflow/services/database/manager.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/backend/langflow/services/database/manager.py b/src/backend/langflow/services/database/manager.py index 18364cd62..4cb715323 100644 --- a/src/backend/langflow/services/database/manager.py +++ b/src/backend/langflow/services/database/manager.py @@ -171,6 +171,7 @@ class DatabaseService(Service): # Now check if the table "flow" exists, if not, something went wrong # and we need to create the tables again. + inspector = inspect(self.engine) table_names = inspector.get_table_names() for table in current_tables: if table not in table_names: From 9751c5cb6272e03d3c831361b0bb5664b4e4ecfd Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 3 Oct 2023 18:14:32 -0300 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=92=20test(test=5Fsetup=5Fsuperuse?= =?UTF-8?q?r.py):=20add=20mock=20for=20verify=5Fpassword=20function=20to?= =?UTF-8?q?=20fix=20test=20failure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_setup_superuser.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_setup_superuser.py b/tests/test_setup_superuser.py index 6cf4b3a3a..137c98763 100644 --- a/tests/test_setup_superuser.py +++ b/tests/test_setup_superuser.py @@ -12,9 +12,10 @@ from langflow.services.utils import ( @patch("langflow.services.getters.get_settings_service") @patch("langflow.services.utils.create_super_user") +@patch("langflow.services.utils.verify_password") @patch("langflow.services.getters.get_session") def test_setup_superuser( - mock_get_session, mock_create_super_user, mock_get_settings_service + mock_get_session, mock_create_super_user, mock_get_settings_service, mock_verify ): # Test when AUTO_LOGIN is True calls = []