Merge branch 'add-template-type-filtering' of github.com:matusdrobuliak66/osparc-simcore into enh/filter-types

odeimaiz · odeimaiz · commit 1426f32bc88d · 2025-05-16T15:03:19.000+02:00
diff --git a/packages/models-library/src/models_library/projects.py b/packages/models-library/src/models_library/projects.py
@@ -3,7 +3,7 @@
 """
 
 from datetime import datetime
-from enum import Enum, auto
+from enum import Enum
 from typing import Annotated, Any, Final, TypeAlias
 from uuid import UUID
 
@@ -54,9 +54,9 @@ class ProjectType(str, Enum):
 
 
 class ProjectTemplateType(StrAutoEnum):
-    TEMPLATE = auto()
-    TUTORIAL = auto()
-    HYPERTOOL = auto()
+    TEMPLATE = "TEMPLATE"
+    TUTORIAL = "TUTORIAL"
+    HYPERTOOL = "HYPERTOOL"
 
 
 class BaseProjectModel(BaseModel):
diff --git a/packages/postgres-database/src/simcore_postgres_database/webserver_models.py b/packages/postgres-database/src/simcore_postgres_database/webserver_models.py
@@ -1,17 +1,18 @@
-""" Facade for webserver service
+"""Facade for webserver service
 
-    Facade to direct access to models in the database by
-    the  webserver service
+Facade to direct access to models in the database by
+the  webserver service
 
 """
+
 from .models.api_keys import api_keys
 from .models.classifiers import group_classifiers
 from .models.comp_pipeline import StateType, comp_pipeline
 from .models.comp_tasks import DB_CHANNEL_NAME, NodeClass, comp_tasks
 from .models.confirmations import ConfirmationAction, confirmations
 from .models.groups import GroupType, groups, user_to_groups
 from .models.products import products
-from .models.projects import ProjectType, projects
+from .models.projects import ProjectTemplateType, ProjectType, projects
 from .models.projects_nodes import projects_nodes
 from .models.projects_tags import projects_tags
 from .models.projects_to_wallet import projects_to_wallet
@@ -35,6 +36,7 @@
     "projects",
     "projects_nodes",
     "ProjectType",
+    "ProjectTemplateType",
     "scicrunch_resources",
     "StateType",
     "projects_tags",
diff --git a/services/efs-guardian/requirements/_base.txt b/services/efs-guardian/requirements/_base.txt
@@ -262,7 +262,7 @@ mako==1.3.5
     #   alembic
 markdown-it-py==3.0.0
     # via rich
-markupsafe==3.0.1
+markupsafe==3.0.2
     # via mako
 mdurl==0.1.2
     # via markdown-it-py
diff --git a/services/efs-guardian/requirements/_test.txt b/services/efs-guardian/requirements/_test.txt
@@ -164,7 +164,7 @@ lazy-object-proxy==1.10.0
     # via openapi-spec-validator
 lupa==2.4
     # via fakeredis
-markupsafe==3.0.1
+markupsafe==3.0.2
     # via
     #   -c requirements/_base.txt
     #   jinja2
diff --git a/services/resource-usage-tracker/requirements/_base.txt b/services/resource-usage-tracker/requirements/_base.txt
@@ -278,7 +278,7 @@ mako==1.3.2
     #   alembic
 markdown-it-py==3.0.0
     # via rich
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via mako
 matplotlib==3.8.3
     # via prometheus-api-client
diff --git a/services/resource-usage-tracker/requirements/_test.txt b/services/resource-usage-tracker/requirements/_test.txt
@@ -149,7 +149,7 @@ mako==1.3.2
     #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_base.txt
     #   alembic
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via
     #   -c requirements/_base.txt
     #   jinja2
diff --git a/services/web/server/requirements/_base.txt b/services/web/server/requirements/_base.txt
@@ -402,7 +402,7 @@ mako==1.2.2
     #   alembic
 markdown-it-py==3.0.0
     # via rich
-markupsafe==2.1.1
+markupsafe==3.0.2
     # via
     #   jinja2
     #   mako
diff --git a/services/web/server/requirements/_test.txt b/services/web/server/requirements/_test.txt
@@ -149,7 +149,7 @@ markdown-it-py==3.0.0
     # via
     #   -c requirements/_base.txt
     #   rich
-markupsafe==2.1.1
+markupsafe==3.0.2
     # via
     #   -c requirements/_base.txt
     #   jinja2
diff --git a/services/web/server/src/simcore_service_webserver/application_settings.py b/services/web/server/src/simcore_service_webserver/application_settings.py
@@ -56,7 +56,7 @@
 # NOTE: to mark a plugin as a DEV-FEATURE annotated it with
 #    `Field(json_schema_extra={_X_DEV_FEATURE_FLAG: True})`
 # This will force it to be disabled when WEBSERVER_DEV_FEATURES_ENABLED=False
-_X_DEV_FEATURE_FLAG: Final[str] = "x-dev-feature"
+_X_FEATURE_UNDER_DEVELOPMENT: Final[str] = "x-dev-feature"
 
 
 class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
@@ -108,10 +108,9 @@ class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
     WEBSERVER_FUNCTIONS: Annotated[
         bool,
         Field(
-            validation_alias=AliasChoices("WEBSERVER_FUNCTIONS"),
-            json_schema_extra={_X_DEV_FEATURE_FLAG: True},
+            json_schema_extra={_X_FEATURE_UNDER_DEVELOPMENT: True},
         ),
-    ] = False
+    ] = True
 
     WEBSERVER_LOGLEVEL: Annotated[
         LogLevel,
@@ -406,8 +405,8 @@ def _build_vcs_release_url_if_unset(cls, values):
 
     @model_validator(mode="before")
     @classmethod
-    def _enable_only_if_dev_features_allowed(cls, data: Any) -> Any:
-        """Force disables plugins marked 'under development' when WEBSERVER_DEV_FEATURES_ENABLED=False"""
+    def _disable_features_under_development_in_production(cls, data: Any) -> Any:
+        """Force disables plugins marked '_X_FEATURE_UNDER_DEVELOPMENT' when WEBSERVER_DEV_FEATURES_ENABLED=False"""
 
         dev_features_allowed = TypeAdapter(bool).validate_python(
             data.get("WEBSERVER_DEV_FEATURES_ENABLED", False)
@@ -423,7 +422,8 @@ def _enable_only_if_dev_features_allowed(cls, data: Any) -> Any:
                 field.json_schema_extra(json_schema)
 
             assert isinstance(json_schema, dict)  # nosec
-            if json_schema.get(_X_DEV_FEATURE_FLAG):
+            if json_schema.get(_X_FEATURE_UNDER_DEVELOPMENT):
+                assert not dev_features_allowed  # nosec
                 _logger.warning(
                     "'%s' is still under development and will be forcibly disabled [WEBSERVER_DEV_FEATURES_ENABLED=%s].",
                     field_name,
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/_rest_exceptions.py b/services/web/server/src/simcore_service_webserver/projects/_controller/_rest_exceptions.py
@@ -27,6 +27,7 @@
 from ..exceptions import (
     ClustersKeeperNotAvailableError,
     DefaultPricingUnitNotFoundError,
+    InsufficientRoleForProjectTemplateTypeUpdateError,
     NodeNotFoundError,
     ParentNodeNotFoundError,
     ProjectDeleteError,
@@ -40,6 +41,7 @@
     ProjectOwnerNotFoundInTheProjectAccessRightsError,
     ProjectStartsTooManyDynamicNodesError,
     ProjectTooManyProjectOpenedError,
+    ProjectTypeAndTemplateIncompatibilityError,
     ProjectWalletPendingTransactionError,
     WrongTagIdsInQueryError,
 )
@@ -88,6 +90,10 @@
         status.HTTP_403_FORBIDDEN,
         "Do not have sufficient access rights on project {project_uuid} for this action",
     ),
+    InsufficientRoleForProjectTemplateTypeUpdateError: HttpErrorInfo(
+        status.HTTP_403_FORBIDDEN,
+        "Do not have sufficient access rights on updating project template type",
+    ),
     ProjectInvalidUsageError: HttpErrorInfo(
         status.HTTP_422_UNPROCESSABLE_ENTITY,
         "Invalid usage for project",
@@ -124,6 +130,10 @@
         status.HTTP_400_BAD_REQUEST,
         "Wrong tag IDs in query",
     ),
+    ProjectTypeAndTemplateIncompatibilityError: HttpErrorInfo(
+        status.HTTP_400_BAD_REQUEST,
+        "Wrong project type and template type combination: {reason}",
+    ),
 }
 
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/projects_rest_schemas.py b/services/web/server/src/simcore_service_webserver/projects/_controller/projects_rest_schemas.py
@@ -136,7 +136,7 @@ class ProjectFilters(Filters):
 
 class ProjectsListExtraQueryParams(RequestParameters):
     project_type: Annotated[ProjectTypeAPI, Field(alias="type")] = ProjectTypeAPI.all
-    template_type: Annotated[ProjectTemplateType | None, Field(...)] = None
+    template_type: ProjectTemplateType | None = None
     show_hidden: Annotated[
         bool, Field(description="includes projects marked as hidden in the listing")
     ] = False
@@ -173,14 +173,12 @@ def _search_check_empty_string(cls, v):
     )(null_or_none_str_to_none_validator)
 
     @model_validator(mode="after")
-    def check_template_type_compatibility(self):
+    def _check_template_type_compatibility(self):
         if (
             self.project_type in [ProjectTypeAPI.all, ProjectTypeAPI.user]
             and self.template_type is not None
         ):
-            msg = (
-                "When project type is `all` or `user` the template_type should be None"
-            )
+            msg = f"When {self.project_type=} is `all` or `user` the {self.template_type=} should be None"
             raise ValueError(msg)
         return self
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/_crud_api_read.py b/services/web/server/src/simcore_service_webserver/projects/_crud_api_read.py
@@ -17,6 +17,9 @@
 from pydantic import NonNegativeInt
 from servicelib.utils import logged_gather
 from simcore_postgres_database.models.projects import ProjectType
+from simcore_postgres_database.webserver_models import (
+    ProjectTemplateType as ProjectTemplateTypeDB,
+)
 from simcore_postgres_database.webserver_models import ProjectType as ProjectTypeDB
 
 from ..catalog import catalog_service
@@ -149,7 +152,7 @@ async def list_projects(  # pylint: disable=too-many-arguments
         ),
         # attrs
         filter_by_project_type=ProjectTypeAPI.to_project_type_db(project_type),
-        filter_by_template_type=template_type,
+        filter_by_template_type=ProjectTemplateTypeDB(template_type),
         filter_by_services=user_available_services,
         filter_trashed=trashed,
         filter_hidden=show_hidden,
diff --git a/services/web/server/src/simcore_service_webserver/projects/_projects_repository_legacy.py b/services/web/server/src/simcore_service_webserver/projects/_projects_repository_legacy.py
@@ -40,7 +40,6 @@
 from simcore_postgres_database.aiopg_errors import UniqueViolation
 from simcore_postgres_database.models.groups import user_to_groups
 from simcore_postgres_database.models.project_to_groups import project_to_groups
-from simcore_postgres_database.models.projects import ProjectTemplateType
 from simcore_postgres_database.models.projects_nodes import projects_nodes
 from simcore_postgres_database.models.projects_tags import projects_tags
 from simcore_postgres_database.models.projects_to_folders import projects_to_folders
@@ -58,7 +57,12 @@
     ProjectNodeCreate,
     ProjectNodesRepo,
 )
-from simcore_postgres_database.webserver_models import ProjectType, projects, users
+from simcore_postgres_database.webserver_models import (
+    ProjectTemplateType,
+    ProjectType,
+    projects,
+    users,
+)
 from sqlalchemy import func, literal_column, sql
 from sqlalchemy.dialects.postgresql import BOOLEAN, INTEGER
 from sqlalchemy.dialects.postgresql import insert as pg_insert
diff --git a/services/web/server/src/simcore_service_webserver/projects/_projects_service.py b/services/web/server/src/simcore_service_webserver/projects/_projects_service.py
@@ -333,7 +333,7 @@ async def patch_project(
     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:
+        if 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:
diff --git a/services/web/server/src/simcore_service_webserver/workspaces/_trash_service.py b/services/web/server/src/simcore_service_webserver/workspaces/_trash_service.py
@@ -104,6 +104,7 @@ async def _list_root_child_projects(
             show_hidden=False,
             workspace_id=workspace_id,
             project_type=ProjectTypeAPI.all,
+            template_type=None,
             folder_id=None,
             trashed=None,
             offset=page_params.offset,
diff --git a/services/web/server/src/simcore_service_webserver/workspaces/_workspaces_service.py b/services/web/server/src/simcore_service_webserver/workspaces/_workspaces_service.py
@@ -110,6 +110,7 @@ async def delete_workspace_with_all_content(
             show_hidden=False,
             workspace_id=workspace_id,
             project_type=ProjectTypeAPI.all,
+            template_type=None,
             folder_id=None,
             trashed=None,
             offset=page_params.offset,
diff --git a/services/web/server/tests/unit/isolated/test_application_settings.py b/services/web/server/tests/unit/isolated/test_application_settings.py
@@ -12,7 +12,7 @@
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_service_webserver.application_settings import (
-    _X_DEV_FEATURE_FLAG,
+    _X_FEATURE_UNDER_DEVELOPMENT,
     APP_SETTINGS_KEY,
     ApplicationSettings,
     setup_settings,
@@ -130,17 +130,25 @@ def test_disabled_plugins_settings_to_client_statics(
     )
 
     class DevSettings(ApplicationSettings):
-        TEST_FOO: Annotated[bool, Field(json_schema_extra={_X_DEV_FEATURE_FLAG: True})]
+        TEST_FOO: Annotated[
+            bool, Field(json_schema_extra={_X_FEATURE_UNDER_DEVELOPMENT: True})
+        ]
         TEST_BAR: Annotated[
-            int | None, Field(json_schema_extra={_X_DEV_FEATURE_FLAG: True})
+            int | None, Field(json_schema_extra={_X_FEATURE_UNDER_DEVELOPMENT: True})
         ]
 
     settings = DevSettings.create_from_envs()
 
     if is_dev_feature_enabled:
+        assert settings.WEBSERVER_DEV_FEATURES_ENABLED is True
+        assert settings.WEBSERVER_FUNCTIONS is True
+
         assert settings.TEST_FOO is True
         assert settings.TEST_BAR == 42
     else:
+        assert settings.WEBSERVER_DEV_FEATURES_ENABLED is False
+        assert settings.WEBSERVER_FUNCTIONS is False
+
         assert settings.TEST_FOO is False
         assert settings.TEST_BAR is None
 
diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__list_with_query_params.py b/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__list_with_query_params.py
