refactor: remove frequency from YamlModel

Author: jsolaas

src/ecalc_cli/commands/run.py

@@ -124,7 +124,6 @@ def run(
         model = YamlModel(
             configuration=configuration,
             resource_service=resource_service,
-            output_frequency=frequency,  # ignore IDE warning due to "instantioation" of an Enum that it doesn't understand type wise
         ).validate_for_run()
 
         if (flow_diagram or ltp_export) and (model.start is None or model.end is None):

src/ecalc_cli/io/output.py

@@ -8,7 +8,7 @@
 from ecalc_cli.emission_intensity import EmissionIntensityResults
 from ecalc_cli.errors import EcalcCLIError
 from libecalc.common.run_info import RunInfo
-from libecalc.common.time_utils import Period, resample_periods
+from libecalc.common.time_utils import Period
 from libecalc.domain.energy import EnergyModel
 from libecalc.infrastructure.file_utils import OutputFormat, dataframe_to_csv, get_result_output
 from libecalc.presentation.exporter.configs.configs import LTPConfig, ResultConfig, STPConfig
@@ -149,10 +149,8 @@ def export_tsv(
     Returns:
 
     """
-    resampled_periods = resample_periods(model.variables.periods, frequency)
-
     prognosis_filter = config.filter(frequency=frequency)
-    result = prognosis_filter.filter(ExportableYamlModel(model), resampled_periods)
+    result = prognosis_filter.filter(ExportableYamlModel(model))
 
     row_based_data: dict[str, list[str]] = CSVFormatter(
         separation_character="\t", index_formatters=PeriodFormatterConfig.get_row_index_formatters()

src/libecalc/fixtures/case_types.py

@@ -4,7 +4,6 @@
 from typing import TextIO
 
 from ecalc_cli.infrastructure.file_resource_service import FileResourceService
-from libecalc.common.time_utils import Frequency
 from libecalc.presentation.yaml.file_configuration_service import FileConfigurationService
 from libecalc.presentation.yaml.model import YamlModel
 from libecalc.presentation.yaml.yaml_entities import MemoryResource
@@ -21,12 +20,11 @@ def main_file(self) -> TextIO:
             lines = f.read()
             return io.StringIO(lines)
 
-    def get_yaml_model(self, frequency: Frequency = Frequency.NONE) -> YamlModel:
+    def get_yaml_model(self) -> YamlModel:
         configuration_service = FileConfigurationService(self.main_file_path)
         configuration = configuration_service.get_configuration()
         resource_service = FileResourceService(self.main_file_path.parent, configuration=configuration)
         return YamlModel(
             configuration=configuration,
             resource_service=resource_service,
-            output_frequency=frequency,
         )

src/libecalc/presentation/exporter/dto/dtos.py

@@ -1,5 +1,5 @@
 from collections.abc import Iterator
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 
 from libecalc.common.time_utils import Period, Periods
 from libecalc.common.units import Unit
@@ -53,7 +53,18 @@ class GroupedQueryResult:
 @dataclass
 class FormattableGroupedQuery(Formattable):
     query_results: list[QueryResult]
-    periods: Periods
+    periods: Periods = field(init=False)
+
+    def __post_init__(self):
+        len_results = len(self.query_results)
+        if len_results >= 1:
+            periods: set[Period] = set(self.query_results[0].values.keys())
+            if len_results > 1:
+                for result in self.query_results[1:]:
+                    assert periods == set(result.values.keys()), "Periods for all query results should match"
+        else:
+            periods = set()
+        self.periods = Periods(periods=sorted(periods))
 
     @property
     def row_ids(self) -> list[RowIndex]:
@@ -80,15 +91,13 @@ def get_value(self, row_id: RowIndex, column_id: ColumnIndex) -> int | float:
 @dataclass
 class FilteredResult(FormattableGroup):
     query_results: list[GroupedQueryResult]
-    periods: Periods
 
     @property
     def groups(self) -> Iterator[tuple[str, Formattable]]:
         return (
             (
                 group.group_name,
                 FormattableGroupedQuery(
-                    periods=self.periods,
                     query_results=group.query_results,
                 ),
             )

src/libecalc/presentation/exporter/filters.py

@@ -1,6 +1,5 @@
 from dataclasses import dataclass
 
-from libecalc.common.time_utils import Periods
 from libecalc.presentation.exporter.aggregators import Aggregator
 from libecalc.presentation.exporter.domain.exportable import ExportableSet
 from libecalc.presentation.exporter.dto.dtos import FilteredResult
@@ -21,8 +20,6 @@ class Filter:
     def filter(
         self,
         energy_calculator_result: ExportableSet,
-        periods: Periods,
     ) -> FilteredResult:
         query_result_collection = self.aggregator.aggregate(energy_calculator_result)
-
-        return FilteredResult(query_results=query_result_collection, periods=periods)
+        return FilteredResult(query_results=query_result_collection)

src/libecalc/presentation/yaml/model.py

@@ -6,7 +6,7 @@
 from typing import Any, Self
 
 from libecalc.common.component_type import ComponentType
-from libecalc.common.time_utils import Frequency, Period, Periods
+from libecalc.common.time_utils import Period, Periods
 from libecalc.common.units import Unit
 from libecalc.common.utils.rates import TimeSeriesBoolean, TimeSeriesFloat, TimeSeriesInt, TimeSeriesStreamDayRate
 from libecalc.common.variables import ExpressionEvaluator, VariablesMap
@@ -34,7 +34,6 @@
 )
 from libecalc.domain.process.pump.pump import PumpModel
 from libecalc.domain.regularity import Regularity
-from libecalc.dto import ResultOptions
 from libecalc.dto.node_info import NodeInfo
 from libecalc.presentation.yaml.domain.category_service import CategoryService
 from libecalc.presentation.yaml.domain.default_process_service import DefaultProcessService
@@ -124,9 +123,7 @@ def __init__(
         self,
         configuration: YamlValidator,
         resource_service: ResourceService,
-        output_frequency: Frequency,
     ) -> None:
-        self._output_frequency = output_frequency
         self._configuration = configuration
         self._resource_service = resource_service
 
@@ -272,14 +269,6 @@ def variables(self) -> VariablesMap:
         assert self._variables is not None
         return self._variables
 
-    @property
-    def result_options(self) -> ResultOptions:
-        return ResultOptions(
-            start=self._configuration.start,
-            end=self._configuration.end,
-            output_frequency=self._output_frequency,
-        )
-
     def _get_token_references(self, time_series_references: list[str]) -> list[str]:
         token_references = time_series_references
         for reference in self._configuration.variables:

tests/conftest.py

@@ -12,7 +12,7 @@
 from ecalc_neqsim_wrapper import NeqsimService
 from ecalc_neqsim_wrapper.java_service import NeqsimPy4JService
 from libecalc.common.math.numbers import Numbers
-from libecalc.common.time_utils import Frequency, Period, Periods
+from libecalc.common.time_utils import Period, Periods
 from libecalc.common.utils.rates import RateType
 from libecalc.common.variables import ExpressionEvaluator, VariablesMap
 from libecalc.domain.process.value_objects.fluid_stream.fluid_model import EoSModel, FluidComposition, FluidModel
@@ -410,15 +410,13 @@ def yaml_model_factory(configuration_service_factory, resource_service_factory):
     def create_yaml_model(
         configuration: ResourceStream | YamlValidator,
         resources: dict[str, MemoryResource],
-        frequency: Frequency = Frequency.NONE,
     ) -> YamlModel:
         if isinstance(configuration, ResourceStream):
             configuration = configuration_service_factory(configuration).get_configuration()
 
         return YamlModel(
             configuration=configuration,
             resource_service=resource_service_factory(resources, configuration),
-            output_frequency=frequency,
         )
 
     return create_yaml_model

tests/libecalc/dto/test_fuel_consumer.py

@@ -6,7 +6,6 @@
 from inline_snapshot import snapshot
 
 import libecalc
-from libecalc.common.time_utils import Frequency
 from libecalc.dto.emission import Emission
 from libecalc.dto.types import FuelTypeUserDefinedCategoryType
 from libecalc.expression import Expression
@@ -99,7 +98,7 @@ def test_no_fuel_installation_and_blank_reference_consumer(self, yaml_model_fact
         asset_stream = fuel_consumer_helper.get_stream(installation_fuel=None, consumer_fuel="")
 
         with pytest.raises(ModelValidationException) as exc_info:
-            yaml_model_factory(configuration=asset_stream, resources={}, frequency=Frequency.YEAR).validate_for_run()
+            yaml_model_factory(configuration=asset_stream, resources={}).validate_for_run()
 
         assert str(exc_info.value) == snapshot("""\
 Validation error

tests/libecalc/dto/test_generator_set.py

@@ -8,7 +8,7 @@
 import libecalc.dto.fuel_type
 from libecalc.common.component_type import ComponentType
 from libecalc.common.temporal_model import TemporalModel
-from libecalc.common.time_utils import Frequency, Period
+from libecalc.common.time_utils import Period
 from libecalc.domain.component_validation_error import (
     GeneratorSetHeaderValidationException,
 )
@@ -241,7 +241,7 @@ def test_missing_installation_fuel(self, yaml_model_factory, generator_set_helpe
 
         with pytest.raises(ModelValidationException) as exc_info:
             yaml_model_factory(
-                configuration=asset_data.resource_stream, resources=asset_data.resources, frequency=Frequency.YEAR
+                configuration=asset_data.resource_stream, resources=asset_data.resources
             ).validate_for_run()
 
         assert str(exc_info.value) == snapshot("""\

tests/libecalc/input/test_yaml_configuration.py

@@ -3,7 +3,6 @@
 import pytest
 from inline_snapshot import snapshot
 
-from libecalc.common.time_utils import Frequency
 from libecalc.presentation.yaml.model import YamlModel
 from libecalc.presentation.yaml.model_validation_exception import ModelValidationException
 from libecalc.presentation.yaml.yaml_models.pyyaml_yaml_model import PyYamlYamlModel
@@ -29,7 +28,6 @@ def test_invalid_timeseries_type(
         model = YamlModel(
             configuration=configuration,
             resource_service=resource_service_factory({}, configuration=configuration),
-            output_frequency=Frequency.NONE,
         )
 
         with pytest.raises(ModelValidationException) as exc_info: