fixes

Author: jan-janssen

src/executorlib/standalone/interactive/arguments.py

@@ -27,10 +27,14 @@ def find_future_in_list(lst):
 
     find_future_in_list(lst=args)
     find_future_in_list(lst=kwargs.values())
-    boolean_flag = len([future for future in future_lst if future.done()]) == len(
+
+    return future_lst
+
+
+def check_list_of_futures_is_done(future_lst: list[Future]) -> bool:
+    return len([future for future in future_lst if future.done()]) == len(
         future_lst
     )
-    return future_lst, boolean_flag
 
 
 def get_exception_lst(future_lst: list[Future]) -> list:

src/executorlib/task_scheduler/interactive/dependency.py

@@ -7,6 +7,7 @@
 from executorlib.standalone.batched import batched_futures
 from executorlib.standalone.interactive.arguments import (
     check_exception_was_raised,
+    check_list_of_futures_is_done,
     get_exception_lst,
     get_future_objects_from_input,
     update_futures_in_input,
@@ -185,6 +186,7 @@ def batched(
                         "args": (),
                         "kwargs": {"lst": iterable, "n": n, "skip_lst": skip_lst},
                         "future": f,
+                        "future_lst": iterable,
                         "future_skip": f_skip,
                         "resource_dict": {},
                     }
@@ -297,9 +299,10 @@ def _execute_tasks_with_dependencies(
             and task_dict["fn"] != "batched"
             and "future" in task_dict
         ):
-            future_lst, ready_flag = get_future_objects_from_input(
+            future_lst = get_future_objects_from_input(
                 args=task_dict["args"], kwargs=task_dict["kwargs"]
             )
+            ready_flag = check_list_of_futures_is_done(future_lst=future_lst)
             exception_lst = get_exception_lst(future_lst=future_lst)
             if not check_exception_was_raised(future_obj=task_dict["future"]):
                 if len(exception_lst) > 0:

tests/unit/standalone/interactive/test_arguments.py

@@ -3,6 +3,7 @@
 
 from executorlib.standalone.interactive.arguments import (
     check_exception_was_raised,
+    check_list_of_futures_is_done,
     get_exception_lst,
     get_future_objects_from_input,
     update_futures_in_input,
@@ -13,14 +14,16 @@ class TestSerial(unittest.TestCase):
     def test_get_future_objects_from_input_with_future(self):
         input_args = (1, 2, Future(), [Future()], {3: Future()})
         input_kwargs = {"a": 1, "b": [Future()], "c": {"d": Future()}, "e": Future()}
-        future_lst, boolean_flag = get_future_objects_from_input(args=input_args, kwargs=input_kwargs)
+        future_lst = get_future_objects_from_input(args=input_args, kwargs=input_kwargs)
+        boolean_flag = check_list_of_futures_is_done(future_lst=future_lst)
         self.assertEqual(len(future_lst), 6)
         self.assertFalse(boolean_flag)
 
     def test_get_future_objects_from_input_without_future(self):
         input_args = (1, 2)
         input_kwargs = {"a": 1}
-        future_lst, boolean_flag = get_future_objects_from_input(args=input_args, kwargs=input_kwargs)
+        future_lst = get_future_objects_from_input(args=input_args, kwargs=input_kwargs)
+        boolean_flag = check_list_of_futures_is_done(future_lst=future_lst)
         self.assertEqual(len(future_lst), 0)
         self.assertTrue(boolean_flag)