flixopt 3.0.0__py3-none-any.whl → 3.0.1__py3-none-any.whl

flixopt/calculation.py

@@ -23,7 +23,7 @@ import yaml
 
 from . import io as fx_io
 from . import utils as utils
-from .aggregation import AggregationModel, AggregationParameters
+from .aggregation import Aggregation, AggregationModel, AggregationParameters
 from .components import Storage
 from .config import CONFIG
 from .core import DataConverter, Scalar, TimeSeriesData, drop_constant_arrays
@@ -286,7 +286,10 @@ class AggregatedCalculation(FullCalculation):
             This equalizes variables in the components according to the typical periods computed in the aggregation
         active_timesteps: DatetimeIndex of timesteps to use for calculation. If None, all timesteps are used
         folder: Folder where results should be saved. If None, current working directory is used
-        aggregation: contains the aggregation model
+
+    Attributes:
+        aggregation (Aggregation | None): Contains the clustered time series data
+        aggregation_model (AggregationModel | None): Contains Variables and Constraints that equalize clusters of the time series data
     """
 
     def __init__(
@@ -306,7 +309,8 @@ class AggregatedCalculation(FullCalculation):
         super().__init__(name, flow_system, active_timesteps, folder=folder)
         self.aggregation_parameters = aggregation_parameters
         self.components_to_clusterize = components_to_clusterize
-        self.aggregation = None
+        self.aggregation: Aggregation | None = None
+        self.aggregation_model: AggregationModel | None = None
 
     def do_modeling(self) -> AggregatedCalculation:
         t_start = timeit.default_timer()
@@ -317,10 +321,10 @@ class AggregatedCalculation(FullCalculation):
         self.model = self.flow_system.create_model(self.normalize_weights)
         self.model.do_modeling()
         # Add Aggregation Submodel after modeling the rest
-        self.aggregation = AggregationModel(
+        self.aggregation_model = AggregationModel(
             self.model, self.aggregation_parameters, self.flow_system, self.aggregation, self.components_to_clusterize
         )
-        self.aggregation.do_modeling()
+        self.aggregation_model.do_modeling()
         self.durations['modeling'] = round(timeit.default_timer() - t_start, 2)
         return self
 

flixopt/config.py

@@ -286,7 +286,7 @@ class CONFIG:
                 setattr(cls, key, value)
 
     @classmethod
-    def to_dict(cls):
+    def to_dict(cls) -> dict:
         """Convert the configuration class into a dictionary for JSON serialization.
 
         Returns:

flixopt/core.py

@@ -6,7 +6,7 @@ It provides Datatypes, logging functionality, and some functions to transform da
 import logging
 import warnings
 from itertools import permutations
-from typing import Literal, Union
+from typing import Any, Literal, Union
 
 import numpy as np
 import pandas as pd
@@ -46,12 +46,12 @@ class TimeSeriesData(xr.DataArray):
 
     def __init__(
         self,
-        *args,
+        *args: Any,
         aggregation_group: str | None = None,
         aggregation_weight: float | None = None,
         agg_group: str | None = None,
         agg_weight: float | None = None,
-        **kwargs,
+        **kwargs: Any,
     ):
         """
         Args:

flixopt/modeling.py

@@ -396,7 +396,7 @@ class BoundingPatterns:
         variable: linopy.Variable,
         bounds: tuple[TemporalData, TemporalData],
         name: str = None,
-    ):
+    ) -> list[linopy.constraints.Constraint]:
         """Create simple bounds.
         variable ∈ [lower_bound, upper_bound]
 
@@ -409,9 +409,7 @@ class BoundingPatterns:
             bounds: Tuple of (lower_bound, upper_bound) absolute bounds
 
         Returns:
-            Tuple containing:
-                - variables (Dict): Empty dict
-                - constraints (Dict[str, linopy.Constraint]): 'ub', 'lb'
+            List containing lower_bound and upper_bound constraints
         """
         if not isinstance(model, Submodel):
             raise ValueError('BoundingPatterns.basic_bounds() can only be used with a Submodel')

flixopt/results.py

@@ -1243,7 +1243,7 @@ class ComponentResults(_NodeResults):
 class EffectResults(_ElementResults):
     """Results for an Effect"""
 
-    def get_shares_from(self, element: str):
+    def get_shares_from(self, element: str) -> xr.Dataset:
         """Get effect shares from specific element.
 
         Args:
@@ -1399,7 +1399,7 @@ class SegmentedCalculationResults:
         )
 
     @classmethod
-    def from_file(cls, folder: str | pathlib.Path, name: str):
+    def from_file(cls, folder: str | pathlib.Path, name: str) -> SegmentedCalculationResults:
         """Load SegmentedCalculationResults from saved files.
 
         Args:

flixopt/utils.py

@@ -5,7 +5,7 @@ This module contains several utility functions used throughout the flixopt frame
 from __future__ import annotations
 
 import logging
-from typing import Literal
+from typing import Any, Literal
 
 import numpy as np
 import xarray as xr
@@ -13,7 +13,7 @@ import xarray as xr
 logger = logging.getLogger('flixopt')
 
 
-def round_nested_floats(obj, decimals=2):
+def round_nested_floats(obj: dict | list | float | int | Any, decimals: int = 2) -> dict | list | float | int | Any:
     """Recursively round floating point numbers in nested data structures.
 
     This function traverses nested data structures (dictionaries, lists) and rounds
@@ -27,9 +27,7 @@ def round_nested_floats(obj, decimals=2):
         decimals (int, optional): Number of decimal places to round to. Defaults to 2.
 
     Returns:
-        The processed object with the same structure as the input, but with all
-        floating point numbers rounded to the specified precision. NumPy arrays
-        and xarray DataArrays are converted to lists.
+        The processed object with the same structure as the input, but with all floating point numbers rounded to the specified precision. NumPy arrays and xarray DataArrays are converted to lists.
 
     Examples:
         >>> data = {'a': 3.14159, 'b': [1.234, 2.678]}

{flixopt-3.0.0.dist-info → flixopt-3.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flixopt
-Version: 3.0.0
+Version: 3.0.1
 Summary: Vector based energy and material flow optimization framework in Python.
 Author-email: "Chair of Building Energy Systems and Heat Supply, TU Dresden" <peter.stange@tu-dresden.de>, Felix Bumann <felixbumann387@gmail.com>, Felix Panitz <baumbude@googlemail.com>, Peter Stange <peter.stange@tu-dresden.de>
 Maintainer-email: Felix Bumann <felixbumann387@gmail.com>, Peter Stange <peter.stange@tu-dresden.de>
@@ -54,7 +54,7 @@ Provides-Extra: dev
 Requires-Dist: pytest==8.4.2; extra == "dev"
 Requires-Dist: pytest-xdist==3.8.0; extra == "dev"
 Requires-Dist: nbformat==5.10.4; extra == "dev"
-Requires-Dist: ruff==0.13.2; extra == "dev"
+Requires-Dist: ruff==0.13.3; extra == "dev"
 Requires-Dist: pre-commit==4.3.0; extra == "dev"
 Requires-Dist: pyvis==0.3.2; extra == "dev"
 Requires-Dist: tsam==2.3.9; extra == "dev"
@@ -66,7 +66,7 @@ Requires-Dist: dash-daq==0.6.0; extra == "dev"
 Requires-Dist: networkx==3.0.0; extra == "dev"
 Requires-Dist: werkzeug==3.0.0; extra == "dev"
 Provides-Extra: docs
-Requires-Dist: mkdocs-material==9.6.20; extra == "docs"
+Requires-Dist: mkdocs-material==9.6.21; extra == "docs"
 Requires-Dist: mkdocstrings-python==1.18.2; extra == "docs"
 Requires-Dist: mkdocs-table-reader-plugin==3.1.0; extra == "docs"
 Requires-Dist: mkdocs-gen-files==0.5.0; extra == "docs"

{flixopt-3.0.0.dist-info → flixopt-3.0.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 flixopt/__init__.py,sha256=8F0MKV9GAsFSP5OCZgn1dwzGD7-bZpsmVnTVe56ZcU8,2204
 flixopt/aggregation.py,sha256=P374vIJc1ZcPxxG8dfCPgUKNLRNP2kf8Y-sc1JOA45U,16191
-flixopt/calculation.py,sha256=KJFSjGB08Nq8hfW63_kfKLruXAkYibTCzaVy-LxmVR4,29371
+flixopt/calculation.py,sha256=jeJzTazlG-KJh4M5VMlEqF-_nwIdtVYN3Z94CfKG8yI,29661
 flixopt/commons.py,sha256=ZNlUN1z-h9OGHPo-s-n5OLlJaoPZKVGcAdRyGKpMk4M,1256
 flixopt/components.py,sha256=bm76uCaXkeLuDBfsJ1kjfaHOl8zmow2JTaNPCK4Jknc,57757
-flixopt/config.py,sha256=hbbwWInUDvnYDlxNidiXkGL5mSwqwLi6p3G9P1p7lkA,21992
-flixopt/core.py,sha256=1eWxpmaDfHfyDt2HgE2WfAzZZ_OsWGYmiOxFrvZVTx4,26351
+flixopt/config.py,sha256=kB-KyPKtmHoK1zwGp1HV8iJShVsjmi2d5SrGmL_uHxA,22000
+flixopt/core.py,sha256=OG789eUaS5Lu0CjJiMIdtaixqnV5ZtMiKfERjCPRTv8,26366
 flixopt/effects.py,sha256=iLVC4VdFTtZaF6B8BJiILRwe9ahj93og8JQSaAE_ocI,34063
 flixopt/elements.py,sha256=D4EkYZxqtyBhpTYf6C82pBRJf5fjyGXxZ8HMNiaHCuA,36156
 flixopt/features.py,sha256=kd-fMvADv8GXoKkrXObYjRJLN8toBG-5bOHTuh-59kk,25073
@@ -12,15 +12,15 @@ flixopt/flow_system.py,sha256=D84MIkX5oA_4H55p9mOC7tstV96V5RN2qPeJ2exX1ks,40242
 flixopt/interface.py,sha256=iLc2-_adqSeljlJrX6tao8IxBCQcksq4S7HQDw9L_OM,57503
 flixopt/io.py,sha256=2ZnpoU4gVnKfv-FiwoYEA11wlqbdUU8PXJiofRSKl5M,11795
 flixopt/linear_converters.py,sha256=tcz5c1SI36hRFbCX-4NXced12ss9VETg5BE7zOdyeo4,22699
-flixopt/modeling.py,sha256=7N24HRz6Jf1s2P9gMD4Ue_jBC0E7jr5o1qrI4Ik-UBQ,31365
+flixopt/modeling.py,sha256=s0zipbblq-LJrSe7angKT3Imxgr3kIbprG98HUvmkzI,31322
 flixopt/network_app.py,sha256=LnVAlAgzL1BgMYLsJ20a62j6nQUmNccF1zo4ACUXzL4,29433
 flixopt/plotting.py,sha256=lHeSwfSaQCGP2w54S8CzSa7sWwCxMcWci1EU1TYqLWM,60909
-flixopt/results.py,sha256=li0KIiSP3spPIJLAgGz22nK1zpwvxGm3Hh1rfblsGv4,77728
+flixopt/results.py,sha256=rgyYJTcgF1DOxYSvKM__BTfVU13o13DwSBjvA4o4gdM,77773
 flixopt/solvers.py,sha256=m38Smc22MJfHYMiqfNf1MA3OmvbTRm5OWS9nECkDdQk,2355
 flixopt/structure.py,sha256=ntLoj--zTnaZwNYKw-WkJTNxY0ef4zDp4S0iiSxyyxE,47707
-flixopt/utils.py,sha256=2c1vwRHMF-vu1oEX4UezGaEw09GiwbzOYZywCTWKOj8,2866
-flixopt-3.0.0.dist-info/licenses/LICENSE,sha256=HKsZnbrM_3Rvnr_u9cWSG90cBsj5_slaqI_z_qcxnGI,1118
-flixopt-3.0.0.dist-info/METADATA,sha256=bA5YAnexuB1Z81yd9JSq7HuQwMjyJSzA25msLQo0-lA,10776
-flixopt-3.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-flixopt-3.0.0.dist-info/top_level.txt,sha256=fanTzb9NylIXfv6Ic7spU97fVmRgGDPKvI_91tw4S3E,8
-flixopt-3.0.0.dist-info/RECORD,,
+flixopt/utils.py,sha256=CtCMBjvq31upz7i-_1nbPnSe-1CoRoOWlPkucwiSo5Q,2930
+flixopt-3.0.1.dist-info/licenses/LICENSE,sha256=HKsZnbrM_3Rvnr_u9cWSG90cBsj5_slaqI_z_qcxnGI,1118
+flixopt-3.0.1.dist-info/METADATA,sha256=TJLBIM5v232UVDWCn5Mrq0-HAfjTW0OBUNC8KbQQIPY,10776
+flixopt-3.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+flixopt-3.0.1.dist-info/top_level.txt,sha256=fanTzb9NylIXfv6Ic7spU97fVmRgGDPKvI_91tw4S3E,8
+flixopt-3.0.1.dist-info/RECORD,,