Merge pull request #114 from predict-idlab/tweaks

🔧 Tweaks - improve code quality, fix type-checking bug when IPywidgets is not installed & loosen up plotly-version

Author: jonasvdd

examples/dash_apps/01_minimal_global.py

@@ -13,10 +13,9 @@
 
 """
 
-import dash
 import numpy as np
 import plotly.graph_objects as go
-from dash import Input, Output, dcc, html
+from dash import Input, Output, dcc, html, Dash, no_update, callback_context
 
 from plotly_resampler import FigureResampler
 from trace_updater import TraceUpdater
@@ -27,7 +26,7 @@
 
 
 # --------------------------------------Globals ---------------------------------------
-app = dash.Dash(__name__)
+app = Dash(__name__)
 fig: FigureResampler = FigureResampler()
 # NOTE: in this example, this reference to a FigureResampler is essential to preserve
 # throughout the whole dash app! If your dash app wants to create a new go.Figure(),
@@ -55,7 +54,7 @@
     prevent_initial_call=True,
 )
 def plot_graph(n_clicks):
-    ctx = dash.callback_context
+    ctx = callback_context
     if len(ctx.triggered) and "plot-button" in ctx.triggered[0]["prop_id"]:
         # Note how the replace method is used here on the global figure object
         global fig
@@ -64,7 +63,7 @@ def plot_graph(n_clicks):
         fig.add_trace(go.Scattergl(name="exp"), hf_x=x, hf_y=noisy_sin * 1.000002 ** x)
         return fig
     else:
-        raise dash.exceptions.PreventUpdate()
+        return no_update
 
 
 # Register the graph update callbacks to the layout

examples/dash_apps/02_minimal_cache.py

@@ -9,10 +9,9 @@
 
 """
 
-import dash
 import numpy as np
 import plotly.graph_objects as go
-from dash import Input, Output, State, dcc, html
+from dash import Input, Output, State, dcc, html, no_update, callback_context
 from dash_extensions.enrich import (
     DashProxy,
     ServersideOutput,
@@ -52,7 +51,7 @@
     memoize=True,
 )
 def plot_graph(n_clicks):
-    ctx = dash.callback_context
+    ctx = callback_context
     if len(ctx.triggered) and "plot-button" in ctx.triggered[0]["prop_id"]:
         fig: FigureResampler = FigureResampler(go.Figure())
 
@@ -62,7 +61,7 @@ def plot_graph(n_clicks):
 
         return fig, fig
     else:
-        raise dash.exceptions.PreventUpdate()
+        return no_update
 
 
 @app.callback(
@@ -74,7 +73,7 @@ def plot_graph(n_clicks):
 )
 def update_fig(relayoutdata, fig):
     if fig is None:
-        raise dash.exceptions.PreventUpdate()
+        return no_update
     return fig.construct_update_data(relayoutdata)
 
 

examples/dash_apps/03_minimal_cache_dynamic.py

@@ -18,8 +18,7 @@
 
 import numpy as np
 import plotly.graph_objects as go
-import dash
-from dash import MATCH, Input, Output, State, dcc, html
+from dash import MATCH, Input, Output, State, dcc, html, no_update
 from dash_extensions.enrich import (
     DashProxy,
     ServersideOutput,
@@ -106,7 +105,7 @@ def construct_display_graph(n_clicks) -> FigureResampler:
 def update_fig(relayoutdata: dict, fig: FigureResampler):
     if fig is not None:
         return fig.construct_update_data(relayoutdata)
-    raise dash.exceptions.PreventUpdate()
+    return no_update
 
 
 # --------------------------------- Running the app ---------------------------------

examples/dash_apps/11_sine_generator.py

@@ -16,9 +16,8 @@
 
 import numpy as np
 import plotly.graph_objects as go
-import dash
 import dash_bootstrap_components as dbc
-from dash import MATCH, Input, Output, State, dcc, html
+from dash import MATCH, Input, Output, State, dcc, html, no_update, callback_context
 from dash_extensions.enrich import (
     DashProxy,
     ServersideOutput,
@@ -116,16 +115,16 @@
 )
 def add_or_remove_graph(add_graph, remove_graph, n, exp, gc_children):
     if (add_graph is None or n is None or exp is None) and (remove_graph is None):
-        raise dash.exceptions.PreventUpdate()
+        return no_update
 
     # Transform the graph data to a figure
     gc_children = [] if gc_children is None else gc_children
 
     # Check if we need to remove a graph
-    clicked_btns = [p["prop_id"] for p in dash.callback_context.triggered]
+    clicked_btns = [p["prop_id"] for p in callback_context.triggered]
     if any("remove-graph" in btn_name for btn_name in clicked_btns):
         if not len(gc_children):
-            raise dash.exceptions.PreventUpdate()
+            return no_update
         return gc_children[:-1]
 
     # No graph needs to be removed -> create a new graph
@@ -193,7 +192,7 @@ def construct_display_graph(n, exp, n_added_graphs) -> FigureResampler:
 def update_fig(relayoutdata: dict, fig: FigureResampler):
     if fig is not None:
         return fig.construct_update_data(relayoutdata)
-    raise dash.exceptions.PreventUpdate()
+    return no_update
 
 
 # --------------------------------- Running the app ---------------------------------

examples/dash_apps/12_file_selector.py

@@ -10,10 +10,9 @@
 from pathlib import Path
 from typing import List
 
-import dash
 import dash_bootstrap_components as dbc
 import plotly.graph_objects as go
-from dash import Input, Output, State, dcc, html
+from dash import Input, Output, State, dcc, html, no_update, callback_context
 
 from dash_extensions.enrich import (
     DashProxy,
@@ -105,13 +104,13 @@ def plot_graph(n_clicks, *folder_list):
             for file in files:
                 file_list.append((Path(folder).joinpath(file)))
 
-    ctx = dash.callback_context
+    ctx = callback_context
     if len(ctx.triggered) and "plot-button" in ctx.triggered[0]["prop_id"]:
         if len(file_list):
             fig: FigureResampler = visualize_multiple_files(file_list)
             return fig, fig
     else:
-        raise dash.exceptions.PreventUpdate()
+        return no_update
 
 
 # --------- Figure update callback ---------
@@ -123,7 +122,7 @@ def plot_graph(n_clicks, *folder_list):
 )
 def update_fig(relayoutdata, fig):
     if fig is None:
-        raise dash.exceptions.PreventUpdate()
+        return no_update
     return fig.construct_update_data(relayoutdata)
 
 

examples/dash_apps/13_coarse_fine.py

@@ -13,12 +13,11 @@
 
 __author__ = "Jonas Van Der Donckt"
 
-import dash
 import dash_bootstrap_components as dbc
 import plotly.graph_objects as go
 from pathlib import Path
 from typing import List
-from dash import Input, Output, State, dcc, html
+from dash import Input, Output, State, dcc, html, no_update, callback_context
 
 from dash_extensions.enrich import (
     DashProxy,
@@ -132,7 +131,7 @@ def construct_plot_graph(n_clicks, *folder_list):
             for file in files:
                 file_list.append((Path(folder).joinpath(file)))
 
-    ctx = dash.callback_context
+    ctx = callback_context
     if len(ctx.triggered) and "plot-button" in ctx.triggered[0]["prop_id"]:
         if len(file_list):
             # Create two graphs, a dynamic plotly-resampler graph and a coarse graph
@@ -159,7 +158,7 @@ def construct_plot_graph(n_clicks, *folder_list):
 
             return coarse_fig, dynamic_fig, dynamic_fig
     else:
-        raise dash.exceptions.PreventUpdate()
+        return no_update
 
 
 # Register the graph update callbacks to the layout
@@ -172,17 +171,17 @@ def construct_plot_graph(n_clicks, *folder_list):
 )
 def update_dynamic_fig(coarse_grained_relayout, fine_grained_relayout, fr_fig):
     if fr_fig is None:  # When the figure does not exist -> do nothing
-        return dash.no_update
+        return no_update
 
-    ctx = dash.callback_context
+    ctx = callback_context
     trigger_id = ctx.triggered[0].get("prop_id", "").split(".")[0]
 
     if trigger_id == "plotly-resampler-graph":
         return fr_fig.construct_update_data(fine_grained_relayout)
     elif trigger_id == "coarse-graph":
         return fr_fig.construct_update_data(coarse_grained_relayout)
 
-    return dash.no_update
+    return no_update
 
 
 # --------------------------------- Running the app ---------------------------------

plotly_resampler/__init__.py

@@ -27,5 +27,5 @@
         from google.colab import output
 
         output.enable_custom_widget_manager()
-except ImportError:
+except (ImportError, ModuleNotFoundError):
     pass

plotly_resampler/aggregation/aggregators.py

@@ -19,7 +19,7 @@
 try:
     # The efficient c version of the LTTB algorithm
     from .algorithms.lttb_c import LTTB_core_c as LTTB_core
-except:
+except (ImportError, ModuleNotFoundError):
     import warnings
     warnings.warn("Could not import lttbc; will use a (slower) python alternative.")
     from .algorithms.lttb_py import LTTB_core_py as LTTB_core

plotly_resampler/figure_resampler/figure_resampler.py

@@ -17,7 +17,6 @@
 import base64
 import dash
 import plotly.graph_objects as go
-from dash import Dash
 from flask_cors import cross_origin
 from jupyter_dash import JupyterDash
 from plotly.basedatatypes import BaseFigure
@@ -320,7 +319,7 @@ def __init__(
                     self.data[idx].update(graph_dict["data"][idx])
 
         # The FigureResampler needs a dash app
-        self._app: JupyterDash | Dash | None = None
+        self._app: JupyterDash | dash.Dash | None = None
         self._port: int | None = None
         self._host: str | None = None
 

plotly_resampler/figure_resampler/figure_resampler_interface.py

@@ -697,7 +697,7 @@ def _parse_get_trace_props(
                 # not will be transformed to an array of ints (0, 1))
                 try:
                     hf_y = pd.to_numeric(hf_y, errors="raise")
-                except:
+                except ValueError:
                     hf_y = hf_y.astype("str")
 
             # orjson encoding doesn't like to encode with uint8 & uint16 dtype