Use benchmark all for rateacuity

Author: MeadBarrel

tariff_fetch/_cli/rateacuity.py

@@ -31,7 +31,7 @@ def process_rateacuity(output_folder: Path, state: str, utility: Utility):
         with attempt, create_context() as context:
             with console.status("Fetching list of utilities..."):
                 scraping_state = (
-                    LoginState(context).login(username, password).electric().benchmark().select_state(state.upper())
+                    LoginState(context).login(username, password).electric().benchmark_all().select_state(state.upper())
                 )
                 utilities = [_ for _ in scraping_state.get_utilities() if _]
 

tariff_fetch/rateacuity/state.py

@@ -87,12 +87,7 @@ def electric(self) -> ElectricState:
         return ElectricState(self._context)
 
 
-class ElectricState(State):
-    def benchmark(self) -> ElectricBenchmarkStateDropdown:
-        """Switch the Electric report type to Benchmark and expose the state dropdown."""
-        self._select_report("benchmark")
-        return ElectricBenchmarkStateDropdown(self._context)
-
+class SelectReportState(State):
     def _select_report(self, report: str):
         """Click the given radio report selector if it is not already active."""
         radio = self._wait().until(
@@ -102,6 +97,17 @@ def _select_report(self, report: str):
             radio.click()
 
 
+class ElectricState(SelectReportState):
+    def benchmark(self) -> ElectricBenchmarkStateDropdown:
+        """Switch the Electric report type to Benchmark and expose the state dropdown."""
+        self._select_report("benchmark")
+        return ElectricBenchmarkStateDropdown(self._context)
+
+    def benchmark_all(self) -> ElectricBenchmarkAllStateDropdown:
+        self._select_report("benchall")
+        return ElectricBenchmarkAllStateDropdown(self._context)
+
+
 class DropdownState(State):
     """Shared behavior for dropdown-driven selections on the benchmark workflow."""
 
@@ -163,6 +169,10 @@ class ElectricBenchmarkAllScheduleDropdown(ElectricBenchmarkAllUtilityDropdown):
     def get_schedules(self) -> list[str]:
         return self._visible_options()
 
+    def select_schedule(self, schedule: str) -> ElectricBenchmarkAllReport:
+        """Select a schedule and produce a report interface that can fetch data."""
+        return self._select(schedule, category="Schedule", next_state=ElectricBenchmarkReport(self._context))
+
 
 class ElectricBenchmarkStateDropdown(DropdownState):
     element_id = "StateSelect"
@@ -246,6 +256,12 @@ def back_to_selections(self) -> ElectricBenchmarkScheduleDropdown:
         return self._back_to_selections(ElectricBenchmarkScheduleDropdown(self._context))
 
 
+class ElectricBenchmarkAllReport(ReportState):
+    def back_to_selections(self) -> ElectricBenchmarkAllScheduleDropdown:
+        """Return to the selections page so additional schedules can be fetched."""
+        return self._back_to_selections(ElectricBenchmarkAllScheduleDropdown(self._context))
+
+
 def _get_xlsx(folder) -> set[str]:
     """Return the set of .xlsx filenames currently present in the provided folder."""
     return {_ for _ in os.listdir(folder) if _.endswith(".xlsx")}