From bc53800b1c7b6dbad324539d2c8bd9b7e6832a4e Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 18 Sep 2023 17:43:05 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20chore(main.py):=20refactor=20imp?= =?UTF-8?q?orts=20and=20remove=20unused=20code=20in=20main.py=20for=20bett?= =?UTF-8?q?er=20code=20organization=20and=20maintainability=20=F0=9F=94=A7?= =?UTF-8?q?=20chore(manager.py):=20remove=20unused=20functions=20and=20ref?= =?UTF-8?q?actor=20code=20in=20manager.py=20for=20better=20code=20organiza?= =?UTF-8?q?tion=20and=20maintainability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/main.py | 8 +-- src/backend/langflow/services/manager.py | 62 ------------------------ 2 files changed, 5 insertions(+), 65 deletions(-) diff --git a/src/backend/langflow/main.py b/src/backend/langflow/main.py index 6c5919421..816fcd532 100644 --- a/src/backend/langflow/main.py +++ b/src/backend/langflow/main.py @@ -10,9 +10,11 @@ from langflow.api import router from langflow.interface.utils import setup_llm_caching from langflow.services.database.utils import initialize_database -from langflow.services.manager import initialize_services, teardown_services +from langflow.services.utils import initialize_services from langflow.services.plugins.langfuse import LangfuseInstance -from langflow.services.utils import setup_superuser +from langflow.services.utils import ( + teardown_services, +) from langflow.utils.logger import configure @@ -41,12 +43,12 @@ def create_app(): app.on_event("startup")(initialize_services) app.on_event("startup")(initialize_database) - app.on_event("startup")(setup_superuser) app.on_event("startup")(setup_llm_caching) app.on_event("startup")(LangfuseInstance.update) app.on_event("shutdown")(teardown_services) app.on_event("shutdown")(LangfuseInstance.teardown) + return app diff --git a/src/backend/langflow/services/manager.py b/src/backend/langflow/services/manager.py index 60a93fe16..205399d86 100644 --- a/src/backend/langflow/services/manager.py +++ b/src/backend/langflow/services/manager.py @@ -93,65 +93,3 @@ class ServiceManager: service_manager = ServiceManager() - - -def initialize_services(): - """ - Initialize all the services needed. - """ - 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 - - service_manager.register_factory(settings_factory.SettingsManagerFactory()) - service_manager.register_factory( - auth_factory.AuthManagerFactory(), dependencies=[ServiceType.SETTINGS_MANAGER] - ) - service_manager.register_factory( - database_factory.DatabaseManagerFactory(), - dependencies=[ServiceType.SETTINGS_MANAGER], - ) - service_manager.register_factory(cache_factory.CacheManagerFactory()) - service_manager.register_factory(chat_factory.ChatManagerFactory()) - - # Test cache connection - service_manager.get(ServiceType.CACHE_MANAGER) - # Test database connection - service_manager.get(ServiceType.DATABASE_MANAGER) - - -def initialize_settings_manager(): - """ - Initialize the settings manager. - """ - from langflow.services.settings import factory as settings_factory - - service_manager.register_factory(settings_factory.SettingsManagerFactory()) - - -def initialize_session_manager(): - """ - Initialize the session manager. - """ - from langflow.services.session import factory as session_manager_factory # type: ignore - from langflow.services.cache import factory as cache_factory - - initialize_settings_manager() - - service_manager.register_factory( - cache_factory.CacheManagerFactory(), dependencies=[ServiceType.SETTINGS_MANAGER] - ) - - service_manager.register_factory( - session_manager_factory.SessionManagerFactory(), - dependencies=[ServiceType.CACHE_MANAGER], - ) - - -def teardown_services(): - """ - Teardown all the services. - """ - service_manager.teardown()