From 1edc096e213e0bcf450e4e1a425cef68cf9dbd21 Mon Sep 17 00:00:00 2001 From: ric-evans Date: Thu, 7 Nov 2024 16:20:51 -0600 Subject: [PATCH] add `"technique"` to `"predictions"` in reporter --- skymap_scanner/server/reporter.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/skymap_scanner/server/reporter.py b/skymap_scanner/server/reporter.py index c00ce2a5b..e7a72437c 100644 --- a/skymap_scanner/server/reporter.py +++ b/skymap_scanner/server/reporter.py @@ -183,11 +183,23 @@ def __init__(self) -> None: self._worker_stats_by_nside: Dict[int, WorkerStats] = {} self._aggregate: Optional[WorkerStats] = None + def get_runtime_prediction_technique(self) -> str: + """Get a human-readable string of what technique is used for predicting runtimes.""" + if self.runtime_sample_window_size < self._runtime_sample_window_size_candidate: + return f"simple average over entire scan runtime" + else: + return f"simple moving average (window={self.runtime_sample_window_size})" + + @property + def _runtime_sample_window_size_candidate(self) -> int: + """The window size that would be used if not for a minimum.""" + return int(self.total_ct * ENV.SKYSCAN_PROGRESS_RUNTIME_PREDICTION_WINDOW_RATIO) + @property def runtime_sample_window_size(self) -> int: """The size of the window used for predicting runtimes.""" return max( - int(self.total_ct * ENV.SKYSCAN_PROGRESS_RUNTIME_PREDICTION_WINDOW_RATIO), + self._runtime_sample_window_size_candidate, ENV.SKYSCAN_PROGRESS_RUNTIME_PREDICTION_WINDOW_MIN, ) @@ -554,7 +566,7 @@ def _get_processing_progress(self) -> StrDict: ), "total # of reconstructions": self.predicted_total_recos(), "end": str(dt.datetime.fromtimestamp(int(time.time() + time_left))), - "technique": f"simple moving average (window={self.worker_stats_collection.runtime_sample_window_size})", + "technique": self.worker_stats_collection.get_runtime_prediction_technique(), } return proc_stats