Merge remote-tracking branch 'origin/feature/v5' into feature/docs-improvement

# Conflicts:
#	CHANGELOG.md

Author: FBumann

CHANGELOG.md

@@ -53,6 +53,48 @@ Until here -->
 
 ## [Upcoming]
 
+### 🔥 Removed
+
+**Deprecated parameters removed** (all were deprecated in v4.0.0 or earlier):
+
+**TimeSeriesData:**
+- `agg_group` → use `aggregation_group`
+- `agg_weight` → use `aggregation_weight`
+- Properties: `agg_group`, `agg_weight`
+
+**Effect:**
+- Constructor parameters: `minimum_operation` → use `minimum_temporal`, `maximum_operation` → use `maximum_temporal`, `minimum_invest` → use `minimum_periodic`, `maximum_invest` → use `maximum_periodic`, `minimum_operation_per_hour` → use `minimum_per_hour`, `maximum_operation_per_hour` → use `maximum_per_hour`
+- Properties: `minimum_operation`, `maximum_operation`, `minimum_invest`, `maximum_invest`, `minimum_operation_per_hour`, `maximum_operation_per_hour`, `minimum_total_per_period`, `maximum_total_per_period`
+
+**Flow:**
+- Constructor parameters: `flow_hours_per_period_max` → use `flow_hours_max`, `flow_hours_per_period_min` → use `flow_hours_min`, `flow_hours_total_max` → use `flow_hours_max`, `flow_hours_total_min` → use `flow_hours_min`, `total_flow_hours_max` → use `flow_hours_max_over_periods`, `total_flow_hours_min` → use `flow_hours_min_over_periods`
+- Properties: `flow_hours_total_max`, `flow_hours_total_min`
+
+**InvestParameters:**
+- Constructor parameters: `fix_effects` → use `effects_of_investment`, `specific_effects` → use `effects_of_investment_per_size`, `divest_effects` → use `effects_of_retirement`, `piecewise_effects` → use `piecewise_effects_of_investment`, `optional` → use `mandatory` (with inverted logic)
+- Properties: `optional`, `fix_effects`, `specific_effects`, `divest_effects`, `piecewise_effects`
+
+**OnOffParameters:**
+- Constructor parameters: `on_hours_total_min` → use `on_hours_min`, `on_hours_total_max` → use `on_hours_max`, `switch_on_total_max` → use `switch_on_max`
+
+**Storage:**
+- `initial_charge_state="lastValueOfSim"` → use `initial_charge_state="equals_final"`
+
+**Source, Sink, SourceAndSink:**
+- Constructor parameters:
+  - Source: `source` → use `outputs`
+  - Sink: `sink` → use `inputs`
+  - SourceAndSink: `source` → use `outputs`, `sink` → use `inputs`, `prevent_simultaneous_sink_and_source` → use `prevent_simultaneous_flow_rates`
+- Properties:
+  - Source: `source` property
+  - Sink: `sink` property
+  - SourceAndSink: `source`, `sink`, `prevent_simultaneous_sink_and_source` properties
+
+**Linear Converters** (Boiler, CHP, HeatPump, etc.):
+- Flow parameters: `Q_fu` → use `fuel_flow`, `P_el` → use `electrical_flow`, `Q_th` → use `thermal_flow`, `Q_ab` → use `heat_source_flow`
+- Efficiency parameters: `eta` → use `thermal_efficiency`, `eta_th` → use `thermal_efficiency`, `eta_el` → use `electrical_efficiency`, `COP` → use `cop`
+
+
 ### 📝 Docs
 - Improve documentation from the ground up
 

bot-test.txt

@@ -5,14 +5,12 @@
 from __future__ import annotations
 
 import logging
-import warnings
 from typing import TYPE_CHECKING, Literal
 
 import numpy as np
 import xarray as xr
 
 from . import io as fx_io
-from .config import DEPRECATION_REMOVAL_VERSION
 from .core import PlausibilityError
 from .elements import Component, ComponentModel, Flow
 from .features import InvestmentModel, PiecewiseModel
@@ -404,14 +402,6 @@ def __init__(
             prevent_simultaneous_flows=[charging, discharging] if prevent_simultaneous_charge_and_discharge else None,
             meta_data=meta_data,
         )
-        if isinstance(initial_charge_state, str) and initial_charge_state == 'lastValueOfSim':
-            warnings.warn(
-                f'{initial_charge_state=} is deprecated. Use "equals_final" instead. '
-                f'Will be removed in v{DEPRECATION_REMOVAL_VERSION}.',
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            initial_charge_state = 'equals_final'
 
         self.charging = charging
         self.discharging = discharging
@@ -1102,22 +1092,7 @@ def __init__(
         outputs: list[Flow] | None = None,
         prevent_simultaneous_flow_rates: bool = True,
         meta_data: dict | None = None,
-        **kwargs,
     ):
-        # Handle deprecated parameters using centralized helper
-        outputs = self._handle_deprecated_kwarg(kwargs, 'source', 'outputs', outputs, transform=lambda x: [x])
-        inputs = self._handle_deprecated_kwarg(kwargs, 'sink', 'inputs', inputs, transform=lambda x: [x])
-        prevent_simultaneous_flow_rates = self._handle_deprecated_kwarg(
-            kwargs,
-            'prevent_simultaneous_sink_and_source',
-            'prevent_simultaneous_flow_rates',
-            prevent_simultaneous_flow_rates,
-            check_conflict=False,
-        )
-
-        # Validate any remaining unexpected kwargs
-        self._validate_kwargs(kwargs)
-
         super().__init__(
             label,
             inputs=inputs,
@@ -1127,36 +1102,6 @@ def __init__(
         )
         self.prevent_simultaneous_flow_rates = prevent_simultaneous_flow_rates
 
-    @property
-    def source(self) -> Flow:
-        warnings.warn(
-            'The source property is deprecated. Use the outputs property instead. '
-            f'Will be removed in v{DEPRECATION_REMOVAL_VERSION}.',
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.outputs[0]
-
-    @property
-    def sink(self) -> Flow:
-        warnings.warn(
-            'The sink property is deprecated. Use the inputs property instead. '
-            f'Will be removed in v{DEPRECATION_REMOVAL_VERSION}.',
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.inputs[0]
-
-    @property
-    def prevent_simultaneous_sink_and_source(self) -> bool:
-        warnings.warn(
-            'The prevent_simultaneous_sink_and_source property is deprecated. Use the prevent_simultaneous_flow_rates property instead. '
-            f'Will be removed in v{DEPRECATION_REMOVAL_VERSION}.',
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.prevent_simultaneous_flow_rates
-
 
 @register_class_for_io
 class Source(Component):
@@ -1240,14 +1185,7 @@ def __init__(
         outputs: list[Flow] | None = None,
         meta_data: dict | None = None,
         prevent_simultaneous_flow_rates: bool = False,
-        **kwargs,
     ):
-        # Handle deprecated parameter using centralized helper
-        outputs = self._handle_deprecated_kwarg(kwargs, 'source', 'outputs', outputs, transform=lambda x: [x])
-
-        # Validate any remaining unexpected kwargs
-        self._validate_kwargs(kwargs)
-
         self.prevent_simultaneous_flow_rates = prevent_simultaneous_flow_rates
         super().__init__(
             label,
@@ -1256,16 +1194,6 @@ def __init__(
             prevent_simultaneous_flows=outputs if prevent_simultaneous_flow_rates else None,
         )
 
-    @property
-    def source(self) -> Flow:
-        warnings.warn(
-            'The source property is deprecated. Use the outputs property instead. '
-            f'Will be removed in v{DEPRECATION_REMOVAL_VERSION}.',
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.outputs[0]
-
 
 @register_class_for_io
 class Sink(Component):
@@ -1350,29 +1278,16 @@ def __init__(
         inputs: list[Flow] | None = None,
         meta_data: dict | None = None,
         prevent_simultaneous_flow_rates: bool = False,
-        **kwargs,
     ):
         """Initialize a Sink (consumes flow from the system).
 
-        Supports legacy `sink=` keyword for backward compatibility (deprecated): if `sink` is provided
-        it is used as the single input flow and a DeprecationWarning is issued; specifying both
-        `inputs` and `sink` raises ValueError.
-
         Args:
             label: Unique element label.
             inputs: Input flows for the sink.
             meta_data: Arbitrary metadata attached to the element.
             prevent_simultaneous_flow_rates: If True, prevents simultaneous nonzero flow rates
                 across the element's inputs by wiring that restriction into the base Component setup.
-
-        Note:
-            The deprecated `sink` kwarg is accepted for compatibility but will be removed in future releases.
         """
-        # Handle deprecated parameter using centralized helper
-        inputs = self._handle_deprecated_kwarg(kwargs, 'sink', 'inputs', inputs, transform=lambda x: [x])
-
-        # Validate any remaining unexpected kwargs
-        self._validate_kwargs(kwargs)
 
         self.prevent_simultaneous_flow_rates = prevent_simultaneous_flow_rates
         super().__init__(
@@ -1381,13 +1296,3 @@ def __init__(
             meta_data=meta_data,
             prevent_simultaneous_flows=inputs if prevent_simultaneous_flow_rates else None,
         )
-
-    @property
-    def sink(self) -> Flow:
-        warnings.warn(
-            'The sink property is deprecated. Use the inputs property instead. '
-            f'Will be removed in v{DEPRECATION_REMOVAL_VERSION}.',
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.inputs[0]

flixopt/components.py

@@ -43,10 +43,6 @@ def __init__(
         *args: Any,
         clustering_group: str | None = None,
         clustering_weight: float | None = None,
-        aggregation_group: str | None = None,
-        aggregation_weight: float | None = None,
-        agg_group: str | None = None,
-        agg_weight: float | None = None,
         **kwargs: Any,
     ):
         """
@@ -56,48 +52,8 @@ def __init__(
                 clustering weight (1/n where n is the number of series in the group). Mutually exclusive with clustering_weight.
             clustering_weight: Clustering weight (0-1). Use this to assign a specific weight to a single time series.
                 Mutually exclusive with clustering_group.
-            aggregation_group: Deprecated, use clustering_group instead
-            aggregation_weight: Deprecated, use clustering_weight instead
-            agg_group: Deprecated, use clustering_group instead
-            agg_weight: Deprecated, use clustering_weight instead
             **kwargs: Additional arguments passed to DataArray
         """
-        # Handle deprecated parameters
-        if agg_group is not None:
-            warnings.warn(
-                f'agg_group is deprecated, use clustering_group instead. '
-                f'Will be removed in v{DEPRECATION_REMOVAL_VERSION}.',
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            clustering_group = agg_group
-        if aggregation_group is not None:
-            warnings.warn(
-                f'aggregation_group is deprecated, use clustering_group instead. '
-                f'Will be removed in v{DEPRECATION_REMOVAL_VERSION}.',
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            if clustering_group is None:
-                clustering_group = aggregation_group
-
-        if agg_weight is not None:
-            warnings.warn(
-                f'agg_weight is deprecated, use clustering_weight instead. '
-                f'Will be removed in v{DEPRECATION_REMOVAL_VERSION}.',
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            clustering_weight = agg_weight
-        if aggregation_weight is not None:
-            warnings.warn(
-                f'aggregation_weight is deprecated, use clustering_weight instead. '
-                f'Will be removed in v{DEPRECATION_REMOVAL_VERSION}.',
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            if clustering_weight is None:
-                clustering_weight = aggregation_weight
 
         if (clustering_group is not None) and (clustering_weight is not None):
             raise ValueError('Use either clustering_group or clustering_weight, not both')
@@ -198,48 +154,6 @@ def __repr__(self):
         info_str = f'TimeSeriesData({", ".join(clustering_info)})' if clustering_info else 'TimeSeriesData'
         return f'{info_str}\n{super().__repr__()}'
 
-    @property
-    def aggregation_group(self):
-        """Deprecated: Use clustering_group instead."""
-        warnings.warn(
-            f'aggregation_group is deprecated, use clustering_group instead. '
-            f'Will be removed in v{DEPRECATION_REMOVAL_VERSION}.',
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.clustering_group
-
-    @property
-    def aggregation_weight(self):
-        """Deprecated: Use clustering_weight instead."""
-        warnings.warn(
-            f'aggregation_weight is deprecated, use clustering_weight instead. '
-            f'Will be removed in v{DEPRECATION_REMOVAL_VERSION}.',
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.clustering_weight
-
-    @property
-    def agg_group(self):
-        warnings.warn(
-            f'agg_group is deprecated, use clustering_group instead. '
-            f'Will be removed in v{DEPRECATION_REMOVAL_VERSION}.',
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.clustering_group
-
-    @property
-    def agg_weight(self):
-        warnings.warn(
-            f'agg_weight is deprecated, use clustering_weight instead. '
-            f'Will be removed in v{DEPRECATION_REMOVAL_VERSION}.',
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.clustering_weight
-
 
 class DataConverter:
     """