service modules

Author: pcrespov

api/specs/web-server/_projects_groups.py

@@ -14,7 +14,7 @@
     _ProjectsGroupsBodyParams,
     _ProjectsGroupsPathParams,
 )
-from simcore_service_webserver.projects._groups_api import ProjectGroupGet
+from simcore_service_webserver.projects._groups_service import ProjectGroupGet
 
 router = APIRouter(
     prefix=f"/{API_VTAG}",

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

@@ -11,7 +11,7 @@
 from ..projects import _folders_db as project_to_folders_db
 from ..projects import _groups_db as project_groups_db
 from ..projects import _projects_db as projects_db
-from ..projects._access_rights_api import check_user_project_permission
+from ..projects._access_rights_service import check_user_project_permission
 from ..users.api import get_user
 from ..workspaces.api import check_user_workspace_access
 from . import _folders_repository

services/web/server/src/simcore_service_webserver/projects/_access_rights_api.py renamed to services/web/server/src/simcore_service_webserver/projects/_access_rights_service.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_api, projects_service
+from . import _comments_service, projects_service
 from ._common.exceptions_handlers import handle_plugin_requests_exceptions
 from ._common.models import RequestContext
 
@@ -74,7 +74,7 @@ async def create_project_comment(request: web.Request):
         include_state=False,
     )
 
-    comment_id = await _comments_api.create_project_comment(
+    comment_id = await _comments_service.create_project_comment(
         request=request,
         project_uuid=path_params.project_uuid,
         user_id=req_ctx.user_id,
@@ -116,12 +116,12 @@ async def list_project_comments(request: web.Request):
         include_state=False,
     )
 
-    total_project_comments = await _comments_api.total_project_comments(
+    total_project_comments = await _comments_service.total_project_comments(
         request=request,
         project_uuid=path_params.project_uuid,
     )
 
-    project_comments = await _comments_api.list_project_comments(
+    project_comments = await _comments_service.list_project_comments(
         request=request,
         project_uuid=path_params.project_uuid,
         offset=query_params.offset,
@@ -165,7 +165,7 @@ async def update_project_comment(request: web.Request):
         include_state=False,
     )
 
-    updated_comment = await _comments_api.update_project_comment(
+    updated_comment = await _comments_service.update_project_comment(
         request=request,
         comment_id=path_params.comment_id,
         project_uuid=path_params.project_uuid,
@@ -195,7 +195,7 @@ async def delete_project_comment(request: web.Request):
         include_state=False,
     )
 
-    await _comments_api.delete_project_comment(
+    await _comments_service.delete_project_comment(
         request=request,
         comment_id=path_params.comment_id,
     )
@@ -223,7 +223,7 @@ async def get_project_comment(request: web.Request):
         include_state=False,
     )
 
-    comment = await _comments_api.get_project_comment(
+    comment = await _comments_service.get_project_comment(
         request=request,
         comment_id=path_params.comment_id,
     )

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

@@ -39,9 +39,9 @@ async def list_project_comments(
 ) -> list[ProjectsCommentsAPI]:
     db: ProjectDBAPI = request.app[APP_PROJECT_DBAPI]
 
-    projects_comments_db_model: list[
-        ProjectsCommentsDB
-    ] = await db.list_project_comments(project_uuid, offset, limit)
+    projects_comments_db_model: list[ProjectsCommentsDB] = (
+        await db.list_project_comments(project_uuid, offset, limit)
+    )
     projects_comments_api_model = [
         ProjectsCommentsAPI(**comment.model_dump())
         for comment in projects_comments_db_model

services/web/server/src/simcore_service_webserver/projects/_comments_api.py renamed to services/web/server/src/simcore_service_webserver/projects/_comments_service.py

@@ -11,7 +11,7 @@
 from ..._meta import api_version_prefix as VTAG
 from ...login.decorators import login_required
 from ...security.decorators import permission_required
-from .. import _folders_api
+from .. import _folders_service
 from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import RequestContext
 
@@ -43,7 +43,7 @@ async def replace_project_folder(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(_ProjectsFoldersPathParams, request)
 
-    await _folders_api.move_project_into_folder(
+    await _folders_service.move_project_into_folder(
         app=request.app,
         user_id=req_ctx.user_id,
         project_id=path_params.project_id,

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

@@ -16,10 +16,10 @@
 from ...login.decorators import login_required
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
-from .. import _groups_api
+from .. import _groups_service
 from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import ProjectPathParams, RequestContext
-from .._groups_api import ProjectGroupGet
+from .._groups_service import ProjectGroupGet
 
 _logger = logging.getLogger(__name__)
 
@@ -55,7 +55,7 @@ async def create_project_group(request: web.Request):
     path_params = parse_request_path_parameters_as(_ProjectsGroupsPathParams, request)
     body_params = await parse_request_body_as(_ProjectsGroupsBodyParams, request)
 
-    project_groups: ProjectGroupGet = await _groups_api.create_project_group(
+    project_groups: ProjectGroupGet = await _groups_service.create_project_group(
         request.app,
         user_id=req_ctx.user_id,
         project_id=path_params.project_id,
@@ -78,7 +78,7 @@ async def list_project_groups(request: web.Request):
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
 
     project_groups: list[ProjectGroupGet] = (
-        await _groups_api.list_project_groups_by_user_and_project(
+        await _groups_service.list_project_groups_by_user_and_project(
             request.app,
             user_id=req_ctx.user_id,
             project_id=path_params.project_id,
@@ -101,7 +101,7 @@ async def replace_project_group(request: web.Request):
     path_params = parse_request_path_parameters_as(_ProjectsGroupsPathParams, request)
     body_params = await parse_request_body_as(_ProjectsGroupsBodyParams, request)
 
-    return await _groups_api.replace_project_group(
+    return await _groups_service.replace_project_group(
         app=request.app,
         user_id=req_ctx.user_id,
         project_id=path_params.project_id,
@@ -124,7 +124,7 @@ async def delete_project_group(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(_ProjectsGroupsPathParams, request)
 
-    await _groups_api.delete_project_group(
+    await _groups_service.delete_project_group(
         app=request.app,
         user_id=req_ctx.user_id,
         project_id=path_params.project_id,

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

@@ -27,7 +27,7 @@
 from ...login.decorators import login_required
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
-from .. import _metadata_api
+from .. import _metadata_service
 from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import ProjectPathParams, RequestContext
 
@@ -52,7 +52,7 @@ async def get_project_metadata(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
 
-    custom_metadata = await _metadata_api.get_project_custom_metadata(
+    custom_metadata = await _metadata_service.get_project_custom_metadata(
         request.app, user_id=req_ctx.user_id, project_uuid=path_params.project_id
     )
 
@@ -73,14 +73,14 @@ async def update_project_metadata(request: web.Request) -> web.Response:
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
     update = await parse_request_body_as(ProjectMetadataUpdate, request)
 
-    custom_metadata = await _metadata_api.set_project_custom_metadata(
+    custom_metadata = await _metadata_service.set_project_custom_metadata(
         request.app,
         user_id=req_ctx.user_id,
         project_uuid=path_params.project_id,
         value=update.custom,
     )
     with log_catch(_logger, reraise=False):
-        await _metadata_api.set_project_ancestors_from_custom_metadata(
+        await _metadata_service.set_project_ancestors_from_custom_metadata(
             request.app,
             user_id=req_ctx.user_id,
             project_uuid=path_params.project_id,

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

@@ -65,12 +65,12 @@
 from ...security.decorators import permission_required
 from ...users.api import get_user_id_from_gid, get_user_role
 from ...utils_aiohttp import envelope_json_response
-from .. import _access_rights_api as access_rights_service
-from .. import _nodes_api as _nodes_service
+from .. import _access_rights_service as access_rights_service
+from .. import _nodes_service as _nodes_service
 from .. import nodes_utils, projects_service
 from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import ProjectPathParams, RequestContext
-from .._nodes_api import NodeScreenshot, get_node_screenshots
+from .._nodes_service import NodeScreenshot, get_node_screenshots
 from ..api import has_user_project_access_rights
 from ..exceptions import (
     NodeNotFoundError,

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

@@ -29,8 +29,8 @@
 from ...login.decorators import login_required
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
-from .. import _ports_api, projects_service
-from .._access_rights_api import check_user_project_permission
+from .. import _ports_service, projects_service
+from .._access_rights_service import check_user_project_permission
 from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import ProjectPathParams, RequestContext
 from ..db import ProjectDBAPI
@@ -72,7 +72,7 @@ async def get_project_inputs(request: web.Request) -> web.Response:
     workbench = await _get_validated_workbench_model(
         app=request.app, project_id=path_params.project_id, user_id=req_ctx.user_id
     )
-    inputs: dict[NodeID, Any] = _ports_api.get_project_inputs(workbench)
+    inputs: dict[NodeID, Any] = _ports_service.get_project_inputs(workbench)
 
     return envelope_json_response(
         {
@@ -99,7 +99,7 @@ async def update_project_inputs(request: web.Request) -> web.Response:
     workbench = await _get_validated_workbench_model(
         app=request.app, project_id=path_params.project_id, user_id=req_ctx.user_id
     )
-    current_inputs: dict[NodeID, Any] = _ports_api.get_project_inputs(workbench)
+    current_inputs: dict[NodeID, Any] = _ports_service.get_project_inputs(workbench)
 
     # build workbench patch
     partial_workbench_data = {}
@@ -133,7 +133,7 @@ async def update_project_inputs(request: web.Request) -> web.Response:
     workbench = TypeAdapter(dict[NodeID, Node]).validate_python(
         updated_project["workbench"]
     )
-    inputs: dict[NodeID, Any] = _ports_api.get_project_inputs(workbench)
+    inputs: dict[NodeID, Any] = _ports_service.get_project_inputs(workbench)
 
     return envelope_json_response(
         {
@@ -163,7 +163,7 @@ async def get_project_outputs(request: web.Request) -> web.Response:
     workbench = await _get_validated_workbench_model(
         app=request.app, project_id=path_params.project_id, user_id=req_ctx.user_id
     )
-    outputs: dict[NodeID, Any] = await _ports_api.get_project_outputs(
+    outputs: dict[NodeID, Any] = await _ports_service.get_project_outputs(
         request.app, project_id=path_params.project_id, workbench=workbench
     )
 
@@ -218,6 +218,6 @@ async def list_project_metadata_ports(request: web.Request) -> web.Response:
                 kind=port.kind,
                 content_schema=port.get_schema(),
             )
-            for port in _ports_api.iter_project_ports(workbench)
+            for port in _ports_service.iter_project_ports(workbench)
         ]
     )