wip: trying to make ci work

Author: Andrei Neagu

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

@@ -156,10 +156,10 @@ def validate_template_type(
     ) -> ProjectTemplateType | None:
         type_value = info.data.get("type")
         if type_value == ProjectType.STANDARD and v is not None:
-            msg = "template_type must be None when type is STANDARD"
+            msg = f"template_type must be {v} when type is {ProjectType.STANDARD}"
             raise ValueError(msg)
         if type_value == ProjectType.TEMPLATE and v is None:
-            msg = "template_type must not be None when type is TEMPLATE"
+            msg = f"template_type must not be {v} when type is {ProjectType.TEMPLATE}"
             raise ValueError(msg)
         return v
 

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

@@ -71,6 +71,18 @@ class BaseProjectModel(BaseModel):
         ),
     ]
 
+    project_type: Annotated[
+        ProjectType, Field(alias="type", description="The project type")
+    ]
+    template_type: Annotated[
+        ProjectTemplateType | None,
+        Field(
+            alias="templateType",
+            description="The project template type",
+            examples=["TEMPLATE", "TUTORIAL", "HYPERTOOL"],
+        ),
+    ]
+
     name: Annotated[
         str,
         Field(description="project name", examples=["Temporal Distortion Simulator"]),
@@ -105,38 +117,26 @@ class BaseProjectModel(BaseModel):
         none_to_empty_str_pre_validator
     )
 
+    @field_validator("project_type", "template_type", mode="before")
+    @classmethod
+    def _convert_sql_alchemy_enum(cls, v):
+        if isinstance(v, Enum):
+            return v.value
+        return v
+
 
 class ProjectAtDB(BaseProjectModel):
     # Model used to READ from database
 
     id: Annotated[int, Field(description="The table primary index")]
 
-    project_type: Annotated[
-        ProjectType, Field(alias="type", description="The project type")
-    ]
-    template_type: Annotated[
-        ProjectTemplateType | None,
-        Field(
-            alias="templateType",
-            description="The project template type",
-            examples=["TEMPLATE", "TUTORIAL", "HYPERTOOL"],
-        ),
-    ]
-
     prj_owner: Annotated[int | None, Field(description="The project owner id")]
 
     published: Annotated[
         bool | None,
         Field(description="Defines if a study is available publicly"),
     ] = False
 
-    @field_validator("project_type", "template_type", mode="before")
-    @classmethod
-    def _convert_sql_alchemy_enum(cls, v):
-        if isinstance(v, Enum):
-            return v.value
-        return v
-
     model_config = ConfigDict(
         from_attributes=True, use_enum_values=True, populate_by_name=True
     )

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

@@ -36,7 +36,8 @@
 
 logger = logging.getLogger(__name__)
 
-DB_EXCLUSIVE_COLUMNS = ["type", "id", "published", "hidden"]
+DB_EXCLUSIVE_COLUMNS_GET = ["id", "published", "hidden"]
+DB_EXCLUSIVE_COLUMNS = [*DB_EXCLUSIVE_COLUMNS_GET, "type"]
 SCHEMA_NON_NULL_KEYS = ["thumbnail"]
 
 PermissionStr = Literal["read", "write", "delete"]
@@ -85,7 +86,7 @@ def convert_to_schema_names(
     # SEE https://github.com/ITISFoundation/osparc-simcore/issues/3516
     converted_args = {}
     for col_name, col_value in project_database_data.items():
-        if col_name in DB_EXCLUSIVE_COLUMNS:
+        if col_name in DB_EXCLUSIVE_COLUMNS_GET:
             continue
         converted_value = col_value
         if isinstance(col_value, datetime) and col_name not in {"trashed"}:

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

@@ -83,10 +83,10 @@ def validate_template_type(
     ) -> ProjectTemplateType | None:
         type_value = info.data.get("type")
         if type_value == ProjectType.STANDARD and v is not None:
-            msg = "template_type must be None when type is STANDARD"
+            msg = f"template_type must be {v} when type is {ProjectType.STANDARD}"
             raise ValueError(msg)
         if type_value == ProjectType.TEMPLATE and v is None:
-            msg = "template_type must not be None when type is TEMPLATE"
+            msg = f"template_type must not be {v} when type is {ProjectType.TEMPLATE}"
             raise ValueError(msg)
         return v
 

services/web/server/tests/conftest.py

@@ -218,6 +218,8 @@ async def _setup(
         # Pre-defined fields imposed by required properties in schema
         project_data: ProjectDict = {}
         expected_data: ProjectDict = {
+            "type": "TEMPLATE" if as_template else "STANDARD",
+            "templateType": "TEMPLATE" if as_template else None,
             "classifiers": [],
             "accessRights": {},
             "tags": [],
@@ -316,6 +318,7 @@ async def _creator(
             parent_project_uuid=parent_project_uuid,
             parent_node_id=parent_node_id,
         )
+        print(f"{project_data=}, {expected_data=}")
         # Create project here:
         resp = await client.post(
             f"{url}", json=project_data, headers=headers