power-grid-model-ds 1.0.13__py3-none-any.whl → 1.1.0__py3-none-any.whl

power_grid_model_ds/_core/model/graphs/models/base.py

@@ -3,6 +3,8 @@
 # SPDX-License-Identifier: MPL-2.0
 
 from abc import ABC, abstractmethod
+from contextlib import contextmanager
+from typing import Generator
 
 import numpy as np
 from numpy._typing import NDArray
@@ -34,6 +36,14 @@ class BaseGraphModel(ABC):
     def nr_branches(self):
         """Returns the number of branches in the graph"""
 
+    @property
+    def all_branches(self) -> Generator[tuple[int, int], None, None]:
+        """Returns all branches in the graph."""
+        return (
+            (self.internal_to_external(source), self.internal_to_external(target))
+            for source, target in self._all_branches()
+        )
+
     @abstractmethod
     def external_to_internal(self, ext_node_id: int) -> int:
         """Convert external node id to internal node id (internal)
@@ -63,6 +73,14 @@ class BaseGraphModel(ABC):
 
         return self._has_node(node_id=internal_node_id)
 
+    def in_branches(self, node_id: int) -> Generator[tuple[int, int], None, None]:
+        """Return all branches that have the node as an endpoint."""
+        int_node_id = self.external_to_internal(node_id)
+        internal_edges = self._in_branches(int_node_id=int_node_id)
+        return (
+            (self.internal_to_external(source), self.internal_to_external(target)) for source, target in internal_edges
+        )
+
     def add_node(self, ext_node_id: int, raise_on_fail: bool = True) -> None:
         """Add a node to the graph."""
         if self.has_node(ext_node_id):
@@ -164,6 +182,28 @@ class BaseGraphModel(ABC):
             branches = _get_branch3_branches(branch3)
             self.delete_branch_array(branches, raise_on_fail=raise_on_fail)
 
+    @contextmanager
+    def tmp_remove_nodes(self, nodes: list[int]) -> Generator:
+        """Context manager that temporarily removes nodes and their branches from the graph.
+        Example:
+            >>> with graph.tmp_remove_nodes([1, 2, 3]):
+            >>>    assert not graph.has_node(1)
+            >>> assert graph.has_node(1)
+        In practice, this is useful when you want to e.g. calculate the shortest path between two nodes without
+        considering certain nodes.
+        """
+        edge_list = []
+        for node in nodes:
+            edge_list += list(self.in_branches(node))
+            self.delete_node(node)
+
+        yield
+
+        for node in nodes:
+            self.add_node(node)
+        for source, target in edge_list:
+            self.add_branch(source, target)
+
     def get_shortest_path(self, ext_start_node_id: int, ext_end_node_id: int) -> tuple[list[int], int]:
         """Calculate the shortest path between two nodes
 
@@ -270,6 +310,9 @@ class BaseGraphModel(ABC):
             return branch.is_active.item()
         return True
 
+    @abstractmethod
+    def _in_branches(self, int_node_id: int) -> Generator[tuple[int, int], None, None]: ...
+
     @abstractmethod
     def _get_connected(self, node_id: int, nodes_to_ignore: list[int], inclusive: bool = False) -> list[int]: ...
 
@@ -307,6 +350,9 @@ class BaseGraphModel(ABC):
     @abstractmethod
     def _find_fundamental_cycles(self) -> list[list[int]]: ...
 
+    @abstractmethod
+    def _all_branches(self) -> Generator[tuple[int, int], None, None]: ...
+
 
 def _get_branch3_branches(branch3: Branch3Array) -> BranchArray:
     node_1 = branch3.node_1.item()

power_grid_model_ds/_core/model/graphs/models/rustworkx.py

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: MPL-2.0
 
 import logging
+from typing import Generator
 
 import rustworkx as rx
 from rustworkx import NoEdgeBetweenNodes
@@ -99,6 +100,9 @@ class RustworkxGraphModel(BaseGraphModel):
 
         return connected_nodes
 
+    def _in_branches(self, int_node_id: int) -> Generator[tuple[int, int], None, None]:
+        return ((source, target) for source, target, _ in self._graph.in_edges(int_node_id))
+
     def _find_fundamental_cycles(self) -> list[list[int]]:
         """Find all fundamental cycles in the graph using Rustworkx.
 
@@ -107,6 +111,9 @@ class RustworkxGraphModel(BaseGraphModel):
         """
         return find_fundamental_cycles_rustworkx(self._graph)
 
+    def _all_branches(self) -> Generator[tuple[int, int], None, None]:
+        return ((source, target) for source, target in self._graph.edge_list())
+
 
 class _NodeVisitor(BFSVisitor):
     def __init__(self, nodes_to_ignore: list[int]):

power_grid_model_ds/_core/model/grids/_text_sources.py

@@ -5,7 +5,6 @@
 """Create a grid from text a text file"""
 
 import logging
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 from power_grid_model_ds._core.model.enums.nodes import NodeType
@@ -35,29 +34,28 @@ class TextSource:
     def __init__(self, grid_class: type["Grid"]):
         self.grid = grid_class.empty()
 
-    def load_grid_from_path(self, path: Path):
-        """Load assets from text file & sort them by id so that
-        they are ready to be appended to the grid"""
+    def load_from_txt(self, *args: str) -> "Grid":
+        """Load a grid from text"""
 
-        txt_nodes, txt_branches = self.read_txt(path)
+        text_lines = [line for arg in args for line in arg.strip().split("\n")]
+
+        txt_nodes, txt_branches = self.read_txt(text_lines)
         self.add_nodes(txt_nodes)
         self.add_branches(txt_branches)
         self.grid.set_feeder_ids()
         return self.grid
 
     @staticmethod
-    def read_txt(path: Path) -> tuple[set, dict]:
+    def read_txt(txt_lines: list[str]) -> tuple[set, dict]:
         """Extract assets from text"""
-        with open(path, "r", encoding="utf-8") as f:
-            txt_rows = f.readlines()
 
         txt_nodes = set()
         txt_branches = {}
-        for text_line in txt_rows:
+        for text_line in txt_lines:
             if not text_line.strip() or text_line.startswith("#"):
                 continue  # skip empty lines and comments
             try:
-                from_node_str, to_node_str, *comments = text_line.strip().split(" ")
+                from_node_str, to_node_str, *comments = text_line.strip().split()
             except ValueError as err:
                 raise ValueError(f"Text line '{text_line}' is invalid. Skipping...") from err
             comments = comments[0].split(",") if comments else []
@@ -116,4 +114,4 @@ class TextSource:
             new_branch.to_status = 0
         else:
             new_branch.to_status = 1
-        self.grid.append(new_branch)
+        self.grid.append(new_branch, check_max_id=False)

power_grid_model_ds/_core/model/grids/base.py

@@ -408,6 +408,21 @@ class Grid(FancyArrayContainer):
             raise TypeError(f"{pickle_path.name} is not a valid {cls.__name__} cache.")
         return grid
 
+    @classmethod
+    def from_txt(cls, *args: str):
+        """Build a grid from a list of strings
+
+        See the documentation for the expected format of the txt_lines
+
+        Args:
+            *args (str): The lines of the grid
+
+        Examples:
+            >>> Grid.from_txt("1 2", "2 3", "3 4 transformer", "4 5", "S1 6")
+            alternative: Grid.from_txt("1 2\n2 3\n3 4 transformer\n4 5\nS1 6")
+        """
+        return TextSource(grid_class=cls).load_from_txt(*args)
+
     @classmethod
     # pylint: disable=arguments-differ
     def from_txt_file(cls, txt_file_path: Path):
@@ -416,8 +431,9 @@ class Grid(FancyArrayContainer):
         Args:
             txt_file_path (Path): The path to the txt file
         """
-        text_source = TextSource(grid_class=cls)
-        return text_source.load_grid_from_path(txt_file_path)
+        with open(txt_file_path, "r", encoding="utf-8") as f:
+            txt_lines = f.readlines()
+        return TextSource(grid_class=cls).load_from_txt(*txt_lines)
 
     def set_feeder_ids(self):
         """Sets feeder and substation id properties in the grids arrays"""

{power_grid_model_ds-1.0.13.dist-info → power_grid_model_ds-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: power-grid-model-ds
-Version: 1.0.13
+Version: 1.1.0
 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

{power_grid_model_ds-1.0.13.dist-info → power_grid_model_ds-1.1.0.dist-info}/RECORD

@@ -47,18 +47,18 @@ power_grid_model_ds/_core/model/graphs/container.py,sha256=w3nwfR5sM-EqVPmZWSmhI
 power_grid_model_ds/_core/model/graphs/errors.py,sha256=-9fAsCqpKM0-lCM-tO2fVot9hqZBJa8WCxxqWEH_z6k,479
 power_grid_model_ds/_core/model/graphs/models/__init__.py,sha256=xwhMajQKIAfL1R3cq2sMNXMWtqfI5WGBi6-P4clyTes,262
 power_grid_model_ds/_core/model/graphs/models/_rustworkx_search.py,sha256=TqRR22TPx8XjRLukQxK8R8FjZvJ60CttDFctbISSbOM,2979
-power_grid_model_ds/_core/model/graphs/models/base.py,sha256=5IzmRGyacpoFNI09GEDGV383pBhtMIQfklTuRw1Utpc,12792
-power_grid_model_ds/_core/model/graphs/models/rustworkx.py,sha256=jD0Bn2tXYdnTKEUPc-eh-sie6o7ME5ukf62VwNSeUUc,4589
+power_grid_model_ds/_core/model/graphs/models/base.py,sha256=vpXVhLSy_npfNN5nY-DaoEdIGpgF9Quiv1NwPPYg_3c,14589
+power_grid_model_ds/_core/model/graphs/models/rustworkx.py,sha256=TKHTmF_DUr9bF6q9YIT-z1H7BtSdLLmetUAyPoYmAG0,4952
 power_grid_model_ds/_core/model/grids/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-power_grid_model_ds/_core/model/grids/_text_sources.py,sha256=Ywt2c1YzBv88w778pr33MVJeCYQX51TjwCgL70M3MPw,4306
-power_grid_model_ds/_core/model/grids/base.py,sha256=FnUR0112xHvmKwY9u3_yTMARlO8btXGPj9dmNUZMJUM,16074
+power_grid_model_ds/_core/model/grids/_text_sources.py,sha256=3CWn0zjaUkFhrnSEIqAas52xeW0EX3EWXIXyo8XSQgw,4229
+power_grid_model_ds/_core/model/grids/base.py,sha256=bmebyn9ILZMZIVpdUAZGer-hzG3Jf_bQKC4bK85_9vk,16616
 power_grid_model_ds/_core/model/grids/helpers.py,sha256=VmIQ5a8oBMWW-VT5HOJk4iRRfEyO_OKc9LqKG0eVpSs,4174
 power_grid_model_ds/_core/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 power_grid_model_ds/_core/utils/misc.py,sha256=aAdlXjyKN6_T4b_CQZ879TbkbDZW4TwBUsxTpkwvymU,1228
 power_grid_model_ds/_core/utils/pickle.py,sha256=LGeTc7nu9RY1noOzLJzYaSHSWIgqzHy2xhmueKGuipc,1445
 power_grid_model_ds/_core/utils/zip.py,sha256=9RtJYhjlgNZOtxr4iI-CpsjT1axw5kCCqprfTjaIsiI,2197
-power_grid_model_ds-1.0.13.dist-info/LICENSE,sha256=GpbnG1pNl-ORtSP6dmHeiZvwy36UFli6MEZy1XlmBqo,14906
-power_grid_model_ds-1.0.13.dist-info/METADATA,sha256=G_AdWIdAk5jp2QL4pfinDGReAda1MeU-Y2gYosL8HeY,4270
-power_grid_model_ds-1.0.13.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-power_grid_model_ds-1.0.13.dist-info/top_level.txt,sha256=nJa103Eqvm5TESYEKPFVImfLg_ugGOBznikrM-rZQZg,20
-power_grid_model_ds-1.0.13.dist-info/RECORD,,
+power_grid_model_ds-1.1.0.dist-info/LICENSE,sha256=GpbnG1pNl-ORtSP6dmHeiZvwy36UFli6MEZy1XlmBqo,14906
+power_grid_model_ds-1.1.0.dist-info/METADATA,sha256=8wCsVEkMj1ul3N-Mp23mdr2bNdgzDzqcEaQ7HS9FCQw,4269
+power_grid_model_ds-1.1.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+power_grid_model_ds-1.1.0.dist-info/top_level.txt,sha256=nJa103Eqvm5TESYEKPFVImfLg_ugGOBznikrM-rZQZg,20
+power_grid_model_ds-1.1.0.dist-info/RECORD,,