🔧 chore(manager.py): remove unused initialize_services function
🔧 chore(utils.py): refactor initialize_services function to use a list of factory and dependencies for better readability and maintainability
This commit is contained in:
parent
a6b30e1b8b
commit
0a61f389c8
2 changed files with 46 additions and 85 deletions
|
|
@ -99,51 +99,6 @@ class ServiceManager:
|
||||||
service_manager = 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.session import factory as session_service_factory
|
|
||||||
from langflow.services.auth import factory as auth_factory
|
|
||||||
from langflow.services.task import factory as task_factory
|
|
||||||
|
|
||||||
service_manager.register_factory(settings_factory.SettingsServiceFactory())
|
|
||||||
service_manager.register_factory(
|
|
||||||
database_factory.DatabaseServiceFactory(),
|
|
||||||
dependencies=[ServiceType.SETTINGS_SERVICE],
|
|
||||||
)
|
|
||||||
service_manager.register_factory(
|
|
||||||
cache_factory.CacheServiceFactory(), dependencies=[ServiceType.SETTINGS_SERVICE]
|
|
||||||
)
|
|
||||||
|
|
||||||
service_manager.register_factory(
|
|
||||||
auth_factory.AuthServiceFactory(), dependencies=[ServiceType.SETTINGS_SERVICE]
|
|
||||||
)
|
|
||||||
|
|
||||||
service_manager.register_factory(chat_factory.ChatServiceFactory())
|
|
||||||
service_manager.register_factory(
|
|
||||||
session_service_factory.SessionServiceFactory(),
|
|
||||||
dependencies=[ServiceType.CACHE_SERVICE],
|
|
||||||
)
|
|
||||||
service_manager.register_factory(
|
|
||||||
task_factory.TaskServiceFactory(),
|
|
||||||
)
|
|
||||||
|
|
||||||
# Test cache connection
|
|
||||||
service_manager.get(ServiceType.CACHE_SERVICE)
|
|
||||||
# Test database connection
|
|
||||||
service_manager.get(ServiceType.DATABASE_SERVICE)
|
|
||||||
|
|
||||||
# Test cache connection
|
|
||||||
service_manager.get(ServiceType.CACHE_SERVICE)
|
|
||||||
# Test database connection
|
|
||||||
service_manager.get(ServiceType.DATABASE_SERVICE)
|
|
||||||
|
|
||||||
|
|
||||||
def reinitialize_services():
|
def reinitialize_services():
|
||||||
"""
|
"""
|
||||||
Reinitialize all the services needed.
|
Reinitialize all the services needed.
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,37 @@ from .getters import get_db_service, get_session, get_settings_service
|
||||||
from loguru import logger
|
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
|
||||||
|
|
||||||
|
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],
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
def get_or_create_super_user(session: Session, username, password, is_default):
|
def get_or_create_super_user(session: Session, username, password, is_default):
|
||||||
from langflow.services.database.models.user.user import User
|
from langflow.services.database.models.user.user import User
|
||||||
|
|
||||||
|
|
@ -99,6 +130,7 @@ def teardown_superuser(settings_service, session):
|
||||||
# from the database.
|
# from the database.
|
||||||
|
|
||||||
if settings_service.auth_settings.AUTO_LOGIN:
|
if settings_service.auth_settings.AUTO_LOGIN:
|
||||||
|
try:
|
||||||
logger.debug("AUTO_LOGIN is set to True. Removing default superuser.")
|
logger.debug("AUTO_LOGIN is set to True. Removing default superuser.")
|
||||||
username = settings_service.auth_settings.SUPERUSER
|
username = settings_service.auth_settings.SUPERUSER
|
||||||
from langflow.services.database.models.user.user import User
|
from langflow.services.database.models.user.user import User
|
||||||
|
|
@ -110,6 +142,9 @@ def teardown_superuser(settings_service, session):
|
||||||
logger.debug("Default superuser removed successfully.")
|
logger.debug("Default superuser removed successfully.")
|
||||||
else:
|
else:
|
||||||
logger.debug("Default superuser not found.")
|
logger.debug("Default superuser not found.")
|
||||||
|
except Exception as exc:
|
||||||
|
logger.exception(exc)
|
||||||
|
raise RuntimeError("Could not remove default superuser.") from exc
|
||||||
|
|
||||||
|
|
||||||
def teardown_services():
|
def teardown_services():
|
||||||
|
|
@ -155,36 +190,7 @@ def initialize_services():
|
||||||
"""
|
"""
|
||||||
Initialize all the services needed.
|
Initialize all the services needed.
|
||||||
"""
|
"""
|
||||||
from langflow.services.database import factory as database_factory
|
for factory, dependencies in FACTORIES_AND_DEPS:
|
||||||
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
|
|
||||||
|
|
||||||
factory_and_dependencies = [
|
|
||||||
(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],
|
|
||||||
),
|
|
||||||
]
|
|
||||||
for factory, dependencies in factory_and_dependencies:
|
|
||||||
try:
|
try:
|
||||||
service_manager.register_factory(factory, dependencies=dependencies)
|
service_manager.register_factory(factory, dependencies=dependencies)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue