flixopt 2.1.4__py3-none-any.whl → 2.1.6__py3-none-any.whl

flixopt/aggregation.py

@@ -34,7 +34,6 @@ from .structure import (
 if TYPE_CHECKING:
     import plotly.graph_objects as go
 
-warnings.filterwarnings('ignore', category=DeprecationWarning)
 logger = logging.getLogger('flixopt')
 
 

flixopt/components.py

@@ -3,6 +3,7 @@ This module contains the basic components of the flixopt framework.
 """
 
 import logging
+import warnings
 from typing import TYPE_CHECKING, Dict, List, Literal, Optional, Set, Tuple, Union
 
 import linopy
@@ -586,52 +587,160 @@ class SourceAndSink(Component):
     def __init__(
         self,
         label: str,
-        source: Flow,
-        sink: Flow,
-        prevent_simultaneous_sink_and_source: bool = True,
+        inputs: List[Flow] = None,
+        outputs: List[Flow] = None,
+        prevent_simultaneous_flow_rates: bool = True,
         meta_data: Optional[Dict] = None,
+        **kwargs,
     ):
         """
         Args:
             label: The label of the Element. Used to identify it in the FlowSystem
-            source: output-flow of this component
-            sink: input-flow of this component
-            prevent_simultaneous_sink_and_source: If True, inflow and outflow can not be active simultaniously.
+            outputs: output-flows of this component
+            inputs: input-flows of this component
+            prevent_simultaneous_flow_rates: If True, inflow and outflow can not be active simultaniously.
             meta_data: used to store more information about the Element. Is not used internally, but saved in the results. Only use python native types.
         """
+        source = kwargs.pop('source', None)
+        sink = kwargs.pop('sink', None)
+        prevent_simultaneous_sink_and_source = kwargs.pop('prevent_simultaneous_sink_and_source', None)
+        if source is not None:
+            warnings.deprecated(
+                'The use of the source argument is deprecated. Use the outputs argument instead.',
+                stacklevel=2,
+            )
+            if outputs is not None:
+                raise ValueError('Either source or outputs can be specified, but not both.')
+            outputs = [source]
+
+        if sink is not None:
+            warnings.deprecated(
+                'The use of the sink argument is deprecated. Use the outputs argument instead.',
+                stacklevel=2,
+            )
+            if inputs is not None:
+                raise ValueError('Either sink or outputs can be specified, but not both.')
+            inputs = [sink]
+
+        if prevent_simultaneous_sink_and_source is not None:
+            warnings.deprecated(
+                'The use of the prevent_simultaneous_sink_and_source argument is deprecated. Use the prevent_simultaneous_flow_rates argument instead.',
+                stacklevel=2,
+            )
+            prevent_simultaneous_flow_rates = prevent_simultaneous_sink_and_source
+
         super().__init__(
             label,
-            inputs=[sink],
-            outputs=[source],
-            prevent_simultaneous_flows=[sink, source] if prevent_simultaneous_sink_and_source is True else None,
+            inputs=inputs,
+            outputs=outputs,
+            prevent_simultaneous_flows=inputs + outputs if prevent_simultaneous_flow_rates is True else None,
             meta_data=meta_data,
         )
-        self.source = source
-        self.sink = sink
-        self.prevent_simultaneous_sink_and_source = prevent_simultaneous_sink_and_source
+        self.prevent_simultaneous_flow_rates = prevent_simultaneous_flow_rates
+
+    @property
+    def source(self) -> Flow:
+        warnings.warn(
+            'The source property is deprecated. Use the outputs property instead.',
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self.outputs[0]
+
+    @property
+    def sink(self) -> Flow:
+        warnings.warn(
+            'The sink property is deprecated. Use the outputs property instead.',
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self.inputs[0]
+
+    @property
+    def prevent_simultaneous_sink_and_source(self) -> bool:
+        warnings.warn(
+            'The prevent_simultaneous_sink_and_source property is deprecated. Use the prevent_simultaneous_flow_rates property instead.',
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self.prevent_simultaneous_flow_rates
 
 
 @register_class_for_io
 class Source(Component):
-    def __init__(self, label: str, source: Flow, meta_data: Optional[Dict] = None):
+    def __init__(
+        self,
+        label: str,
+        outputs: List[Flow] = None,
+        meta_data: Optional[Dict] = None,
+        prevent_simultaneous_flow_rates: bool = False,
+        **kwargs
+    ):
         """
         Args:
             label: The label of the Element. Used to identify it in the FlowSystem
-            source: output-flow of source
+            outputs: output-flows of source
             meta_data: used to store more information about the Element. Is not used internally, but saved in the results. Only use python native types.
         """
-        super().__init__(label, outputs=[source], meta_data=meta_data)
-        self.source = source
+        source = kwargs.pop('source', None)
+        if source is not None:
+            warnings.warn(
+                'The use of the source argument is deprecated. Use the outputs argument instead.',
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            if outputs is not None:
+                raise ValueError('Either source or outputs can be specified, but not both.')
+            outputs = [source]
+
+        self.prevent_simultaneous_flow_rates = prevent_simultaneous_flow_rates
+        super().__init__(label, outputs=outputs, meta_data=meta_data, prevent_simultaneous_flows=outputs if prevent_simultaneous_flow_rates else None)
+
+    @property
+    def source(self) -> Flow:
+        warnings.warn(
+            'The source property is deprecated. Use the outputs property instead.',
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self.outputs[0]
 
 
 @register_class_for_io
 class Sink(Component):
-    def __init__(self, label: str, sink: Flow, meta_data: Optional[Dict] = None):
+    def __init__(
+        self,
+        label: str,
+        inputs: List[Flow] = None,
+        meta_data: Optional[Dict] = None,
+        prevent_simultaneous_flow_rates: bool = False,
+        **kwargs
+    ):
         """
         Args:
             label: The label of the Element. Used to identify it in the FlowSystem
-            meta_data: used to store more information about the element. Is not used internally, but saved in the results
-            sink: input-flow of sink
+            inputs: output-flows of source
+            meta_data: used to store more information about the Element. Is not used internally, but saved in the results. Only use python native types.
         """
-        super().__init__(label, inputs=[sink], meta_data=meta_data)
-        self.sink = sink
+        sink = kwargs.pop('sink', None)
+        if sink is not None:
+            warnings.warn(
+                'The use of the sink argument is deprecated. Use the outputs argument instead.',
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            if inputs is not None:
+                raise ValueError('Either sink or outputs can be specified, but not both.')
+            inputs = [sink]
+
+        self.prevent_simultaneous_flow_rates = prevent_simultaneous_flow_rates
+        super().__init__(label, inputs=inputs, meta_data=meta_data, prevent_simultaneous_flows=inputs if prevent_simultaneous_flow_rates else None)
+
+    @property
+    def sink(self) -> Flow:
+        warnings.warn(
+            'The sink property is deprecated. Use the outputs property instead.',
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self.inputs[0]

flixopt/flow_system.py

@@ -61,6 +61,8 @@ class FlowSystem:
 
         self._connected = False
 
+        self._network_app = None
+
     @classmethod
     def from_dataset(cls, ds: xr.Dataset):
         timesteps_extra = pd.DatetimeIndex(ds.attrs['timesteps_extra'], name='time')
@@ -241,6 +243,57 @@ class FlowSystem:
         node_infos, edge_infos = self.network_infos()
         return plotting.plot_network(node_infos, edge_infos, path, controls, show)
 
+    def start_network_app(self):
+        """Visualizes the network structure of a FlowSystem using Dash, Cytoscape, and networkx.
+        Requires optional dependencies: dash, dash-cytoscape, networkx, werkzeug.
+        """
+        from .network_app import DASH_CYTOSCAPE_AVAILABLE, VISUALIZATION_ERROR, flow_graph, shownetwork
+
+        warnings.warn(
+            'The network visualization is still experimental and might change in the future.',
+            stacklevel=2,
+            category=UserWarning,
+        )
+
+        if not DASH_CYTOSCAPE_AVAILABLE:
+            raise ImportError(
+                f"Network visualization requires optional dependencies. "
+                f"Install with: pip install flixopt[viz], flixopt[full] or pip install dash dash_cytoscape networkx werkzeug. "
+                f"Original error: {VISUALIZATION_ERROR}"
+            )
+
+        if not self._connected:
+            self._connect_network()
+
+        if self._network_app is not None:
+            logger.warning('The network app is already running. Restarting it.')
+            self.stop_network_app()
+
+        self._network_app = shownetwork(flow_graph(self))
+
+    def stop_network_app(self):
+        """Stop the network visualization server."""
+        from .network_app import DASH_CYTOSCAPE_AVAILABLE, VISUALIZATION_ERROR
+        if not DASH_CYTOSCAPE_AVAILABLE:
+            raise ImportError(
+                f'Network visualization requires optional dependencies. '
+                f'Install with: pip install flixopt[viz]. '
+                f'Original error: {VISUALIZATION_ERROR}'
+            )
+
+        if self._network_app is None:
+            logger.warning('No network app is currently running. Cant stop it')
+            return
+
+        try:
+            logger.info('Stopping network visualization server...')
+            self._network_app.server_instance.shutdown()
+            logger.info('Network visualization stopped.')
+        except Exception as e:
+            logger.error(f'Failed to stop the network visualization app: {e}')
+        finally:
+            self._network_app = None
+
     def network_infos(self) -> Tuple[Dict[str, Dict[str, str]], Dict[str, Dict[str, str]]]:
         if not self._connected:
             self._connect_network()

flixopt/network_app.py

@@ -0,0 +1,612 @@
+import json
+import logging
+import socket
+import threading
+from typing import Any, Dict, List
+
+try:
+    import dash_cytoscape as cyto
+    import dash_daq as daq
+    import networkx
+    from dash import Dash, Input, Output, State, callback_context, dcc, html, no_update
+    from werkzeug.serving import make_server
+
+    DASH_CYTOSCAPE_AVAILABLE = True
+    VISUALIZATION_ERROR = None
+except ImportError as e:
+    DASH_CYTOSCAPE_AVAILABLE = False
+    VISUALIZATION_ERROR = str(e)
+
+from .components import LinearConverter, Sink, Source, SourceAndSink, Storage
+from .elements import Bus, Component, Flow
+from .flow_system import FlowSystem
+
+logger = logging.getLogger('flixopt')
+
+# Configuration class for better organization
+class VisualizationConfig:
+    """Configuration constants for the visualization"""
+
+    DEFAULT_COLORS = {
+        'Bus': '#7F8C8D',
+        'Source': '#F1C40F',
+        'Sink': '#F1C40F',
+        'Storage': '#2980B9',
+        'Converter': '#D35400',
+        'Other': '#27AE60',
+    }
+
+    COLOR_PRESETS = {
+        'Default': DEFAULT_COLORS,
+        'Vibrant': {
+            'Bus': '#FF6B6B', 'Source': '#4ECDC4', 'Sink': '#45B7D1',
+            'Storage': '#96CEB4', 'Converter': '#FFEAA7', 'Other': '#DDA0DD',
+        },
+        'Dark': {
+            'Bus': '#2C3E50', 'Source': '#34495E', 'Sink': '#7F8C8D',
+            'Storage': '#95A5A6', 'Converter': '#BDC3C7', 'Other': '#ECF0F1',
+        },
+        'Pastel': {
+            'Bus': '#FFB3BA', 'Source': '#BAFFC9', 'Sink': '#BAE1FF',
+            'Storage': '#FFFFBA', 'Converter': '#FFDFBA', 'Other': '#E0BBE4',
+        },
+    }
+
+    DEFAULT_STYLESHEET = [
+        {
+            'selector': 'node',
+            'style': {
+                'content': 'data(label)',
+                'background-color': 'data(color)',
+                'font-size': 10,
+                'color': 'white',
+                'text-valign': 'center',
+                'text-halign': 'center',
+                'width': '90px',
+                'height': '70px',
+                'shape': 'data(shape)',
+                'text-outline-color': 'black',
+                'text-outline-width': 0.5,
+            },
+        },
+        {
+            'selector': '[shape = "custom-source"]',
+            'style': {
+                'shape': 'polygon',
+                'shape-polygon-points': '-0.5 0.5, 0.5 0.5, 1 -0.5, -1 -0.5',
+            },
+        },
+        {
+            'selector': '[shape = "custom-sink"]',
+            'style': {
+                'shape': 'polygon',
+                'shape-polygon-points': '-0.5 -0.5, 0.5 -0.5, 1 0.5, -1 0.5',
+            },
+        },
+        {
+            'selector': 'edge',
+            'style': {
+                'curve-style': 'straight',
+                'width': 2,
+                'line-color': 'gray',
+                'target-arrow-color': 'gray',
+                'target-arrow-shape': 'triangle',
+                'arrow-scale': 2,
+            },
+        },
+    ]
+
+def flow_graph(flow_system: FlowSystem) -> networkx.DiGraph:
+    """Convert FlowSystem to NetworkX graph - simplified and more robust"""
+    nodes = list(flow_system.components.values()) + list(flow_system.buses.values())
+    edges = list(flow_system.flows.values())
+
+    def get_element_type(element):
+        """Determine element type for coloring"""
+        if isinstance(element, Bus):
+            return 'Bus'
+        elif isinstance(element, Source):
+            return 'Source'
+        elif isinstance(element, (Sink, SourceAndSink)):
+            return 'Sink'
+        elif isinstance(element, Storage):
+            return 'Storage'
+        elif isinstance(element, LinearConverter):
+            return 'Converter'
+        else:
+            return 'Other'
+
+    def get_shape(element):
+        """Determine node shape"""
+        if isinstance(element, Bus):
+            return 'ellipse'
+        elif isinstance(element, Source):
+            return 'custom-source'
+        elif isinstance(element, (Sink, SourceAndSink)):
+            return 'custom-sink'
+        else:
+            return 'rectangle'
+
+    graph = networkx.DiGraph()
+
+    # Add nodes with attributes
+    for node in nodes:
+        graph.add_node(
+            node.label_full,
+            color=VisualizationConfig.DEFAULT_COLORS[get_element_type(node)],
+            shape=get_shape(node),
+            element_type=get_element_type(node),
+            parameters=str(node),
+        )
+
+    # Add edges
+    for edge in edges:
+        try:
+            graph.add_edge(
+                u_of_edge=edge.bus if edge.is_input_in_component else edge.component,
+                v_of_edge=edge.component if edge.is_input_in_component else edge.bus,
+                label=edge.label_full,
+                parameters=edge.__str__().replace(')', '\n)'),
+            )
+        except Exception as e:
+            logger.error(f"Failed to add edge {edge}: {e}")
+
+    return graph
+
+def make_cytoscape_elements(graph: networkx.DiGraph) -> List[Dict[str, Any]]:
+    """Convert NetworkX graph to Cytoscape elements"""
+    elements = []
+
+    # Add nodes
+    for node_id in graph.nodes():
+        node_data = graph.nodes[node_id]
+        elements.append({
+            'data': {
+                'id': node_id,
+                'label': node_id,
+                'color': node_data.get('color', '#7F8C8D'),
+                'shape': node_data.get('shape', 'rectangle'),
+                'element_type': node_data.get('element_type', 'Other'),
+                'parameters': node_data.get('parameters', ''),
+            }
+        })
+
+    # Add edges
+    for u, v in graph.edges():
+        edge_data = graph.edges[u, v]
+        elements.append({
+            'data': {
+                'source': u,
+                'target': v,
+                'id': f'{u}-{v}',
+                'label': edge_data.get('label', ''),
+                'parameters': edge_data.get('parameters', ''),
+            }
+        })
+
+    return elements
+
+def create_color_picker_input(label: str, input_id: str, default_color: str):
+    """Create a compact color picker with DAQ ColorPicker"""
+    return html.Div([
+        html.Label(label, style={
+            'color': 'white', 'font-size': '12px', 'margin-bottom': '5px',
+            'display': 'block'
+        }),
+        daq.ColorPicker(
+            id=input_id,
+            label="",
+            value={'hex': default_color},
+            size=200,
+            theme={'dark': True},
+            style={'margin-bottom': '10px'}
+        ),
+    ])
+
+def create_style_section(title: str, children: List):
+    """Create a collapsible section for organizing controls"""
+    return html.Div([
+        html.H4(title, style={
+            'color': 'white', 'margin-bottom': '10px',
+            'border-bottom': '2px solid #3498DB', 'padding-bottom': '5px',
+        }),
+        html.Div(children, style={'margin-bottom': '20px'}),
+    ])
+
+def create_sidebar():
+    """Create the main sidebar with improved organization"""
+    return html.Div([
+        html.Div([
+            html.H3('Style Controls', style={
+                'color': 'white', 'margin-bottom': '20px', 'text-align': 'center',
+                'border-bottom': '3px solid #9B59B6', 'padding-bottom': '10px',
+            }),
+
+            # Layout Section
+            create_style_section('Layout', [
+                dcc.Dropdown(
+                    id='layout-dropdown',
+                    options=[
+                        {'label': 'Klay (horizontal)', 'value': 'klay'},
+                        {'label': 'Dagre (vertical)', 'value': 'dagre'},
+                        {'label': 'Breadthfirst', 'value': 'breadthfirst'},
+                        {'label': 'Cose (force-directed)', 'value': 'cose'},
+                        {'label': 'Grid', 'value': 'grid'},
+                        {'label': 'Circle', 'value': 'circle'},
+                    ],
+                    value='klay',
+                    clearable=False,
+                    style={'width': '100%'},
+                ),
+            ]),
+
+            # Color Scheme Section
+            create_style_section('Color Scheme', [
+                dcc.Dropdown(
+                    id='color-scheme-dropdown',
+                    options=[{'label': k, 'value': k} for k in VisualizationConfig.COLOR_PRESETS.keys()],
+                    value='Default',
+                    style={'width': '100%', 'margin-bottom': '10px'},
+                ),
+            ]),
+
+            # Color Pickers Section
+            create_style_section('Custom Colors', [
+                create_color_picker_input('Bus', 'bus-color-picker', '#7F8C8D'),
+                create_color_picker_input('Source', 'source-color-picker', '#F1C40F'),
+                create_color_picker_input('Sink', 'sink-color-picker', '#F1C40F'),
+                create_color_picker_input('Storage', 'storage-color-picker', '#2980B9'),
+                create_color_picker_input('Converter', 'converter-color-picker', '#D35400'),
+                create_color_picker_input('Edge', 'edge-color-picker', '#808080'),
+            ]),
+
+            # Node Settings
+            create_style_section('Node Settings', [
+                html.Label('Size', style={'color': 'white', 'font-size': '12px'}),
+                dcc.Slider(
+                    id='node-size-slider', min=50, max=150, step=10, value=90,
+                    marks={i: {'label': str(i), 'style': {'color': 'white', 'font-size': '10px'}}
+                           for i in range(50, 151, 25)},
+                    tooltip={'placement': 'bottom', 'always_visible': True},
+                ),
+                html.Br(),
+                html.Label('Font Size', style={'color': 'white', 'font-size': '12px'}),
+                dcc.Slider(
+                    id='font-size-slider', min=8, max=20, step=1, value=10,
+                    marks={i: {'label': str(i), 'style': {'color': 'white', 'font-size': '10px'}}
+                           for i in range(8, 21, 2)},
+                    tooltip={'placement': 'bottom', 'always_visible': True},
+                ),
+            ]),
+
+            # Reset Button
+            html.Div([
+                html.Button('Reset to Defaults', id='reset-btn', n_clicks=0, style={
+                    'width': '100%', 'background-color': '#E74C3C', 'color': 'white',
+                    'border': 'none', 'padding': '10px', 'border-radius': '5px',
+                    'cursor': 'pointer', 'margin-top': '20px',
+                }),
+            ]),
+        ], id='sidebar-content', style={
+            'width': '280px', 'height': '100vh', 'background-color': '#2C3E50',
+            'padding': '20px', 'position': 'fixed', 'left': '0', 'top': '0',
+            'overflow-y': 'auto', 'border-right': '3px solid #34495E',
+            'box-shadow': '2px 0 5px rgba(0,0,0,0.1)', 'z-index': '999',
+            'transform': 'translateX(-100%)', 'transition': 'transform 0.3s ease',
+        })
+    ])
+
+def shownetwork(graph: networkx.DiGraph):
+    """Main function to create and run the network visualization"""
+    if not DASH_CYTOSCAPE_AVAILABLE:
+        raise ImportError(f"Required packages not available: {VISUALIZATION_ERROR}")
+
+    app = Dash(__name__, suppress_callback_exceptions=True)
+
+    # Load extra layouts
+    cyto.load_extra_layouts()
+
+    # Create initial elements
+    elements = make_cytoscape_elements(graph)
+
+    # App Layout
+    app.layout = html.Div([
+        # Toggle button
+        html.Button('☰', id='toggle-sidebar', n_clicks=0, style={
+            'position': 'fixed', 'top': '20px', 'left': '20px', 'z-index': '1000',
+            'background-color': '#3498DB', 'color': 'white', 'border': 'none',
+            'padding': '10px 15px', 'border-radius': '5px', 'cursor': 'pointer',
+            'font-size': '18px', 'box-shadow': '0 2px 5px rgba(0,0,0,0.3)',
+        }),
+
+        # Data storage
+        dcc.Store(id='elements-store', data=elements),
+
+        # Sidebar
+        create_sidebar(),
+
+        # Main content
+        html.Div([
+            # Header
+            html.Div([
+                html.H2('Network Visualization', style={
+                    'color': 'white', 'margin': '0', 'text-align': 'center'
+                }),
+                html.Button('Export PNG', id='export-btn', n_clicks=0, style={
+                    'position': 'absolute', 'right': '20px', 'top': '15px',
+                    'background-color': '#27AE60', 'color': 'white', 'border': 'none',
+                    'padding': '10px 20px', 'border-radius': '5px', 'cursor': 'pointer',
+                }),
+            ], style={
+                'background-color': '#34495E', 'padding': '15px 20px',
+                'position': 'relative', 'border-bottom': '2px solid #3498DB',
+            }),
+
+            # Cytoscape graph
+            cyto.Cytoscape(
+                id='cytoscape',
+                layout={'name': 'klay'},
+                style={'width': '100%', 'height': '70vh'},
+                elements=elements,
+                stylesheet=VisualizationConfig.DEFAULT_STYLESHEET,
+            ),
+
+            # Info panel
+            html.Div([
+                html.H4('Element Information', style={
+                    'color': 'white', 'margin': '0 0 10px 0',
+                    'border-bottom': '2px solid #3498DB', 'padding-bottom': '5px',
+                }),
+                html.Div(id='info-panel', children=[
+                    html.P('Click on a node or edge to see details.',
+                           style={'color': '#95A5A6', 'font-style': 'italic'})
+                ]),
+            ], style={
+                'background-color': '#2C3E50', 'padding': '15px',
+                'height': '25vh', 'overflow-y': 'auto',
+                'border-top': '2px solid #34495E',
+            }),
+        ], id='main-content', style={
+            'margin-left': '0', 'background-color': '#1A252F',
+            'min-height': '100vh', 'transition': 'margin-left 0.3s ease',
+        }),
+    ])
+
+    # Callbacks
+    @app.callback(
+        [Output('sidebar-content', 'style'), Output('main-content', 'style')],
+        [Input('toggle-sidebar', 'n_clicks')]
+    )
+    def toggle_sidebar(n_clicks):
+        is_open = (n_clicks or 0) % 2 == 1
+        sidebar_transform = 'translateX(0)' if is_open else 'translateX(-100%)'
+        main_margin = '280px' if is_open else '0'
+
+        sidebar_style = {
+            'width': '280px', 'height': '100vh', 'background-color': '#2C3E50',
+            'padding': '20px', 'position': 'fixed', 'left': '0', 'top': '0',
+            'overflow-y': 'auto', 'border-right': '3px solid #34495E',
+            'box-shadow': '2px 0 5px rgba(0,0,0,0.1)', 'z-index': '999',
+            'transform': sidebar_transform, 'transition': 'transform 0.3s ease',
+        }
+
+        main_style = {
+            'margin-left': main_margin, 'background-color': '#1A252F',
+            'min-height': '100vh', 'transition': 'margin-left 0.3s ease',
+        }
+
+        return sidebar_style, main_style
+
+    @app.callback(
+        [Output('cytoscape', 'elements'), Output('cytoscape', 'stylesheet')],
+        [
+            Input('color-scheme-dropdown', 'value'),
+            Input('bus-color-picker', 'value'),
+            Input('source-color-picker', 'value'),
+            Input('sink-color-picker', 'value'),
+            Input('storage-color-picker', 'value'),
+            Input('converter-color-picker', 'value'),
+            Input('edge-color-picker', 'value'),
+            Input('node-size-slider', 'value'),
+            Input('font-size-slider', 'value'),
+        ],
+        [State('elements-store', 'data')]
+    )
+    def update_visualization(color_scheme, bus_color, source_color, sink_color,
+                             storage_color, converter_color, edge_color,
+                             node_size, font_size, stored_elements):
+        if not stored_elements:
+            return no_update, no_update
+
+        # Determine colors to use
+        if any(picker for picker in [bus_color, source_color, sink_color,
+                                     storage_color, converter_color, edge_color]):
+            # Use custom colors from pickers
+            colors = {
+                'Bus': bus_color.get('hex') if bus_color else '#7F8C8D',
+                'Source': source_color.get('hex') if source_color else '#F1C40F',
+                'Sink': sink_color.get('hex') if sink_color else '#F1C40F',
+                'Storage': storage_color.get('hex') if storage_color else '#2980B9',
+                'Converter': converter_color.get('hex') if converter_color else '#D35400',
+                'Other': '#27AE60',
+            }
+        else:
+            # Use preset scheme
+            colors = VisualizationConfig.COLOR_PRESETS.get(color_scheme,
+                                                           VisualizationConfig.DEFAULT_COLORS)
+
+        # Update element colors
+        updated_elements = []
+        for element in stored_elements:
+            if 'data' in element and 'element_type' in element['data']:
+                element_copy = element.copy()
+                element_copy['data'] = element['data'].copy()
+                element_type = element_copy['data']['element_type']
+                if element_type in colors:
+                    element_copy['data']['color'] = colors[element_type]
+                updated_elements.append(element_copy)
+            else:
+                updated_elements.append(element)
+
+        # Create stylesheet
+        edge_color_hex = edge_color.get('hex') if edge_color else 'gray'
+        stylesheet = [
+            {
+                'selector': 'node',
+                'style': {
+                    'content': 'data(label)',
+                    'background-color': 'data(color)',
+                    'font-size': font_size or 10,
+                    'color': 'white',
+                    'text-valign': 'center',
+                    'text-halign': 'center',
+                    'width': f'{node_size or 90}px',
+                    'height': f'{int((node_size or 90) * 0.8)}px',
+                    'shape': 'data(shape)',
+                    'text-outline-color': 'black',
+                    'text-outline-width': 0.5,
+                },
+            },
+            {
+                'selector': '[shape = "custom-source"]',
+                'style': {
+                    'shape': 'polygon',
+                    'shape-polygon-points': '-0.5 0.5, 0.5 0.5, 1 -0.5, -1 -0.5',
+                },
+            },
+            {
+                'selector': '[shape = "custom-sink"]',
+                'style': {
+                    'shape': 'polygon',
+                    'shape-polygon-points': '-0.5 -0.5, 0.5 -0.5, 1 0.5, -1 0.5',
+                },
+            },
+            {
+                'selector': 'edge',
+                'style': {
+                    'curve-style': 'straight',
+                    'width': 2,
+                    'line-color': edge_color_hex,
+                    'target-arrow-color': edge_color_hex,
+                    'target-arrow-shape': 'triangle',
+                    'arrow-scale': 2,
+                },
+            },
+        ]
+
+        return updated_elements, stylesheet
+
+    @app.callback(
+        Output('info-panel', 'children'),
+        [Input('cytoscape', 'tapNodeData'), Input('cytoscape', 'tapEdgeData')]
+    )
+    def display_element_info(node_data, edge_data):
+        ctx = callback_context
+        if not ctx.triggered:
+            return [html.P('Click on a node or edge to see details.',
+                           style={'color': '#95A5A6', 'font-style': 'italic'})]
+
+        # Determine what was clicked
+        if ctx.triggered[0]['prop_id'] == 'cytoscape.tapNodeData' and node_data:
+            return [
+                html.H5(f"Node: {node_data.get('label', 'Unknown')}",
+                        style={'color': 'white', 'margin-bottom': '10px'}),
+                html.P(f"Type: {node_data.get('element_type', 'Unknown')}",
+                       style={'color': '#BDC3C7'}),
+                html.Pre(node_data.get('parameters', 'No parameters'),
+                         style={'color': '#BDC3C7', 'font-size': '11px',
+                                'white-space': 'pre-wrap'})
+            ]
+        elif ctx.triggered[0]['prop_id'] == 'cytoscape.tapEdgeData' and edge_data:
+            return [
+                html.H5(f"Edge: {edge_data.get('label', 'Unknown')}",
+                        style={'color': 'white', 'margin-bottom': '10px'}),
+                html.P(f"{edge_data.get('source', '')} → {edge_data.get('target', '')}",
+                       style={'color': '#E67E22'}),
+                html.Pre(edge_data.get('parameters', 'No parameters'),
+                         style={'color': '#BDC3C7', 'font-size': '11px',
+                                'white-space': 'pre-wrap'})
+            ]
+
+        return [html.P('Click on a node or edge to see details.',
+                       style={'color': '#95A5A6', 'font-style': 'italic'})]
+
+    @app.callback(
+        Output('cytoscape', 'layout'),
+        Input('layout-dropdown', 'value')
+    )
+    def update_layout(selected_layout):
+        return {'name': selected_layout}
+
+    # Reset callback
+    @app.callback(
+        [
+            Output('color-scheme-dropdown', 'value'),
+            Output('bus-color-picker', 'value'),
+            Output('source-color-picker', 'value'),
+            Output('sink-color-picker', 'value'),
+            Output('storage-color-picker', 'value'),
+            Output('converter-color-picker', 'value'),
+            Output('edge-color-picker', 'value'),
+            Output('node-size-slider', 'value'),
+            Output('font-size-slider', 'value'),
+            Output('layout-dropdown', 'value'),
+        ],
+        [Input('reset-btn', 'n_clicks')]
+    )
+    def reset_controls(n_clicks):
+        if n_clicks and n_clicks > 0:
+            return (
+                'Default',  # color scheme
+                {'hex': '#7F8C8D'},  # bus
+                {'hex': '#F1C40F'},  # source
+                {'hex': '#F1C40F'},  # sink
+                {'hex': '#2980B9'},  # storage
+                {'hex': '#D35400'},  # converter
+                {'hex': '#808080'},  # edge
+                90,  # node size
+                10,  # font size
+                'klay',  # layout
+            )
+        return no_update
+
+    # Export functionality
+    app.clientside_callback(
+        """
+        function(n_clicks) {
+            if (n_clicks > 0 && window.cy) {
+                var png64 = window.cy.png({scale: 3, full: true});
+                var a = document.createElement('a');
+                a.href = png64;
+                a.download = 'network_visualization.png';
+                a.click();
+            }
+            return 'Export PNG';
+        }
+        """,
+        Output('export-btn', 'children'),
+        Input('export-btn', 'n_clicks'),
+    )
+
+    # Start server
+    def find_free_port(start_port=8050, end_port=8100):
+        for port in range(start_port, end_port):
+            with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+                if s.connect_ex(('localhost', port)) != 0:
+                    return port
+        raise Exception('No free port found')
+
+    port = find_free_port()
+    server = make_server('127.0.0.1', port, app.server)
+
+    # Start server in background thread
+    server_thread = threading.Thread(target=server.serve_forever, daemon=True)
+    server_thread.start()
+
+    print(f'Network visualization started on http://127.0.0.1:{port}/')
+
+    # Store server reference for cleanup
+    app.server_instance = server
+    app.port = port
+
+    return app

{flixopt-2.1.4.dist-info → flixopt-2.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flixopt
-Version: 2.1.4
+Version: 2.1.6
 Summary: Vector based energy and material flow optimization framework in Python.
 Author-email: "Chair of Building Energy Systems and Heat Supply, TU Dresden" <peter.stange@tu-dresden.de>, Felix Bumann <felixbumann387@gmail.com>, Felix Panitz <baumbude@googlemail.com>, Peter Stange <peter.stange@tu-dresden.de>
 Maintainer-email: Felix Bumann <felixbumann387@gmail.com>, Peter Stange <peter.stange@tu-dresden.de>
@@ -18,13 +18,12 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering
-Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy<3,>=1.21.5
 Requires-Dist: pandas<3,>=2.0.0
-Requires-Dist: linopy<0.6.0,>=0.5.1
+Requires-Dist: linopy<0.5.6,>=0.5.1
 Requires-Dist: netcdf4<2,>=1.6.1
 Requires-Dist: PyYAML<7,>=6.0.0
 Requires-Dist: rich>=13.0.0
@@ -32,6 +31,22 @@ Requires-Dist: tomli>=2.0.1; python_version < "3.11"
 Requires-Dist: highspy>=1.5.3
 Requires-Dist: matplotlib<4.0.0,>=3.5.2
 Requires-Dist: plotly<6.0.0,>=5.15.0
+Provides-Extra: network-viz
+Requires-Dist: dash>=3.0.0; extra == "network-viz"
+Requires-Dist: dash-cytoscape>=1.0.0; extra == "network-viz"
+Requires-Dist: dash-daq>=0.6.0; extra == "network-viz"
+Requires-Dist: networkx>=3.0.0; extra == "network-viz"
+Requires-Dist: werkzeug>=3.0.0; extra == "network-viz"
+Provides-Extra: full
+Requires-Dist: pyvis==0.3.1; extra == "full"
+Requires-Dist: tsam<3.0.0,>=2.3.1; extra == "full"
+Requires-Dist: scipy<2.0.0,>=1.15.1; extra == "full"
+Requires-Dist: gurobipy>=10.0.0; extra == "full"
+Requires-Dist: dash>=3.0.0; extra == "full"
+Requires-Dist: dash-cytoscape>=1.0.0; extra == "full"
+Requires-Dist: dash-daq>=0.6.0; extra == "full"
+Requires-Dist: networkx>=3.0.0; extra == "full"
+Requires-Dist: werkzeug>=3.0.0; extra == "full"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: ruff>=0.9.0; extra == "dev"
@@ -39,12 +54,11 @@ Requires-Dist: pyvis==0.3.1; extra == "dev"
 Requires-Dist: tsam<3.0.0,>=2.3.1; extra == "dev"
 Requires-Dist: scipy<2.0.0,>=1.15.1; extra == "dev"
 Requires-Dist: gurobipy>=10.0.0; extra == "dev"
-Provides-Extra: full
-Requires-Dist: pyvis==0.3.1; extra == "full"
-Requires-Dist: tsam<3.0.0,>=2.3.1; extra == "full"
-Requires-Dist: scipy<2.0.0,>=1.15.1; extra == "full"
-Requires-Dist: streamlit<2.0.0,>=1.44.0; extra == "full"
-Requires-Dist: gurobipy>=10.0.0; extra == "full"
+Requires-Dist: dash>=3.0.0; extra == "dev"
+Requires-Dist: dash-cytoscape>=1.0.0; extra == "dev"
+Requires-Dist: dash-daq>=0.6.0; extra == "dev"
+Requires-Dist: networkx>=3.0.0; extra == "dev"
+Requires-Dist: werkzeug>=3.0.0; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: mkdocs-material<10,>=9.0.0; extra == "docs"
 Requires-Dist: mkdocstrings-python>=1.0.0; extra == "docs"

{flixopt-2.1.4.dist-info → flixopt-2.1.6.dist-info}/RECORD

@@ -19,26 +19,27 @@ docs/user-guide/Mathematical Notation/Storage.md,sha256=PeNzk77i-81VX8I5r3zen3ka
 docs/user-guide/Mathematical Notation/index.md,sha256=gkglBsoARhgvppXN9PgdJF33sCSnwGY7MtKDtCC32bE,1255
 docs/user-guide/Mathematical Notation/others.md,sha256=wOUsfspAoSNTMlTNipeQ8ohoVVX2S-eI3dmlzqqrbR8,47
 flixopt/__init__.py,sha256=F49OK5QLUnMGmsaKQ-G0dXsVuKr9Ow_pjM4KMSNZ918,614
-flixopt/aggregation.py,sha256=UaAYh34C4XhDgiSs4lm31XEMLr4YO5BzLKUAx4NQuyI,17002
+flixopt/aggregation.py,sha256=xgQu2U5YEbtdDAEMjWiuP9uo_KjhzC95VNmY4ZcSX3I,16939
 flixopt/calculation.py,sha256=1Hs9dc6eqdJoHT6Dd3NlwdRORFO2vKdKx38o95FPxJE,20016
 flixopt/commons.py,sha256=ZNlUN1z-h9OGHPo-s-n5OLlJaoPZKVGcAdRyGKpMk4M,1256
-flixopt/components.py,sha256=7vI0IzWBLj81IErPllWHbMMqrrPlplYOPcH3aHvDbeY,29124
+flixopt/components.py,sha256=4M1WR4JasMXiOUo4JpJfgPuMY5H0RbazhTAXAf8IWI0,33177
 flixopt/config.py,sha256=Kt8QYk7hX5qHcQUtfgjM862C6SQr4K2lDvtk_LLER8Y,9085
 flixopt/config.yaml,sha256=imzAnnhcJhIfKNTTXFB5Td7Pvk5ARn5j720k-oGGRug,392
 flixopt/core.py,sha256=dBdAzA3khIe64aVGpPj3G5PzOr7RdGdSymnV3xWgaR8,38083
 flixopt/effects.py,sha256=TKpUfUo0wbX5y5HS9U8HcDNOiygg0R7k9V3TM0G6uL4,16650
 flixopt/elements.py,sha256=9P2uB3twwADf48Gx1xCluE-ZJCkzw0X7tYrtKEQOjk8,26932
 flixopt/features.py,sha256=sEtdj7BpaYS9a0XdhRUtdDFXWLdaGABRXdi5JOoLPb0,43919
-flixopt/flow_system.py,sha256=4D2u2ucLig0GbC7ksCuWXuZPZdkgDzPafv-GhjAxRyk,17479
+flixopt/flow_system.py,sha256=x7wgbBhftIarB7w1lNzSkDY6b1IYzg6O7rexsAym1es,19606
 flixopt/interface.py,sha256=uXf6Z29OfHpIRsS1-oZZ6SSuy8FLe13FjtqzHPqzzQE,12088
 flixopt/io.py,sha256=2QKdtu2-mkzSGBIqHtUcF9UaG32nq9qcIRxZghf1hLw,11284
 flixopt/linear_converters.py,sha256=ej5V_ML_3m1k9HbDnuey6pHEpQtguYkxBXHxWyE9sq0,10936
+flixopt/network_app.py,sha256=Xyb4iLm13BFlIPhkL6RE2x8n5jgAbXMiN8mTMr-_-nM,23459
 flixopt/plotting.py,sha256=wUwBSQxxwy1uui-mi2hgj6h__O6EvxCnocIbX0ewpMk,54111
 flixopt/results.py,sha256=GKSZmz0GCuJwspTC8Ot6MOKinvy_mhnDXCafb_f7uVY,35161
 flixopt/solvers.py,sha256=k1bSoiXec3asWED70-erXkgtpn2C8KRBfSZj0FLviSM,2436
 flixopt/structure.py,sha256=QS0IFBHzdEMKYTgd6uosudhoDD4X0JcdF7LlS-XRacs,26295
 flixopt/utils.py,sha256=f-_vFDvvG27-c_VMpzkv3lb79Yny4rvoSmemushbzhU,1687
-flixopt-2.1.4.dist-info/licenses/LICENSE,sha256=HKsZnbrM_3Rvnr_u9cWSG90cBsj5_slaqI_z_qcxnGI,1118
+flixopt-2.1.6.dist-info/licenses/LICENSE,sha256=HKsZnbrM_3Rvnr_u9cWSG90cBsj5_slaqI_z_qcxnGI,1118
 pics/architecture_flixOpt-pre2.0.0.png,sha256=9RWSA3vys588aadr2437zor-_-xBTQNQ0bAf8xGcu5g,70605
 pics/architecture_flixOpt.png,sha256=KjN1bJwESbkHmTW7UsJ7dZyiKZlTO7Dx20dg8KlR1HU,260219
 pics/flixOpt_plotting.jpg,sha256=zn7ZPAtXm5eRTxtOj86e4-PPhHpCar1jqGh7vMBgQGY,518862
@@ -47,7 +48,7 @@ pics/pics.pptx,sha256=ImWeGGvjtWJ6BGruipsnZYmWtHj5sWdbw1NSFePbkC8,683344
 scripts/extract_release_notes.py,sha256=0v8B9c6VXz55PJ0I08W7FdxGp7jEY5NOkrqMY6MNdYU,1249
 scripts/gen_ref_pages.py,sha256=AYRtXyz78x5I_Hn0oRtGVbTxgLLj2QNyRX6vWRefPjc,1960
 tests/ressources/Zeitreihen2020.csv,sha256=kbsDTKZS0iUsNZAS7m3DohzZI_OHHWe44s3GwLvcTLw,1918412
-flixopt-2.1.4.dist-info/METADATA,sha256=48o6Nah3Lr1g2NSvKWQmJbAWpMgrxMEYjTMG_smnYIU,7343
-flixopt-2.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-flixopt-2.1.4.dist-info/top_level.txt,sha256=DEuo4R1z7GmEp5R3pjbQEJbaPRjKHFvNX2ceiBnVOL0,32
-flixopt-2.1.4.dist-info/RECORD,,
+flixopt-2.1.6.dist-info/METADATA,sha256=drw11yScM5qaROW3pGcs_6S55msL0DiC3uzzppHDwpQ,8019
+flixopt-2.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+flixopt-2.1.6.dist-info/top_level.txt,sha256=DEuo4R1z7GmEp5R3pjbQEJbaPRjKHFvNX2ceiBnVOL0,32
+flixopt-2.1.6.dist-info/RECORD,,