work

Author: matusdrobuliak66

packages/models-library/src/models_library/api_schemas_webserver/projects.py

@@ -261,6 +261,7 @@ class ProjectPatch(InputSchema):
         ),
     ] = None
     quality: dict[str, Any] | None = None
+    template_type: ProjectTemplateType | None = None
 
     def to_domain_model(self) -> dict[str, Any]:
         return self.model_dump(exclude_unset=True, by_alias=False)

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -14876,6 +14876,10 @@ components:
           - type: object
           - type: 'null'
           title: Quality
+        templateType:
+          anyOf:
+          - $ref: '#/components/schemas/ProjectTemplateType'
+          - type: 'null'
       type: object
       title: ProjectPatch
     ProjectPermalink:

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

@@ -667,9 +667,6 @@ async def list_projects_dicts(  # pylint: disable=too-many-arguments,too-many-st
         # order
         order_by: OrderBy = DEFAULT_ORDER_BY,
     ) -> tuple[list[ProjectDict], list[ProjectType], int]:
-
-        # Check compatibility of project type and template type
-
         async with self.engine.acquire() as conn:
             user_groups_proxy: list[RowProxy] = await self._list_user_groups(
                 conn, user_id

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

@@ -139,6 +139,7 @@
 from .exceptions import (
     ClustersKeeperNotAvailableError,
     DefaultPricingUnitNotFoundError,
+    InsufficientRoleForProjectTemplateTypeUpdateError,
     InvalidEC2TypeInResourcesSpecsError,
     InvalidKeysInResourcesSpecsError,
     NodeNotFoundError,
@@ -150,6 +151,7 @@
     ProjectOwnerNotFoundInTheProjectAccessRightsError,
     ProjectStartsTooManyDynamicNodesError,
     ProjectTooManyProjectOpenedError,
+    ProjectTypeAndTemplateIncompatibilityError,
 )
 from .models import ProjectDict, ProjectPatchInternalExtended
 from .settings import ProjectsSettings, get_plugin_settings
@@ -327,7 +329,27 @@ async def patch_project(
         if new_prj_access_rights[_prj_owner_primary_group] != _prj_required_permissions:
             raise ProjectOwnerNotFoundInTheProjectAccessRightsError
 
-    # 4. Patch the project
+    # 4. If patching template type
+    if new_template_type := patch_project_data.get("template_type"):
+        # 4.1 Check if user is a tester
+        current_user: dict = await get_user(app, user_id)
+        if not UserRole(current_user["role"]) >= UserRole.TESTER:
+            raise InsufficientRoleForProjectTemplateTypeUpdateError
+        # 4.2 Check the compatibility of the template type with the project
+        if project_db.type == ProjectType.STANDARD and new_template_type is not None:
+            raise ProjectTypeAndTemplateIncompatibilityError(
+                project_uuid=project_uuid,
+                project_type=project_db.type,
+                project_template=new_template_type,
+            )
+        if project_db.type == ProjectType.TEMPLATE and new_template_type is None:
+            raise ProjectTypeAndTemplateIncompatibilityError(
+                project_uuid=project_uuid,
+                project_type=project_db.type,
+                project_template=new_template_type,
+            )
+
+    # 5. Patch the project
     await _projects_repository.patch_project(
         app=app,
         project_uuid=project_uuid,

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

@@ -23,8 +23,7 @@ def debug_message(self):
         return f"{self.code}: {self}"
 
 
-class ProjectInvalidUsageError(BaseProjectError):
-    ...
+class ProjectInvalidUsageError(BaseProjectError): ...
 
 
 class ProjectOwnerNotFoundInTheProjectAccessRightsError(BaseProjectError):
@@ -83,8 +82,17 @@ class ProjectsBatchDeleteError(BaseProjectError):
     msg_template = "One or more projects could not be deleted in the batch: {errors}"
 
 
-class ProjectTrashError(BaseProjectError):
-    ...
+class ProjectsPatchError(BaseProjectError): ...
+
+
+class ProjectTypeAndTemplateIncompatibilityError(ProjectsPatchError):
+    msg_template = "Patching project '{project_uuid}' type {project_type} and template {project_template} is not allowed"
+
+
+class InsufficientRoleForProjectTemplateTypeUpdateError(ProjectsPatchError): ...
+
+
+class ProjectTrashError(BaseProjectError): ...
 
 
 class ProjectStoppingError(ProjectTrashError):
@@ -146,12 +154,10 @@ def __init__(self, *, max_num_projects: int, **ctx):
         self.max_num_projects = max_num_projects
 
 
-class PermalinkNotAllowedError(BaseProjectError):
-    ...
+class PermalinkNotAllowedError(BaseProjectError): ...
 
 
-class PermalinkFactoryError(BaseProjectError):
-    ...
+class PermalinkFactoryError(BaseProjectError): ...
 
 
 class ProjectNodeResourcesInvalidError(BaseProjectError):
@@ -178,12 +184,10 @@ class InvalidEC2TypeInResourcesSpecsError(ProjectNodeResourcesInvalidError):
     )
 
 
-class ProjectNodeResourcesInsufficientRightsError(BaseProjectError):
-    ...
+class ProjectNodeResourcesInsufficientRightsError(BaseProjectError): ...
 
 
-class ProjectNodeRequiredInputsNotSetError(BaseProjectError):
-    ...
+class ProjectNodeRequiredInputsNotSetError(BaseProjectError): ...
 
 
 class ProjectNodeConnectionsMissingError(ProjectNodeRequiredInputsNotSetError):