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/interface/initialize/loading.py b/src/backend/langflow/interface/initialize/loading.py index bcf27b042..c3021531e 100644 --- a/src/backend/langflow/interface/initialize/loading.py +++ b/src/backend/langflow/interface/initialize/loading.py @@ -13,8 +13,6 @@ from langchain.vectorstores.base import VectorStore from loguru import logger from pydantic import ValidationError -from langflow.interface.agents.base import agent_creator -from langflow.interface.chains.base import chain_creator from langflow.interface.custom_lists import CUSTOM_NODES from langflow.interface.importing.utils import ( get_function, @@ -208,6 +206,8 @@ def instantiate_retriever(node_type, class_object, params): def instantiate_chains(node_type, class_object: Type[Chain], params: Dict): + from langflow.interface.chains.base import chain_creator + if "retriever" in params and hasattr(params["retriever"], "as_retriever"): params["retriever"] = params["retriever"].as_retriever() if node_type in chain_creator.from_method_nodes: @@ -220,6 +220,8 @@ def instantiate_chains(node_type, class_object: Type[Chain], params: Dict): def instantiate_agent(node_type, class_object: Type[agent_module.Agent], params: Dict): + from langflow.interface.agents.base import agent_creator + if node_type in agent_creator.from_method_nodes: method = agent_creator.from_method_nodes[node_type] if class_method := getattr(class_object, method, None): 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/src/backend/langflow/template/frontend_node/custom_components.py b/src/backend/langflow/template/frontend_node/custom_components.py index e239775bc..60c3f0bc0 100644 --- a/src/backend/langflow/template/frontend_node/custom_components.py +++ b/src/backend/langflow/template/frontend_node/custom_components.py @@ -1,8 +1,9 @@ +from typing import Optional + +from langflow.interface.custom.constants import DEFAULT_CUSTOM_COMPONENT_CODE from langflow.template.field.base import TemplateField from langflow.template.frontend_node.base import FrontendNode from langflow.template.template.base import Template -from langflow.interface.custom.constants import DEFAULT_CUSTOM_COMPONENT_CODE -from typing import Optional class CustomComponentFrontendNode(FrontendNode): diff --git a/tests/test_setup_superuser.py b/tests/test_setup_superuser.py index 5c1629708..95a8deffb 100644 --- a/tests/test_setup_superuser.py +++ b/tests/test_setup_superuser.py @@ -1,17 +1,12 @@ from unittest.mock import MagicMock, patch from langflow.services.database.models.user.user import User -from langflow.services.settings.constants import ( - DEFAULT_SUPERUSER, - DEFAULT_SUPERUSER_PASSWORD, -) -from langflow.services.utils import ( - teardown_superuser, -) +from langflow.services.settings.constants import DEFAULT_SUPERUSER, DEFAULT_SUPERUSER_PASSWORD +from langflow.services.utils import teardown_superuser -# @patch("langflow.services.getters.get_session") +# @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 @@ -92,8 +87,8 @@ from langflow.services.utils import ( # 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 @@ -118,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()