660 use groups to create subdirectories in nwd

tests/integration/test_project.py

@@ -1,3 +1,4 @@
+import json
 import pathlib
 
 import pytest
@@ -276,3 +277,45 @@ def test_build_groups(tmp_path_2):
 
     with pytest.raises(ValueError):
         project.run(nodes=[42])
+
+
+def test_groups_nwd(tmp_path_2):
+    with zntrack.Project(automatic_node_names=True) as project:
+        node_1 = WriteIO(inputs="Lorem Ipsum")
+        with project.group() as group_1:
+            node_2 = WriteIO(inputs="Dolor Sit")
+        with project.group(name="CustomGroup") as group_2:
+            node_3 = WriteIO(inputs="Adipiscing Elit")
+
+    project.build()
+
+    assert node_1.nwd == pathlib.Path("nodes", node_1.name)
+    assert node_2.nwd == pathlib.Path(
+        "nodes", group_1.name, node_2.name.replace(f"{group_1.name}_", "")
+    )
+    assert node_3.nwd == pathlib.Path(
+        "nodes", group_2.name, node_3.name.replace(f"{group_2.name}_", "")
+    )
+    # now load the Nodes and assert as well
+
+    assert zntrack.from_rev(node_1).nwd == pathlib.Path("nodes", node_1.name)
+    assert zntrack.from_rev(node_2).nwd == pathlib.Path(
+        "nodes", group_1.name, node_2.name.replace(f"{group_1.name}_", "")
+    )
+    assert zntrack.from_rev(node_3).nwd == pathlib.Path(
+        "nodes", group_2.name, node_3.name.replace(f"{group_2.name}_", "")
+    )
+
+    with open("zntrack.json") as f:
+        data = json.load(f)
+        data[node_1.name]["nwd"]["value"] = "test"
+        data[node_2.name].pop("nwd")
+
+    with open("zntrack.json", "w") as f:
+        json.dump(data, f)
+
+    assert zntrack.from_rev(node_1).nwd == pathlib.Path("test")
+    assert zntrack.from_rev(node_2).nwd == pathlib.Path("nodes", node_2.name)
+    assert zntrack.from_rev(node_3).nwd == pathlib.Path(
+        "nodes", group_2.name, node_3.name.replace(f"{group_2.name}_", "")
+    )

zntrack/core/node.py

@@ -162,7 +162,15 @@ def state(self) -> NodeStatus:
     @property
     def nwd(self) -> pathlib.Path:
         """Get the node working directory."""
-        nwd = pathlib.Path("nodes", znflow.get_attribute(self, "name"))
+        try:
+            nwd = self.__dict__["nwd"]
+        except KeyError:
+            try:
+                zntrack_config = json.loads(pathlib.Path("zntrack.json").read_text())
+                nwd = zntrack_config[znflow.get_attribute(self, "name")]["nwd"]
+                nwd = json.loads(json.dumps(nwd), cls=znjson.ZnDecoder)
+            except (FileNotFoundError, KeyError):
+                nwd = pathlib.Path("nodes", znflow.get_attribute(self, "name"))
         if not nwd.exists():
             nwd.mkdir(parents=True)
         return nwd
@@ -202,6 +210,13 @@ def save(
                     f"Field {attr} has no group. Please assign a group from"
                     f" '{FieldGroup.__module__}.{FieldGroup.__name__}'."
                 )
+        # save the nwd to zntrack.json
+        file_io.update_config_file(
+            file=pathlib.Path("zntrack.json"),
+            node_name=self.name,
+            value_name="nwd",
+            value=self.nwd,
+        )
 
     def run(self) -> None:
         """Run the node's code."""

zntrack/project/zntrack_project.py

@@ -157,6 +157,7 @@ def group(self, name: str = None):
             for node_uuid in self.graph.get_sorted_nodes():
                 node: Node = self.graph.nodes[node_uuid]["value"]
                 if node_uuid not in existing_nodes:
+                    node.__dict__["nwd"] = pathlib.Path("nodes", group.name, node.name)
                     node.name = f"{name}_{node.name}"
                     group.nodes.append(node)