From d93df826071c8373b9d94295db7ac7015763daae Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 14 Nov 2023 22:01:37 -0300 Subject: [PATCH] Refactor dependencies and imports in custom_component.py and add new deps.py file --- .../interface/custom/custom_component.py | 3 +-- .../langflow/services/{getters.py => deps.py} | 17 +++++++++-------- tests/test_setup_superuser.py | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) rename src/backend/langflow/services/{getters.py => deps.py} (99%) diff --git a/src/backend/langflow/interface/custom/custom_component.py b/src/backend/langflow/interface/custom/custom_component.py index 1bda1beb4..87b8e33d6 100644 --- a/src/backend/langflow/interface/custom/custom_component.py +++ b/src/backend/langflow/interface/custom/custom_component.py @@ -3,14 +3,13 @@ from uuid import UUID import yaml from fastapi import HTTPException - from langflow.field_typing.constants import CUSTOM_COMPONENT_SUPPORTED_TYPES from langflow.interface.custom.component import Component from langflow.interface.custom.directory_reader import DirectoryReader from langflow.interface.custom.utils import extract_inner_type, extract_union_types from langflow.services.database.models.flow import Flow from langflow.services.database.utils import session_getter -from langflow.services.getters import get_db_service +from langflow.services.deps import get_db_service from langflow.utils import validate diff --git a/src/backend/langflow/services/getters.py b/src/backend/langflow/services/deps.py similarity index 99% rename from src/backend/langflow/services/getters.py rename to src/backend/langflow/services/deps.py index 4b8c6f145..776c0b2c4 100644 --- a/src/backend/langflow/services/getters.py +++ b/src/backend/langflow/services/deps.py @@ -1,17 +1,18 @@ -from langflow.services import ServiceType, service_manager from typing import TYPE_CHECKING, Generator +from langflow.services import ServiceType, service_manager if TYPE_CHECKING: - from langflow.services.database.service import DatabaseService - from langflow.services.settings.service import SettingsService - from langflow.services.cache.service import BaseCacheService - from langflow.services.session.service import SessionService - from langflow.services.task.service import TaskService - from langflow.services.chat.service import ChatService - from langflow.services.store.service import StoreService from sqlmodel import Session + from langflow.services.cache.service import BaseCacheService + from langflow.services.chat.service import ChatService + from langflow.services.database.service import DatabaseService + from langflow.services.session.service import SessionService + from langflow.services.settings.service import SettingsService + from langflow.services.store.service import StoreService + from langflow.services.task.service import TaskService + def get_settings_service() -> "SettingsService": try: diff --git a/tests/test_setup_superuser.py b/tests/test_setup_superuser.py index c4ff80a95..95a8deffb 100644 --- a/tests/test_setup_superuser.py +++ b/tests/test_setup_superuser.py @@ -6,7 +6,7 @@ from langflow.services.utils import teardown_superuser # @patch("langflow.services.deps.get_session") # @patch("langflow.services.utils.create_super_user") -# @patch("langflow.services.getters.get_settings_service") +# @patch("langflow.services.deps.get_settings_service") # # @patch("langflow.services.utils.verify_password") # def test_setup_superuser( # mock_get_session, mock_create_super_user, mock_get_settings_service @@ -87,8 +87,8 @@ from langflow.services.utils import teardown_superuser # assert str(actual_expr) == str(expected_expr) -@patch("langflow.services.getters.get_settings_service") -@patch("langflow.services.getters.get_session") +@patch("langflow.services.deps.get_settings_service") +@patch("langflow.services.deps.get_session") def test_teardown_superuser_default_superuser(mock_get_session, mock_get_settings_service): mock_settings_service = MagicMock() mock_settings_service.auth_settings.AUTO_LOGIN = True @@ -113,8 +113,8 @@ def test_teardown_superuser_default_superuser(mock_get_session, mock_get_setting mock_session.commit.assert_called_once() -@patch("langflow.services.getters.get_settings_service") -@patch("langflow.services.getters.get_session") +@patch("langflow.services.deps.get_settings_service") +@patch("langflow.services.deps.get_session") def test_teardown_superuser_no_default_superuser(mock_get_session, mock_get_settings_service): ADMIN_USER_NAME = "admin_user" mock_settings_service = MagicMock()