chore: remove none

Author: olelod

src/libecalc/common/list/list_utils.py

@@ -62,7 +62,7 @@ def group_data_by_value_at_index(index: int, row_based_data: list[list[Any]]) ->
     return chart_grouped_by_index
 
 
-def elementwise_sum(*vectors: Sequence[float | None], periods: Periods | None = None) -> NDArray[np.float64]:
+def elementwise_sum(*vectors: Sequence[float], periods: Periods | None = None) -> NDArray[np.float64]:
     """Sum up multiple vectors elementwise.
 
     E.g. if we provide three lists [1,20], [2,10], [1,30], the result will be [1+2+1,20+10+30] = [4,60]
@@ -81,11 +81,11 @@ def elementwise_sum(*vectors: Sequence[float | None], periods: Periods | None =
         result = np.full_like(vectors[0], fill_value=0.0, dtype=float64)
 
     for vector in vectors:
-        result = np.add(result, vector)  # type: ignore[arg-type]
+        result = np.add(result, vector)
     return result
 
 
-def elementwise_multiplication(*vectors: Sequence[float | None], periods: Periods | None = None) -> NDArray[np.float64]:
+def elementwise_multiplication(*vectors: Sequence[float], periods: Periods | None = None) -> NDArray[np.float64]:
     """Multiply multiple vectors elementwise.
 
     E.g. if we provide three lists [1,20], [2,10], [1,30], the result will be [1*2*1,20*10*30] = [2,6000]
@@ -104,7 +104,7 @@ def elementwise_multiplication(*vectors: Sequence[float | None], periods: Period
         result = np.full_like(vectors[0], fill_value=1.0, dtype=float64)
 
     for vector in vectors:
-        result = np.multiply(result, vector)  # type: ignore[arg-type]
+        result = np.multiply(result, vector)
     return result
 
 

src/libecalc/common/utils/rates.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
 
-import math
 from abc import ABC
 from collections import defaultdict
 from collections.abc import Iterable, Iterator
 from datetime import datetime
 from enum import Enum
-from typing import Any, Generic, Self, TypeVar, Union
+from typing import Generic, Self, TypeVar, Union
 
 import numpy as np
 import pandas as pd
@@ -462,27 +461,12 @@ def __mul__(self, other: object) -> Self:
         )
 
 
-class TimeSeriesFloat(TimeSeries[float]):
-    @field_validator("values", mode="before")
-    @classmethod
-    def convert_none_to_nan(cls, v: Any) -> list[TimeSeriesValue]:
-        if isinstance(v, list):
-            # convert None to nan
-            return [i if i is not None else math.nan for i in v]  # type: ignore[misc]
-        return v
+class TimeSeriesFloat(TimeSeries[float]): ...
 
 
 class TimeSeriesVolumesCumulative(TimeSeries[float]):
     """This will represent the sum of the volumes in all periods up to and including each individual period."""
 
-    @field_validator("values", mode="before")
-    @classmethod
-    def convert_none_to_nan(cls, v: Any) -> list[TimeSeriesValue]:
-        if isinstance(v, list):
-            # convert None to nan
-            return [i if i is not None else math.nan for i in v]  # type: ignore[misc]
-        return v
-
     def resample(
         self, freq: Frequency, include_start_date: bool = True, include_end_date: bool = True
     ) -> TimeSeriesVolumesCumulative:
@@ -573,14 +557,6 @@ def to_volumes(self) -> TimeSeriesVolumes:
 
 
 class TimeSeriesVolumes(TimeSeries[float]):
-    @field_validator("values", mode="before")
-    @classmethod
-    def convert_none_to_nan(cls, v: Any) -> list[TimeSeriesValue]:
-        if isinstance(v, list):
-            # convert None to nan
-            return [i if i is not None else math.nan for i in v]  # type: ignore[misc]
-        return v
-
     def resample(self, freq: Frequency, include_start_date: bool = True, include_end_date: bool = True):
         """
         Resample the time series of period volumes to a new frequency or set of periods.
@@ -729,14 +705,6 @@ class TimeSeriesRate(TimeSeries[float]):
     rate_type: RateType
     regularity: list[float]
 
-    @field_validator("values", "regularity", mode="before")
-    @classmethod
-    def convert_none_to_nan(cls, v: Any) -> list[TimeSeriesValue]:
-        if isinstance(v, list):
-            # convert None to nan
-            return [i if i is not None else math.nan for i in v]  # type: ignore[misc]
-        return v
-
     @field_validator("regularity")
     @classmethod
     def check_regularity_length(cls, regularity: list[float], info: ValidationInfo) -> list[float]:

src/libecalc/domain/process/core/results/compressor.py

@@ -47,15 +47,15 @@ class TargetPressureStatus(str, Enum):
 class CompressorStreamCondition(EnergyModelBaseResult):
     def __init__(
         self,
-        pressure: Sequence[float | None] | None = None,
-        actual_rate_m3_per_hr: Sequence[float | None] | None = None,
-        actual_rate_before_asv_m3_per_hr: Sequence[float | None] | None = None,
-        standard_rate_sm3_per_day: Sequence[float | None] | None = None,
-        standard_rate_before_asv_sm3_per_day: Sequence[float | None] | None = None,
-        density_kg_per_m3: Sequence[float | None] | None = None,
-        kappa: Sequence[float | None] | None = None,
-        z: Sequence[float | None] | None = None,
-        temperature_kelvin: Sequence[float | None] | None = None,
+        pressure: Sequence[float] | None = None,
+        actual_rate_m3_per_hr: Sequence[float] | None = None,
+        actual_rate_before_asv_m3_per_hr: Sequence[float] | None = None,
+        standard_rate_sm3_per_day: Sequence[float] | None = None,
+        standard_rate_before_asv_sm3_per_day: Sequence[float] | None = None,
+        density_kg_per_m3: Sequence[float] | None = None,
+        kappa: Sequence[float] | None = None,
+        z: Sequence[float] | None = None,
+        temperature_kelvin: Sequence[float] | None = None,
     ):
         super().__init__()
         self.pressure = pressure
@@ -87,20 +87,20 @@ def create_empty(cls, number_of_periods) -> CompressorStreamCondition:
 class CompressorStageResult(EnergyModelBaseResult):
     def __init__(
         self,
-        energy_usage: Sequence[float | None],
+        energy_usage: Sequence[float],
         energy_usage_unit: Unit,
-        power: Sequence[float | None] | None = None,
+        power: Sequence[float] | None = None,
         power_unit: Unit | None = None,
-        mass_rate_kg_per_hr: Sequence[float | None] | None = None,
-        mass_rate_before_asv_kg_per_hr: Sequence[float | None] | None = None,
+        mass_rate_kg_per_hr: Sequence[float] | None = None,
+        mass_rate_before_asv_kg_per_hr: Sequence[float] | None = None,
         inlet_stream_condition: CompressorStreamCondition = None,
         outlet_stream_condition: CompressorStreamCondition = None,
-        polytropic_enthalpy_change_kJ_per_kg: Sequence[float | None] | None = None,
-        polytropic_head_kJ_per_kg: Sequence[float | None] | None = None,
-        polytropic_efficiency: Sequence[float | None] | None = None,
-        polytropic_enthalpy_change_before_choke_kJ_per_kg: Sequence[float | None] | None = None,
-        speed: Sequence[float | None] | None = None,
-        asv_recirculation_loss_mw: Sequence[float | None] = None,
+        polytropic_enthalpy_change_kJ_per_kg: Sequence[float] | None = None,
+        polytropic_head_kJ_per_kg: Sequence[float] | None = None,
+        polytropic_efficiency: Sequence[float] | None = None,
+        polytropic_enthalpy_change_before_choke_kJ_per_kg: Sequence[float] | None = None,
+        speed: Sequence[float] | None = None,
+        asv_recirculation_loss_mw: Sequence[float] = None,
         fluid_composition: dict[str, float | None] = None,
         is_valid: Sequence[bool] = None,
         chart_area_flags: Sequence[str] = None,
@@ -182,8 +182,8 @@ class CompressorTrainResult(EnergyFunctionResult):
 
     def __init__(
         self,
-        rate_sm3_day: Sequence[float | None] | list[list[float]],
-        max_standard_rate: Sequence[float | None] | list[list[float]] | None = None,
+        rate_sm3_day: Sequence[float] | list[list[float]],
+        max_standard_rate: Sequence[float] | list[list[float]] | None = None,
         inlet_stream_condition: CompressorStreamCondition = None,
         outlet_stream_condition: CompressorStreamCondition = None,
         stage_results: Sequence[CompressorStageResult] = None,

tests/libecalc/common/utils/test_rates.py

@@ -298,24 +298,6 @@ def test_resample_missing_year(self):
 
 
 class TestTimeSeriesRate:
-    def test_none_value_timeseriesrate(self):
-        rate1 = TimeSeriesRate(
-            periods=Periods(
-                [
-                    Period(
-                        start=datetime(2023, 1, 1),
-                        end=datetime(2023, 6, 1),
-                    )
-                ]
-            ),
-            values=[10] * 1,
-            regularity=[None],
-            unit=Unit.STANDARD_CUBIC_METER_PER_DAY,
-            rate_type=RateType.STREAM_DAY,
-        )
-
-        assert np.isnan(rate1.regularity)
-
     def test_adding_timeseriesrate(self):
         rate1 = TimeSeriesRate(
             periods=Periods.create_periods(