Merge branch 'feature/store' of github.com:logspace-ai/langflow into feature/store

src/backend/langflow/services/getters.py

@@ -0,0 +1,53 @@
+from langflow.services import ServiceType, service_manager
+from typing import TYPE_CHECKING, Generator
+
+
+if TYPE_CHECKING:
+    from langflow.services.database.service import DatabaseService
+    from langflow.services.settings.service import SettingsService
+    from langflow.services.cache.service import BaseCacheService
+    from langflow.services.session.service import SessionService
+    from langflow.services.task.service import TaskService
+    from langflow.services.chat.service import ChatService
+    from langflow.services.store.service import StoreService
+    from sqlmodel import Session
+
+
+def get_settings_service() -> "SettingsService":
+    try:
+        return service_manager.get(ServiceType.SETTINGS_SERVICE)
+    except ValueError:
+        # initialize settings service
+        from langflow.services.manager import initialize_settings_service
+
+        initialize_settings_service()
+        return service_manager.get(ServiceType.SETTINGS_SERVICE)
+
+
+def get_db_service() -> "DatabaseService":
+    return service_manager.get(ServiceType.DATABASE_SERVICE)
+
+
+def get_session() -> Generator["Session", None, None]:
+    db_service = service_manager.get(ServiceType.DATABASE_SERVICE)
+    yield from db_service.get_session()
+
+
+def get_cache_service() -> "BaseCacheService":
+    return service_manager.get(ServiceType.CACHE_SERVICE)
+
+
+def get_session_service() -> "SessionService":
+    return service_manager.get(ServiceType.SESSION_SERVICE)
+
+
+def get_task_service() -> "TaskService":
+    return service_manager.get(ServiceType.TASK_SERVICE)
+
+
+def get_chat_service() -> "ChatService":
+    return service_manager.get(ServiceType.CHAT_SERVICE)
+
+
+def get_store_service() -> "StoreService":
+    return service_manager.get(ServiceType.STORE_SERVICE)

tests/test_setup_superuser.py

@@ -1,4 +1,5 @@
-from unittest.mock import patch, MagicMock
+from unittest.mock import MagicMock, patch
+
 from langflow.services.database.models.user.user import User
 from langflow.services.settings.constants import (
     DEFAULT_SUPERUSER,
@@ -8,10 +9,9 @@ from langflow.services.utils import (
     teardown_superuser,
 )
 
-
-# @patch("langflow.services.deps.get_session")
+# @patch("langflow.services.getters.get_session")
 # @patch("langflow.services.utils.create_super_user")
-# @patch("langflow.services.deps.get_settings_service")
+# @patch("langflow.services.getters.get_settings_service")
 # # @patch("langflow.services.utils.verify_password")
 # def test_setup_superuser(
 #     mock_get_session, mock_create_super_user, mock_get_settings_service
@@ -92,8 +92,8 @@ from langflow.services.utils import (
 #     assert str(actual_expr) == str(expected_expr)
 
 
-@patch("langflow.services.deps.get_settings_service")
-@patch("langflow.services.deps.get_session")
+@patch("langflow.services.getters.get_settings_service")
+@patch("langflow.services.getters.get_session")
 def test_teardown_superuser_default_superuser(mock_get_session, mock_get_settings_service):
     mock_settings_service = MagicMock()
     mock_settings_service.auth_settings.AUTO_LOGIN = True
@@ -118,8 +118,8 @@ def test_teardown_superuser_default_superuser(mock_get_session, mock_get_setting
     mock_session.commit.assert_called_once()
 
 
-@patch("langflow.services.deps.get_settings_service")
-@patch("langflow.services.deps.get_session")
+@patch("langflow.services.getters.get_settings_service")
+@patch("langflow.services.getters.get_session")
 def test_teardown_superuser_no_default_superuser(mock_get_session, mock_get_settings_service):
     ADMIN_USER_NAME = "admin_user"
     mock_settings_service = MagicMock()