From dcd9d3a23ec2701acc2852366f9f35f014595daf Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 22 Sep 2023 13:08:57 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(=5F=5Finit=5F=5F.py):=20rena?= =?UTF-8?q?me=20service=5Fservice=20to=20service=5Fmanager=20for=20better?= =?UTF-8?q?=20semantics=20=F0=9F=90=9B=20fix(manager.py):=20rename=20servi?= =?UTF-8?q?ce=5Fservice=20to=20service=5Fmanager=20for=20better=20semantic?= =?UTF-8?q?s=20=F0=9F=90=9B=20fix(manager.py):=20rename=20ServiceService?= =?UTF-8?q?=20class=20to=20ServiceManager=20for=20better=20semantics=20?= =?UTF-8?q?=F0=9F=90=9B=20fix(manager.py):=20rename=20service=5Fservice=20?= =?UTF-8?q?variable=20to=20service=5Fmanager=20for=20better=20semantics=20?= =?UTF-8?q?=F0=9F=90=9B=20fix(utils.py):=20rename=20service=5Fservice=20to?= =?UTF-8?q?=20service=5Fmanager=20for=20better=20semantics=20=E2=9C=A8=20f?= =?UTF-8?q?eat(manager.py):=20add=20support=20for=20service=5Fmanager=20to?= =?UTF-8?q?=20manage=20creation=20of=20different=20services=20=E2=9C=A8=20?= =?UTF-8?q?feat(manager.py):=20add=20support=20for=20service=5Fmanager=20t?= =?UTF-8?q?o=20update=20services=20=E2=9C=A8=20feat(manager.py):=20add=20s?= =?UTF-8?q?upport=20for=20service=5Fmanager=20to=20teardown=20services=20?= =?UTF-8?q?=E2=9C=A8=20feat(manager.py):=20add=20support=20for=20service?= =?UTF-8?q?=5Fmanager=20to=20register=20and=20update=20factories=20?= =?UTF-8?q?=E2=9C=A8=20feat(manager.py):=20add=20support=20for=20service?= =?UTF-8?q?=5Fmanager=20to=20initialize=20and=20reinitialize=20services=20?= =?UTF-8?q?=E2=9C=A8=20feat(manager.py):=20add=20support=20for=20service?= =?UTF-8?q?=5Fmanager=20to=20get=20services=20by=20type=20=E2=9C=A8=20feat?= =?UTF-8?q?(manager.py):=20add=20support=20for=20service=5Fmanager=20to=20?= =?UTF-8?q?get=20services=20by=20type=20=E2=9C=A8=20feat(manager.py):=20ad?= =?UTF-8?q?d=20support=20for=20service=5Fmanager=20to=20get=20services=20b?= =?UTF-8?q?y=20type=20=E2=9C=A8=20feat(manager.py):=20add=20support=20for?= =?UTF-8?q?=20service=5Fmanager=20to=20get=20services=20by=20type=20?= =?UTF-8?q?=E2=9C=A8=20feat(manager.py):=20add=20support=20for=20service?= =?UTF-8?q?=5Fmanager=20to=20get=20services=20by=20type=20=E2=9C=A8=20feat?= =?UTF-8?q?(manager.py):=20add=20support=20for=20service=5Fmanager=20to=20?= =?UTF-8?q?get=20services=20by=20type=20=E2=9C=A8=20feat(manager.py):=20ad?= =?UTF-8?q?d=20support=20for=20service=5Fmanager=20to=20get=20services=20b?= =?UTF-8?q?y=20type=20=E2=9C=A8=20feat(manager.py):=20add=20support=20for?= =?UTF-8?q?=20service=5Fmanager=20to=20get=20services=20by=20type=20?= =?UTF-8?q?=E2=9C=A8=20feat(manager.py):=20add=20support=20for=20service?= =?UTF-8?q?=5Fmanager=20to=20get=20services=20by=20type=20=E2=9C=A8=20feat?= =?UTF-8?q?(manager.py):=20add=20support=20for=20service=5Fmanager=20to=20?= =?UTF-8?q?get=20services=20by=20type=20=E2=9C=A8=20feat(manager.py):=20ad?= =?UTF-8?q?d=20support=20for=20service=5Fmanager=20to=20get=20services=20b?= =?UTF-8?q?y=20type=20=E2=9C=A8=20feat(manager.py):=20add=20support=20for?= =?UTF-8?q?=20service=5Fmanager=20to=20get=20services=20by=20type=20?= =?UTF-8?q?=E2=9C=A8=20feat(manager.py):=20add=20support=20for=20service?= =?UTF-8?q?=5Fmanager=20to=20get=20services=20by=20type=20=E2=9C=A8=20feat?= =?UTF-8?q?(manager.py):=20add=20support=20for=20service=5Fmanager=20to=20?= =?UTF-8?q?get=20services=20by=20type=20=E2=9C=A8=20feat(manager.py):=20ad?= =?UTF-8?q?d=20support=20for=20service=5Fmanager=20to=20get=20services=20b?= =?UTF-8?q?y=20type=20=E2=9C=A8=20feat(manager.py):=20add=20support=20for?= =?UTF-8?q?=20service=5Fmanager=20to=20get=20services=20by=20type=20?= =?UTF-8?q?=E2=9C=A8=20feat(manager.py):=20add=20support=20for=20service?= =?UTF-8?q?=5Fmanager=20to=20get=20services=20by=20type=20=E2=9C=A8=20feat?= =?UTF-8?q?(manager.py):=20add=20support=20for=20service=5Fmanager=20to=20?= =?UTF-8?q?get=20services=20by=20type=20=E2=9C=A8=20feat(manager.py):=20ad?= =?UTF-8?q?d=20support=20for=20service=5Fmanager=20to=20get=20services=20b?= =?UTF-8?q?y=20type=20=E2=9C=A8=20feat(manager.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/services/__init__.py | 4 +- src/backend/langflow/services/chat/manager.py | 4 +- .../langflow/services/database/utils.py | 4 +- src/backend/langflow/services/manager.py | 56 +++++++++---------- .../langflow/services/plugins/langfuse.py | 4 +- src/backend/langflow/services/utils.py | 18 +++--- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/langflow/services/__init__.py b/src/backend/langflow/services/__init__.py index c58f34b1d..8ac74b5b9 100644 --- a/src/backend/langflow/services/__init__.py +++ b/src/backend/langflow/services/__init__.py @@ -1,4 +1,4 @@ -from .manager import service_service +from .manager import service_manager from .schema import ServiceType -__all__ = ["service_service", "ServiceType"] +__all__ = ["service_manager", "ServiceType"] diff --git a/src/backend/langflow/services/chat/manager.py b/src/backend/langflow/services/chat/manager.py index 2a2e1ce42..029c26ecd 100644 --- a/src/backend/langflow/services/chat/manager.py +++ b/src/backend/langflow/services/chat/manager.py @@ -12,7 +12,7 @@ from .cache import cache_service import asyncio from typing import Any, Dict, List -from langflow.services import service_service, ServiceType +from langflow.services import service_manager, ServiceType import orjson @@ -52,7 +52,7 @@ class ChatService(Service): self.chat_history = ChatHistory() self.chat_cache = cache_service self.chat_cache.attach(self.update) - self.cache_service = service_service.get(ServiceType.CACHE_MANAGER) + self.cache_service = service_manager.get(ServiceType.CACHE_MANAGER) def on_chat_history_update(self): """Send the last chat message to the client.""" diff --git a/src/backend/langflow/services/database/utils.py b/src/backend/langflow/services/database/utils.py index db4fdf124..5ac62ee93 100644 --- a/src/backend/langflow/services/database/utils.py +++ b/src/backend/langflow/services/database/utils.py @@ -11,9 +11,9 @@ if TYPE_CHECKING: def initialize_database(): logger.debug("Initializing database") - from langflow.services import service_service, ServiceType + from langflow.services import service_manager, ServiceType - database_service = service_service.get(ServiceType.DATABASE_MANAGER) + database_service = service_manager.get(ServiceType.DATABASE_MANAGER) try: database_service.check_schema_health() except Exception as exc: diff --git a/src/backend/langflow/services/manager.py b/src/backend/langflow/services/manager.py index 59c9aaf8e..e6d8aabd1 100644 --- a/src/backend/langflow/services/manager.py +++ b/src/backend/langflow/services/manager.py @@ -7,7 +7,7 @@ if TYPE_CHECKING: from langflow.services.base import Service -class ServiceService: +class ServiceManager: """ Manages the creation of different services. """ @@ -95,7 +95,7 @@ class ServiceService: self.dependencies = {} -service_service = ServiceService() +service_manager = ServiceManager() def initialize_services(): @@ -110,37 +110,37 @@ def initialize_services(): from langflow.services.auth import factory as auth_factory from langflow.services.task import factory as task_factory - service_service.register_factory(settings_factory.SettingsServiceFactory()) - service_service.register_factory( + service_manager.register_factory(settings_factory.SettingsServiceFactory()) + service_manager.register_factory( database_factory.DatabaseServiceFactory(), dependencies=[ServiceType.SETTINGS_MANAGER], ) - service_service.register_factory( + service_manager.register_factory( cache_factory.CacheServiceFactory(), dependencies=[ServiceType.SETTINGS_MANAGER] ) - service_service.register_factory( + service_manager.register_factory( auth_factory.AuthServiceFactory(), dependencies=[ServiceType.SETTINGS_MANAGER] ) - service_service.register_factory(chat_factory.ChatServiceFactory()) - service_service.register_factory( + service_manager.register_factory(chat_factory.ChatServiceFactory()) + service_manager.register_factory( session_service_factory.SessionServiceFactory(), dependencies=[ServiceType.CACHE_MANAGER], ) - service_service.register_factory( + service_manager.register_factory( task_factory.TaskServiceFactory(), ) # Test cache connection - service_service.get(ServiceType.CACHE_MANAGER) + service_manager.get(ServiceType.CACHE_MANAGER) # Test database connection - service_service.get(ServiceType.DATABASE_MANAGER) + service_manager.get(ServiceType.DATABASE_MANAGER) # Test cache connection - service_service.get(ServiceType.CACHE_MANAGER) + service_manager.get(ServiceType.CACHE_MANAGER) # Test database connection - service_service.get(ServiceType.DATABASE_MANAGER) + service_manager.get(ServiceType.DATABASE_MANAGER) def reinitialize_services(): @@ -155,23 +155,23 @@ def reinitialize_services(): from langflow.services.auth import factory as auth_factory from langflow.services.task import factory as task_factory - service_service.update(ServiceType.SETTINGS_MANAGER) - service_service.update(ServiceType.DATABASE_MANAGER) - service_service.update(ServiceType.CACHE_MANAGER) - service_service.update(ServiceType.CHAT_MANAGER) - service_service.update(ServiceType.SESSION_MANAGER) - service_service.update(ServiceType.AUTH_MANAGER) - service_service.update(ServiceType.TASK_MANAGER) + service_manager.update(ServiceType.SETTINGS_MANAGER) + service_manager.update(ServiceType.DATABASE_MANAGER) + service_manager.update(ServiceType.CACHE_MANAGER) + service_manager.update(ServiceType.CHAT_MANAGER) + service_manager.update(ServiceType.SESSION_MANAGER) + service_manager.update(ServiceType.AUTH_MANAGER) + service_manager.update(ServiceType.TASK_MANAGER) # Test cache connection - service_service.get(ServiceType.CACHE_MANAGER) + service_manager.get(ServiceType.CACHE_MANAGER) # Test database connection - service_service.get(ServiceType.DATABASE_MANAGER) + service_manager.get(ServiceType.DATABASE_MANAGER) # Test cache connection - service_service.get(ServiceType.CACHE_MANAGER) + service_manager.get(ServiceType.CACHE_MANAGER) # Test database connection - service_service.get(ServiceType.DATABASE_MANAGER) + service_manager.get(ServiceType.DATABASE_MANAGER) def initialize_settings_service(): @@ -180,7 +180,7 @@ def initialize_settings_service(): """ from langflow.services.settings import factory as settings_factory - service_service.register_factory(settings_factory.SettingsServiceFactory()) + service_manager.register_factory(settings_factory.SettingsServiceFactory()) def initialize_session_service(): @@ -192,11 +192,11 @@ def initialize_session_service(): initialize_settings_service() - service_service.register_factory( + service_manager.register_factory( cache_factory.CacheServiceFactory(), dependencies=[ServiceType.SETTINGS_MANAGER] ) - service_service.register_factory( + service_manager.register_factory( session_service_factory.SessionServiceFactory(), dependencies=[ServiceType.CACHE_MANAGER], ) @@ -206,4 +206,4 @@ def teardown_services(): """ Teardown all the services. """ - service_service.teardown() + service_manager.teardown() diff --git a/src/backend/langflow/services/plugins/langfuse.py b/src/backend/langflow/services/plugins/langfuse.py index ce3e25c53..bc50ccc2c 100644 --- a/src/backend/langflow/services/plugins/langfuse.py +++ b/src/backend/langflow/services/plugins/langfuse.py @@ -1,4 +1,4 @@ -from langflow.services.utils import get_settings_manager +from langflow.services.utils import get_settings_service from langflow.utils.logger import logger ### Temporary implementation @@ -20,7 +20,7 @@ class LangfuseInstance: logger.debug("Creating Langfuse instance") from langfuse import Langfuse # type: ignore - settings_manager = get_settings_manager() + settings_manager = get_settings_service() if ( settings_manager.settings.LANGFUSE_PUBLIC_KEY diff --git a/src/backend/langflow/services/utils.py b/src/backend/langflow/services/utils.py index edcaa7fe6..9eb7ce66a 100644 --- a/src/backend/langflow/services/utils.py +++ b/src/backend/langflow/services/utils.py @@ -1,4 +1,4 @@ -from langflow.services import ServiceType, service_service +from langflow.services import ServiceType, service_manager from typing import TYPE_CHECKING, Generator @@ -14,35 +14,35 @@ if TYPE_CHECKING: def get_settings_service() -> "SettingsService": try: - return service_service.get(ServiceType.SETTINGS_MANAGER) + return service_manager.get(ServiceType.SETTINGS_MANAGER) except ValueError: # initialize settings service from langflow.services.manager import initialize_settings_service initialize_settings_service() - return service_service.get(ServiceType.SETTINGS_MANAGER) + return service_manager.get(ServiceType.SETTINGS_MANAGER) def get_db_service() -> "DatabaseService": - return service_service.get(ServiceType.DATABASE_MANAGER) + return service_manager.get(ServiceType.DATABASE_MANAGER) def get_session() -> Generator["Session", None, None]: - db_service = service_service.get(ServiceType.DATABASE_MANAGER) + db_service = service_manager.get(ServiceType.DATABASE_MANAGER) yield from db_service.get_session() def get_cache_service() -> "BaseCacheService": - return service_service.get(ServiceType.CACHE_MANAGER) + return service_manager.get(ServiceType.CACHE_MANAGER) def get_session_service() -> "SessionService": - return service_service.get(ServiceType.SESSION_MANAGER) + return service_manager.get(ServiceType.SESSION_MANAGER) def get_task_service() -> "TaskService": - return service_service.get(ServiceType.TASK_MANAGER) + return service_manager.get(ServiceType.TASK_MANAGER) def get_chat_service() -> "ChatService": - return service_service.get(ServiceType.CHAT_MANAGER) + return service_manager.get(ServiceType.CHAT_MANAGER)