cleanup

Author: pcrespov

services/web/server/src/simcore_service_webserver/db_listener/plugin.py

@@ -1,14 +1,15 @@
 """
-    computation module is the main entry-point for computational backend
+computation module is the main entry-point for computational backend
 
 """
+
 import logging
 
 from aiohttp import web
 from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 
 from ..db.plugin import setup_db
-from ..projects._projects_repository_legacy import setup_projects_db
+from ..projects import projects_service_legacy
 from ..rabbitmq import setup_rabbitmq
 from ..socketio.plugin import setup_socketio
 from ._db_comp_tasks_listening_task import create_comp_tasks_listening_task
@@ -25,7 +26,7 @@
 def setup_db_listener(app: web.Application):
     setup_rabbitmq(app)
     setup_socketio(app)
-    setup_projects_db(app)
+    projects_service_legacy.setup_projects_db(app)
     # Creates a task to listen to comp_task pg-db's table events
     setup_db(app)
     app.cleanup_ctx.append(create_comp_tasks_listening_task)

services/web/server/src/simcore_service_webserver/garbage_collector/_core_guests.py

@@ -11,7 +11,7 @@
 from simcore_postgres_database.errors import DatabaseError
 from simcore_postgres_database.models.users import UserRole
 
-from ..projects._projects_repository_legacy import ProjectDBAPI
+from ..projects import projects_service_legacy
 from ..projects.exceptions import ProjectDeleteError, ProjectNotFoundError
 from ..projects.projects_service import get_project_for_user, submit_delete_project_task
 from ..redis import get_redis_lock_manager_client
@@ -56,9 +56,11 @@ async def _delete_all_projects_for_user(app: web.Application, user_id: int) -> N
         return
 
     # fetch all projects for the user
-    user_project_uuids = await ProjectDBAPI.get_from_app_context(
-        app
-    ).list_projects_uuids(user_id=user_id)
+    user_project_uuids = (
+        await projects_service_legacy.ProjectDBAPI.get_from_app_context(
+            app
+        ).list_projects_uuids(user_id=user_id)
+    )
 
     _logger.info(
         "Removing or transfering projects of user with %s, %s: %s",

services/web/server/src/simcore_service_webserver/projects/projects_service_legacy.py

@@ -1,12 +1,21 @@
-from ._projects_repository_legacy import ProjectDBAPI
+import warnings
+
+from ._projects_repository_legacy import ProjectDBAPI, setup_projects_db
 from ._projects_service_utils import (
     clone_project_document,
     substitute_parameterized_inputs,
 )
 
+warnings.warn(
+    "The 'projects_service_legacy' module is deprecated. Please use the 'projects_service' module instead.",
+    DeprecationWarning,
+    stacklevel=2,
+)
+
 __all__: tuple[str, ...] = (
     "ProjectDBAPI",
     "clone_project_document",
+    "setup_projects_db",
     "substitute_parameterized_inputs",
 )