power-grid-model-ds 1.4.2__tar.gz → 1.4.4__tar.gz

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: power-grid-model-ds
-Version: 1.4.2
+Version: 1.4.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
@@ -36,7 +36,7 @@ Requires-Dist: isort>=5.13.2; extra == "dev"
 Requires-Dist: mypy>=1.9.0; extra == "dev"
 Requires-Dist: pre-commit>=4; extra == "dev"
 Requires-Dist: dash>=3.0.0; extra == "dev"
-Requires-Dist: dash-bootstrap-components>=2.0.0; extra == "dev"
+Requires-Dist: dash-bootstrap-components>=2.0.3; extra == "dev"
 Requires-Dist: dash-cytoscape>=1.0.2; extra == "dev"
 Provides-Extra: visualizer
 Requires-Dist: dash>=3.0.0; extra == "visualizer"

power_grid_model_ds-1.4.4/PYPI_VERSION

@@ -0,0 +1 @@
+1.4.4

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.4}/pyproject.toml

@@ -46,7 +46,7 @@ dev = [
   "pre-commit>=4",
   # Visualization (make sure these stay equalivalent to the 'visualizer' group)
   "dash>=3.0.0",
-  "dash-bootstrap-components>=2.0.0",
+  "dash-bootstrap-components>=2.0.3",
   "dash-cytoscape>=1.0.2",
 ]
 

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.4}/src/power_grid_model_ds/_core/fancypy.py

@@ -4,7 +4,7 @@
 
 """A set of helper functions that mimic numpy functions but are specifically designed for FancyArrays."""
 
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING, TypeVar, Union
 
 import numpy as np
 
@@ -13,8 +13,10 @@ 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
 
+T = TypeVar("T", bound="FancyArray")
 
-def concatenate(fancy_array: "FancyArray", *other_arrays: Union["FancyArray", np.ndarray]) -> "FancyArray":
+
+def concatenate(fancy_array: T, *other_arrays: Union[T, np.ndarray]) -> T:
     """Concatenate arrays."""
     np_arrays = [array if isinstance(array, np.ndarray) else array.data for array in other_arrays]
     try:
@@ -24,7 +26,7 @@ def concatenate(fancy_array: "FancyArray", *other_arrays: Union["FancyArray", np
     return fancy_array.__class__(data=concatenated)
 
 
-def unique(array: "FancyArray", **kwargs):
+def unique(array: T, **kwargs):
     """Return the unique elements of the array."""
     for column in array.columns:
         if np.issubdtype(array.dtype[column], np.floating) and np.isnan(array[column]).any():
@@ -37,13 +39,13 @@ def unique(array: "FancyArray", **kwargs):
     return array.__class__(data=unique_data)
 
 
-def sort(array: "FancyArray", axis=-1, kind=None, order=None) -> "FancyArray":
+def sort(array: T, axis=-1, kind=None, order=None) -> T:
     """Sort the array in-place and return sorted array."""
     array.data.sort(axis=axis, kind=kind, order=order)
     return array
 
 
-def array_equal(array1: "FancyArray", array2: "FancyArray", equal_nan: bool = True) -> bool:
+def array_equal(array1: T, array2: T, equal_nan: bool = True) -> bool:
     """Return True if two arrays are equal."""
     if equal_nan:
         return array_equal_with_nan(array1.data, array2.data)

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.4}/src/power_grid_model_ds/_core/model/arrays/base/array.py

@@ -66,7 +66,7 @@ class FancyArray(ABC):
             self._data = data
 
     @property
-    def data(self: Self):
+    def data(self: Self) -> NDArray:
         return self._data
 
     @classmethod

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.4}/src/power_grid_model_ds/_core/model/arrays/pgm_arrays.py

@@ -9,6 +9,7 @@ from typing import Literal
 import numpy as np
 from numpy.typing import NDArray
 
+from power_grid_model_ds._core.fancypy import concatenate
 from power_grid_model_ds._core.model.arrays.base.array import FancyArray
 from power_grid_model_ds._core.model.dtypes.appliances import Source, SymGen, SymLoad
 from power_grid_model_ds._core.model.dtypes.branches import (
@@ -99,7 +100,26 @@ class TransformerArray(Transformer, BranchArray):
 
 
 class Branch3Array(IdArray, Branch3):
-    pass
+    def as_branches(self) -> BranchArray:
+        """Convert Branch3Array to BranchArray."""
+        branches_1_2 = BranchArray.empty(self.size)
+        branches_1_2.from_node = self.node_1
+        branches_1_2.to_node = self.node_2
+        branches_1_2.from_status = self.status_1
+        branches_1_2.to_status = self.status_2
+
+        branches_1_3 = BranchArray.empty(self.size)
+        branches_1_3.from_node = self.node_1
+        branches_1_3.to_node = self.node_3
+        branches_1_3.from_status = self.status_1
+        branches_1_3.to_status = self.status_3
+
+        branches_2_3 = BranchArray.empty(self.size)
+        branches_2_3.from_node = self.node_2
+        branches_2_3.to_node = self.node_3
+        branches_2_3.from_status = self.status_2
+        branches_2_3.to_status = self.status_3
+        return concatenate(branches_1_2, branches_1_3, branches_2_3)
 
 
 class ThreeWindingTransformerArray(Branch3Array, ThreeWindingTransformer):

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.4}/src/power_grid_model_ds/_core/model/graphs/models/base.py

@@ -15,7 +15,6 @@ from power_grid_model_ds._core.model.graphs.errors import (
     MissingNodeError,
     NoPathBetweenNodes,
 )
-from power_grid_model_ds._core.model.utils import _get_branch3_branches
 
 if TYPE_CHECKING:
     from power_grid_model_ds._core.model.grids.base import Grid
@@ -175,8 +174,7 @@ class BaseGraphModel(ABC):
     def add_branch3_array(self, branch3_array: Branch3Array) -> None:
         """Add all branch3s in the branch3 array to the graph."""
         for branch3 in branch3_array:
-            branches = _get_branch3_branches(branch3)
-            self.add_branch_array(branches)
+            self.add_branch_array(branch3.as_branches())
 
     def delete_branch_array(self, branch_array: BranchArray, raise_on_fail: bool = True) -> None:
         """Delete all branches in branch_array from the graph."""
@@ -187,8 +185,7 @@ class BaseGraphModel(ABC):
     def delete_branch3_array(self, branch3_array: Branch3Array, raise_on_fail: bool = True) -> None:
         """Delete all branch3s in the branch3 array from the graph."""
         for branch3 in branch3_array:
-            branches = _get_branch3_branches(branch3)
-            self.delete_branch_array(branches, raise_on_fail=raise_on_fail)
+            self.delete_branch_array(branch3.as_branches(), raise_on_fail=raise_on_fail)
 
     @contextmanager
     def tmp_remove_nodes(self, nodes: list[int]) -> Generator:

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.4}/src/power_grid_model_ds/_core/visualizer/app.py

@@ -8,12 +8,13 @@ from dash_bootstrap_components.icons import FONT_AWESOME
 
 from power_grid_model_ds._core.model.grids.base import Grid
 from power_grid_model_ds._core.visualizer.callbacks import (  # noqa: F401  # pylint: disable=unused-import
-    element_scaling,
+    config,
     element_selection,
-    layout_dropdown,
+    header,
     search_form,
 )
 from power_grid_model_ds._core.visualizer.layout.cytoscape_html import get_cytoscape_html
+from power_grid_model_ds._core.visualizer.layout.cytoscape_styling import DEFAULT_STYLESHEET
 from power_grid_model_ds._core.visualizer.layout.header import HEADER_HTML
 from power_grid_model_ds._core.visualizer.layout.selection_output import SELECTION_OUTPUT_HTML
 from power_grid_model_ds._core.visualizer.parsers import parse_branches, parse_node_array
@@ -76,6 +77,7 @@ def get_app_layout(grid: Grid) -> html.Div:
     return html.Div(
         [
             columns_store,
+            dcc.Store(id="stylesheet-store", data=DEFAULT_STYLESHEET),
             HEADER_HTML,
             html.Hr(style={"border-color": "white", "margin": "0"}),
             cytoscape_html,

power_grid_model_ds-1.4.4/src/power_grid_model_ds/_core/visualizer/callbacks/config.py

@@ -0,0 +1,66 @@
+# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
+#
+# SPDX-License-Identifier: MPL-2.0
+
+
+from dash import Input, Output, State, callback
+from dash.exceptions import PreventUpdate
+
+from power_grid_model_ds._core.visualizer.layout.cytoscape_styling import BRANCH_WIDTH, NODE_SIZE
+from power_grid_model_ds._core.visualizer.typing import STYLESHEET
+
+
+@callback(
+    Output("stylesheet-store", "data", allow_duplicate=True),
+    Output("cytoscape-graph", "stylesheet", allow_duplicate=True),
+    Input("node-scale-input", "value"),
+    Input("edge-scale-input", "value"),
+    State("stylesheet-store", "data"),
+    prevent_initial_call=True,
+)
+def scale_elements(node_scale: float, edge_scale: float, stylesheet: STYLESHEET) -> tuple[STYLESHEET, STYLESHEET]:
+    """Callback to scale the elements of the graph."""
+    if stylesheet is None:
+        raise PreventUpdate
+    if node_scale == 1 and edge_scale == 1:
+        raise PreventUpdate
+    new_stylesheet = stylesheet.copy()
+    edge_style = {
+        "selector": "edge",
+        "style": {
+            "width": BRANCH_WIDTH * edge_scale,
+        },
+    }
+    new_stylesheet.append(edge_style)
+    node_style = {
+        "selector": "node",
+        "style": {
+            "height": NODE_SIZE * node_scale,
+            "width": NODE_SIZE * node_scale,
+        },
+    }
+    new_stylesheet.append(node_style)
+
+    return new_stylesheet, new_stylesheet
+
+
+@callback(Output("cytoscape-graph", "layout"), Input("dropdown-update-layout", "value"), prevent_initial_call=True)
+def update_layout(layout):
+    """Callback to update the layout of the graph."""
+    return {"name": layout, "animate": True}
+
+
+@callback(
+    Output("cytoscape-graph", "stylesheet", allow_duplicate=True),
+    Input("show-arrows", "value"),
+    State("cytoscape-graph", "stylesheet"),
+    prevent_initial_call=True,
+)
+def update_arrows(show_arrows, current_stylesheet):
+    """Callback to update the arrow style of edges in the graph."""
+    selectors = [rule["selector"] for rule in current_stylesheet]
+    index = selectors.index("edge")
+    edge_style = current_stylesheet[index]["style"]
+
+    edge_style["target-arrow-shape"] = "triangle" if show_arrows else "none"
+    return current_stylesheet

power_grid_model_ds-1.4.4/src/power_grid_model_ds/_core/visualizer/callbacks/header.py

@@ -0,0 +1,30 @@
+# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
+#
+# SPDX-License-Identifier: MPL-2.0
+
+import dash
+from dash import Input, Output, callback
+
+from power_grid_model_ds._core.visualizer.layout.header import CONFIG_DIV, LEGENDA_DIV, SEARCH_DIV
+
+
+@callback(
+    Output("header-right-col", "children"),
+    [
+        Input("btn-legend", "n_clicks"),
+        Input("btn-search", "n_clicks"),
+        Input("btn-config", "n_clicks"),
+    ],
+)
+def update_right_col(_btn1, _btn2, _btn3):
+    """Update the right column content based on the button clicked."""
+    ctx = dash.callback_context
+    if not ctx.triggered:
+        return LEGENDA_DIV
+    button_id = ctx.triggered[0]["prop_id"].split(".")[0]
+    button_map = {
+        "btn-legend": LEGENDA_DIV,
+        "btn-search": SEARCH_DIV,
+        "btn-config": CONFIG_DIV,
+    }
+    return button_map.get(button_id, "Right Column")

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.4}/src/power_grid_model_ds/_core/visualizer/callbacks/search_form.py

@@ -1,12 +1,12 @@
 # SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
 #
 # SPDX-License-Identifier: MPL-2.0
-from typing import Any
 
-from dash import Input, Output, callback
+from dash import Input, Output, State, callback
+from dash.exceptions import PreventUpdate
 
 from power_grid_model_ds._core.visualizer.layout.colors import CYTO_COLORS
-from power_grid_model_ds._core.visualizer.layout.cytoscape_styling import DEFAULT_STYLESHEET
+from power_grid_model_ds._core.visualizer.typing import STYLESHEET
 
 
 @callback(
@@ -15,11 +15,12 @@ from power_grid_model_ds._core.visualizer.layout.cytoscape_styling import DEFAUL
     Input("search-form-column-input", "value"),
     Input("search-form-operator-input", "value"),
     Input("search-form-value-input", "value"),
+    State("stylesheet-store", "data"),
 )
-def search_element(group: str, column: str, operator: str, value: str) -> list[dict[str, Any]]:
+def search_element(group: str, column: str, operator: str, value: str, stylesheet: STYLESHEET) -> STYLESHEET:
     """Color the specified element red based on the input values."""
     if not group or not column or not value:
-        return DEFAULT_STYLESHEET
+        raise PreventUpdate
 
     # Determine if we're working with a node or an edge type
     if group == "node":
@@ -39,7 +40,8 @@ def search_element(group: str, column: str, operator: str, value: str) -> list[d
         "selector": selector,
         "style": style,
     }
-    return DEFAULT_STYLESHEET + [new_style]
+    updated_stylesheet = stylesheet + [new_style]
+    return updated_stylesheet
 
 
 @callback(

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.4}/src/power_grid_model_ds/_core/visualizer/layout/cytoscape_html.py

@@ -10,8 +10,6 @@ from dash import html
 from power_grid_model_ds._core.visualizer.layout.colors import BACKGROUND_COLOR
 from power_grid_model_ds._core.visualizer.layout.cytoscape_styling import DEFAULT_STYLESHEET
 
-LAYOUT_OPTIONS = ["random", "circle", "concentric", "grid", "cose", "breadthfirst"]
-
 _CYTO_INNER_STYLE = {"width": "100%", "height": "100%", "background-color": BACKGROUND_COLOR}
 _CYTO_OUTER_STYLE = {"height": "80vh"}
 

power_grid_model_ds-1.4.4/src/power_grid_model_ds/_core/visualizer/layout/header.py

@@ -0,0 +1,62 @@
+# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
+#
+# SPDX-License-Identifier: MPL-2.0
+
+import dash_bootstrap_components as dbc
+from dash import html
+
+from power_grid_model_ds._core.visualizer.layout.header_config import CONFIG_ELEMENTS
+from power_grid_model_ds._core.visualizer.layout.header_legenda import LEGENDA_ELEMENTS, LEGENDA_STYLE
+from power_grid_model_ds._core.visualizer.layout.header_search import SEARCH_ELEMENTS
+
+_MENU_BUTTON_STYLE_CLASS = "me-2 btn-outline-primary"
+
+_LEFT_COLUMN_HTML = dbc.Col(
+    [
+        dbc.Button("Legend", id="btn-legend", className=_MENU_BUTTON_STYLE_CLASS),
+        dbc.Button("Search", id="btn-search", className=_MENU_BUTTON_STYLE_CLASS),
+        dbc.Button("Config", id="btn-config", className=_MENU_BUTTON_STYLE_CLASS),
+    ],
+    id="header-left-col",
+    width=5,
+    style={
+        "display": "flex",
+        "align-items": "center",
+        "justify-content": "center",
+        "border-right": "1px solid white",
+    },
+)
+
+
+_RIGHT_COLUMN_STYLE = {
+    "display": "flex",
+    "align-items": "center",
+    "width": "100%",
+}
+
+
+CONFIG_DIV = html.Div(CONFIG_ELEMENTS, style=_RIGHT_COLUMN_STYLE | {"justify-content": "space-between"})
+SEARCH_DIV = html.Div(SEARCH_ELEMENTS, style=_RIGHT_COLUMN_STYLE | {"justify-content": "center"})
+LEGENDA_DIV = html.Div(LEGENDA_ELEMENTS, style=_RIGHT_COLUMN_STYLE | LEGENDA_STYLE)
+
+_RIGHT_COLUMN_HTML = dbc.Col(
+    [LEGENDA_DIV, SEARCH_DIV, CONFIG_DIV],
+    id="header-right-col",
+    width=7,
+)
+
+HEADER_HTML = dbc.Row(
+    [
+        _LEFT_COLUMN_HTML,
+        _RIGHT_COLUMN_HTML,
+    ],
+    style={
+        "background-color": "#343a40",
+        "color": "white",
+        "padding": "1rem 0",
+        "margin": 0,
+        "height": "90px",
+        "width": "100%",
+    },
+    align="center",
+)

power_grid_model_ds-1.4.4/src/power_grid_model_ds/_core/visualizer/layout/header_config.py

@@ -0,0 +1,71 @@
+# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
+#
+# SPDX-License-Identifier: MPL-2.0
+from enum import Enum
+
+import dash_bootstrap_components as dbc
+from dash import dcc, html
+
+from power_grid_model_ds._core.visualizer.layout.colors import CYTO_COLORS
+
+NODE_SCALE_HTML = [
+    html.I(className="fas fa-circle", style={"color": CYTO_COLORS["node"], "margin-right": "10px"}),
+    dcc.Input(
+        id="node-scale-input",
+        type="number",
+        value=1,
+        min=0.1,
+        step=0.1,
+        style={"width": "75px"},
+    ),
+    html.Span(style={"margin-right": "10px"}),
+]
+
+EDGE_SCALE_HTML = [
+    html.I(className="fas fa-arrow-right-long", style={"color": CYTO_COLORS["line"], "margin-right": "10px"}),
+    dcc.Input(
+        id="edge-scale-input",
+        type="number",
+        value=1,
+        min=0.1,
+        step=0.1,
+        style={"width": "75px"},
+    ),
+]
+
+_SCALING_DIV = html.Div(NODE_SCALE_HTML + EDGE_SCALE_HTML, style={"margin": "0 20px 0 10px"})
+
+
+class LayoutOptions(Enum):
+    """Cytoscape layout options."""
+
+    RANDOM = "random"
+    CIRCLE = "circle"
+    CONCENTRIC = "concentric"
+    GRID = "grid"
+    COSE = "cose"
+    BREADTHFIRST = "breadthfirst"
+
+
+_LAYOUT_DROPDOWN = html.Div(
+    dcc.Dropdown(
+        id="dropdown-update-layout",
+        placeholder="Select layout",
+        value=LayoutOptions.BREADTHFIRST.value,
+        clearable=False,
+        options=[{"label": option.value, "value": option.value} for option in LayoutOptions],
+        style={"width": "200px"},
+    ),
+    style={"margin": "0 20px 0 10px", "color": "black"},
+)
+
+
+_ARROWS_CHECKBOX = dbc.Checkbox(
+    id="show-arrows",
+    label="Show arrows",
+    value=True,
+    label_style={"color": "white"},
+    style={"margin-top": "10px"},
+)
+
+CONFIG_ELEMENTS = [_LAYOUT_DROPDOWN, _ARROWS_CHECKBOX, _SCALING_DIV]

power_grid_model_ds-1.4.4/src/power_grid_model_ds/_core/visualizer/layout/header_legenda.py

@@ -0,0 +1,36 @@
+# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
+#
+# SPDX-License-Identifier: MPL-2.0
+
+import dash_bootstrap_components as dbc
+from dash import html
+
+from power_grid_model_ds._core.visualizer.layout.colors import CYTO_COLORS
+
+_BOOTSTRAP_ARROW_ICON_CLASS = "fas fa-arrow-right-long"
+_MARGIN = "0 10px"
+
+LEGENDA_STYLE = {"margin": _MARGIN, "text-shadow": "0 0 5px #000", "justify-content": "center"}
+
+_FONT_SIZE = "2.5em"
+
+NODE_ICON_STYLE = {"font-size": _FONT_SIZE, "margin": _MARGIN, "color": CYTO_COLORS["node"]}
+_SUBSTATION_ICON_STYLE = {"font-size": _FONT_SIZE, "margin": _MARGIN, "color": CYTO_COLORS["substation_node"]}
+_LINE_ICON_STYLE = {"font-size": _FONT_SIZE, "margin": _MARGIN, "color": CYTO_COLORS["line"]}
+_LINK_ICON_STYLE = {"font-size": _FONT_SIZE, "margin": _MARGIN, "color": CYTO_COLORS["link"]}
+_TRANSFORMER_ICON_STYLE = {"font-size": _FONT_SIZE, "margin": _MARGIN, "color": CYTO_COLORS["transformer"]}
+_OPEN_BRANCH_ICON_STYLE = {"font-size": _FONT_SIZE, "margin": _MARGIN, "color": CYTO_COLORS["open_branch"]}
+LEGENDA_ELEMENTS = [
+    html.I(className="fas fa-circle", id="node-icon", style=NODE_ICON_STYLE),
+    dbc.Tooltip("Node", target="node-icon", placement="bottom"),
+    html.I(className="fas fa-diamond", id="substation-icon", style=_SUBSTATION_ICON_STYLE),
+    dbc.Tooltip("Substation", target="substation-icon", placement="bottom"),
+    html.I(className=_BOOTSTRAP_ARROW_ICON_CLASS, id="line-icon", style=_LINE_ICON_STYLE),
+    dbc.Tooltip("Line", target="line-icon", placement="bottom"),
+    html.I(className=_BOOTSTRAP_ARROW_ICON_CLASS, id="transformer-icon", style=_TRANSFORMER_ICON_STYLE),
+    dbc.Tooltip("Transformer", target="transformer-icon", placement="bottom"),
+    html.I(className=_BOOTSTRAP_ARROW_ICON_CLASS, id="link-icon", style=_LINK_ICON_STYLE),
+    dbc.Tooltip("Link", target="link-icon", placement="bottom"),
+    html.I(className="fas fa-ellipsis", id="open-branch-icon", style=_OPEN_BRANCH_ICON_STYLE),
+    dbc.Tooltip("Open Branch", target="open-branch-icon", placement="bottom"),
+]

power_grid_model_ds-1.4.2/src/power_grid_model_ds/_core/visualizer/layout/search_form.py → power_grid_model_ds-1.4.4/src/power_grid_model_ds/_core/visualizer/layout/header_search.py

@@ -44,21 +44,15 @@ OPERATOR_INPUT = dbc.Select(
 
 
 # Arrange as a sentence
-SEARCH_FORM_HTML = html.Div(
-    [
-        html.Span("Search ", style=SPAN_TEXT_STYLE),
-        GROUP_INPUT,
-        html.Span(" with ", className="mx-2", style=SPAN_TEXT_STYLE),
-        COLUMN_INPUT,
-        OPERATOR_INPUT,
-        VALUE_INPUT,
-    ],
-    style={
-        "display": "flex",
-        "align-items": "center",
-        "justify-content": "center",  # Centers items horizontally
-        "padding": "10px",
-        "margin": "0 auto",  # Centers the container itself
-        "width": "100%",  # Ensures the container takes full width
-    },
-)
+SEARCH_ELEMENTS = [
+    html.Div(
+        [
+            html.Span("Search ", style=SPAN_TEXT_STYLE),
+            GROUP_INPUT,
+            html.Span(" with ", style=SPAN_TEXT_STYLE),
+            COLUMN_INPUT,
+            OPERATOR_INPUT,
+            VALUE_INPUT,
+        ]
+    )
+]

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.4}/src/power_grid_model_ds/_core/visualizer/parsers.py

@@ -6,7 +6,6 @@ from typing import Any, Literal
 
 from power_grid_model_ds._core.model.arrays.base.array import FancyArray
 from power_grid_model_ds._core.model.grids.base import Grid
-from power_grid_model_ds._core.model.utils import _get_branch3_branches
 from power_grid_model_ds.arrays import Branch3Array, BranchArray, NodeArray
 
 
@@ -41,15 +40,15 @@ def parse_branch3_array(branches: Branch3Array, group: Literal["transformer"]) -
     """Parse the three-winding transformer array."""
     parsed_branches = []
     columns = branches.columns
-    for branch in branches:
-        for branch_ in _get_branch3_branches(branch):
-            cyto_elements = {"data": _array_to_dict(branch_, columns)}
+    for branch3 in branches:
+        for branch1 in branch3.as_branches():
+            cyto_elements = {"data": _array_to_dict(branch1, columns)}
             cyto_elements["data"].update(
                 {
                     # IDs need to be unique, so we combine the branch ID with the from and to nodes
-                    "id": str(branch.id.item()) + f"_{branch_.from_node.item()}_{branch_.to_node.item()}",
-                    "source": str(branch_.from_node.item()),
-                    "target": str(branch_.to_node.item()),
+                    "id": str(branch3.id.item()) + f"_{branch1.from_node.item()}_{branch1.to_node.item()}",
+                    "source": str(branch1.from_node.item()),
+                    "target": str(branch1.to_node.item()),
                     "group": group,
                 }
             )

power_grid_model_ds-1.4.4/src/power_grid_model_ds/_core/visualizer/typing.py

@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
+#
+# SPDX-License-Identifier: MPL-2.0
+
+from typing import Any
+
+STYLESHEET = list[dict[str, Any]]

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.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.4.2
+Version: 1.4.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
@@ -36,7 +36,7 @@ Requires-Dist: isort>=5.13.2; extra == "dev"
 Requires-Dist: mypy>=1.9.0; extra == "dev"
 Requires-Dist: pre-commit>=4; extra == "dev"
 Requires-Dist: dash>=3.0.0; extra == "dev"
-Requires-Dist: dash-bootstrap-components>=2.0.0; extra == "dev"
+Requires-Dist: dash-bootstrap-components>=2.0.3; extra == "dev"
 Requires-Dist: dash-cytoscape>=1.0.2; extra == "dev"
 Provides-Extra: visualizer
 Requires-Dist: dash>=3.0.0; extra == "visualizer"

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.4}/src/power_grid_model_ds.egg-info/SOURCES.txt

@@ -31,7 +31,6 @@ src/power_grid_model_ds/_core/data_source/generator/arrays/source.py
 src/power_grid_model_ds/_core/data_source/generator/arrays/transformer.py
 src/power_grid_model_ds/_core/model/__init__.py
 src/power_grid_model_ds/_core/model/constants.py
-src/power_grid_model_ds/_core/model/utils.py
 src/power_grid_model_ds/_core/model/arrays/__init__.py
 src/power_grid_model_ds/_core/model/arrays/pgm_arrays.py
 src/power_grid_model_ds/_core/model/arrays/base/__init__.py
@@ -71,17 +70,18 @@ src/power_grid_model_ds/_core/utils/zip.py
 src/power_grid_model_ds/_core/visualizer/__init__.py
 src/power_grid_model_ds/_core/visualizer/app.py
 src/power_grid_model_ds/_core/visualizer/parsers.py
+src/power_grid_model_ds/_core/visualizer/typing.py
 src/power_grid_model_ds/_core/visualizer/callbacks/__init__.py
-src/power_grid_model_ds/_core/visualizer/callbacks/element_scaling.py
+src/power_grid_model_ds/_core/visualizer/callbacks/config.py
 src/power_grid_model_ds/_core/visualizer/callbacks/element_selection.py
-src/power_grid_model_ds/_core/visualizer/callbacks/layout_dropdown.py
+src/power_grid_model_ds/_core/visualizer/callbacks/header.py
 src/power_grid_model_ds/_core/visualizer/callbacks/search_form.py
 src/power_grid_model_ds/_core/visualizer/layout/__init__.py
 src/power_grid_model_ds/_core/visualizer/layout/colors.py
-src/power_grid_model_ds/_core/visualizer/layout/cytoscape_config.py
 src/power_grid_model_ds/_core/visualizer/layout/cytoscape_html.py
 src/power_grid_model_ds/_core/visualizer/layout/cytoscape_styling.py
 src/power_grid_model_ds/_core/visualizer/layout/header.py
-src/power_grid_model_ds/_core/visualizer/layout/legenda.py
-src/power_grid_model_ds/_core/visualizer/layout/search_form.py
+src/power_grid_model_ds/_core/visualizer/layout/header_config.py
+src/power_grid_model_ds/_core/visualizer/layout/header_legenda.py
+src/power_grid_model_ds/_core/visualizer/layout/header_search.py
 src/power_grid_model_ds/_core/visualizer/layout/selection_output.py

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.4}/src/power_grid_model_ds.egg-info/requires.txt

@@ -12,7 +12,7 @@ isort>=5.13.2
 mypy>=1.9.0
 pre-commit>=4
 dash>=3.0.0
-dash-bootstrap-components>=2.0.0
+dash-bootstrap-components>=2.0.3
 dash-cytoscape>=1.0.2
 
 [doc]

power_grid_model_ds-1.4.2/PYPI_VERSION

@@ -1 +0,0 @@
-1.4.2

power_grid_model_ds-1.4.2/src/power_grid_model_ds/_core/model/utils.py

@@ -1,22 +0,0 @@
-# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
-#
-# SPDX-License-Identifier: MPL-2.0
-from power_grid_model_ds._core.model.arrays.pgm_arrays import Branch3Array, BranchArray
-
-
-def _get_branch3_branches(branch3: Branch3Array) -> BranchArray:
-    node_1 = branch3.node_1.item()
-    node_2 = branch3.node_2.item()
-    node_3 = branch3.node_3.item()
-
-    status_1 = branch3.status_1.item()
-    status_2 = branch3.status_2.item()
-    status_3 = branch3.status_3.item()
-
-    branches = BranchArray.zeros(3)
-    branches.from_node = [node_1, node_1, node_2]
-    branches.to_node = [node_2, node_3, node_3]
-    branches.from_status = [status_1, status_1, status_2]
-    branches.to_status = [status_2, status_3, status_3]
-
-    return branches

power_grid_model_ds-1.4.2/src/power_grid_model_ds/_core/visualizer/callbacks/element_scaling.py

@@ -1,37 +0,0 @@
-# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
-#
-# SPDX-License-Identifier: MPL-2.0
-
-from copy import deepcopy
-from typing import Any
-
-from dash import Input, Output, callback
-
-from power_grid_model_ds._core.visualizer.layout.cytoscape_styling import BRANCH_WIDTH, DEFAULT_STYLESHEET, NODE_SIZE
-
-
-@callback(
-    Output("cytoscape-graph", "stylesheet", allow_duplicate=True),
-    Input("node-scale-input", "value"),
-    Input("edge-scale-input", "value"),
-    prevent_initial_call=True,
-)
-def scale_elements(node_scale: float, edge_scale: float) -> list[dict[str, Any]]:
-    """Callback to scale the elements of the graph."""
-    new_stylesheet = deepcopy(DEFAULT_STYLESHEET)
-    edge_style = {
-        "selector": "edge",
-        "style": {
-            "width": BRANCH_WIDTH * edge_scale,
-        },
-    }
-    new_stylesheet.append(edge_style)
-    node_style = {
-        "selector": "node",
-        "style": {
-            "height": NODE_SIZE * node_scale,
-            "width": NODE_SIZE * node_scale,
-        },
-    }
-    new_stylesheet.append(node_style)
-    return new_stylesheet

power_grid_model_ds-1.4.2/src/power_grid_model_ds/_core/visualizer/callbacks/layout_dropdown.py

@@ -1,11 +0,0 @@
-# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
-#
-# SPDX-License-Identifier: MPL-2.0
-
-from dash import Input, Output, callback
-
-
-@callback(Output("cytoscape-graph", "layout"), Input("dropdown-update-layout", "value"), prevent_initial_call=True)
-def update_layout(layout):
-    """Callback to update the layout of the graph."""
-    return {"name": layout, "animate": True}

power_grid_model_ds-1.4.2/src/power_grid_model_ds/_core/visualizer/layout/cytoscape_config.py

@@ -1,54 +0,0 @@
-# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
-#
-# SPDX-License-Identifier: MPL-2.0
-
-from dash import dcc, html
-
-from power_grid_model_ds._core.visualizer.layout.colors import CYTO_COLORS
-from power_grid_model_ds._core.visualizer.layout.cytoscape_html import LAYOUT_OPTIONS
-
-NODE_SCALE_HTML = [
-    html.I(className="fas fa-circle", style={"color": CYTO_COLORS["node"], "margin-right": "10px"}),
-    dcc.Input(
-        id="node-scale-input",
-        type="number",
-        value=1,
-        min=0.1,
-        step=0.1,
-        style={"width": "75px"},
-    ),
-    html.Span(style={"margin-right": "10px"}),
-]
-
-EDGE_SCALE_HTML = [
-    html.I(className="fas fa-arrow-right-long", style={"color": CYTO_COLORS["line"], "margin-right": "10px"}),
-    dcc.Input(
-        id="edge-scale-input",
-        type="number",
-        value=1,
-        min=0.1,
-        step=0.1,
-        style={"width": "75px"},
-    ),
-]
-
-SCALE_INPUTS = [
-    html.Div(
-        NODE_SCALE_HTML + EDGE_SCALE_HTML,
-        style={"margin": "0 20px 0 10px"},
-    ),
-]
-
-LAYOUT_DROPDOWN_HTML = [
-    html.Div(
-        dcc.Dropdown(
-            id="dropdown-update-layout",
-            placeholder="Select layout",
-            value="",
-            clearable=False,
-            options=[{"label": name.capitalize(), "value": name} for name in LAYOUT_OPTIONS],
-            style={"width": "200px"},
-        ),
-        style={"margin": "0 20px 0 10px"},
-    )
-]

power_grid_model_ds-1.4.2/src/power_grid_model_ds/_core/visualizer/layout/header.py

@@ -1,31 +0,0 @@
-# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
-#
-# SPDX-License-Identifier: MPL-2.0
-
-import dash_bootstrap_components as dbc
-
-from power_grid_model_ds._core.visualizer.layout.colors import BACKGROUND_COLOR
-from power_grid_model_ds._core.visualizer.layout.cytoscape_config import LAYOUT_DROPDOWN_HTML, SCALE_INPUTS
-from power_grid_model_ds._core.visualizer.layout.legenda import LEGENDA_HTML
-from power_grid_model_ds._core.visualizer.layout.search_form import SEARCH_FORM_HTML
-
-_SEARCH_FORM_CARD_STYLE = {
-    "background-color": "#555555",
-    "color": "white",
-    "border-left": "1px solid white",
-    "border-right": "1px solid white",
-    "border-radius": 0,
-}
-
-
-HEADER_HTML = dbc.Row(
-    [
-        dbc.Col(LEGENDA_HTML, className="d-flex align-items-center"),
-        dbc.Col(
-            dbc.Card(SEARCH_FORM_HTML, style=_SEARCH_FORM_CARD_STYLE),
-            className="d-flex justify-content-center align-items-center",
-        ),
-        dbc.Col(SCALE_INPUTS + LAYOUT_DROPDOWN_HTML, className="d-flex justify-content-end align-items-center"),
-    ],
-    style={"background-color": BACKGROUND_COLOR},
-)

power_grid_model_ds-1.4.2/src/power_grid_model_ds/_core/visualizer/layout/legenda.py

@@ -1,41 +0,0 @@
-# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
-#
-# SPDX-License-Identifier: MPL-2.0
-
-import dash_bootstrap_components as dbc
-from dash import html
-
-from power_grid_model_ds._core.visualizer.layout.colors import CYTO_COLORS
-
-_MARGIN = "0 10px"
-_FONT_SIZE = "2.5em"
-
-NODE_ICON_STYLE = {"font-size": _FONT_SIZE, "margin": _MARGIN, "color": CYTO_COLORS["node"]}
-_SUBSTATION_ICON_STYLE = {"font-size": _FONT_SIZE, "margin": _MARGIN, "color": CYTO_COLORS["substation_node"]}
-_LINE_ICON_STYLE = {"font-size": _FONT_SIZE, "margin": _MARGIN, "color": CYTO_COLORS["line"]}
-_LINK_ICON_STYLE = {"font-size": _FONT_SIZE, "margin": _MARGIN, "color": CYTO_COLORS["link"]}
-_TRANSFORMER_ICON_STYLE = {"font-size": _FONT_SIZE, "margin": _MARGIN, "color": CYTO_COLORS["transformer"]}
-_OPEN_BRANCH_ICON_STYLE = {"font-size": _FONT_SIZE, "margin": _MARGIN, "color": CYTO_COLORS["open_branch"]}
-LEGENDA_HTML = html.Div(
-    [
-        html.I(className="fas fa-circle", id="node-icon", style=NODE_ICON_STYLE),
-        dbc.Tooltip("Node", target="node-icon", placement="bottom"),
-        html.I(className="fas fa-diamond", id="substation-icon", style=_SUBSTATION_ICON_STYLE),
-        dbc.Tooltip("Substation", target="substation-icon", placement="bottom"),
-        html.I(className="fas fa-arrow-right-long", id="line-icon", style=_LINE_ICON_STYLE),
-        dbc.Tooltip("Line", target="line-icon", placement="bottom"),
-        html.I(className="fas fa-arrow-right-long", id="transformer-icon", style=_TRANSFORMER_ICON_STYLE),
-        dbc.Tooltip("Transformer", target="transformer-icon", placement="bottom"),
-        html.I(className="fas fa-arrow-right-long", id="link-icon", style=_LINK_ICON_STYLE),
-        dbc.Tooltip("Link", target="link-icon", placement="bottom"),
-        html.I(className="fas fa-ellipsis", id="open-branch-icon", style=_OPEN_BRANCH_ICON_STYLE),
-        dbc.Tooltip("Open Branch", target="open-branch-icon", placement="bottom"),
-    ],
-    style={
-        "display": "flex",
-        "align-items": "center",
-        "margin": _MARGIN,
-        "width": "100%",
-        "text-shadow": "0 0 5px #000",
-    },
-)