projects service

Author: pcrespov

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

@@ -2,6 +2,7 @@
 First a procedure is registered in postgres that gets triggered whenever the outputs
 of a record in comp_task table is changed.
 """
+
 import asyncio
 import json
 import logging
@@ -22,7 +23,7 @@
 from sqlalchemy.sql import select
 
 from ..db.plugin import get_database_engine
-from ..projects import exceptions, projects_service
+from ..projects import _projects_service, exceptions
 from ..projects.nodes_utils import update_node_outputs
 from ._utils import convert_state_from_db
 
@@ -47,12 +48,14 @@ async def _update_project_state(
     new_state: RunningState,
     node_errors: list[ErrorDict] | None,
 ) -> None:
-    project = await projects_service.update_project_node_state(
+    project = await _projects_service.update_project_node_state(
         app, user_id, project_uuid, node_uuid, new_state
     )
 
-    await projects_service.notify_project_node_update(app, project, node_uuid, node_errors)
-    await projects_service.notify_project_state_update(app, project)
+    await _projects_service.notify_project_node_update(
+        app, project, node_uuid, node_errors
+    )
+    await _projects_service.notify_project_state_update(app, project)
 
 
 @dataclass(frozen=True)

services/web/server/src/simcore_service_webserver/exporter/_formatter/_sds.py

@@ -8,9 +8,9 @@
 from servicelib.pools import non_blocking_process_pool_executor
 
 from ...catalog import catalog_service
+from ...projects._projects_service import get_project_for_user
 from ...projects.exceptions import BaseProjectError
 from ...projects.models import ProjectDict
-from ...projects.projects_service import get_project_for_user
 from ...scicrunch.db import ResearchResourceRepository
 from ..exceptions import SDSException
 from .template_json import write_template_json

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

@@ -15,7 +15,7 @@
 from .._meta import API_VTAG
 from ..constants import RQ_PRODUCT_KEY
 from ..login.decorators import login_required
-from ..projects.projects_service import create_user_notification_cb
+from ..projects._projects_service import create_user_notification_cb
 from ..redis import get_redis_lock_manager_client_sdk
 from ..security.decorators import permission_required
 from ..users.api import get_user_fullname

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

@@ -15,7 +15,7 @@
 from servicelib.common_headers import UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE
 from servicelib.utils import fire_and_forget_task
 
-from ..projects.projects_service import submit_delete_project_task
+from ..projects._projects_service import submit_delete_project_task
 from ..users.api import get_user
 from ..workspaces.api import check_user_workspace_access
 from ..workspaces.errors import (
@@ -352,14 +352,14 @@ async def delete_folder(
 
     # 1. Delete folder content
     # 1.1 Delete all child projects that I am an owner
-    project_id_list: list[
-        ProjectID
-    ] = await _folders_repository.get_projects_recursively_only_if_user_is_owner(
-        app,
-        folder_id=folder_id,
-        private_workspace_user_id_or_none=user_id if workspace_is_private else None,
-        user_id=user_id,
-        product_name=product_name,
+    project_id_list: list[ProjectID] = (
+        await _folders_repository.get_projects_recursively_only_if_user_is_owner(
+            app,
+            folder_id=folder_id,
+            private_workspace_user_id_or_none=user_id if workspace_is_private else None,
+            user_id=user_id,
+            product_name=product_name,
+        )
     )
 
     # fire and forget task for project deletion

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

@@ -5,8 +5,8 @@
 from servicelib.common_headers import UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE
 from servicelib.utils import logged_gather
 
+from ..projects._projects_service import remove_project_dynamic_services
 from ..projects.exceptions import ProjectLockError, ProjectNotFoundError
-from ..projects.projects_service import remove_project_dynamic_services
 from ..redis import get_redis_lock_manager_client
 from ..resource_manager.registry import (
     RedisResourceRegistry,

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

@@ -12,8 +12,11 @@
 from simcore_postgres_database.models.users import UserRole
 
 from ..projects._projects_repository_legacy import ProjectDBAPI
+from ..projects._projects_service import (
+    get_project_for_user,
+    submit_delete_project_task,
+)
 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
 from ..resource_manager.registry import RedisResourceRegistry
 from ..users import exceptions

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

@@ -15,11 +15,11 @@
 from servicelib.utils import limited_as_completed, logged_gather
 
 from ..dynamic_scheduler import api as dynamic_scheduler_api
-from ..projects.api import has_user_project_access_rights
-from ..projects.projects_service import (
+from ..projects._projects_service import (
     is_node_id_present_in_any_project_workbench,
     list_node_ids_in_project,
 )
+from ..projects.api import has_user_project_access_rights
 from ..resource_manager.registry import RedisResourceRegistry
 from ..users.api import get_user_role
 from ..users.exceptions import UserNotFoundError

services/web/server/src/simcore_service_webserver/notifications/_rabbitmq_exclusive_queue_consumers.py

@@ -18,7 +18,7 @@
 from servicelib.rabbitmq import RabbitMQClient
 from servicelib.utils import logged_gather
 
-from ..projects import projects_service
+from ..projects import _projects_service
 from ..projects.exceptions import ProjectNotFoundError
 from ..rabbitmq import get_rabbitmq_client
 from ..socketio.messages import (
@@ -42,7 +42,7 @@ async def _convert_to_node_update_event(
     app: web.Application, message: ProgressRabbitMessageNode
 ) -> SocketMessageDict | None:
     try:
-        project = await projects_service.get_project_for_user(
+        project = await _projects_service.get_project_for_user(
             app, f"{message.project_id}", message.user_id
         )
         if f"{message.node_id}" in project["workbench"]:

services/web/server/src/simcore_service_webserver/projects/_controller/comments_rest.py

@@ -26,7 +26,7 @@
 from ...login.decorators import login_required
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
-from .. import _comments_service, projects_service
+from .. import _comments_service, _projects_service
 from ._rest_exceptions import handle_plugin_requests_exceptions
 from ._rest_schemas import RequestContext
 
@@ -67,7 +67,7 @@ async def create_project_comment(request: web.Request):
     body_params = await parse_request_body_as(_ProjectCommentsBodyParams, request)
 
     # ensure the project exists
-    await projects_service.get_project_for_user(
+    await _projects_service.get_project_for_user(
         request.app,
         project_uuid=f"{path_params.project_uuid}",
         user_id=req_ctx.user_id,
@@ -109,7 +109,7 @@ async def list_project_comments(request: web.Request):
     )
 
     # ensure the project exists
-    await projects_service.get_project_for_user(
+    await _projects_service.get_project_for_user(
         request.app,
         project_uuid=f"{path_params.project_uuid}",
         user_id=req_ctx.user_id,
@@ -158,7 +158,7 @@ async def update_project_comment(request: web.Request):
     body_params = await parse_request_body_as(_ProjectCommentsBodyParams, request)
 
     # ensure the project exists
-    await projects_service.get_project_for_user(
+    await _projects_service.get_project_for_user(
         request.app,
         project_uuid=f"{path_params.project_uuid}",
         user_id=req_ctx.user_id,
@@ -188,7 +188,7 @@ async def delete_project_comment(request: web.Request):
     )
 
     # ensure the project exists
-    await projects_service.get_project_for_user(
+    await _projects_service.get_project_for_user(
         request.app,
         project_uuid=f"{path_params.project_uuid}",
         user_id=req_ctx.user_id,
@@ -216,7 +216,7 @@ async def get_project_comment(request: web.Request):
     )
 
     # ensure the project exists
-    await projects_service.get_project_for_user(
+    await _projects_service.get_project_for_user(
         request.app,
         project_uuid=f"{path_params.project_uuid}",
         user_id=req_ctx.user_id,

services/web/server/src/simcore_service_webserver/projects/_controller/nodes_pricing_unit_rest.py

@@ -16,7 +16,7 @@
 from ...resource_usage import service as rut_api
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
-from .. import projects_service
+from .. import _projects_service
 from .._projects_repository_legacy import ProjectDBAPI
 from ._rest_exceptions import handle_plugin_requests_exceptions
 from ._rest_schemas import RequestContext
@@ -48,7 +48,7 @@ async def get_project_node_pricing_unit(request: web.Request):
     path_params = parse_request_path_parameters_as(NodePathParams, request)
 
     # ensure the project exists
-    await projects_service.get_project_for_user(
+    await _projects_service.get_project_for_user(
         request.app,
         project_uuid=f"{path_params.project_id}",
         user_id=req_ctx.user_id,
@@ -97,7 +97,7 @@ async def connect_pricing_unit_to_project_node(request: web.Request):
     )
 
     # ensure the project exists
-    project = await projects_service.get_project_for_user(
+    project = await _projects_service.get_project_for_user(
         request.app,
         project_uuid=f"{path_params.project_id}",
         user_id=req_ctx.user_id,
@@ -123,7 +123,7 @@ async def connect_pricing_unit_to_project_node(request: web.Request):
 
     node_data = project["workbench"][NodeIDStr(f"{path_params.node_id}")]
 
-    await projects_service.update_project_node_resources_from_hardware_info(
+    await _projects_service.update_project_node_resources_from_hardware_info(
         request.app,
         user_id=req_ctx.user_id,
         project_id=path_params.project_id,