fix: workbench nulls

Author: giancarloromeo

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

@@ -300,8 +300,6 @@ def _convert_from_enum(cls, v):
             # the old version of state was a enum of RunningState
             running_state_value = _convert_old_enum_name(v)
             return NodeState(current_status=running_state_value)
-        if v is None:
-            return NodeState(current_status=RunningState.NOT_STARTED)
         return v
 
     @staticmethod

packages/postgres-database/src/simcore_postgres_database/utils_projects_nodes.py

@@ -117,45 +117,46 @@ def model_dump_as_node(self) -> dict[str, Any]:
 
 
 def create_workbench_subquery(project_id: str) -> Subquery:
+    workbench_obj = sa.func.json_build_object(
+        "key",
+        projects_nodes.c.key,
+        "version",
+        projects_nodes.c.version,
+        "label",
+        projects_nodes.c.label,
+        "progress",
+        projects_nodes.c.progress,
+        "thumbnail",
+        projects_nodes.c.thumbnail,
+        "inputAccess",
+        projects_nodes.c.input_access,
+        "inputNodes",
+        projects_nodes.c.input_nodes,
+        "inputs",
+        projects_nodes.c.inputs,
+        "inputsRequired",
+        projects_nodes.c.inputs_required,
+        "inputsUnits",
+        projects_nodes.c.inputs_units,
+        "outputNodes",
+        projects_nodes.c.output_nodes,
+        "outputs",
+        projects_nodes.c.outputs,
+        "runHash",
+        projects_nodes.c.run_hash,
+        "state",
+        projects_nodes.c.state,
+        "parent",
+        projects_nodes.c.parent,
+        "bootOptions",
+        projects_nodes.c.boot_options,
+    )
+
     return (
         sa.select(
             projects_nodes.c.project_uuid,
             sa.func.json_object_agg(
-                projects_nodes.c.node_id,
-                sa.func.json_build_object(
-                    "key",
-                    projects_nodes.c.key,
-                    "version",
-                    projects_nodes.c.version,
-                    "label",
-                    projects_nodes.c.label,
-                    "progress",
-                    projects_nodes.c.progress,
-                    "thumbnail",
-                    projects_nodes.c.thumbnail,
-                    "inputAccess",
-                    projects_nodes.c.input_access,
-                    "inputNodes",
-                    projects_nodes.c.input_nodes,
-                    "inputs",
-                    projects_nodes.c.inputs,
-                    "inputsRequired",
-                    projects_nodes.c.inputs_required,
-                    "inputsUnits",
-                    projects_nodes.c.inputs_units,
-                    "outputNodes",
-                    projects_nodes.c.output_nodes,
-                    "outputs",
-                    projects_nodes.c.outputs,
-                    "runHash",
-                    projects_nodes.c.run_hash,
-                    "state",
-                    projects_nodes.c.state,
-                    "parent",
-                    projects_nodes.c.parent,
-                    "bootOptions",
-                    projects_nodes.c.boot_options,
-                ),
+                projects_nodes.c.node_id, sa.func.json_strip_nulls(workbench_obj)
             ).label("workbench"),
         )
         .select_from(