Merge pull request #138 from predict-idlab/resample_bug

Resample bug, see #137

Author: jvdd

README.md

@@ -140,7 +140,7 @@ In [this Plotly-Resampler demo](https://github.com/predict-idlab/plotly-resample
 
 
 <br>
-<details><summary>Features</summary>
+<details><summary>👉 <b>Features</b></summary>
 
   * **Convenient** to use:
     * just add either
@@ -149,7 +149,7 @@ In [this Plotly-Resampler demo](https://github.com/predict-idlab/plotly-resample
       * `FigureWidgetResampler` decorator around a plotly Figure and output the instance in a cell
     * allows all other plotly figure construction flexibility to be used!
   * **Environment-independent**
-    * can be used in Jupyter, vscode-notebooks, Pycharm-notebooks, Google Colab, and even as application (on a server)
+    * can be used in Jupyter, vscode-notebooks, Pycharm-notebooks, Google Colab, DataSpell, and even as application (on a server)
   * Interface for **various aggregation algorithms**:
     * ability to develop or select your preferred sequence aggregation method
 </details>

plotly_resampler/figure_resampler/figure_resampler_interface.py

@@ -398,8 +398,9 @@ def _check_update_figure_dict(
             if xaxis_filter is not None:
                 # the x-anchor of the trace is stored in the layout data
                 if trace.get("yaxis") is None:
-                    # no yaxis -> we make the assumption that yaxis = xaxis_filter_short
-                    y_axis = "y" + xaxis_filter[1:]
+                    # TODO In versions up until v0.8.2 we made the assumption that yaxis
+                    # = xaxis_filter_short. -> Why did we make this assumption?
+                    y_axis = "y"  # + xaxis_filter[1:]
                 else:
                     y_axis = "yaxis" + trace.get("yaxis")[1:]
 

poetry.lock

@@ -28,8 +28,9 @@ trace-updater = ">=0.0.8"
 numpy = ">=1.14"
 Flask-Cors = "^3.0.10"
 orjson = "^3.8.0"  # Faster json serialization
-Werkzeug = "2.1.2"  # Fixating werkzeug version because of:
+# TODO -> check other werkzeug versions: 2.1.2 and 2.1.1 seem to work.
 # https://github.com/predict-idlab/plotly-resampler/issues/123
+Werkzeug = "<=2.1.2"
 
 [tool.poetry.dev-dependencies]
 pytest = "^6.2.5"

pyproject.toml

@@ -746,6 +746,55 @@ def test_hf_data_property_subplots_reload_data():
     )
 
 
+def test_hf_data_subplots_non_shared_xaxes():
+    fwr = FigureWidgetResampler(make_subplots(rows=2, cols=1, shared_xaxes=False))
+    n = 100_000
+    x = np.arange(n)
+    y = np.sin(x)
+
+    assert len(fwr.hf_data) == 0
+    fwr.add_trace(go.Scattergl(name="test"), hf_x=x, hf_y=y, row=1, col=1)
+    fwr.add_trace(go.Scattergl(name="test"), hf_x=x, hf_y=y, row=2, col=1)
+
+    fwr.layout.update(
+        {
+            "xaxis2": {"range": [40_000, 60_000]},
+            "yaxis2": {"range": [-10, 3]},
+        },
+        overwrite=False,
+    )
+    x_0 = fwr.data[0]['x']
+    assert 0 <= x_0[0] <= (n / 1000)  
+    assert (n - 1000) <= x_0[-1] <= n - 1
+    x_1 = fwr.data[1]['x']
+    assert 40_000 <= x_1[0] <= 40_000 + (20_000 / 1000)  
+    assert (60_000 - 20_000 / 1_000) <= x_1[-1] <= 60_000
+
+
+def test_hf_data_subplots_non_shared_xaxes_row_col_none():
+    fwr = FigureWidgetResampler(make_subplots(rows=2, cols=1, shared_xaxes=False))
+    n = 100_000
+    x = np.arange(n)
+    y = np.sin(x)
+
+    assert len(fwr.hf_data) == 0
+    fwr.add_trace(go.Scattergl(name="test"), hf_x=x, hf_y=y)
+    fwr.add_trace(go.Scattergl(name="test"), hf_x=x, hf_y=y, row=2, col=1)
+
+    fwr.layout.update(
+        {
+            "xaxis2": {"range": [40_000, 60_000]},
+            "yaxis2": {"range": [-10, 3]},
+        },
+        overwrite=False,
+    )
+    x_0 = fwr.data[0]['x']
+    assert 0 <= x_0[0] <= (n / 1000)  
+    assert (n - 1000) <= x_0[-1] <= n - 1
+    x_1 = fwr.data[1]['x']
+    assert 40_000 <= x_1[0] <= 40_000 + (20_000 / 1000)  
+    assert (60_000 - 20_000 / 1_000) <= x_1[-1] <= 60_000
+
 def test_updates_two_traces():
     n = 1_000_000
     X = np.arange(n)