Update znflow (#535)

* update znflow

* bump version

* fix znflow imports

* fix zn.nodes(None)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ZnTrack"
-version = "0.6.0a1"
+version = "0.6.0a2"
 description = "Create, Run and Benchmark DVC Pipelines in Python"
 authors = ["zincwarecode <zincwarecode@gmail.com>"]
 license = "Apache-2.0"
@@ -10,15 +10,15 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4.0.0"
-dvc = "^2.47.0"
+dvc = "^2.50.0"
 pyyaml = "^6.0"
 tqdm = "^4.64.0"
 pandas = "^1.4.3"
 typer = "^0.7.0"
 
 dot4dict = "^0.1.1"
 zninit = "^0.1.9"
-znflow = "^0.1.3"
+znflow = "^0.1.4"
 znjson = "^0.2.2"
 
 

tests/integration/test_none_values.py

@@ -62,3 +62,15 @@ def test_from_dvc_deps(proj_path, eager):
         node.load()
 
     assert node.result == "Hello World"
+
+
+class EmptyNodesNode(zntrack.Node):
+    nodes = zntrack.zn.nodes(None)
+
+    def run(self):
+        pass
+
+
+def test_EmptyNode(proj_path):
+    with zntrack.Project() as project:
+        node = EmptyNodesNode()

tests/integration/test_zn_nodes2.py

@@ -26,7 +26,7 @@ class ExampleNodeLst(Node):
     outs = zn.outs()
 
     def run(self):
-        self.outs = sum([p.param1 for p in self.params])
+        self.outs = sum(p.param1 for p in self.params)
 
 
 @pytest.mark.parametrize("eager", [True, False])

tests/test_zntrack.py

@@ -4,4 +4,4 @@
 
 def test_version():
     """Test 'ZnTrack' version."""
-    assert __version__ == "0.6.0a1"
+    assert __version__ == "0.6.0a2"

zntrack/fields/zn/__init__.py

@@ -10,6 +10,7 @@
 import znflow.utils
 import zninit
 import znjson
+from znflow import handler
 
 from zntrack.fields.field import Field, FieldGroup, LazyField
 from zntrack.utils import LazyOption, module_handler, update_key_val
@@ -325,7 +326,7 @@ def get_data(self, instance: "Node") -> any:
         # Up until here we have connection objects. Now we need
         # to resolve them to Nodes. The Nodes, as in 'connection.instance'
         #  are already loaded by the ZnDecoder.
-        return znflow.graph._UpdateConnectors()(value)
+        return handler.UpdateConnectors()(value)
 
     def get_stage_add_argument(self, instance) -> typing.List[tuple]:
         """Get the dvc command for this field."""
@@ -355,6 +356,9 @@ class NodeField(Dependency):
 
     def __set__(self, instance, value):
         """Disbale the _graph_ in the value 'Node'."""
+        if value is None:
+            return super().__set__(instance, value)
+
         for entry in value if isinstance(value, (list, tuple)) else [value]:
             if hasattr(entry, "_graph_"):
                 entry._graph_ = None
@@ -375,7 +379,7 @@ def save(self, instance: "Node"):
             value = getattr(instance, self.name)
         except AttributeError:
             return
-        if value is LazyOption:
+        if value in [LazyOption, None]:
             return
         if not isinstance(value, (list, tuple)):
             value = [value]
@@ -386,8 +390,11 @@ def save(self, instance: "Node"):
 
     def get_optional_dvc_cmd(self, instance: "Node") -> typing.List[list]:
         """Get the dvc command for this field."""
-        names = self.get_node_names(instance)
         nodes = instance.__dict__[self.name]
+        if nodes is None:
+            return []
+
+        names = self.get_node_names(instance)
         if not isinstance(nodes, (list, tuple)):
             nodes = [nodes]
 

zntrack/project/zntrack_project.py

@@ -10,7 +10,7 @@
 import git
 import yaml
 import znflow
-from znflow.graph import _UpdateConnectors
+from znflow.handler import UpdateConnectors
 
 from zntrack.core.node import Node, get_dvc_cmd
 from zntrack.utils import capture_run_dvc_cmd, run_dvc_cmd
@@ -48,7 +48,7 @@ def run(
             if eager:
                 # update connectors
                 log.info(f"Running node {node}")
-                self._update_node_attributes(node, _UpdateConnectors())
+                self._update_node_attributes(node, UpdateConnectors())
                 node.run()
                 if save:
                     node.save()