Define duplicate_dict as optional

Author: jan-janssen

src/executorlib/task_scheduler/file/shared.py

@@ -196,7 +196,7 @@ def execute_tasks_h5(
 
 
 def _check_task_output(
-    task_key: str, future_obj: Future, cache_directory: str, duplicate_dict: dict
+    task_key: str, future_obj: Future, cache_directory: str, duplicate_dict: Optional[dict] = None
 ) -> Future:
     """
     Check the output of a task and set the result of the future object if available.
@@ -218,7 +218,7 @@ def _check_task_output(
         future_obj.set_result(result)
     elif exec_flag:
         future_obj.set_exception(result)
-    if task_key in duplicate_dict:
+    if duplicate_dict is not None and task_key in duplicate_dict:
         for duplicate_future in duplicate_dict[task_key]:
             if exec_flag and no_error_flag:
                 duplicate_future.set_result(result)
@@ -295,7 +295,7 @@ def _refresh_memory_dict(
     memory_dict: dict,
     cache_dir_dict: dict,
     process_dict: dict,
-    duplicate_dict: dict,
+    duplicate_dict: Optional[dict] = None,
     terminate_function: Optional[Callable] = None,
     pysqa_config_directory: Optional[str] = None,
     backend: Optional[str] = None,
@@ -412,12 +412,12 @@ def _cancel_futures(future_dict: dict):
 
 
 def _shutdown_executor(
-    wait: bool,
-    cancel_futures: bool,
-    memory_dict: dict,
-    process_dict: dict,
-    duplicate_dict: dict,
-    cache_dir_dict: dict,
+    wait: bool = True,
+    cancel_futures: bool = False,
+    memory_dict: Optional[dict] = None,
+    process_dict: Optional[dict] = None,
+    cache_dir_dict: Optional[dict] = None,
+    duplicate_dict: Optional[dict] = None,
     terminate_function: Optional[Callable] = None,
     pysqa_config_directory: Optional[str] = None,
     backend: Optional[str] = None,

tests/unit/executor/test_api.py

@@ -213,7 +213,7 @@ def test_shutdown_executor_function(self):
             cancel_futures=True,
             memory_dict=memory_dict,
             process_dict={},
-            duplicate_dict={},
+            duplicate_dict=None,
             cache_dir_dict={"a": "cache_dir"},
             terminate_function=None,
             pysqa_config_directory=None,

tests/unit/task_scheduler/file/test_backend.py

@@ -50,7 +50,7 @@ def test_execute_function_mixed(self):
         backend_execute_task_in_file(file_name=file_name)
         future_obj = Future()
         _check_task_output(
-            task_key=task_key, future_obj=future_obj, cache_directory=cache_directory, duplicate_dict={},
+            task_key=task_key, future_obj=future_obj, cache_directory=cache_directory,
         )
         self.assertTrue(future_obj.done())
         self.assertEqual(future_obj.result(), 3)
@@ -101,7 +101,7 @@ def test_execute_function_mixed_selector_convert(self):
         backend_execute_task_in_file(file_name=file_name_1)
         f1 = Future()
         _check_task_output(
-            task_key=task_key_1, future_obj=f1, cache_directory=cache_directory, duplicate_dict={},
+            task_key=task_key_1, future_obj=f1, cache_directory=cache_directory,
         )
         task_key_2, data_dict = serialize_funct(
             fn=return_list,
@@ -113,7 +113,7 @@ def test_execute_function_mixed_selector_convert(self):
         backend_execute_task_in_file(file_name=file_name_2)
         f2 = Future()
         _check_task_output(
-            task_key=task_key_2, future_obj=f2, cache_directory=cache_directory, duplicate_dict={},
+            task_key=task_key_2, future_obj=f2, cache_directory=cache_directory,
         )
         fs1 = FutureSelector(future=f1, selector="a")
         fs2 = FutureSelector(future=f2, selector=1)
@@ -143,7 +143,7 @@ def test_execute_function_args(self):
         backend_execute_task_in_file(file_name=file_name)
         future_obj = Future()
         _check_task_output(
-            task_key=task_key, future_obj=future_obj, cache_directory=cache_directory, duplicate_dict={},
+            task_key=task_key, future_obj=future_obj, cache_directory=cache_directory,
         )
         self.assertTrue(future_obj.done())
         self.assertEqual(future_obj.result(), 3)
@@ -170,7 +170,7 @@ def test_execute_function_kwargs(self):
         backend_execute_task_in_file(file_name=file_name)
         future_obj = Future()
         _check_task_output(
-            task_key=task_key, future_obj=future_obj, cache_directory=cache_directory, duplicate_dict={},
+            task_key=task_key, future_obj=future_obj, cache_directory=cache_directory,
         )
         self.assertTrue(future_obj.done())
         self.assertEqual(future_obj.result(), 3)
@@ -198,7 +198,7 @@ def test_execute_function_error(self):
         backend_execute_task_in_file(file_name=file_name)
         future_obj = Future()
         _check_task_output(
-            task_key=task_key, future_obj=future_obj, cache_directory=cache_directory, duplicate_dict={},
+            task_key=task_key, future_obj=future_obj, cache_directory=cache_directory,
         )
         self.assertTrue(future_obj.done())
         with self.assertRaises(ValueError):