refactor: remove result from generator

Make it easier to reuse generator by not including unused parameter
equinor · Jun 13, 2024 · 9a2f9a9 · 9a2f9a9
1 parent c2d9dc9
commit 9a2f9a9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/src/libecalc/presentation/exporter/filters.py b/src/libecalc/presentation/exporter/filters.py
@@ -30,9 +30,7 @@ def filter(
         energy_calculator_result: GraphResult,
         time_vector: List[datetime],
     ) -> FilteredResult:
-        data_series_collection = [
-            generator.generate(energy_calculator_result, time_vector) for generator in self.generators
-        ]
+        data_series_collection = [generator.generate(time_vector) for generator in self.generators]
         query_result_collection = self.aggregator.aggregate(energy_calculator_result)
 
         return FilteredResult(

diff --git a/src/libecalc/presentation/exporter/generators.py b/src/libecalc/presentation/exporter/generators.py
@@ -2,16 +2,13 @@
 from datetime import datetime
 from typing import List
 
-from libecalc.application.graph_result import GraphResult
-from libecalc.dto.result import EcalcModelResult
 from libecalc.presentation.exporter.dto.dtos import DataSeries
 
 
 class Generator(abc.ABC):
     @abc.abstractmethod
     def generate(
         self,
-        energy_calculator_result: GraphResult,
         time_vector: List[datetime],
     ) -> DataSeries:
         pass
@@ -30,7 +27,6 @@ def __init__(
 
     def generate(
         self,
-        energy_calculator_result: EcalcModelResult,
         time_vector: List[datetime],
     ) -> DataSeries:
         return DataSeries(