From 537e1a3e052d207ab15dd9852a85296c2cbb2b58 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Wed, 4 Oct 2023 17:42:26 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20chore(utils.py):=20refactor=20ge?= =?UTF-8?q?t=5Ffactories=5Fand=5Fdeps=20function=20to=20improve=20code=20o?= =?UTF-8?q?rganization=20and=20readability=20=F0=9F=94=A7=20chore(utils.py?= =?UTF-8?q?):=20refactor=20initialize=5Fservices=20function=20to=20use=20t?= =?UTF-8?q?he=20updated=20get=5Ffactories=5Fand=5Fdeps=20function=20for=20?= =?UTF-8?q?better=20maintainability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/services/utils.py | 59 +++++++++++++------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/src/backend/langflow/services/utils.py b/src/backend/langflow/services/utils.py index 05bc43fda..adbf072fe 100644 --- a/src/backend/langflow/services/utils.py +++ b/src/backend/langflow/services/utils.py @@ -11,35 +11,36 @@ from .getters import get_db_service, get_session, get_settings_service from loguru import logger -from langflow.services.database import factory as database_factory -from langflow.services.cache import factory as cache_factory -from langflow.services.chat import factory as chat_factory -from langflow.services.settings import factory as settings_factory -from langflow.services.auth import factory as auth_factory -from langflow.services.task import factory as task_factory -from langflow.services.session import factory as session_service_factory # type: ignore +def get_factories_and_deps(): + from langflow.services.database import factory as database_factory + from langflow.services.cache import factory as cache_factory + from langflow.services.chat import factory as chat_factory + from langflow.services.settings import factory as settings_factory + from langflow.services.auth import factory as auth_factory + from langflow.services.task import factory as task_factory + from langflow.services.session import factory as session_service_factory # type: ignore -FACTORIES_AND_DEPS = [ - (settings_factory.SettingsServiceFactory(), []), - ( - auth_factory.AuthServiceFactory(), - [ServiceType.SETTINGS_SERVICE], - ), - ( - database_factory.DatabaseServiceFactory(), - [ServiceType.SETTINGS_SERVICE], - ), - ( - cache_factory.CacheServiceFactory(), - [ServiceType.SETTINGS_SERVICE], - ), - (chat_factory.ChatServiceFactory(), []), - (task_factory.TaskServiceFactory(), []), - ( - session_service_factory.SessionServiceFactory(), - [ServiceType.CACHE_SERVICE], - ), -] + return [ + (settings_factory.SettingsServiceFactory(), []), + ( + auth_factory.AuthServiceFactory(), + [ServiceType.SETTINGS_SERVICE], + ), + ( + database_factory.DatabaseServiceFactory(), + [ServiceType.SETTINGS_SERVICE], + ), + ( + cache_factory.CacheServiceFactory(), + [ServiceType.SETTINGS_SERVICE], + ), + (chat_factory.ChatServiceFactory(), []), + (task_factory.TaskServiceFactory(), []), + ( + session_service_factory.SessionServiceFactory(), + [ServiceType.CACHE_SERVICE], + ), + ] def get_or_create_super_user(session: Session, username, password, is_default): @@ -193,7 +194,7 @@ def initialize_services(): """ Initialize all the services needed. """ - for factory, dependencies in FACTORIES_AND_DEPS: + for factory, dependencies in get_factories_and_deps(): try: service_manager.register_factory(factory, dependencies=dependencies) except Exception as exc: