fix: clone test

Author: giancarloromeo

packages/pytest-simcore/src/pytest_simcore/helpers/storage_utils_project.py

@@ -2,12 +2,13 @@
 from copy import deepcopy
 from typing import Any
 
-from models_library.projects_nodes_io import NodeIDStr
+from models_library.projects_nodes_io import NodeID
 
 
 def clone_project_data(
-    project: dict,
-) -> tuple[dict[str, Any], dict[NodeIDStr, NodeIDStr]]:
+    project: dict[str, Any],
+    project_nodes: dict[NodeID, dict[str, Any]],
+) -> tuple[dict[str, Any], dict[NodeID, dict[str, Any]], dict[NodeID, NodeID]]:
     project_copy = deepcopy(project)
 
     # Update project id
@@ -17,28 +18,17 @@ def clone_project_data(
     project_copy.pop("id", None)
     project_copy["name"] = f"{project['name']}-copy"
 
-    # Workbench nodes shall be unique within the project context
-    def _create_new_node_uuid(old_uuid: NodeIDStr) -> NodeIDStr:
-        return NodeIDStr(uuidlib.uuid5(project_copy_uuid, old_uuid))
+    # Nodes shall be unique within the project context
+    def _new_node_uuid(old: NodeID) -> NodeID:
+        return uuidlib.uuid5(project_copy_uuid, f"{old}")
 
-    nodes_map = {}
-    for node_uuid in project.get("workbench", {}):
-        nodes_map[node_uuid] = _create_new_node_uuid(node_uuid)
+    nodes_map = {node_uuid: _new_node_uuid(node_uuid) for node_uuid in project_nodes}
+    project_nodes_copy = {
+        nodes_map[old_node_id]: {
+            **deepcopy(data),
+            "node_id": nodes_map[old_node_id],  # update the internal "node_id" field
+        }
+        for old_node_id, data in project_nodes.items()
+    }
 
-    def _replace_uuids(node):
-        if isinstance(node, str):
-            node = nodes_map.get(node, node)
-        elif isinstance(node, list):
-            node = [_replace_uuids(item) for item in node]
-        elif isinstance(node, dict):
-            _frozen_items = tuple(node.items())
-            for key, value in _frozen_items:
-                if key in nodes_map:
-                    new_key = nodes_map[key]
-                    node[new_key] = node.pop(key)
-                    key = new_key
-                node[key] = _replace_uuids(value)
-        return node
-
-    project_copy["workbench"] = _replace_uuids(project_copy.get("workbench", {}))
-    return project_copy, nodes_map
+    return project_copy, project_nodes_copy, nodes_map