chore: remove none

Author: olelod

src/libecalc/common/list/list_utils.py

@@ -110,7 +110,7 @@ def elementwise_multiplication(*vectors: Sequence[float | None], periods: Period
 
 def array_to_list(
     result_array: NDArray[np.float64] | NDArray[np.bool_] | list[NDArray[np.float64]] | None,
-) -> list[float | None] | None:
+) -> list[float] | None:
     """Method to convert numpy arrays and list of numpy arrays into lists (or list of lists). Method is used recursively on lists so needs to handle None as well.
 
     Args:
@@ -130,7 +130,7 @@ def array_to_list(
     elif isinstance(result_array, np.ndarray):
         if result_array.shape == ():  # Handle 0D array (scalar)
             return [result_array.item()]
-        return cast(list[float | None], result_array.tolist())
+        return cast(list[float], result_array.tolist())
     else:
         # Unexpected type, log a warning and return an empty list)
         logger.warning(f"array_to_list received unexpected type: {type(result_array)}. Returning empty list.")

src/libecalc/core/result/results.py

@@ -173,10 +173,10 @@ def __init__(
         energy_usage: TimeSeriesStreamDayRate,
         power: TimeSeriesStreamDayRate | None,
         name: str,
-        inlet_liquid_rate_m3_per_day: list[float | None],
-        inlet_pressure_bar: list[float | None],
-        outlet_pressure_bar: list[float | None],
-        operational_head: list[float | None],
+        inlet_liquid_rate_m3_per_day: list[float],
+        inlet_pressure_bar: list[float],
+        outlet_pressure_bar: list[float],
+        operational_head: list[float],
     ):
         super().__init__(periods=periods, is_valid=is_valid, energy_usage=energy_usage, power=power)
         self.name = name
@@ -198,8 +198,8 @@ def __init__(
         energy_usage: TimeSeriesStreamDayRate,
         power: TimeSeriesStreamDayRate | None,
         name: str,
-        rate_sm3_day: list[float | None] | list[list[float | None]],
-        max_standard_rate: list[float | None] | list[list[float | None]] | None,
+        rate_sm3_day: list[float] | list[list[float]],
+        max_standard_rate: list[float] | list[list[float]] | None,
         stage_results: list[CompressorStageResult],
         failure_status: list[CompressorTrainCommonShaftFailureStatus | None],
         turbine_result: TurbineResult | None,

src/libecalc/domain/infrastructure/energy_components/legacy_consumer/system/results.py

@@ -27,7 +27,7 @@ def __init__(self, name: str, consumer_model_result: PumpModelResult | Compresso
         self.consumer_model_result = consumer_model_result
 
     @property
-    def energy_usage(self) -> list[float | None]:
+    def energy_usage(self) -> list[float]:
         return self.consumer_model_result.energy_usage
 
     @property
@@ -38,7 +38,7 @@ def power(self) -> NDArray:
             return np.zeros_like(self.consumer_model_result.energy_usage)
 
     @property
-    def rate(self) -> list[float | None]:
+    def rate(self) -> list[float]:
         return self.consumer_model_result.rate
 
 

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

@@ -139,7 +139,7 @@ def _calculate_remaining_capacity_in_train_given_standard_rate(
         result = self.compressor_model.evaluate()
         if result.power is None or len(result.power) == 0:
             return 0.0  # Return 0 if no power value available
-        return float(result.power[0]) - (max_power - POWER_CALCULATION_TOLERANCE)  # type: ignore[arg-type]
+        return float(result.power[0]) - (max_power - POWER_CALCULATION_TOLERANCE)
 
     def get_max_standard_rate(
         self, suction_pressures: NDArray[np.float64], discharge_pressures: NDArray[np.float64]

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

@@ -56,9 +56,9 @@ class EnergyFunctionResult(EnergyModelBaseResult):
 
     def __init__(
         self,
-        energy_usage: list[float | None],
+        energy_usage: list[float],
         energy_usage_unit: Unit,
-        power: list[float | None] | None = None,
+        power: list[float] | None = None,
         power_unit: Unit | None = Unit.MEGA_WATT,
         **kwargs,
     ):
@@ -73,7 +73,7 @@ def is_valid(self) -> list[bool]:
         """We assume that all non-NaN results are valid calculation points except for a few exceptions where we override
         this method.
         """
-        return list(~np.isnan(self.energy_usage))  # type: ignore[arg-type]
+        return list(~np.isnan(self.energy_usage))
 
     @property
     def len(self) -> int:

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

@@ -182,8 +182,8 @@ class CompressorTrainResult(EnergyFunctionResult):
 
     def __init__(
         self,
-        rate_sm3_day: Sequence[float | None] | list[list[float | None]],
-        max_standard_rate: Sequence[float | None] | list[list[float | None]] | None = None,
+        rate_sm3_day: Sequence[float | None] | list[list[float]],
+        max_standard_rate: Sequence[float | None] | list[list[float]] | None = None,
         inlet_stream_condition: CompressorStreamCondition = None,
         outlet_stream_condition: CompressorStreamCondition = None,
         stage_results: Sequence[CompressorStageResult] = None,
@@ -257,7 +257,7 @@ def log_lost_result_data(attr: str) -> None:
         return self
 
     @property
-    def rate(self) -> list[float | None]:
+    def rate(self) -> list[float]:
         return self.rate_sm3_day
 
     @property

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

@@ -4,8 +4,8 @@
 
 
 class PumpModelResult(EnergyFunctionResult):
-    rate: list[float | None]
-    suction_pressure: list[float | None]
-    discharge_pressure: list[float | None]
-    fluid_density: list[float | None]
-    operational_head: list[float | None]
+    rate: list[float]
+    suction_pressure: list[float]
+    discharge_pressure: list[float]
+    fluid_density: list[float]
+    operational_head: list[float]

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

@@ -7,11 +7,11 @@
 
 
 class TurbineResult(EnergyFunctionResult):
-    load: list[float | None]  # MW
-    efficiency: list[float | None]  # % Fraction between 0 and 1
-    fuel_rate: list[float | None]  # Sm3/day?
+    load: list[float]  # MW
+    efficiency: list[float]  # % Fraction between 0 and 1
+    fuel_rate: list[float]  # Sm3/day?
 
-    power: list[float | None]
+    power: list[float]
     power_unit: Unit
 
     exceeds_maximum_load: list[bool]

src/libecalc/domain/time_series_flow_rate.py

@@ -13,7 +13,7 @@ class TimeSeriesFlowRate(ABC):
     """
 
     @abstractmethod
-    def get_stream_day_values(self) -> list[float | None]:
+    def get_stream_day_values(self) -> list[float]:
         """
         Returns the evaluated flow rate values for each stream day.
         """

src/libecalc/domain/time_series_power.py

@@ -13,7 +13,7 @@ class TimeSeriesPower(ABC):
     """
 
     @abstractmethod
-    def get_stream_day_values(self) -> list[float | None]:
+    def get_stream_day_values(self) -> list[float]:
         """
         Returns the evaluated power values for each stream day.
         """