flixopt 3.1.0__py3-none-any.whl → 3.2.0__py3-none-any.whl

flixopt/structure.py

@@ -6,7 +6,6 @@ These classes are not directly used by the end user, but are used by other modul
 from __future__ import annotations
 
 import inspect
-import json
 import logging
 from dataclasses import dataclass
 from io import StringIO
@@ -788,8 +787,7 @@ class Interface:
         try:
             # Use the stats mode for JSON export (cleaner output)
             data = self.get_structure(clean=True, stats=True)
-            with open(path, 'w', encoding='utf-8') as f:
-                json.dump(data, f, indent=4, ensure_ascii=False)
+            fx_io.save_json(data, path)
         except Exception as e:
             raise OSError(f'Failed to save {self.__class__.__name__} to JSON file {path}: {e}') from e
 
@@ -880,13 +878,10 @@ class Element(Interface):
 
     @staticmethod
     def _valid_label(label: str) -> str:
-        """
-        Checks if the label is valid. If not, it is replaced by the default label
+        """Checks if the label is valid. If not, it is replaced by the default label.
 
-        Raises
-        ------
-        ValueError
-            If the label is not valid
+        Raises:
+            ValueError: If the label is not valid.
         """
         not_allowed = ['(', ')', '|', '->', '\\', '-slash-']  # \\ is needed to check for \
         if any([sign in label for sign in not_allowed]):

{flixopt-3.1.0.dist-info → flixopt-3.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flixopt
-Version: 3.1.0
+Version: 3.2.0
 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>
@@ -24,7 +24,7 @@ Requires-Dist: numpy<3,>=1.21.5
 Requires-Dist: pandas<3,>=2.0.0
 Requires-Dist: xarray<2026.0,>=2024.2.0
 Requires-Dist: linopy<0.6,>=0.5.1
-Requires-Dist: h5netcdf<2,>=1.0.0
+Requires-Dist: netcdf4<2,>=1.6.1
 Requires-Dist: pyyaml<7,>=6.0.0
 Requires-Dist: rich<15,>=13.0.0
 Requires-Dist: tomli<3,>=2.0.1; python_version < "3.11"

flixopt-3.2.0.dist-info/RECORD

@@ -0,0 +1,26 @@
+flixopt/__init__.py,sha256=_5d7Buc1ugaip5QbDGc9ebMO8LK0WWAjYHQMX2Th8P0,2217
+flixopt/aggregation.py,sha256=ZE0LcUAZ8xNet13YjxvvMw8BAL7Qo4TcJBwBCE2sHqE,16562
+flixopt/calculation.py,sha256=YkVzpWJ4lYxCReP7H-lBYrkNGrza_SggjqGMU3xVf7o,29605
+flixopt/color_processing.py,sha256=bSq6iAnreiEBFz4Xf0AIUMyENJsWbJ-5xpiqM7_teUc,9027
+flixopt/commons.py,sha256=ZNlUN1z-h9OGHPo-s-n5OLlJaoPZKVGcAdRyGKpMk4M,1256
+flixopt/components.py,sha256=0EKnzoehrx4Wk-5b6NokHvmT1i7t1msi0JAMM5BA0WU,57711
+flixopt/config.py,sha256=ScqPyYn_URJmOo_aQDViQ-TktF3TZPrcCSoBCQXVpXc,24591
+flixopt/core.py,sha256=OG789eUaS5Lu0CjJiMIdtaixqnV5ZtMiKfERjCPRTv8,26366
+flixopt/effects.py,sha256=1UZaqmjHEjMahbKBcmgXP3JojIRDhUZKjPgLgOAJvO0,34056
+flixopt/elements.py,sha256=92SQ3ax57I9VLjhe0-4L6u3jaYDylrKcmuSFGuzneqI,36371
+flixopt/features.py,sha256=kd-fMvADv8GXoKkrXObYjRJLN8toBG-5bOHTuh-59kk,25073
+flixopt/flow_system.py,sha256=HI4nOGRFjleumBcusjCU1Momw0DN7Q2oCgy0gU0dCug,40339
+flixopt/interface.py,sha256=ACWFIwdbjVN0x52QukKetpJgM0YGsWpvlBAtFnHgHa4,57925
+flixopt/io.py,sha256=1vjwFTyAr2ohkiwqE4qVX9juAG0l1wgxltcWcEPaFcQ,18895
+flixopt/linear_converters.py,sha256=tcz5c1SI36hRFbCX-4NXced12ss9VETg5BE7zOdyeo4,22699
+flixopt/modeling.py,sha256=s0zipbblq-LJrSe7angKT3Imxgr3kIbprG98HUvmkzI,31322
+flixopt/network_app.py,sha256=LnVAlAgzL1BgMYLsJ20a62j6nQUmNccF1zo4ACUXzL4,29433
+flixopt/plotting.py,sha256=C_VyBVQIUP1HYt8roXk__Gz9m17cSSPikXZL4jidIpg,65024
+flixopt/results.py,sha256=gZAj-BQpb7CHp0CcYy99ZF4_IEZvJnQfTeOEZe2TdCU,118942
+flixopt/solvers.py,sha256=m38Smc22MJfHYMiqfNf1MA3OmvbTRm5OWS9nECkDdQk,2355
+flixopt/structure.py,sha256=CrMqp1rzo45S-XJTVmJW4kQWh-a_ukz38uBp18LnBLU,47585
+flixopt-3.2.0.dist-info/licenses/LICENSE,sha256=HKsZnbrM_3Rvnr_u9cWSG90cBsj5_slaqI_z_qcxnGI,1118
+flixopt-3.2.0.dist-info/METADATA,sha256=uBnKopA20TTqYiHXdbxW1X3szcF4s4HS2JqBUXQ8cao,12855
+flixopt-3.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+flixopt-3.2.0.dist-info/top_level.txt,sha256=fanTzb9NylIXfv6Ic7spU97fVmRgGDPKvI_91tw4S3E,8
+flixopt-3.2.0.dist-info/RECORD,,

flixopt/utils.py

@@ -1,86 +0,0 @@
-"""
-This module contains several utility functions used throughout the flixopt framework.
-"""
-
-from __future__ import annotations
-
-import logging
-from typing import Any, Literal
-
-import numpy as np
-import xarray as xr
-
-logger = logging.getLogger('flixopt')
-
-
-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
-    any floating point numbers to the specified number of decimal places. It handles
-    various data types including NumPy arrays and xarray DataArrays by converting
-    them to lists with rounded values.
-
-    Args:
-        obj: The object to process. Can be a dict, list, float, int, numpy.ndarray,
-            xarray.DataArray, or any other type.
-        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.
-
-    Examples:
-        >>> data = {'a': 3.14159, 'b': [1.234, 2.678]}
-        >>> round_nested_floats(data, decimals=2)
-        {'a': 3.14, 'b': [1.23, 2.68]}
-
-        >>> import numpy as np
-        >>> arr = np.array([1.234, 5.678])
-        >>> round_nested_floats(arr, decimals=1)
-        [1.2, 5.7]
-    """
-    if isinstance(obj, dict):
-        return {k: round_nested_floats(v, decimals) for k, v in obj.items()}
-    elif isinstance(obj, list):
-        return [round_nested_floats(v, decimals) for v in obj]
-    elif isinstance(obj, float):
-        return round(obj, decimals)
-    elif isinstance(obj, int):
-        return obj
-    elif isinstance(obj, np.ndarray):
-        return np.round(obj, decimals).tolist()
-    elif isinstance(obj, xr.DataArray):
-        return obj.round(decimals).values.tolist()
-    return obj
-
-
-def convert_dataarray(
-    data: xr.DataArray, mode: Literal['py', 'numpy', 'xarray', 'structure']
-) -> list | np.ndarray | xr.DataArray | str:
-    """
-    Convert a DataArray to a different format.
-
-    Args:
-        data: The DataArray to convert.
-        mode: The mode to convert to.
-            - 'py': Convert to python native types (for json)
-            - 'numpy': Convert to numpy array
-            - 'xarray': Convert to xarray.DataArray
-            - 'structure': Convert to strings (for structure, storing variable names)
-
-    Returns:
-        The converted data.
-
-    Raises:
-        ValueError: If the mode is unknown.
-    """
-    if mode == 'numpy':
-        return data.values
-    elif mode == 'py':
-        return data.values.tolist()
-    elif mode == 'xarray':
-        return data
-    elif mode == 'structure':
-        return f':::{data.name}'
-    else:
-        raise ValueError(f'Unknown mode {mode}')

flixopt-3.1.0.dist-info/RECORD

@@ -1,26 +0,0 @@
-flixopt/__init__.py,sha256=_5d7Buc1ugaip5QbDGc9ebMO8LK0WWAjYHQMX2Th8P0,2217
-flixopt/aggregation.py,sha256=P374vIJc1ZcPxxG8dfCPgUKNLRNP2kf8Y-sc1JOA45U,16191
-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=kB-KyPKtmHoK1zwGp1HV8iJShVsjmi2d5SrGmL_uHxA,22000
-flixopt/core.py,sha256=OG789eUaS5Lu0CjJiMIdtaixqnV5ZtMiKfERjCPRTv8,26366
-flixopt/effects.py,sha256=iLVC4VdFTtZaF6B8BJiILRwe9ahj93og8JQSaAE_ocI,34063
-flixopt/elements.py,sha256=92SQ3ax57I9VLjhe0-4L6u3jaYDylrKcmuSFGuzneqI,36371
-flixopt/features.py,sha256=kd-fMvADv8GXoKkrXObYjRJLN8toBG-5bOHTuh-59kk,25073
-flixopt/flow_system.py,sha256=D84MIkX5oA_4H55p9mOC7tstV96V5RN2qPeJ2exX1ks,40242
-flixopt/interface.py,sha256=jatkXaYpugm1BsSAIbehfLCY8EgIuSmrUTPCNwidYLY,57798
-flixopt/io.py,sha256=2ZnpoU4gVnKfv-FiwoYEA11wlqbdUU8PXJiofRSKl5M,11795
-flixopt/linear_converters.py,sha256=tcz5c1SI36hRFbCX-4NXced12ss9VETg5BE7zOdyeo4,22699
-flixopt/modeling.py,sha256=s0zipbblq-LJrSe7angKT3Imxgr3kIbprG98HUvmkzI,31322
-flixopt/network_app.py,sha256=LnVAlAgzL1BgMYLsJ20a62j6nQUmNccF1zo4ACUXzL4,29433
-flixopt/plotting.py,sha256=kGN9iD_LQlwESYG7eb6s15YaWRHL1-dLSW-eb0436nM,74553
-flixopt/results.py,sha256=1Mizhn4YZeaA1u1G26tQe-jl4hFFE_HCNqIyzNII_nI,101596
-flixopt/solvers.py,sha256=m38Smc22MJfHYMiqfNf1MA3OmvbTRm5OWS9nECkDdQk,2355
-flixopt/structure.py,sha256=ntLoj--zTnaZwNYKw-WkJTNxY0ef4zDp4S0iiSxyyxE,47707
-flixopt/utils.py,sha256=CtCMBjvq31upz7i-_1nbPnSe-1CoRoOWlPkucwiSo5Q,2930
-flixopt-3.1.0.dist-info/licenses/LICENSE,sha256=HKsZnbrM_3Rvnr_u9cWSG90cBsj5_slaqI_z_qcxnGI,1118
-flixopt-3.1.0.dist-info/METADATA,sha256=xErTi6739EVXchaAdkU9axCI06kuIGjGnH8PHdA6aZ0,12856
-flixopt-3.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-flixopt-3.1.0.dist-info/top_level.txt,sha256=fanTzb9NylIXfv6Ic7spU97fVmRgGDPKvI_91tw4S3E,8
-flixopt-3.1.0.dist-info/RECORD,,