power-grid-model-ds 1.3.1__py3-none-any.whl → 1.3.3__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- power_grid_model_ds/_core/model/arrays/base/_build.py +7 -6
- power_grid_model_ds/_core/model/arrays/base/_filters.py +1 -1
- power_grid_model_ds/_core/model/arrays/base/_modify.py +2 -2
- power_grid_model_ds/_core/model/graphs/models/base.py +1 -1
- power_grid_model_ds/_core/model/grids/helpers.py +1 -1
- {power_grid_model_ds-1.3.1.dist-info → power_grid_model_ds-1.3.3.dist-info}/METADATA +3 -5
- {power_grid_model_ds-1.3.1.dist-info → power_grid_model_ds-1.3.3.dist-info}/RECORD +10 -10
- {power_grid_model_ds-1.3.1.dist-info → power_grid_model_ds-1.3.3.dist-info}/WHEEL +1 -1
- {power_grid_model_ds-1.3.1.dist-info → power_grid_model_ds-1.3.3.dist-info}/licenses/LICENSE +0 -0
- {power_grid_model_ds-1.3.1.dist-info → power_grid_model_ds-1.3.3.dist-info}/top_level.txt +0 -0
|
@@ -25,13 +25,13 @@ def build_array(*args: tuple[Any], dtype: np.dtype, defaults: dict[str, np.gener
|
|
|
25
25
|
return array
|
|
26
26
|
|
|
27
27
|
if isinstance(parsed_input, np.ndarray) and parsed_input.dtype.names:
|
|
28
|
-
_check_missing_columns(array.dtype.names, defaults, set(parsed_input.dtype.names))
|
|
28
|
+
_check_missing_columns(array.dtype.names or (), defaults, set(parsed_input.dtype.names))
|
|
29
29
|
return _parse_structured_array(parsed_input, array)
|
|
30
30
|
if isinstance(parsed_input, np.ndarray):
|
|
31
31
|
# Note: defaults are not supported when working with unstructured arrays
|
|
32
32
|
return _parse_array(parsed_input, array.dtype)
|
|
33
33
|
|
|
34
|
-
_check_missing_columns(array.dtype.names, defaults, set(parsed_input.keys()))
|
|
34
|
+
_check_missing_columns(array.dtype.names or (), defaults, set(parsed_input.keys()))
|
|
35
35
|
_fill_with_kwargs(array, parsed_input)
|
|
36
36
|
return array
|
|
37
37
|
|
|
@@ -54,7 +54,7 @@ def _parse_input(*args: Any, dtype: np.dtype, **kwargs):
|
|
|
54
54
|
return {}, 0
|
|
55
55
|
|
|
56
56
|
|
|
57
|
-
def _check_missing_columns(array_columns: tuple, defaults: dict[str, np.generic], provided_columns: set[str]):
|
|
57
|
+
def _check_missing_columns(array_columns: tuple[str, ...], defaults: dict[str, np.generic], provided_columns: set[str]):
|
|
58
58
|
required_columns = set(array_columns) - set(defaults.keys())
|
|
59
59
|
if missing_columns := required_columns - provided_columns:
|
|
60
60
|
raise ValueError(f"Missing required columns: {missing_columns}")
|
|
@@ -64,7 +64,8 @@ def _fill_defaults(array: np.ndarray, defaults: dict[str, np.generic]):
|
|
|
64
64
|
"""Fills the defaults into the array."""
|
|
65
65
|
for column, default in defaults.items():
|
|
66
66
|
if default is empty:
|
|
67
|
-
|
|
67
|
+
column_type: type = array.dtype[column]
|
|
68
|
+
array[column] = empty(column_type) # type: ignore[call-overload]
|
|
68
69
|
else:
|
|
69
70
|
array[column] = default # type: ignore[call-overload]
|
|
70
71
|
|
|
@@ -87,8 +88,8 @@ def _parse_structured_array(from_array: np.ndarray, to_array: np.ndarray) -> np.
|
|
|
87
88
|
|
|
88
89
|
def _determine_column_overlap(from_array: np.ndarray, to_array: np.ndarray) -> tuple[list[str], list[str]]:
|
|
89
90
|
"""Returns two lists: columns present in both arrays and the columns that are only present in from_array"""
|
|
90
|
-
from_columns = set(from_array.dtype.names)
|
|
91
|
-
to_columns = set(to_array.dtype.names)
|
|
91
|
+
from_columns = set(from_array.dtype.names or ())
|
|
92
|
+
to_columns = set(to_array.dtype.names or ())
|
|
92
93
|
|
|
93
94
|
return list(from_columns & to_columns), list(from_columns - to_columns)
|
|
94
95
|
|
|
@@ -20,7 +20,7 @@ def get_filter_mask(
|
|
|
20
20
|
"""Returns a mask that matches the input parameters."""
|
|
21
21
|
parsed_kwargs = _parse(args, kwargs)
|
|
22
22
|
|
|
23
|
-
if invalid_kwargs := set(parsed_kwargs.keys()) - set(array.dtype.names):
|
|
23
|
+
if invalid_kwargs := set(parsed_kwargs.keys()) - set(array.dtype.names or ()):
|
|
24
24
|
raise ValueError(f"Invalid kwargs: {invalid_kwargs}")
|
|
25
25
|
|
|
26
26
|
filter_mask = _initialize_filter_mask(mode_, array.size)
|
|
@@ -12,7 +12,7 @@ def re_order(array: np.ndarray, new_order: ArrayLike, column: str = "id") -> np.
|
|
|
12
12
|
"""Re-order an id-array by the id column so that it follows a new_order.
|
|
13
13
|
Expects the new_order input to contain the same values as self.id
|
|
14
14
|
"""
|
|
15
|
-
if column not in array.dtype.names:
|
|
15
|
+
if column not in (array.dtype.names or ()):
|
|
16
16
|
raise ValueError(f"Cannot re-order array: column {column} does not exist.")
|
|
17
17
|
if not np.array_equal(np.sort(array[column]), np.sort(new_order)):
|
|
18
18
|
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
|
|
|
50
50
|
|
|
51
51
|
def check_ids(array: np.ndarray, return_duplicates: bool = False) -> NDArray | None:
|
|
52
52
|
"""Check for duplicate ids within the array"""
|
|
53
|
-
if "id" not in array.dtype.names:
|
|
53
|
+
if "id" not in (array.dtype.names or ()):
|
|
54
54
|
raise AttributeError("Array has no 'id' column.")
|
|
55
55
|
|
|
56
56
|
unique, counts = np.unique(array["id"], return_counts=True)
|
|
@@ -208,7 +208,7 @@ class BaseGraphModel(ABC):
|
|
|
208
208
|
yield
|
|
209
209
|
|
|
210
210
|
for node in nodes:
|
|
211
|
-
self.add_node(node)
|
|
211
|
+
self.add_node(int(node)) # convert to int to avoid type issues when input is e.g. a numpy array
|
|
212
212
|
for source, target in edge_list:
|
|
213
213
|
self.add_branch(source, target)
|
|
214
214
|
|
|
@@ -46,7 +46,7 @@ def set_feeder_ids(grid: "Grid"):
|
|
|
46
46
|
"""
|
|
47
47
|
_reset_feeder_ids(grid)
|
|
48
48
|
feeder_node_ids = grid.node.filter(node_type=NodeType.SUBSTATION_NODE)["id"]
|
|
49
|
-
with grid.graphs.active_graph.tmp_remove_nodes(feeder_node_ids):
|
|
49
|
+
with grid.graphs.active_graph.tmp_remove_nodes(feeder_node_ids.tolist()):
|
|
50
50
|
components = grid.graphs.active_graph.get_components()
|
|
51
51
|
for component_node_ids in components:
|
|
52
52
|
component_branches = _get_active_component_branches(grid, component_node_ids)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: power-grid-model-ds
|
|
3
|
-
Version: 1.3.
|
|
3
|
+
Version: 1.3.3
|
|
4
4
|
Summary: Power Grid Model extension which provides a grid data structure for simulation and analysis
|
|
5
5
|
Author-email: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
|
|
6
6
|
License: MPL-2.0
|
|
@@ -62,9 +62,7 @@ SPDX-License-Identifier: MPL-2.0
|
|
|
62
62
|
[](https://pepy.tech/project/power-grid-model-ds)
|
|
63
63
|
[](https://pepy.tech/project/power-grid-model-ds)
|
|
64
64
|
|
|
65
|
-
[](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/check-code-quality.yml)
|
|
67
|
-
[](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/reuse-compliance.yml)
|
|
65
|
+
[](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/ci.yml)
|
|
68
66
|
[](https://power-grid-model-ds.readthedocs.io/en/stable/)
|
|
69
67
|
|
|
70
68
|
[](https://sonarcloud.io/summary/new_code?id=PowerGridModel_power-grid-model-ds)
|
|
@@ -78,7 +76,7 @@ SPDX-License-Identifier: MPL-2.0
|
|
|
78
76
|
|
|
79
77
|
[](https://zenodo.org/record/14825565)
|
|
80
78
|
|
|
81
|
-
[](#)
|
|
79
|
+
[](#)
|
|
82
80
|
|
|
83
81
|
# Power Grid Model Data Science (DS)
|
|
84
82
|
|
|
@@ -24,9 +24,9 @@ power_grid_model_ds/_core/model/constants.py,sha256=pxkZ-a4J8RVu4ziw_A6usY81I2tt
|
|
|
24
24
|
power_grid_model_ds/_core/model/arrays/__init__.py,sha256=WMMIUW5RAkJ6E7tRtu8sImhxjnQDo7h5J2I9dhvfAcw,1013
|
|
25
25
|
power_grid_model_ds/_core/model/arrays/pgm_arrays.py,sha256=Vmzj6BFVY3vZqfpiOZ0-KDNdi3EbkWv3cUHUx8D29jw,3318
|
|
26
26
|
power_grid_model_ds/_core/model/arrays/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
27
|
-
power_grid_model_ds/_core/model/arrays/base/_build.py,sha256=
|
|
28
|
-
power_grid_model_ds/_core/model/arrays/base/_filters.py,sha256=
|
|
29
|
-
power_grid_model_ds/_core/model/arrays/base/_modify.py,sha256=
|
|
27
|
+
power_grid_model_ds/_core/model/arrays/base/_build.py,sha256=NAdmzkjpC4lP-z1y0au8ZDuL7rWSwN-YG2VUv0u5lYM,6365
|
|
28
|
+
power_grid_model_ds/_core/model/arrays/base/_filters.py,sha256=68DBuliTADfp2VNKpuTSq18fgPa5XC4MkxQIH6G9mV8,4241
|
|
29
|
+
power_grid_model_ds/_core/model/arrays/base/_modify.py,sha256=TP8LojFMcZnyzhmshzNQnjlEVSZjE_xJ6BNQ4SpIBvA,2476
|
|
30
30
|
power_grid_model_ds/_core/model/arrays/base/_optional.py,sha256=zEEaE5z7bjLiARb8WTYsgZhbtJYAT6BTd61IUdv_YTA,288
|
|
31
31
|
power_grid_model_ds/_core/model/arrays/base/_string.py,sha256=H66DBYq8RHQHj6Gfn2tdEXKoL3ND64iVkZCt-Fwjdn0,3568
|
|
32
32
|
power_grid_model_ds/_core/model/arrays/base/array.py,sha256=F2o5Oc2AFfJ_aBpdSzQd5qxhA6-ynE7xuupPDDIPOWg,12758
|
|
@@ -47,12 +47,12 @@ power_grid_model_ds/_core/model/graphs/container.py,sha256=ZsE6Wr7DvVcYJYjvBszqn
|
|
|
47
47
|
power_grid_model_ds/_core/model/graphs/errors.py,sha256=-9fAsCqpKM0-lCM-tO2fVot9hqZBJa8WCxxqWEH_z6k,479
|
|
48
48
|
power_grid_model_ds/_core/model/graphs/models/__init__.py,sha256=xwhMajQKIAfL1R3cq2sMNXMWtqfI5WGBi6-P4clyTes,262
|
|
49
49
|
power_grid_model_ds/_core/model/graphs/models/_rustworkx_search.py,sha256=TqRR22TPx8XjRLukQxK8R8FjZvJ60CttDFctbISSbOM,2979
|
|
50
|
-
power_grid_model_ds/_core/model/graphs/models/base.py,sha256=
|
|
50
|
+
power_grid_model_ds/_core/model/graphs/models/base.py,sha256=OyhSN4Vn3otM20HDBt0Y6aXeQW7Lis7MuTgGe9aeEgM,17637
|
|
51
51
|
power_grid_model_ds/_core/model/graphs/models/rustworkx.py,sha256=jccM7MUhNqH2215mk_X8ihQ-Q8IkjjRhUk4jSruaxy8,6158
|
|
52
52
|
power_grid_model_ds/_core/model/grids/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
53
53
|
power_grid_model_ds/_core/model/grids/_text_sources.py,sha256=3CWn0zjaUkFhrnSEIqAas52xeW0EX3EWXIXyo8XSQgw,4229
|
|
54
54
|
power_grid_model_ds/_core/model/grids/base.py,sha256=8AQdqPuVLBjOKE2JQvlrQErq8NcCowot3SUlJvcmYvA,16592
|
|
55
|
-
power_grid_model_ds/_core/model/grids/helpers.py,sha256=
|
|
55
|
+
power_grid_model_ds/_core/model/grids/helpers.py,sha256=lMUEER6l5MfdgLBIesSo_KnqK_K1CyRtu1dj33q924c,4244
|
|
56
56
|
power_grid_model_ds/_core/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
57
57
|
power_grid_model_ds/_core/utils/misc.py,sha256=aAdlXjyKN6_T4b_CQZ879TbkbDZW4TwBUsxTpkwvymU,1228
|
|
58
58
|
power_grid_model_ds/_core/utils/pickle.py,sha256=LGeTc7nu9RY1noOzLJzYaSHSWIgqzHy2xhmueKGuipc,1445
|
|
@@ -74,8 +74,8 @@ power_grid_model_ds/_core/visualizer/layout/header.py,sha256=el-5SlWIPeEbZZLbi3v
|
|
|
74
74
|
power_grid_model_ds/_core/visualizer/layout/legenda.py,sha256=8JTrMRgaYRaSIXAEoM0b3PgX7AYvW0_fHuYg8nY4y0g,2161
|
|
75
75
|
power_grid_model_ds/_core/visualizer/layout/search_form.py,sha256=4LPU6MjD3QEIeBEOOWBvV5-GyLMqNYWyKcUa_oWScCs,2002
|
|
76
76
|
power_grid_model_ds/_core/visualizer/layout/selection_output.py,sha256=fuPAdG5XmTj2E0oQ8w_tp9PGbB8bJ5fguteLtnM1EDg,534
|
|
77
|
-
power_grid_model_ds-1.3.
|
|
78
|
-
power_grid_model_ds-1.3.
|
|
79
|
-
power_grid_model_ds-1.3.
|
|
80
|
-
power_grid_model_ds-1.3.
|
|
81
|
-
power_grid_model_ds-1.3.
|
|
77
|
+
power_grid_model_ds-1.3.3.dist-info/licenses/LICENSE,sha256=GpbnG1pNl-ORtSP6dmHeiZvwy36UFli6MEZy1XlmBqo,14906
|
|
78
|
+
power_grid_model_ds-1.3.3.dist-info/METADATA,sha256=qFZaPDlHj5uGBUUvnf14k6E-CdsSdj0BkucAZXSvYFI,8873
|
|
79
|
+
power_grid_model_ds-1.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
80
|
+
power_grid_model_ds-1.3.3.dist-info/top_level.txt,sha256=nJa103Eqvm5TESYEKPFVImfLg_ugGOBznikrM-rZQZg,20
|
|
81
|
+
power_grid_model_ds-1.3.3.dist-info/RECORD,,
|
{power_grid_model_ds-1.3.1.dist-info → power_grid_model_ds-1.3.3.dist-info}/licenses/LICENSE
RENAMED
|
File without changes
|
|
File without changes
|