No running cache hit (#714)

* Add return hint

Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>

* Don't cache hit with running children

Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>

* Simplify slurm test

The parent workflows should fail to cache hit now anyway, since the child is running at the relevant times

Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>

---------

Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>

Author: liamhuber

pyiron_workflow/node.py

@@ -704,7 +704,7 @@ def run_data_tree(self, run_parent_trees_too=False) -> None:
                 c1.connect(c2)
 
     @property
-    def cache_hit(self):
+    def cache_hit(self) -> bool:
         try:
             return self.inputs.to_value_dict() == self._cached_inputs
         except Exception:

pyiron_workflow/nodes/composite.py

@@ -188,6 +188,10 @@ def use_cache(self, value: bool):
         for c in self.children.values():
             c.use_cache = value
 
+    @property
+    def cache_hit(self) -> bool:
+        return not any(c.running for c in self.children.values()) and super().cache_hit
+
     def _on_cache_miss(self) -> None:
         super()._on_cache_miss()
         # Reset provenance and run status trackers

tests/cluster/slurm_test.py

@@ -49,7 +49,6 @@ def submission():
     print("submitting")
     print(time.time())
     wf.n2.executor = (CacheSlurmClusterExecutor, (), {"resource_dict": resource_dict})
-    wf.n2.use_cache = False
     out = wf.run_in_thread()
     print("run return", out)
     state_check(wf, True, True)

tests/unit/nodes/test_composite.py

@@ -422,6 +422,14 @@ def test_cache(self):
             "setting it recursively on all children",
         )
 
+    def test_cache_hit(self):
+        self.comp.direct_child = Composite.create.function_node(plus_one)
+        self.assertFalse(self.comp.cache_hit, msg="Sanity check")
+        self.comp.run()
+        self.assertTrue(self.comp.cache_hit, msg="Cache hit should be set")
+        self.comp.direct_child.running = True  # fake it
+        self.assertFalse(self.comp.cache_hit, msg="If a child is running, cache miss")
+
     def test_push_child(self):
         self.comp.n1 = self.comp.create.function_node(plus_one)
         self.comp.n2 = self.comp.create.function_node(plus_one, x=self.comp.n1)