this might break

Author: sanderegg

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

@@ -171,7 +171,9 @@ class NodeState(BaseModel):
         ),
     ] = 0
 
-    lock_state: Annotated[NodeShareState, Field(description="the node's lock state")]
+    lock_state: Annotated[
+        NodeShareState | None, Field(description="the node's lock state")
+    ]
 
     model_config = ConfigDict(
         extra="forbid",
@@ -329,8 +331,8 @@ class Node(BaseModel):
 
     state: Annotated[
         NodeState | None,
-        Field(default_factory=NodeState, description="The node's state object"),
-    ] = DEFAULT_FACTORY
+        Field(description="The node's state object"),
+    ] = None
 
     boot_options: Annotated[
         dict[EnvVarKey, str] | None,
@@ -357,7 +359,7 @@ def _convert_from_enum(cls, v):
         if isinstance(v, str):
             # 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)
+            return NodeState(current_status=running_state_value, lock_state=None)
         return v
 
     @staticmethod

services/director-v2/src/simcore_service_director_v2/utils/dags.py

@@ -256,6 +256,7 @@ async def compute_pipeline_details(
                     and node_id_to_comp_task[node_id].progress is not None
                     else None
                 ),
+                lock_state=None,
             )
             for node_id, node_data in complete_dag.nodes.data()
             if node_data["node_class"] is NodeClass.COMPUTATIONAL

services/director-v2/tests/integration/01/test_computation_api.py

@@ -433,6 +433,7 @@ def _convert_to_pipeline_details(
                 },
                 currentStatus=s.get("currentStatus", RunningState.NOT_STARTED),
                 progress=s.get("progress"),
+                lock_state=None,
             )
             for n, s in exp_node_states.items()
         }

services/director-v2/tests/unit/test_utils_dags.py

@@ -489,7 +489,7 @@ def pipeline_test_params(
                 adjacency_list={f"node_{x}": [] for x in range(_MANY_NODES)},
                 progress=1.0,
                 node_states={
-                    f"node_{x}": NodeState(modified=True, progress=1)
+                    f"node_{x}": NodeState(modified=True, progress=1, lock_state=None)
                     for x in range(_MANY_NODES)
                 },
             ),
@@ -568,9 +568,9 @@ def pipeline_test_params(
                 },
                 progress=0.3333333333333333,
                 node_states={
-                    "node_1": NodeState(modified=True, progress=None),
-                    "node_2": NodeState(modified=True, progress=None),
-                    "node_3": NodeState(modified=True, progress=1),
+                    "node_1": NodeState(modified=True, progress=None, lock_state=None),
+                    "node_2": NodeState(modified=True, progress=None, lock_state=None),
+                    "node_3": NodeState(modified=True, progress=1, lock_state=None),
                 },
             ),
             id="proper dag",
@@ -653,12 +653,13 @@ async def test_compute_pipeline_details(
                 },
                 progress=0.0,
                 node_states={
-                    "node_1": NodeState(modified=True, progress=None),
-                    "node_2": NodeState(modified=True, progress=None),
+                    "node_1": NodeState(modified=True, progress=None, lock_state=None),
+                    "node_2": NodeState(modified=True, progress=None, lock_state=None),
                     "node_3": NodeState(
                         modified=True,
                         progress=None,
                         current_status=RunningState.UNKNOWN,
+                        lock_state=None,
                     ),
                 },
             ),

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_api_route_computations.py

@@ -953,6 +953,7 @@ async def test_get_computation_from_not_started_computation_task(
                         for node, next_nodes in fake_workbench_adjacency.items()
                         if f"{t.node_id}" in next_nodes
                     },
+                    lock_state=None,
                 )
                 for t in comp_tasks
                 if t.node_class == NodeClass.COMPUTATIONAL
@@ -1025,6 +1026,7 @@ async def test_get_computation_from_published_computation_task(
                         if f"{t.node_id}" in next_nodes
                     },
                     progress=0,
+                    lock_state=None,
                 )
                 for t in comp_tasks
                 if t.node_class == NodeClass.COMPUTATIONAL