Refactor code for API (#3)

Co-authored-by: Mikael CAPELLE <mikael.capelle@thalesaleniaspace.com>
Co-authored-by: Mikaël Capelle <capelle.mikael@gmail.com>
Reviewed-on: #3

src/holt59/aoc/2015/day7.py

@@ -1,11 +1,7 @@
-import logging
 import operator
-import os
-import sys
-from typing import Callable
+from typing import Any, Callable, Iterator
 
-VERBOSE = os.getenv("AOC_VERBOSE") == "True"
-logging.basicConfig(level=logging.INFO if VERBOSE else logging.WARNING)
+from ..base import BaseSolver
 
 OPERATORS = {
     "AND": operator.and_,
@@ -36,48 +32,6 @@ def value_of(key: str) -> tuple[str, Callable[[dict[str, int]], int]]:
         return key, lambda values: values[key]
 
 
-lines = sys.stdin.read().splitlines()
-
-signals: Signals = {}
-values: dict[str, int] = {"": 0}
-
-for line in lines:
-    command, signal = line.split(" -> ")
-
-    if command.startswith("NOT"):
-        name = command.split(" ")[1]
-        signals[signal] = (
-            (name, ""),
-            (lambda values, _n=name: values[_n], lambda _v: 0),
-            lambda a, _b: ~a,
-        )
-
-    elif not any(command.find(name) >= 0 for name in OPERATORS):
-        try:
-            values[signal] = int(command)
-        except ValueError:
-            signals[signal] = (
-                (command, ""),
-                (lambda values, _c=command: values[_c], lambda _v: 0),
-                lambda a, _b: a,
-            )
-
-    else:
-        op: Callable[[int, int], int] = zero_op
-        lhs_s, rhs_s = "", ""
-
-        for name in OPERATORS:
-            if command.find(name) >= 0:
-                op = OPERATORS[name]
-                lhs_s, rhs_s = command.split(f" {name} ")
-                break
-
-        lhs_s, lhs_fn = value_of(lhs_s)
-        rhs_s, rhs_fn = value_of(rhs_s)
-
-        signals[signal] = ((lhs_s, rhs_s), (lhs_fn, rhs_fn), op)
-
-
 def process(
     signals: Signals,
     values: dict[str, int],
@@ -91,11 +45,52 @@ def process(
     return values
 
 
-values_1 = process(signals.copy(), values.copy())
-logging.info("\n" + "\n".join(f"{k}: {values_1[k]}" for k in sorted(values_1)))
-answer_1 = values_1["a"]
-print(f"answer 1 is {answer_1}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any] | None:
+        lines = input.splitlines()
 
-values_2 = process(signals.copy(), values | {"b": values_1["a"]})
-answer_2 = values_2["a"]
-print(f"answer 2 is {answer_2}")
+        signals: Signals = {}
+        values: dict[str, int] = {"": 0}
+
+        for line in lines:
+            command, signal = line.split(" -> ")
+
+            if command.startswith("NOT"):
+                name = command.split(" ")[1]
+                signals[signal] = (
+                    (name, ""),
+                    (lambda values, _n=name: values[_n], lambda _v: 0),
+                    lambda a, _b: ~a,
+                )
+
+            elif not any(command.find(name) >= 0 for name in OPERATORS):
+                try:
+                    values[signal] = int(command)
+                except ValueError:
+                    signals[signal] = (
+                        (command, ""),
+                        (lambda values, _c=command: values[_c], lambda _v: 0),
+                        lambda a, _b: a,
+                    )
+
+            else:
+                op: Callable[[int, int], int] = zero_op
+                lhs_s, rhs_s = "", ""
+
+                for name in OPERATORS:
+                    if command.find(name) >= 0:
+                        op = OPERATORS[name]
+                        lhs_s, rhs_s = command.split(f" {name} ")
+                        break
+
+                lhs_s, lhs_fn = value_of(lhs_s)
+                rhs_s, rhs_fn = value_of(rhs_s)
+
+                signals[signal] = ((lhs_s, rhs_s), (lhs_fn, rhs_fn), op)
+
+        values_1 = process(signals.copy(), values.copy())
+        for k in sorted(values_1):
+            self.logger.info(f"{k}: {values_1[k]}")
+        yield values_1["a"]
+
+        yield process(signals.copy(), values | {"b": values_1["a"]})["a"]