diff --git a/evalharness/progress/rich_terminal.py b/evalharness/progress/rich_terminal.py index 174ddb9..12c704e 100644 --- a/evalharness/progress/rich_terminal.py +++ b/evalharness/progress/rich_terminal.py @@ -182,7 +182,7 @@ class RichTerminalProgress: description=f'[green]{self.bench_tag}{self.bench_name} ยท scoring[/green]', total=total, completed=min(done, total), new='', rate=f'{done / elapsed:.2f}', inflight=0, cur='0s', - elapsed=_fmt(elapsed), + elapsed=_fmt_eta(elapsed), eta=_fmt_eta((total - done) * elapsed / done) if done and total > done else '-') def set_bench_tag(self, tag: str): @@ -267,7 +267,7 @@ class RichTerminalProgress: new=self._new_txt(completed), rate=f"{fresh / elapsed:.2f}", inflight=self._inflight_txt(), cur='0s', - elapsed=_fmt(elapsed), + elapsed=_fmt_eta(elapsed), eta=_fmt_eta((task.total - completed) * elapsed / fresh) if fresh and task.total and task.total > completed else '-', ) @@ -279,8 +279,7 @@ class RichTerminalProgress: try: while self.task_id is not None: e = time.monotonic() - self.started - upd = {'elapsed': f'{int(e) // 60}m{int(e) % 60:02d}s' if e >= 60 - else f'{int(e)}s'} + upd = {'elapsed': _fmt_eta(e)} if self.inflight: secs = int(time.monotonic() - self.current_started) upd['cur'] = (f'{secs // 60}m{secs % 60:02d}s'