import

Author: pcrespov

services/web/server/src/simcore_service_webserver/diagnostics/_handlers.py

@@ -19,7 +19,7 @@
 from ..login.decorators import login_required
 from ..resource_usage._client import is_resource_usage_tracking_service_responsive
 from ..security.decorators import permission_required
-from ..storage import api as storage_api
+from ..storage import api as storage_service
 from ..utils import TaskInfoDict, get_task_info, get_tracemalloc_info
 from ..utils_aiohttp import envelope_json_response
 
@@ -118,7 +118,7 @@ async def _check_pg():
 
     async def _check_storage():
         check.services["storage"] = {
-            "healthy": await storage_api.is_healthy(request.app),
+            "healthy": await storage_service.is_healthy(request.app),
             "status_url": _get_url_for("get_service_status", service_name="storage"),
         }
 
@@ -158,7 +158,7 @@ async def get_service_status(request: web.Request):
 
     if service_name == "storage":
         with suppress(ClientError):
-            status = await storage_api.get_app_status(request.app)
+            status = await storage_service.get_app_status(request.app)
             return envelope_json_response(status)
 
     raise web.HTTPNotFound

services/web/server/src/simcore_service_webserver/folders/_workspaces_repository.py

@@ -10,7 +10,7 @@
 from ..db.plugin import get_asyncpg_engine
 from ..projects import _folders_repository as projects_folders_repository
 from ..projects import _groups_repository as projects_groups_repository
-from ..projects import _projects_repository as projects_repository
+from ..projects import _projects_repository as _projects_repository
 from ..projects._access_rights_service import check_user_project_permission
 from ..users.api import get_user
 from ..workspaces.api import check_user_workspace_access
@@ -78,7 +78,7 @@ async def move_folder_into_workspace(
     async with transaction_context(get_asyncpg_engine(app)) as conn:
         # 4. Update workspace ID on the project resource
         for project_id in project_ids:
-            await projects_repository.patch_project(
+            await _projects_repository.patch_project(
                 app=app,
                 connection=conn,
                 project_uuid=project_id,

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

@@ -112,7 +112,7 @@
     send_message_to_standard_group,
     send_message_to_user,
 )
-from ..storage import api as storage_api
+from ..storage import api as storage_service
 from ..users.api import FullNameDict, get_user, get_user_fullname, get_user_role
 from ..users.exceptions import UserNotFoundError
 from ..users.preferences_api import (
@@ -122,7 +122,7 @@
 )
 from ..wallets import api as wallets_service
 from ..wallets.errors import WalletNotEnoughCreditsError
-from ..workspaces import _workspaces_repository as workspaces_db
+from ..workspaces import _workspaces_repository as workspaces_workspaces_repository
 from . import (
     _crud_api_delete,
     _nodes_service,
@@ -226,7 +226,7 @@ async def get_project_for_user(
 
     if project["workspaceId"] is not None:
         workspace: UserWorkspaceWithAccessRights = (
-            await workspaces_db.get_workspace_for_user(
+            await workspaces_workspaces_repository.get_workspace_for_user(
                 app=app,
                 user_id=user_id,
                 workspace_id=project["workspaceId"],
@@ -912,7 +912,7 @@ async def _remove_service_and_its_data_folders(
         )
 
     # remove the node's data if any
-    await storage_api.delete_data_folders_of_project_node(
+    await storage_service.delete_data_folders_of_project_node(
         app, f"{project_uuid}", node_uuid, user_id
     )
 

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

@@ -11,7 +11,7 @@
 from servicelib.redis._errors import ProjectLockError
 
 from ..director_v2 import director_v2_service
-from . import _projects_repository as projects_repository
+from . import _projects_repository as _projects_repository
 from . import _projects_service
 from .exceptions import ProjectDeleteError, ProjectNotFoundError
 
@@ -68,7 +68,7 @@ async def delete_project_as_admin(
     try:
         # 1. hide
         with _monitor_step(state, name="hide"):
-            project = await projects_repository.patch_project(
+            project = await _projects_repository.patch_project(
                 app,
                 project_uuid=project_uuid,
                 new_partial_project_data={"hidden": True},
@@ -83,7 +83,7 @@ async def delete_project_as_admin(
 
         # 3. delete
         with _monitor_step(state, name="delete"):
-            await projects_repository.delete_project(app, project_uuid=project_uuid)
+            await _projects_repository.delete_project(app, project_uuid=project_uuid)
 
     except ProjectNotFoundError as err:
         _logger.debug(

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

@@ -7,7 +7,7 @@
 from models_library.users import UserID
 from models_library.workspaces import UserWorkspaceWithAccessRights
 
-from ..workspaces import _workspaces_repository as workspaces_db
+from ..workspaces import _workspaces_repository as workspaces_workspaces_repository
 from ._access_rights_service import check_user_project_permission
 from ._projects_repository_legacy import ProjectDBAPI
 from .models import ProjectDict
@@ -35,7 +35,7 @@ async def add_tag(
 
     if project["workspaceId"] is not None:
         workspace: UserWorkspaceWithAccessRights = (
-            await workspaces_db.get_workspace_for_user(
+            await workspaces_workspaces_repository.get_workspace_for_user(
                 app=app,
                 user_id=user_id,
                 workspace_id=project["workspaceId"],
@@ -69,7 +69,7 @@ async def remove_tag(
 
     if project["workspaceId"] is not None:
         workspace: UserWorkspaceWithAccessRights = (
-            await workspaces_db.get_workspace_for_user(
+            await workspaces_workspaces_repository.get_workspace_for_user(
                 app=app,
                 user_id=user_id,
                 workspace_id=project["workspaceId"],

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

@@ -16,10 +16,9 @@
 from ..director_v2 import director_v2_service
 from ..dynamic_scheduler import api as dynamic_scheduler_service
 from . import _crud_api_read
-from . import _projects_repository as projects_repository
+from . import _projects_repository as _projects_repository
 from . import _projects_service, _projects_service_delete
 from ._access_rights_service import check_user_project_permission
-from ._projects_repository import _OLDEST_TRASHED_FIRST
 from .exceptions import (
     ProjectNotFoundError,
     ProjectNotTrashedError,
@@ -243,13 +242,13 @@ async def batch_delete_trashed_projects_as_admin(
         (
             page_params.total_number_of_items,
             expired_trashed_projects,
-        ) = await projects_repository.list_trashed_projects(
+        ) = await _projects_repository.list_trashed_projects(
             app,
             # both implicit and explicitly trashed
             trashed_before=trashed_before,
             offset=page_params.offset,
             limit=page_params.limit,
-            order_by=_OLDEST_TRASHED_FIRST,
+            order_by=_projects_repository._OLDEST_TRASHED_FIRST,
         )
         # BATCH delete
         for project in expired_trashed_projects:

services/web/server/src/simcore_service_webserver/workspaces/_groups_service.py

@@ -10,7 +10,7 @@
 
 from ..users import api as users_service
 from . import _groups_repository as workspaces_groups_db
-from . import _workspaces_repository as workspaces_db
+from . import _workspaces_repository as workspaces_workspaces_repository
 from ._groups_repository import WorkspaceGroupGetDB
 from ._workspaces_service import check_user_workspace_access
 from .errors import WorkspaceAccessForbiddenError
@@ -125,7 +125,7 @@ async def update_workspace_group(
     product_name: ProductName,
 ) -> WorkspaceGroupGet:
     workspace: UserWorkspaceWithAccessRights = (
-        await workspaces_db.get_workspace_for_user(
+        await workspaces_workspaces_repository.get_workspace_for_user(
             app=app,
             user_id=user_id,
             workspace_id=workspace_id,
@@ -171,7 +171,7 @@ async def delete_workspace_group(
 ) -> None:
     user: dict = await users_service.get_user(app, user_id=user_id)
     workspace: UserWorkspaceWithAccessRights = (
-        await workspaces_db.get_workspace_for_user(
+        await workspaces_workspaces_repository.get_workspace_for_user(
             app=app,
             user_id=user_id,
             workspace_id=workspace_id,