power-grid-model-ds 1.2.0__tar.gz → 1.2.2__tar.gz

{power_grid_model_ds-1.2.0 → power_grid_model_ds-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: power-grid-model-ds
-Version: 1.2.0
+Version: 1.2.2
 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
@@ -42,6 +42,7 @@ Requires-Dist: sphinx_rtd_theme; extra == "doc"
 Requires-Dist: readthedocs-sphinx-search; extra == "doc"
 Requires-Dist: sphinx-hoverxref; extra == "doc"
 Requires-Dist: numpydoc; extra == "doc"
+Dynamic: license-file
 
 <!--
 SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>

power_grid_model_ds-1.2.2/PYPI_VERSION

@@ -0,0 +1 @@
+1.2.2

{power_grid_model_ds-1.2.0 → power_grid_model_ds-1.2.2}/src/power_grid_model_ds/_core/model/graphs/container.py

@@ -6,17 +6,19 @@
 
 import dataclasses
 from dataclasses import dataclass
-from typing import Generator
+from typing import TYPE_CHECKING, Generator
 
 import numpy as np
 
 from power_grid_model_ds._core.model.arrays import Branch3Array, BranchArray, NodeArray
 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.containers.grid_protocol import MinimalGridArrays
 from power_grid_model_ds._core.model.graphs.models import RustworkxGraphModel
 from power_grid_model_ds._core.model.graphs.models.base import BaseGraphModel
 
+if TYPE_CHECKING:  # pragma: no cover
+    from power_grid_model_ds._core.model.grids.base import Grid
+
 
 @dataclass
 class GraphContainer:
@@ -119,7 +121,7 @@ class GraphContainer:
             setattr(self, field.name, graph)
 
     @classmethod
-    def from_arrays(cls, arrays: MinimalGridArrays) -> "GraphContainer":
+    def from_arrays(cls, arrays: "Grid") -> "GraphContainer":
         """Build from arrays"""
         cls._validate_branches(arrays=arrays)
 
@@ -132,7 +134,7 @@ class GraphContainer:
         return new_container
 
     @staticmethod
-    def _validate_branches(arrays: MinimalGridArrays):
+    def _validate_branches(arrays: "Grid") -> None:
         for array in arrays.branch_arrays:
             if any(~np.isin(array.from_node, arrays.node.id)):
                 raise RecordDoesNotExist(f"Found invalid .from_node values in {array.__class__.__name__}")

{power_grid_model_ds-1.2.0 → power_grid_model_ds-1.2.2}/src/power_grid_model_ds/_core/model/graphs/models/base.py

@@ -4,13 +4,12 @@
 
 from abc import ABC, abstractmethod
 from contextlib import contextmanager
-from typing import Generator
+from typing import TYPE_CHECKING, Generator
 
 import numpy as np
 from numpy._typing import NDArray
 
 from power_grid_model_ds._core.model.arrays.pgm_arrays import Branch3Array, BranchArray, NodeArray
-from power_grid_model_ds._core.model.containers.grid_protocol import MinimalGridArrays
 from power_grid_model_ds._core.model.graphs.errors import (
     GraphError,
     MissingBranchError,
@@ -18,6 +17,9 @@ from power_grid_model_ds._core.model.graphs.errors import (
     NoPathBetweenNodes,
 )
 
+if TYPE_CHECKING:  # pragma: no cover
+    from power_grid_model_ds._core.model.grids.base import Grid
+
 
 # pylint: disable=too-many-public-methods
 class BaseGraphModel(ABC):
@@ -327,7 +329,7 @@ class BaseGraphModel(ABC):
         return [self._internals_to_externals(nodes) for nodes in internal_cycles]
 
     @classmethod
-    def from_arrays(cls, arrays: MinimalGridArrays, active_only=False) -> "BaseGraphModel":
+    def from_arrays(cls, arrays: "Grid", active_only=False) -> "BaseGraphModel":
         """Build from arrays"""
         new_graph = cls(active_only=active_only)
 

{power_grid_model_ds-1.2.0 → power_grid_model_ds-1.2.2}/src/power_grid_model_ds.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: power-grid-model-ds
-Version: 1.2.0
+Version: 1.2.2
 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
@@ -42,6 +42,7 @@ Requires-Dist: sphinx_rtd_theme; extra == "doc"
 Requires-Dist: readthedocs-sphinx-search; extra == "doc"
 Requires-Dist: sphinx-hoverxref; extra == "doc"
 Requires-Dist: numpydoc; extra == "doc"
+Dynamic: license-file
 
 <!--
 SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>

{power_grid_model_ds-1.2.0 → power_grid_model_ds-1.2.2}/src/power_grid_model_ds.egg-info/SOURCES.txt

@@ -42,7 +42,6 @@ src/power_grid_model_ds/_core/model/arrays/base/array.py
 src/power_grid_model_ds/_core/model/arrays/base/errors.py
 src/power_grid_model_ds/_core/model/containers/__init__.py
 src/power_grid_model_ds/_core/model/containers/base.py
-src/power_grid_model_ds/_core/model/containers/grid_protocol.py
 src/power_grid_model_ds/_core/model/dtypes/__init__.py
 src/power_grid_model_ds/_core/model/dtypes/appliances.py
 src/power_grid_model_ds/_core/model/dtypes/branches.py

power_grid_model_ds-1.2.0/PYPI_VERSION

@@ -1 +0,0 @@
-1.2.0

power_grid_model_ds-1.2.0/src/power_grid_model_ds/_core/model/containers/grid_protocol.py

@@ -1,22 +0,0 @@
-# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
-#
-# SPDX-License-Identifier: MPL-2.0
-"""This file contains the Grid protocol defining the minimal arrays contained in a grid"""
-
-from typing import Protocol
-
-from power_grid_model_ds._core.model.arrays import (
-    BranchArray,
-    NodeArray,
-    ThreeWindingTransformerArray,
-)
-
-
-class MinimalGridArrays(Protocol):
-    """Protocol for the minimal arrays contained in a grid,
-    they may be implemented using properties or added as attributes"""
-
-    node: NodeArray
-    three_winding_transformer: ThreeWindingTransformerArray
-    branches: BranchArray
-    branch_arrays: list[BranchArray]