cleanup

Thijss · Thijss · commit 403bd308e501 · 2025-03-30T14:33:07.000+02:00
diff --git a/src/power_grid_model_ds/_core/visualizer/callbacks/element_scaling.py b/src/power_grid_model_ds/_core/visualizer/callbacks/element_scaling.py
@@ -1,15 +1,18 @@
-from dash import Input, Output, callback
 from copy import deepcopy
-from power_grid_model_ds._core.visualizer.layout.cytoscape_styling import DEFAULT_STYLESHEET, BRANCH_WIDTH, NODE_SIZE
+
+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
+    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, edge_scale):
+    """Callback to scale the elements of the graph."""
     new_stylesheet = deepcopy(DEFAULT_STYLESHEET)
     edge_style = {
         "selector": "edge",
diff --git a/src/power_grid_model_ds/_core/visualizer/callbacks/element_selection.py b/src/power_grid_model_ds/_core/visualizer/callbacks/element_selection.py
@@ -1,9 +1,8 @@
 from typing import Any
 
-from dash import Input, Output, callback, dash_table, dcc
+from dash import Input, Output, callback, dash_table
 
 from power_grid_model_ds._core.visualizer.layout.selection_output import (
-    SELECTION_OUTPUT_HEADER_STYLE,
     SELECTION_OUTPUT_HTML,
 )
 
@@ -24,8 +23,6 @@ def display_selected_element(node_data, edge_data):
 
 def _to_data_table(data: dict[str, Any]):
     # del data["timeStamp"]
-    group = data.pop("group")
-    header = dcc.Markdown(f"↓ A **{group}** is selected ↓", style=SELECTION_OUTPUT_HEADER_STYLE)
     columns = data.keys()
     data_table = dash_table.DataTable(
         data=[data], columns=[{"name": key, "id": key} for key in columns], editable=False
diff --git a/src/power_grid_model_ds/_core/visualizer/callbacks/layout_dropdown.py b/src/power_grid_model_ds/_core/visualizer/callbacks/layout_dropdown.py
@@ -1,7 +1,7 @@
-from dash import callback, Output, Input
+from dash import Input, Output, callback
 
 
-@callback(Output('cytoscape-graph', 'layout'), Input('dropdown-update-layout', 'value'),
-          prevent_initial_call=True)
+@callback(Output("cytoscape-graph", "layout"), Input("dropdown-update-layout", "value"), prevent_initial_call=True)
 def update_layout(layout):
-    return {'name': layout, 'animate': True}
+    """Callback to update the layout of the graph."""
+    return {"name": layout, "animate": True}
diff --git a/src/power_grid_model_ds/_core/visualizer/callbacks/search_form.py b/src/power_grid_model_ds/_core/visualizer/callbacks/search_form.py
@@ -1,4 +1,4 @@
-from dash import Input, Output, State, callback
+from dash import Input, Output, callback
 
 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
@@ -28,7 +28,7 @@ def search_element(group, column, operator, value):
     if column == "id":
         selector = f'[{column} {operator} "{value}"]'
     else:
-        selector = f'[{column} {operator} {value}]'
+        selector = f"[{column} {operator} {value}]"
 
     new_style = {
         "selector": selector,
@@ -37,7 +37,6 @@ def search_element(group, column, operator, value):
     return DEFAULT_STYLESHEET + [new_style]
 
 
-
 @callback(
     Output("search-form-column-input", "options"),
     Output("search-form-column-input", "value"),
diff --git a/src/power_grid_model_ds/_core/visualizer/layout/colors.py b/src/power_grid_model_ds/_core/visualizer/layout/colors.py
@@ -1,4 +1,3 @@
-
 YELLOW = "#facc37"
 CYTO_COLORS = {
     "line": YELLOW,
diff --git a/src/power_grid_model_ds/_core/visualizer/layout/cytoscape_config.py b/src/power_grid_model_ds/_core/visualizer/layout/cytoscape_config.py
@@ -1,4 +1,4 @@
-from dash import html, dcc
+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
@@ -14,7 +14,6 @@
         style={"width": "75px"},
     ),
     html.Span(style={"margin-right": "10px"}),
-
 ]
 
 EDGE_SCALE_HTML = [
@@ -37,12 +36,15 @@
 ]
 
 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"}
-    )]
+    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"},
+    )
+]
diff --git a/src/power_grid_model_ds/_core/visualizer/layout/cytoscape_html.py b/src/power_grid_model_ds/_core/visualizer/layout/cytoscape_html.py
@@ -1,4 +1,4 @@
-from typing import Any, Literal
+from typing import Any
 
 import dash_cytoscape as cyto
 from dash import html
diff --git a/src/power_grid_model_ds/_core/visualizer/layout/header.py b/src/power_grid_model_ds/_core/visualizer/layout/header.py
@@ -1,25 +1,27 @@
 import dash_bootstrap_components as dbc
-from dash import html, dcc
 
 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}
+_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"
+            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"),
+        dbc.Col(SCALE_INPUTS + LAYOUT_DROPDOWN_HTML, className="d-flex justify-content-end align-items-center"),
     ],
     style={"background-color": BACKGROUND_COLOR},
-)
+)
diff --git a/src/power_grid_model_ds/_core/visualizer/layout/legenda.py b/src/power_grid_model_ds/_core/visualizer/layout/legenda.py
@@ -1,5 +1,5 @@
-from dash import html
 import dash_bootstrap_components as dbc
+from dash import html
 
 from power_grid_model_ds._core.visualizer.layout.colors import CYTO_COLORS
 
@@ -29,6 +29,6 @@
         "align-items": "center",
         "margin": "0 10px",
         "width": "100%",
-        "text-shadow": "0 0 5px #000"
-    }
+        "text-shadow": "0 0 5px #000",
+    },
 )
diff --git a/src/power_grid_model_ds/_core/visualizer/layout/search_form.py b/src/power_grid_model_ds/_core/visualizer/layout/search_form.py
@@ -14,22 +14,17 @@
         {"label": "branch", "value": "branch"},
     ],
     value="node",  # Default value
-    style=_INPUT_STYLE
+    style=_INPUT_STYLE,
 )
 
 COLUMN_INPUT = dbc.Select(
     id="search-form-column-input",
     options=[{"label": "id", "value": "id"}],
     value="id",  # Default value
-    style=_INPUT_STYLE
+    style=_INPUT_STYLE,
 )
 
-VALUE_INPUT = dbc.Input(
-    id="search-form-value-input",
-    placeholder="Enter value",
-    type="text",
-    style=_INPUT_STYLE
-)
+VALUE_INPUT = dbc.Input(id="search-form-value-input", placeholder="Enter value", type="text", style=_INPUT_STYLE)
 
 OPERATOR_INPUT = dbc.Select(
     id="search-form-operator-input",
@@ -40,7 +35,7 @@
         {"label": "!=", "value": "!="},
     ],
     value="=",  # Default value
-    style={"width": "60px", "display": "inline-block", "margin": "0 8px"}
+    style={"width": "60px", "display": "inline-block", "margin": "0 8px"},
 )
 
 
@@ -54,13 +49,12 @@
         OPERATOR_INPUT,
         VALUE_INPUT,
     ],
-style={
+    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
-    }
+        "width": "100%",  # Ensures the container takes full width
+    },
 )
-
diff --git a/src/power_grid_model_ds/_core/visualizer/main.py b/src/power_grid_model_ds/_core/visualizer/main.py
@@ -2,12 +2,13 @@
 from dash import Dash, dcc, html
 from dash_bootstrap_components.icons import FONT_AWESOME
 
-from power_grid_model_ds import Grid
+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,
     element_selection,
-    search_form,
     layout_dropdown,
-    element_scaling)
+    search_form,
+)
 from power_grid_model_ds._core.visualizer.layout.cytoscape_html import get_cytoscape_html
 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
@@ -44,7 +45,9 @@ def visualize(grid: Grid, debug: bool = False):
     elements = parse_node_array(grid.node) + parse_branches(grid)
     cytoscape_html = get_cytoscape_html(layout, elements)
 
-    app = Dash(external_stylesheets=[dbc.themes.BOOTSTRAP, dbc.icons.BOOTSTRAP, MDBOOTSTRAP, FONT_AWESOME, GOOGLE_FONTS])
+    app = Dash(
+        external_stylesheets=[dbc.themes.BOOTSTRAP, dbc.icons.BOOTSTRAP, MDBOOTSTRAP, FONT_AWESOME, GOOGLE_FONTS]
+    )
     app.layout = html.Div(
         [
             columns_store,
@@ -53,7 +56,6 @@ def visualize(grid: Grid, debug: bool = False):
             cytoscape_html,
             SELECTION_OUTPUT_HTML,
         ],
-
     )
     app.run(debug=debug)
 
diff --git a/src/power_grid_model_ds/_core/visualizer/parsers.py b/src/power_grid_model_ds/_core/visualizer/parsers.py
@@ -1,7 +1,7 @@
 from typing import Any, Literal
 
-from power_grid_model_ds import Grid
 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.arrays import BranchArray, NodeArray
 
 
diff --git a/tests/integration/visualizer_tests.py b/tests/integration/visualizer_tests.py
@@ -37,7 +37,10 @@ def visualize_grid():
 
 
 def visualize_topo_grid():
-    visualize(grid=get_topo_grid(), debug=True, )
+    visualize(
+        grid=get_topo_grid(),
+        debug=True,
+    )
 
 
 if __name__ == "__main__":

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`YELLOW = "#facc37"`
`3`	`2`	`CYTO_COLORS = {`
`4`	`3`	`"line": YELLOW,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from typing import Any, Literal`
	`1`	`+from typing import Any`
`2`	`2`
`3`	`3`	`import dash_cytoscape as cyto`
`4`	`4`	`from dash import html`