power-grid-model-ds 1.3.2__tar.gz → 1.3.4__tar.gz

{power_grid_model_ds-1.3.2 → power_grid_model_ds-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: power-grid-model-ds
-Version: 1.3.2
+Version: 1.3.4
 Summary: Power Grid Model extension which provides a grid data structure for simulation and analysis
 Author-email: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
 License: MPL-2.0
@@ -62,9 +62,7 @@ SPDX-License-Identifier: MPL-2.0
 [![Downloads](https://static.pepy.tech/badge/power-grid-model-ds)](https://pepy.tech/project/power-grid-model-ds)
 [![Downloads](https://static.pepy.tech/badge/power-grid-model-ds/month)](https://pepy.tech/project/power-grid-model-ds)
 
-[![Build and Test Python](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/build-test-and-sonar.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/build-test-and-sonar.yml)
-[![Check Code Quality](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/check-code-quality.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/check-code-quality.yml)
-[![REUSE Compliance Check](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/reuse-compliance.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/reuse-compliance.yml)
+[![CI Build](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/ci.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/ci.yml)
 [![docs](https://readthedocs.org/projects/power-grid-model-ds/badge/)](https://power-grid-model-ds.readthedocs.io/en/stable/)
 
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=PowerGridModel_power-grid-model-ds&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=PowerGridModel_power-grid-model-ds)
@@ -78,7 +76,7 @@ SPDX-License-Identifier: MPL-2.0
 
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.14825565.svg)](https://zenodo.org/record/14825565)
 
-[![](https://github.com/PowerGridModel/.github/blob/main/artwork/svg/color.svg)](#)
+[![Power Grid Model logo](https://github.com/PowerGridModel/.github/blob/main/artwork/svg/color.svg)](#)
 
 # Power Grid Model Data Science (DS)
 

power_grid_model_ds-1.3.4/PYPI_VERSION

@@ -0,0 +1 @@
+1.3.4

{power_grid_model_ds-1.3.2 → power_grid_model_ds-1.3.4}/README.md

@@ -9,9 +9,7 @@ SPDX-License-Identifier: MPL-2.0
 [![Downloads](https://static.pepy.tech/badge/power-grid-model-ds)](https://pepy.tech/project/power-grid-model-ds)
 [![Downloads](https://static.pepy.tech/badge/power-grid-model-ds/month)](https://pepy.tech/project/power-grid-model-ds)
 
-[![Build and Test Python](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/build-test-and-sonar.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/build-test-and-sonar.yml)
-[![Check Code Quality](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/check-code-quality.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/check-code-quality.yml)
-[![REUSE Compliance Check](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/reuse-compliance.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/reuse-compliance.yml)
+[![CI Build](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/ci.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/ci.yml)
 [![docs](https://readthedocs.org/projects/power-grid-model-ds/badge/)](https://power-grid-model-ds.readthedocs.io/en/stable/)
 
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=PowerGridModel_power-grid-model-ds&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=PowerGridModel_power-grid-model-ds)
@@ -25,7 +23,7 @@ SPDX-License-Identifier: MPL-2.0
 
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.14825565.svg)](https://zenodo.org/record/14825565)
 
-[![](https://github.com/PowerGridModel/.github/blob/main/artwork/svg/color.svg)](#)
+[![Power Grid Model logo](https://github.com/PowerGridModel/.github/blob/main/artwork/svg/color.svg)](#)
 
 # Power Grid Model Data Science (DS)
 

{power_grid_model_ds-1.3.2 → power_grid_model_ds-1.3.4}/src/power_grid_model_ds/_core/fancypy.py

@@ -8,6 +8,8 @@ from typing import TYPE_CHECKING, Union
 
 import numpy as np
 
+from power_grid_model_ds._core.utils.misc import array_equal_with_nan
+
 if TYPE_CHECKING:
     from power_grid_model_ds._core.model.arrays.base.array import FancyArray
 
@@ -44,23 +46,5 @@ def sort(array: "FancyArray", axis=-1, kind=None, order=None) -> "FancyArray":
 def array_equal(array1: "FancyArray", array2: "FancyArray", equal_nan: bool = True) -> bool:
     """Return True if two arrays are equal."""
     if equal_nan:
-        return _array_equal_with_nan(array1, array2)
+        return array_equal_with_nan(array1.data, array2.data)
     return np.array_equal(array1.data, array2.data)
-
-
-def _array_equal_with_nan(array1: "FancyArray", array2: "FancyArray") -> bool:
-    # np.array_equal does not work with NaN values in structured arrays, so we need to compare column by column.
-    # related issue: https://github.com/numpy/numpy/issues/21539
-
-    if array1.columns != array2.columns:
-        return False
-
-    for column in array1.columns:
-        column_dtype = array1.dtype[column]
-        if np.issubdtype(column_dtype, np.str_):
-            if not np.array_equal(array1[column], array2[column]):
-                return False
-            continue
-        if not np.array_equal(array1[column], array2[column], equal_nan=True):
-            return False
-    return True

{power_grid_model_ds-1.3.2 → power_grid_model_ds-1.3.4}/src/power_grid_model_ds/_core/model/arrays/base/_build.py

@@ -25,13 +25,13 @@ def build_array(*args: tuple[Any], dtype: np.dtype, defaults: dict[str, np.gener
         return array
 
     if isinstance(parsed_input, np.ndarray) and parsed_input.dtype.names:
-        _check_missing_columns(array.dtype.names, defaults, set(parsed_input.dtype.names))
+        _check_missing_columns(array.dtype.names or (), defaults, set(parsed_input.dtype.names))
         return _parse_structured_array(parsed_input, array)
     if isinstance(parsed_input, np.ndarray):
         # Note: defaults are not supported when working with unstructured arrays
         return _parse_array(parsed_input, array.dtype)
 
-    _check_missing_columns(array.dtype.names, defaults, set(parsed_input.keys()))
+    _check_missing_columns(array.dtype.names or (), defaults, set(parsed_input.keys()))
     _fill_with_kwargs(array, parsed_input)
     return array
 
@@ -54,7 +54,7 @@ def _parse_input(*args: Any, dtype: np.dtype, **kwargs):
     return {}, 0
 
 
-def _check_missing_columns(array_columns: tuple, defaults: dict[str, np.generic], provided_columns: set[str]):
+def _check_missing_columns(array_columns: tuple[str, ...], defaults: dict[str, np.generic], provided_columns: set[str]):
     required_columns = set(array_columns) - set(defaults.keys())
     if missing_columns := required_columns - provided_columns:
         raise ValueError(f"Missing required columns: {missing_columns}")
@@ -64,7 +64,8 @@ def _fill_defaults(array: np.ndarray, defaults: dict[str, np.generic]):
     """Fills the defaults into the array."""
     for column, default in defaults.items():
         if default is empty:
-            array[column] = empty(array.dtype[column])  # type: ignore[call-overload]
+            column_type: type = array.dtype[column]
+            array[column] = empty(column_type)  # type: ignore[call-overload]
         else:
             array[column] = default  # type: ignore[call-overload]
 
@@ -87,8 +88,8 @@ def _parse_structured_array(from_array: np.ndarray, to_array: np.ndarray) -> np.
 
 def _determine_column_overlap(from_array: np.ndarray, to_array: np.ndarray) -> tuple[list[str], list[str]]:
     """Returns two lists: columns present in both arrays and the columns that are only present in from_array"""
-    from_columns = set(from_array.dtype.names)
-    to_columns = set(to_array.dtype.names)
+    from_columns = set(from_array.dtype.names or ())
+    to_columns = set(to_array.dtype.names or ())
 
     return list(from_columns & to_columns), list(from_columns - to_columns)
 

{power_grid_model_ds-1.3.2 → power_grid_model_ds-1.3.4}/src/power_grid_model_ds/_core/model/arrays/base/_filters.py

@@ -20,7 +20,7 @@ def get_filter_mask(
     """Returns a mask that matches the input parameters."""
     parsed_kwargs = _parse(args, kwargs)
 
-    if invalid_kwargs := set(parsed_kwargs.keys()) - set(array.dtype.names):
+    if invalid_kwargs := set(parsed_kwargs.keys()) - set(array.dtype.names or ()):
         raise ValueError(f"Invalid kwargs: {invalid_kwargs}")
 
     filter_mask = _initialize_filter_mask(mode_, array.size)

{power_grid_model_ds-1.3.2 → power_grid_model_ds-1.3.4}/src/power_grid_model_ds/_core/model/arrays/base/_modify.py

@@ -12,7 +12,7 @@ def re_order(array: np.ndarray, new_order: ArrayLike, column: str = "id") -> np.
     """Re-order an id-array by the id column so that it follows a new_order.
     Expects the new_order input to contain the same values as self.id
     """
-    if column not in array.dtype.names:
+    if column not in (array.dtype.names or ()):
         raise ValueError(f"Cannot re-order array: column {column} does not exist.")
     if not np.array_equal(np.sort(array[column]), np.sort(new_order)):
         raise ValueError(f"Cannot re-order array: mismatch between new_order and values in '{column}'-column.")
@@ -50,7 +50,7 @@ def update_by_id(array: np.ndarray, ids: ArrayLike, allow_missing: bool, **kwarg
 
 def check_ids(array: np.ndarray, return_duplicates: bool = False) -> NDArray | None:
     """Check for duplicate ids within the array"""
-    if "id" not in array.dtype.names:
+    if "id" not in (array.dtype.names or ()):
         raise AttributeError("Array has no 'id' column.")
 
     unique, counts = np.unique(array["id"], return_counts=True)

{power_grid_model_ds-1.3.2 → power_grid_model_ds-1.3.4}/src/power_grid_model_ds/_core/model/arrays/base/array.py

@@ -323,3 +323,11 @@ class FancyArray(ABC):
         if pandas is None:
             raise ImportError("pandas is not installed")
         return pandas.DataFrame(self._data)
+
+    @classmethod
+    def from_extended(cls: Type[Self], extended: Self) -> Self:
+        """Create an instance from an extended array."""
+        if not isinstance(extended, cls):
+            raise TypeError(f"Extended array must be of type {cls.__name__}, got {type(extended).__name__}")
+        dtype = cls.get_dtype()
+        return cls(data=np.array(extended[list(dtype.names)], dtype=dtype))

{power_grid_model_ds-1.3.2 → power_grid_model_ds-1.3.4}/src/power_grid_model_ds/_core/model/grids/base.py

@@ -440,6 +440,24 @@ class Grid(FancyArrayContainer):
         set_is_feeder(grid=self)
         set_feeder_ids(grid=self)
 
+    @classmethod
+    def from_extended(cls, extended: "Grid") -> "Grid":
+        """Create a grid from an extended Grid object."""
+        new_grid = cls.empty()
+
+        # Add nodes first, so that branches can reference them
+        new_grid.append(new_grid.node.__class__.from_extended(extended.node))
+
+        for field in dataclasses.fields(cls):
+            if field.name == "node":
+                continue  # already added
+            if issubclass(field.type, FancyArray):
+                extended_array = getattr(extended, field.name)
+                new_array = field.type.from_extended(extended_array)
+                new_grid.append(new_array, check_max_id=False)
+
+        return new_grid
+
 
 def _add_branch_array(branch: BranchArray | Branch3Array, grid: Grid):
     """Add a branch array to the grid"""

{power_grid_model_ds-1.3.2 → power_grid_model_ds-1.3.4}/src/power_grid_model_ds/_core/utils/misc.py

@@ -39,3 +39,24 @@ def get_inherited_attrs(cls: Type, *private_attributes):
             retrieved_attributes[private_attr] = attr_dict
 
     return retrieved_attributes
+
+
+def array_equal_with_nan(array1: np.ndarray, array2: np.ndarray) -> bool:
+    """Compare two structured arrays for equality, treating NaN values as equal.
+
+    np.array_equal does not work with NaN values in structured arrays, so we need to compare column by column.
+    related issue: https://github.com/numpy/numpy/issues/21539
+    """
+    if array1.dtype.names != array2.dtype.names:
+        return False
+
+    columns: Sequence[str] = array1.dtype.names
+    for column in columns:
+        column_dtype = array1.dtype[column]
+        if np.issubdtype(column_dtype, np.str_):
+            if not np.array_equal(array1[column], array2[column]):
+                return False
+            continue
+        if not np.array_equal(array1[column], array2[column], equal_nan=True):
+            return False
+    return True

{power_grid_model_ds-1.3.2 → power_grid_model_ds-1.3.4}/src/power_grid_model_ds.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: power-grid-model-ds
-Version: 1.3.2
+Version: 1.3.4
 Summary: Power Grid Model extension which provides a grid data structure for simulation and analysis
 Author-email: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
 License: MPL-2.0
@@ -62,9 +62,7 @@ SPDX-License-Identifier: MPL-2.0
 [![Downloads](https://static.pepy.tech/badge/power-grid-model-ds)](https://pepy.tech/project/power-grid-model-ds)
 [![Downloads](https://static.pepy.tech/badge/power-grid-model-ds/month)](https://pepy.tech/project/power-grid-model-ds)
 
-[![Build and Test Python](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/build-test-and-sonar.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/build-test-and-sonar.yml)
-[![Check Code Quality](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/check-code-quality.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/check-code-quality.yml)
-[![REUSE Compliance Check](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/reuse-compliance.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/reuse-compliance.yml)
+[![CI Build](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/ci.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/ci.yml)
 [![docs](https://readthedocs.org/projects/power-grid-model-ds/badge/)](https://power-grid-model-ds.readthedocs.io/en/stable/)
 
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=PowerGridModel_power-grid-model-ds&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=PowerGridModel_power-grid-model-ds)
@@ -78,7 +76,7 @@ SPDX-License-Identifier: MPL-2.0
 
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.14825565.svg)](https://zenodo.org/record/14825565)
 
-[![](https://github.com/PowerGridModel/.github/blob/main/artwork/svg/color.svg)](#)
+[![Power Grid Model logo](https://github.com/PowerGridModel/.github/blob/main/artwork/svg/color.svg)](#)
 
 # Power Grid Model Data Science (DS)
 

power_grid_model_ds-1.3.2/PYPI_VERSION

@@ -1 +0,0 @@
-1.3.2