remove workbench

Author: giancarloromeo

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

@@ -11,7 +11,14 @@
 from models_library.basic_types import ConstrainedStr
 from models_library.folders import FolderID
 from models_library.workspaces import WorkspaceID
-from pydantic import BaseModel, ConfigDict, Field, HttpUrl, field_validator
+from pydantic import (
+    BaseModel,
+    BeforeValidator,
+    ConfigDict,
+    Field,
+    HttpUrl,
+    field_validator,
+)
 
 from .basic_regex import DATE_RE, UUID_RE_BASE
 from .emails import LowerCaseEmailStr
@@ -65,32 +72,28 @@ class BaseProjectModel(BaseModel):
     name: str = Field(
         ..., description="project name", examples=["Temporal Distortion Simulator"]
     )
-    description: str = Field(
-        ...,
-        description="longer one-line description about the project",
-        examples=["Dabbling in temporal transitions ..."],
-    )
-    thumbnail: HttpUrl | None = Field(
-        ...,
-        description="url of the project thumbnail",
-        examples=["https://placeimg.com/171/96/tech/grayscale/?0.jpg"],
-    )
+    description: Annotated[
+        str,
+        BeforeValidator(none_to_empty_str_pre_validator),
+        Field(
+            ...,
+            description="longer one-line description about the project",
+            examples=["Dabbling in temporal transitions ..."],
+        ),
+    ]
+    thumbnail: Annotated[
+        HttpUrl | None,
+        BeforeValidator(empty_str_to_none_pre_validator),
+        Field(
+            ...,
+            description="url of the project thumbnail",
+            examples=["https://placeimg.com/171/96/tech/grayscale/?0.jpg"],
+        ),
+    ]
 
     creation_date: datetime = Field(...)
     last_change_date: datetime = Field(...)
 
-    # Pipeline of nodes (SEE projects_nodes.py)
-    workbench: Annotated[NodesDict, Field(..., description="Project's pipeline")]
-
-    # validators
-    _empty_thumbnail_is_none = field_validator("thumbnail", mode="before")(
-        empty_str_to_none_pre_validator
-    )
-
-    _none_description_is_empty = field_validator("description", mode="before")(
-        none_to_empty_str_pre_validator
-    )
-
 
 class ProjectAtDB(BaseProjectModel):
     # Model used to READ from database

packages/pytest-simcore/src/pytest_simcore/db_entries_mocks.py

@@ -83,8 +83,10 @@ async def creator(
             "prj_owner": user["id"],
             "access_rights": {"1": {"read": True, "write": True, "delete": True}},
             "thumbnail": "",
-            "workbench": {},
         }
+        workbench = {}
+        if "workbench" in project_overrides:
+            workbench.update(**project_overrides.pop("workbench"))
         project_config.update(**project_overrides)
         async with aiopg_engine.acquire() as con, con.begin():
             result = await con.execute(
@@ -96,14 +98,19 @@ async def creator(
             inserted_project = ProjectAtDB.model_validate(await result.first())
             project_nodes_repo = ProjectNodesRepo(project_uuid=project_uuid)
             # NOTE: currently no resources is passed until it becomes necessary
-            default_node_config = {"required_resources": {}, "key": faker.pystr(), "version": faker.pystr(), "label": faker.pystr()}
+            default_node_config = {
+                "required_resources": {},
+                "key": faker.pystr(),
+                "version": faker.pystr(),
+                "label": faker.pystr(),
+            }
             if project_nodes_overrides:
                 default_node_config.update(project_nodes_overrides)
             await project_nodes_repo.add(
                 con,
                 nodes=[
                     ProjectNodeCreate(node_id=NodeID(node_id), **default_node_config)
-                    for node_id in inserted_project.workbench
+                    for node_id in workbench
                 ],
             )
         print(f"--> created {inserted_project=}")