WIP: ♻️ Mai/project renaming

api/specs/web-server/_projects.py

@@ -1,4 +1,4 @@
-""" Helper script to automatically generate OAS
+"""Helper script to automatically generate OAS
 
 This OAS are the source of truth
 """
@@ -31,12 +31,16 @@
 from models_library.rest_pagination import Page
 from pydantic import BaseModel
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._common.exceptions_handlers import (
+from simcore_service_webserver.projects._controller._rest_exceptions import (
     _TO_HTTP_ERROR_MAP,
 )
-from simcore_service_webserver.projects._common.models import ProjectPathParams
-from simcore_service_webserver.projects._crud_handlers import ProjectCreateQueryParams
-from simcore_service_webserver.projects._crud_handlers_models import (
+from simcore_service_webserver.projects._controller._rest_schemas import (
+    ProjectPathParams,
+)
+from simcore_service_webserver.projects._controller.projects_rest import (
+    ProjectCreateQueryParams,
+)
+from simcore_service_webserver.projects._projects_models import (
     ProjectActiveQueryParams,
     ProjectsListQueryParams,
     ProjectsSearchQueryParams,
@@ -83,8 +87,7 @@ async def create_project(
     _h: Annotated[_ProjectCreateHeaderParams, Depends()],
     _query: Annotated[ProjectCreateQueryParams, Depends()],
     _body: ProjectCreateNew | ProjectCopyOverride,
-):
-    ...
+): ...
 
 
 @router.get(
@@ -93,8 +96,7 @@ async def create_project(
 )
 async def list_projects(
     _query: Annotated[as_query(ProjectsListQueryParams), Depends()],
-):
-    ...
+): ...
 
 
 @router.get(
@@ -103,8 +105,7 @@ async def list_projects(
 )
 async def get_active_project(
     _query: Annotated[ProjectActiveQueryParams, Depends()],
-):
-    ...
+): ...
 
 
 @router.get(
@@ -113,8 +114,7 @@ async def get_active_project(
 )
 async def get_project(
     _path: Annotated[ProjectPathParams, Depends()],
-):
-    ...
+): ...
 
 
 @router.patch(
@@ -125,8 +125,7 @@ async def get_project(
 async def patch_project(
     _path: Annotated[ProjectPathParams, Depends()],
     _body: ProjectPatch,
-):
-    ...
+): ...
 
 
 @router.delete(
@@ -135,8 +134,7 @@ async def patch_project(
 )
 async def delete_project(
     _path: Annotated[ProjectPathParams, Depends()],
-):
-    ...
+): ...
 
 
 @router.post(
@@ -146,8 +144,7 @@ async def delete_project(
 )
 async def clone_project(
     _path: Annotated[ProjectPathParams, Depends()],
-):
-    ...
+): ...
 
 
 @router.get(
@@ -156,8 +153,7 @@ async def clone_project(
 )
 async def list_projects_full_search(
     _query: Annotated[as_query(ProjectsSearchQueryParams), Depends()],
-):
-    ...
+): ...
 
 
 @router.get(
@@ -167,5 +163,4 @@ async def list_projects_full_search(
 )
 async def get_project_inactivity(
     _path: Annotated[ProjectPathParams, Depends()],
-):
-    ...
+): ...

api/specs/web-server/_projects_comments.py

@@ -1,4 +1,4 @@
-""" Helper script to automatically generate OAS
+"""Helper script to automatically generate OAS
 
 This OAS are the source of truth
 """
@@ -17,7 +17,7 @@
 from models_library.projects_comments import CommentID, ProjectsCommentsAPI
 from pydantic import NonNegativeInt
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._comments_handlers import (
+from simcore_service_webserver.projects._controller.comments_rest import (
     _ProjectCommentsBodyParams,
     _ProjectCommentsPathParams,
     _ProjectCommentsWithCommentPathParams,
@@ -45,8 +45,7 @@
 )
 async def create_project_comment(
     project_uuid: ProjectID, body: _ProjectCommentsBodyParams
-):
-    ...
+): ...
 
 
 assert_handler_signature_against_model(
@@ -61,8 +60,7 @@ async def create_project_comment(
 )
 async def list_project_comments(
     project_uuid: ProjectID, limit: int = 20, offset: NonNegativeInt = 0
-):
-    ...
+): ...
 
 
 assert_handler_signature_against_model(
@@ -79,8 +77,7 @@ async def update_project_comment(
     project_uuid: ProjectID,
     comment_id: CommentID,
     body: _ProjectCommentsBodyParams,
-):
-    ...
+): ...
 
 
 assert_handler_signature_against_model(
@@ -93,8 +90,7 @@ async def update_project_comment(
     description="Delete a specific comment associated with a project.",
     status_code=204,
 )
-async def delete_project_comment(project_uuid: ProjectID, comment_id: CommentID):
-    ...
+async def delete_project_comment(project_uuid: ProjectID, comment_id: CommentID): ...
 
 
 assert_handler_signature_against_model(
@@ -107,8 +103,7 @@ async def delete_project_comment(project_uuid: ProjectID, comment_id: CommentID)
     response_model=Envelope[ProjectsCommentsAPI],
     description="Retrieve a specific comment by its ID within a project.",
 )
-async def get_project_comment(project_uuid: ProjectID, comment_id: CommentID):
-    ...
+async def get_project_comment(project_uuid: ProjectID, comment_id: CommentID): ...
 
 
 assert_handler_signature_against_model(

api/specs/web-server/_projects_folders.py

@@ -1,4 +1,4 @@
-""" Helper script to automatically generate OAS
+"""Helper script to automatically generate OAS
 
 This OAS are the source of truth
 """
@@ -13,7 +13,7 @@
 
 from fastapi import APIRouter, Depends, status
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._folders_handlers import (
+from simcore_service_webserver.projects._controller.folders_rest import (
     _ProjectsFoldersPathParams,
 )
 
@@ -30,5 +30,4 @@
 )
 async def replace_project_folder(
     _path: Annotated[_ProjectsFoldersPathParams, Depends()],
-):
-    ...
+): ...

api/specs/web-server/_projects_groups.py

@@ -7,11 +7,13 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, status
+from models_library.api_schemas_webserver.projects_groups import ProjectGroupGet
 from models_library.generics import Envelope
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._common.models import ProjectPathParams
-from simcore_service_webserver.projects._groups_api import ProjectGroupGet
-from simcore_service_webserver.projects._groups_handlers import (
+from simcore_service_webserver.projects._controller._rest_schemas import (
+    ProjectPathParams,
+)
+from simcore_service_webserver.projects._controller.groups_rest import (
     _ProjectsGroupsBodyParams,
     _ProjectsGroupsPathParams,
 )
@@ -30,16 +32,14 @@
 async def create_project_group(
     _path: Annotated[_ProjectsGroupsPathParams, Depends()],
     _body: _ProjectsGroupsBodyParams,
-):
-    ...
+): ...
 
 
 @router.get(
     "/projects/{project_id}/groups",
     response_model=Envelope[list[ProjectGroupGet]],
 )
-async def list_project_groups(_path: Annotated[ProjectPathParams, Depends()]):
-    ...
+async def list_project_groups(_path: Annotated[ProjectPathParams, Depends()]): ...
 
 
 @router.put(
@@ -49,13 +49,13 @@ async def list_project_groups(_path: Annotated[ProjectPathParams, Depends()]):
 async def replace_project_group(
     _path: Annotated[_ProjectsGroupsPathParams, Depends()],
     _body: _ProjectsGroupsBodyParams,
-):
-    ...
+): ...
 
 
 @router.delete(
     "/projects/{project_id}/groups/{group_id}",
     status_code=status.HTTP_204_NO_CONTENT,
 )
-async def delete_project_group(_path: Annotated[_ProjectsGroupsPathParams, Depends()]):
-    ...
+async def delete_project_group(
+    _path: Annotated[_ProjectsGroupsPathParams, Depends()],
+): ...

api/specs/web-server/_projects_metadata.py

@@ -1,4 +1,4 @@
-""" Helper script to automatically generate OAS
+"""Helper script to automatically generate OAS
 
 This OAS are the source of truth
 """
@@ -18,7 +18,9 @@
 )
 from models_library.generics import Envelope
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._metadata_handlers import ProjectPathParams
+from simcore_service_webserver.projects._controller.metadata_rest import (
+    ProjectPathParams,
+)
 
 router = APIRouter(prefix=f"/{API_VTAG}", tags=["projects", "metadata"])
 
@@ -33,8 +35,7 @@
     response_model=Envelope[ProjectMetadataGet],
     status_code=status.HTTP_200_OK,
 )
-async def get_project_metadata(_params: Annotated[ProjectPathParams, Depends()]):
-    ...
+async def get_project_metadata(_params: Annotated[ProjectPathParams, Depends()]): ...
 
 
 @router.patch(
@@ -44,5 +45,4 @@ async def get_project_metadata(_params: Annotated[ProjectPathParams, Depends()])
 )
 async def update_project_metadata(
     _params: Annotated[ProjectPathParams, Depends()], _body: ProjectMetadataUpdate
-):
-    ...
+): ...

api/specs/web-server/_projects_nodes.py

@@ -26,12 +26,14 @@
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._crud_handlers import ProjectPathParams
-from simcore_service_webserver.projects._nodes_handlers import (
+from simcore_service_webserver.projects._controller.nodes_rest import (
     NodePathParams,
     _ProjectGroupAccess,
     _ProjectNodePreview,
 )
+from simcore_service_webserver.projects._controller.projects_rest import (
+    ProjectPathParams,
+)
 
 router = APIRouter(
     prefix=f"/{API_VTAG}",

api/specs/web-server/_projects_nodes_pricing_unit.py

@@ -1,4 +1,4 @@
-""" Helper script to automatically generate OAS
+"""Helper script to automatically generate OAS
 
 This OAS are the source of truth
 """
@@ -17,10 +17,10 @@
 from models_library.projects_nodes_io import NodeID
 from models_library.resource_tracker import PricingPlanId, PricingUnitId
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._nodes_handlers import NodePathParams
-from simcore_service_webserver.projects._projects_nodes_pricing_unit_handlers import (
+from simcore_service_webserver.projects._controller.nodes_pricing_unit_rest import (
     _ProjectNodePricingUnitPathParams,
 )
+from simcore_service_webserver.projects._controller.nodes_rest import NodePathParams
 
 router = APIRouter(
     prefix=f"/{API_VTAG}",
@@ -35,8 +35,7 @@
     response_model=Envelope[PricingUnitGet | None],
     description="Get currently connected pricing unit to the project node.",
 )
-async def get_project_node_pricing_unit(project_id: ProjectID, node_id: NodeID):
-    ...
+async def get_project_node_pricing_unit(project_id: ProjectID, node_id: NodeID): ...
 
 
 assert_handler_signature_against_model(get_project_node_pricing_unit, NodePathParams)
@@ -52,8 +51,7 @@ async def connect_pricing_unit_to_project_node(
     node_id: NodeID,
     pricing_plan_id: PricingPlanId,
     pricing_unit_id: PricingUnitId,
-):
-    ...
+): ...
 
 
 assert_handler_signature_against_model(

api/specs/web-server/_projects_ports.py

@@ -9,7 +9,7 @@
 from models_library.projects import ProjectID
 from models_library.projects_nodes import NodeID
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._ports_handlers import (
+from simcore_service_webserver.projects._controller.ports_rest import (
     ProjectInputGet,
     ProjectInputUpdate,
     ProjectMetadataPortGet,

api/specs/web-server/_projects_states.py

@@ -14,7 +14,7 @@
 from servicelib.aiohttp import status
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.director_v2.exceptions import DirectorServiceError
-from simcore_service_webserver.projects._states_handlers import (
+from simcore_service_webserver.projects._controller.projects_rest import (
     ProjectPathParams,
     _OpenProjectQuery,
 )
@@ -70,20 +70,17 @@ def open_project(
     client_session_id: Annotated[str, Body(...)],
     _path_params: Annotated[ProjectPathParams, Depends()],
     _query_params: Annotated[_OpenProjectQuery, Depends()],
-):
-    ...
+): ...
 
 
 @router.post("/projects/{project_id}:close", status_code=status.HTTP_204_NO_CONTENT)
 def close_project(
     _path_params: Annotated[ProjectPathParams, Depends()],
     client_session_id: Annotated[str, Body(...)],
-):
-    ...
+): ...
 
 
 @router.get("/projects/{project_id}/state", response_model=Envelope[ProjectState])
 def get_project_state(
     _path_params: Annotated[ProjectPathParams, Depends()],
-):
-    ...
+): ...