first files

Signed-off-by: Thijs Baaijen <[email protected]>

Author: Thijss

src/power_grid_model_ds/_core/data_source/generator/arrays/base.py

@@ -12,7 +12,7 @@
 class BaseGenerator:
     """Base class to build a generator for grid elements"""
 
-    def __init__(self, grid: Grid, seed: int) -> None:
+    def __init__(self, grid: Grid, seed: int | None) -> None:
         """Initializes generator with grid and amount"""
         self.grid = grid
 

src/power_grid_model_ds/_core/model/arrays/base/_modify.py

@@ -10,7 +10,7 @@
 
 def re_order(array: np.ndarray, new_order: ArrayLike, column: str = "id") -> np.ndarray:
     """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
+    Expects the new_order input to contain the same values as self["id"]
     """
     if column not in (array.dtype.names or ()):
         raise ValueError(f"Cannot re-order array: column {column} does not exist.")

src/power_grid_model_ds/_core/model/containers/base.py

@@ -13,6 +13,7 @@
 import numpy as np
 
 from power_grid_model_ds._core import fancypy as fp
+from power_grid_model_ds._core.model.arrays import IdArray
 from power_grid_model_ds._core.model.arrays.base.array import FancyArray
 from power_grid_model_ds._core.model.arrays.base.errors import RecordDoesNotExist
 from power_grid_model_ds._core.model.constants import EMPTY_ID
@@ -75,7 +76,7 @@ def find_array_field(cls, array_type: Type[FancyArray]) -> dataclasses.Field:
     @property
     def max_id(self) -> int:
         """Returns the max id across all arrays within the container."""
-        max_per_array = [np.max(array.id) if array.size > 0 else 0 for array in self.all_arrays()]
+        max_per_array = [np.max(array["id"]) if array.size > 0 else 0 for array in self.all_arrays()]
         return int(max(max_per_array))
 
     def check_ids(self, check_between_arrays: bool = True, check_within_arrays: bool = True) -> None:
@@ -89,7 +90,7 @@ def check_ids(self, check_between_arrays: bool = True, check_within_arrays: bool
             ValueError: if duplicates are found.
         """
 
-        id_arrays = [array for array in self.all_arrays() if hasattr(array, "id")]
+        id_arrays = [array for array in self.all_arrays() if isinstance(array, IdArray)]
         if not id_arrays:
             return  # no arrays to check
 
@@ -113,7 +114,7 @@ def append(self, array: FancyArray, check_max_id: bool = True) -> None:
 
         Args:
             array(FancyArray): the asset_array to be appended (e.g. a NodeArray instance).
-            check_max_id(bool): whether to check max(array.id) with the id counter
+            check_max_id(bool): whether to check max(array["id"]) with the id counter
 
         Returns:
             None
@@ -132,12 +133,12 @@ def attach_ids(self, array: FancyArray) -> FancyArray:
         if not array.size:
             return array
 
-        if (id_set := set(array.id)) != {array.get_empty_value("id")}:
+        if (id_set := set(array["id"])) != {array.get_empty_value("id")}:
             raise ValueError(f"Cannot attach ids to array that contains non-empty ids: {id_set}")
 
         start = self._id_counter + 1
         end = start + len(array)
-        array.id = np.arange(start, end)
+        array["id"] = np.arange(start, end)
         self._id_counter = max(self._id_counter, end - 1)
 
         return array
@@ -175,15 +176,15 @@ def _append(self, array: FancyArray, check_max_id: bool = True) -> None:
         Append the given asset_array to the corresponding field of Grid and generate ids.
         Args:
             array: the asset_array to be appended (e.g. a KabelArray instance).
-            check_max_id: whether to check max(array.id) with the id counter
+            check_max_id: whether to check max(array["id"]) with the id counter
         Returns: None.
         """
         if array.size == 0:
             return
 
         array_field = self.find_array_field(array.__class__)
 
-        if hasattr(array, "id"):
+        if isinstance(array, IdArray):
             self._update_id_counter(array, check_max_id)
 
         # Add the given asset_array to the corresponding array in the Grid.
@@ -208,30 +209,30 @@ def _get_empty_arrays(cls) -> dict:
         }
 
     def _update_id_counter(self, array, check_max_id: bool = True):
-        if np.all(array.id == EMPTY_ID):
+        if np.all(array["id"] == EMPTY_ID):
             array = self.attach_ids(array)
-        elif np.any(array.id == EMPTY_ID):
+        elif np.any(array["id"] == EMPTY_ID):
             raise ValueError(f"Cannot append: array contains empty [{EMPTY_ID}] and non-empty ids.")
         elif check_max_id and self.id_counter > 0:
             # Only check for overlaps when array has prescribed (non-empty) IDs
             # Check if any incoming ID might overlap with existing IDs
             # This prevents overlaps since counter tracks the highest used ID
-            new_min_id = np.min(array.id)
+            new_min_id = np.min(array["id"])
             if new_min_id <= self._id_counter:
                 raise ValueError(
                     f"Cannot append: minimum id {new_min_id} is not greater than "
                     f"the current id counter {self._id_counter}"
                 )
 
-        new_max_id = np.max(array.id)
+        new_max_id = np.max(array["id"])
         # Update _id_counter
         self._id_counter = max(self._id_counter, new_max_id)
 
     @staticmethod
-    def _get_duplicates_between_arrays(id_arrays: list[FancyArray], check: bool) -> np.ndarray:
+    def _get_duplicates_between_arrays(id_arrays: list[IdArray], check: bool) -> np.ndarray:
         if not check:
             return np.array([])
-        unique_ids_per_array = [np.unique(array.id) for array in id_arrays]
+        unique_ids_per_array = [np.unique(array["id"]) for array in id_arrays]
 
         all_ids = np.concatenate(unique_ids_per_array)
 
@@ -240,7 +241,7 @@ def _get_duplicates_between_arrays(id_arrays: list[FancyArray], check: bool) ->
         return unique_ids[duplicate_mask]
 
     @staticmethod
-    def _get_arrays_with_duplicates(id_arrays: list[FancyArray], check: bool) -> list:
+    def _get_arrays_with_duplicates(id_arrays: list[IdArray], check: bool) -> list:
         arrays_with_duplicates: list[Type] = []
         if not check:
             return arrays_with_duplicates

src/power_grid_model_ds/_core/model/grids/_text_sources.py

@@ -74,13 +74,13 @@ def add_nodes(self, nodes: set[str]):
 
         for node_id in source_nodes:
             new_node = self.grid.node.empty(1)
-            new_node.id = node_id
-            new_node.node_type = NodeType.SUBSTATION_NODE
+            new_node["id"] = node_id
+            new_node["node_type"] = NodeType.SUBSTATION_NODE
             self.grid.append(new_node, check_max_id=False)
 
         for node_id in regular_nodes:
             new_node = self.grid.node.empty(1)
-            new_node.id = node_id
+            new_node["id"] = node_id
             self.grid.append(new_node, check_max_id=False)
 
     def add_branches(self, branches: dict[tuple[str, str], list[str]]):
@@ -105,13 +105,13 @@ def add_branch(self, branch: tuple[str, str], comments: list[str]):
         if branch_ids:
             if len(branch_ids) > 1:
                 raise ValueError(f"Multiple branch ids found in row {branch} {','.join(comments)}")
-            new_branch.id = int(branch_ids[0])
+            new_branch["id"] = int(branch_ids[0])
 
-        new_branch.from_node = from_node
-        new_branch.to_node = to_node
-        new_branch.from_status = 1
+        new_branch["from_node"] = from_node
+        new_branch["to_node"] = to_node
+        new_branch["from_status"] = 1
         if "open" in comments:
-            new_branch.to_status = 0
+            new_branch["to_status"] = 0
         else:
-            new_branch.to_status = 1
+            new_branch["to_status"] = 1
         self.grid.append(new_branch, check_max_id=False)

tests/performance/_constants.py

@@ -10,7 +10,7 @@
     "structured": "import numpy as np;" + NUMPY_DTYPE + "input_array = np.zeros({size}, dtype=dtype)",
     "rec": "import numpy as np;" + NUMPY_DTYPE + "input_array = np.recarray(({size},),dtype=dtype)",
     "fancy": "from tests.conftest import FancyTestArray; input_array=FancyTestArray.zeros({size});"
-    + "import numpy as np;input_array.id = np.arange({size})",
+    + "import numpy as np;input_array['id'] = np.arange({size})",
 }
 
 GRAPH_SETUP_CODES = {