runner - compacter cli layout

Author: pareronia

src/main/python/aoc/runner/listener.py

@@ -3,10 +3,11 @@
 import sys
 from abc import ABC
 from abc import abstractmethod
+from collections.abc import Iterable
+from collections.abc import Iterator
 from datetime import datetime
-from typing import Iterable
-from typing import Iterator
 from typing import NamedTuple
+from typing import cast
 
 from dateutil import tz
 from junitparser import Attr
@@ -214,43 +215,42 @@ def part_finished(
     ) -> None:
         if answer and correct:
             icon = colored("✅", "green")
-            string = f"{answer[:CLIListener.cutoff]}"
+            string = f"{answer[: CLIListener.cutoff]}"
         elif answer and not correct:
             if expected is None:
                 icon = colored("?", "magenta")
                 correction = "(correct answer unknown)"
             else:
                 icon = colored("❌", "red")
                 correction = f"(expected: {expected})"
-            string = f"{answer[:CLIListener.cutoff]} {correction}"
+            string = f"{answer[: CLIListener.cutoff]} {correction}"
         if time is not None:
             self.times.append(time)
         self._update_part(sum(self.times), part, string, icon)
 
     def stop(self) -> None:
         print()
         print(
-            "Total run time: {:8.4f}s\nTook: {:8.4f}s".format(
-                self.total_time / 1e9, self.total_walltime
-            )
+            f"Total run time: {self.total_time / 1e9:8.4f}s\n"
+            f"Took: {self.total_walltime:8.4f}s"
         )
 
     def _init_line(self, time: int) -> None:
         runtime = self._format_time(time, self.timeout)
-        self.line = "   ".join([runtime, self.progress])
+        self.line = f"{runtime}   {self.progress}"
 
     def _update_part(
         self, time: int, part: str, answer: str, icon: str
     ) -> None:
         if part == "a":
             self._init_line(time)
             answer = answer.ljust(30)
-            self.line_a = f"   {icon} part {part}: {answer}"
+            self.line_a = f"   {icon} {part}: {answer}"
             self.line += self.line_a
         else:
             self._init_line(time)
             self.line += self.line_a
-            self.line += f"   {icon} part {part}: {answer}"
+            self.line += f"   {icon} {part}: {answer}"
 
     def _format_time(self, time: int, timeout: float) -> str:
         t = time / 1e9
@@ -261,10 +261,10 @@ def _format_time(self, time: int, timeout: float) -> str:
         else:
             color = "red"
         if t < 0.001:
-            runtime = colored("{: 7.3f}ms".format(t * 1000), color)
+            runtime = colored(f"{t * 1000:7.3f}ms", color)
         else:
-            runtime = colored("{: 8.4f}s".format(t), color)
-        return runtime
+            runtime = colored("{t:8.4f}s", color)
+        return cast("str", runtime)
 
 
 class JUnitXmlListener(Listener):
@@ -298,7 +298,7 @@ def puzzle_finished(self, time: int, walltime: float) -> None:
         pass
 
     def puzzle_finished_with_error(
-        self, time: int, walltime: float, error: str
+        self, _time: int, walltime: float, error: str
     ) -> None:
         case = TestCase(
             name=f"{self.year}/{self.day:02}/{self.plugin}/{self.user_id}"
@@ -314,9 +314,9 @@ def puzzle_finished_with_error(
     def part_missing(self, time: int, part: str) -> None:
         pass
 
-    def part_skipped(self, time: int, part: str) -> None:
+    def part_skipped(self, _time: int, part: str) -> None:
         case = TestCase(
-            name=f"{self.year}/{self.day:02}/{part}/{self.plugin}/{self.user_id}"  # noqa E501
+            name=f"{self.year}/{self.day:02}/{part}/{self.plugin}/{self.user_id}"
         )
         case.year = self.year
         case.day = self.day
@@ -335,14 +335,15 @@ def part_finished(
         correct: bool,
     ) -> None:
         case = TestCase(
-            name=f"{self.year}/{self.day:02}/{part}/{self.plugin}/{self.user_id}"  # noqa E501
+            name=f"{self.year}/{self.day:02}/{part}/{self.plugin}/{self.user_id}"
         )
         case.year = self.year
         case.day = self.day
         case.part = part
         case.plugin = self.plugin
         case.user_id = self.user_id
-        case.time = time / 1e9
+        if time is not None:
+            case.time = time / 1e9
         if not correct:
             case.result = [Failure(f"Expected '{expected}', was: '{answer}'")]
         self.suite.add_testcase(case)
@@ -366,7 +367,7 @@ def __init__(self) -> None:
         self.part_runs = list[BenchmarkListener.PartRun]()
 
     def puzzle_started(
-        self, year: int, day: int, title: str, plugin: str, user_id: str
+        self, year: int, day: int, _title: str, plugin: str, user_id: str
     ) -> None:
         self.year = year
         self.day = day
@@ -397,9 +398,9 @@ def part_finished(
         self,
         time: int | None,
         part: str,
-        answer: str | None,
-        expected: str | None,
-        correct: bool,
+        _answer: str | None,
+        _expected: str | None,
+        _correct: bool,
     ) -> None:
         if time is None:
             return

src/main/python/aoc/runner/runner.py

@@ -1,5 +1,4 @@
-"""
-Copyright (c) 2016 wim glenn
+"""Copyright (c) 2016 wim glenn.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -28,12 +27,12 @@
 import time
 from argparse import ArgumentParser
 from collections import OrderedDict
+from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
 from datetime import datetime
 from pathlib import Path
 from typing import Any
-from typing import Callable
-from typing import Generator
 
 import pebble
 from dateutil.tz import gettz
@@ -190,7 +189,7 @@ def main() -> None:
 
     if "slowest" in args:
         print()
-        by_time = [_ for _ in bench.get_by_time()]
+        by_time = list(bench.get_by_time())
         by_time.reverse()
         for i in range(args.slowest):
             print(
@@ -203,7 +202,7 @@ def main() -> None:
 
 
 def run_with_timeout(
-    callable: Callable[[int, int, str], tuple[Result, Result]],
+    callable_: Callable[[int, int, str], tuple[Result, Result]],
     args: dict[str, Any],
     timeout: int,
     listener: Listener,
@@ -212,7 +211,7 @@ def run_with_timeout(
     elapsed = 0
     t0 = time.time_ns()
     future = pebble.concurrent.process(daemon=False, timeout=timeout)(
-        callable
+        callable_
     )(**args)
     while not future.done():
         listener.run_elapsed(elapsed)
@@ -222,7 +221,7 @@ def run_with_timeout(
     try:
         result_a, result_b = future.result()
     except Exception as err:
-        log.error(err)
+        log.exception("Exception in run_with_timeout")
         result_a = Result.ok("")
         result_b = Result.ok("")
         error = repr(err)
@@ -233,22 +232,22 @@ def run_with_timeout(
 
 
 @contextmanager
-def use_plugins(plugins: dict[str, Plugin]) -> Generator[None, None, None]:
-    for p in plugins:
-        plugins[p].start()
+def use_plugins(plugins: dict[str, Plugin]) -> Generator[None]:
+    for plugin in plugins.values():
+        plugin.start()
     try:
         yield
     finally:
-        for p in plugins:
-            plugins[p].stop()
+        for plugin in plugins.values():
+            plugin.stop()
 
 
 @contextmanager
 def scratch_file(
     name: str, year: int, day: int, input_data: str
-) -> Generator[None, None, None]:
-    prev = os.getcwd()
-    scratch = tempfile.mkdtemp(prefix=f"{year}-{day:02d}-")
+) -> Generator[None]:
+    prev = Path.cwd()
+    scratch = Path(tempfile.mkdtemp(prefix=f"{year}-{day:02d}-"))
     os.chdir(scratch)
     input_path = Path(name)
     assert not input_path.exists()
@@ -259,8 +258,8 @@ def scratch_file(
         input_path.unlink(missing_ok=True)
         os.chdir(prev)
         try:
-            os.rmdir(scratch)
-        except Exception as err:
+            scratch.rmdir()
+        except Exception as err:  # noqa:BLE001
             log.warning(
                 "failed to remove scratch %s (%s: %s)", scratch, type(err), err
             )
@@ -296,7 +295,7 @@ def run_for(
         else:
             with scratch_file(config.scratch_file, year, day, input_data):
                 result_a, result_b, walltime, error = run_with_timeout(
-                    callable=plugin[1].run,
+                    callable_=plugin[1].run,
                     args={"year": year, "day": day, "data": input_data},
                     timeout=timeout,
                     listener=listener,
@@ -309,7 +308,7 @@ def run_for(
             n_incorrect += 1
             listener.puzzle_finished_with_error(time, walltime, error)
         else:
-            for result, part in zip((result_a, result_b), "ab"):
+            for result, part in zip((result_a, result_b), "ab", strict=True):
                 if day == 25 and part == "b":
                     # there's no part b on christmas day, skip
                     continue