🐛 fix(__init__.py): rename service_service to service_manager for better semantics
🐛 fix(manager.py): rename service_service to service_manager for better semantics 🐛 fix(manager.py): rename ServiceService class to ServiceManager for better semantics 🐛 fix(manager.py): rename service_service variable to service_manager for better semantics 🐛 fix(utils.py): rename service_service to service_manager for better semantics ✨ feat(manager.py): add support for service_manager to manage creation of different services ✨ feat(manager.py): add support for service_manager to update services ✨ feat(manager.py): add support for service_manager to teardown services ✨ feat(manager.py): add support for service_manager to register and update factories ✨ feat(manager.py): add support for service_manager to initialize and reinitialize services ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py): add support for service_manager to get services by type ✨ feat(manager.py
This commit is contained in:
parent
78ecb4c341
commit
dcd9d3a23e
6 changed files with 45 additions and 45 deletions
|
|
@ -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"]
|
||||
|
|
|
|||
|
|
@ -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."""
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue