DSPy: The framework for programming—not prompting—language models
Python
fix(dspy): track completed None results in ParallelExecutor (#10142)
Isaac Miller485ce445432a
diff --git a/dspy/utils/parallelizer.py b/dspy/utils/parallelizer.pyindex b94c18ca0..2f71c0f12 100644--- a/dspy/utils/parallelizer.py+++ b/dspy/utils/parallelizer.py@@ -15,6 +15,8 @@ from dspy.utils.callback_context import _bind_active_call_idlogger = logging.getLogger(__name__)+_UNSET = object()+class ParallelExecutor:def __init__(@@ -73,7 +75,7 @@ class ParallelExecutor:def _execute_sequential(self, function, data):"""Execute items sequentially on the main thread."""- results = [None] * len(data)+ results = [_UNSET] * len(data)pbar = tqdm.tqdm(total=len(data),@@ -101,10 +103,10 @@ class ParallelExecutor:logger.warning("Execution cancelled due to errors or interruption.")raise Exception("Execution cancelled due to errors or interruption.")- return results+ return [None if result is _UNSET else result for result in results]def _execute_parallel(self, function, data):- results = [None] * len(data)+ results = [_UNSET] * len(data)job_cancelled = "cancelled"# We resubmit at most once per item.@@ -175,7 +177,7 @@ class ParallelExecutor:)def all_done():- return all(r is not None for r in results)+ return all(result is not _UNSET for result in results)while futures_set and not self.cancel_jobs.is_set():if all_done():@@ -188,7 +190,7 @@ class ParallelExecutor:except Exception:passelse:- if outcome != job_cancelled and results[index] is None:+ if outcome != job_cancelled and results[index] is _UNSET:self._process_outcome(results, index, outcome)self._report_progress(pbar, results, len(data))@@ -227,7 +229,7 @@ class ParallelExecutor:logger.warning("Execution cancelled due to errors or interruption.")raise Exception("Execution cancelled due to errors or interruption.")- return results+ return [None if result is _UNSET else result for result in results]def _process_outcome(self, results, idx, outcome):"""Store a single outcome and track errors."""@@ -241,12 +243,12 @@ class ParallelExecutor:def _report_progress(self, pbar, results, total):"""Compute metrics and update the progress bar."""if self.compare_results:- vals = [r[-1] for r in results if r is not None]+ vals = [result[-1] for result in results if result is not _UNSET and result is not None]self._update_progress(pbar, sum(vals), len(vals))else:self._update_progress(pbar,- len([r for r in results if r is not None]),+ len([result for result in results if result is not _UNSET]),total,)diff --git a/tests/utils/test_parallelizer.py b/tests/utils/test_parallelizer.pyindex b83b5e4a2..6e86b5edb 100644--- a/tests/utils/test_parallelizer.py+++ b/tests/utils/test_parallelizer.py@@ -1,5 +1,6 @@import threadingimport time+from unittest import mockimport pytest@@ -182,3 +183,15 @@ def test_sequential_compare_results():results = executor.execute(task, data)assert results == [(1, False), (2, False), (3, True), (4, True), (5, True)]++[email protected]("num_threads", [1, 3])+def test_none_returning_tasks_are_counted_as_complete(num_threads):+ data = [1, 2, 3, 4, 5]+ executor = ParallelExecutor(num_threads=num_threads, disable_progress_bar=True)++ with mock.patch.object(executor, "_update_progress") as update_progress:+ results = executor.execute(lambda _: None, data)++ assert results == [None] * len(data)+ assert update_progress.call_args == mock.call(mock.ANY, len(data), len(data))