Merge upstream main and resolve changelog conflict

Author: MokiMeow

CHANGELOG.md

@@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - Fix single-color requests in `n_colors` and `sample_colorscale` raising `ZeroDivisionError` [[#5805](https://github.com/plotly/plotly.py/issues/5805)].
+- Fix figures in JupyterLab not redrawing when their output is updated with `update_display_data` (for example `DisplayHandle.update`), which also kept animations in other kernels on their first frame [[#5865](https://github.com/plotly/plotly.py/pull/5865)], with thanks to @AllenDowney for the contribution!
 - Fix `mpl_to_plotly` tick marker mirroring, axis positioning, and trace visibility for twinned and overlaid subplots (such as `twinx` and `twiny`) [[#5310](https://github.com/plotly/plotly.py/pull/5310)], with thanks to @robertoffmoura for the contribution!
 - Fix `mpl_to_plotly` losing matplotlib axis line colors by exporting the color of each axis's displayed spine to the plotly x and y axis `linecolor` [[#5311](https://github.com/plotly/plotly.py/pull/5311)], with thanks to @robertoffmoura for the contribution!
 - Fix concurrent first access to lazily initialized graph object properties, which could raise `ValueError("Invalid value")` [[#5691](https://github.com/plotly/plotly.py/pull/5691)], with thanks to @hb1915 for the contribution!
@@ -22,6 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Fix `convert_dash` mapping dotted lines (`linestyle=':'`) to invalid `'circle'` in Plotly, correctly converting them to `'dot'` and preserving custom dash patterns as pixel lists, [[#5719](https://github.com/plotly/plotly.py/pull/5719)] with thanks to @robertoffmoura for the contribution!
 - Fix Plotly Express mutating lists passed to the `x` or `y` arguments in wide mode [[#5727](https://github.com/plotly/plotly.py/pull/5727)], with thanks to @cpruijsen for the contribution!
 - Fix `px.sunburst`, `px.treemap` and `px.icicle` listing sectors in a different order on every run when `path` is used with a Polars DataFrame; sectors now follow their order of first appearance for all dataframe backends [[#5766](https://github.com/plotly/plotly.py/pull/5766)], with thanks to @Irahan2 for the contribution!
+- Fix `trendline_scope="overall"` drawing the overall trendline on the `marginal_x`/`marginal_y` subplots as well as the main plot; it is now drawn only on the main subplots [[#5780](https://github.com/plotly/plotly.py/pull/5780)], with thanks to @jayzhou2309 for the contribution!
 - Fix `mpl_to_plotly` conversion of matplotlib contour lines and line collections: close contour rings ending with `Z` codes, support dash styles, convert date x-axes, separate disjoint subpaths with `None` separators, hide line collection traces from the legend by default, and group consecutive same-style lines into single traces [[#5770](https://github.com/plotly/plotly.py/pull/5770)], with thanks to @robertoffmoura for the contribution!
 - Fix `plotly.io.write_images` ignoring `layout.width`/`layout.height` (and the template's) and exporting every figure at the default 700x500 size; it now uses the same width/height priority as `write_image` and `to_image` [[#5784](https://github.com/plotly/plotly.py/pull/5784)], with thanks to @breken-ai for the contribution!
 - Fix color utilities mutating the list of colors passed to them [[#5836](https://github.com/plotly/plotly.py/pull/5836)], with thanks to @Enesuygurs for the contribution!

js/lib/mimeExtension.js

@@ -54,8 +54,16 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
    */
   renderModel(model: IRenderMime.IMimeModel): Promise<void> {
     if (this.hasGraphElement()) {
-      // We already have a graph, don't overwrite it
-      return Promise.resolve();
+      // We already have a graph. Redraw it only if the figure has changed,
+      // as it does when a kernel sends update_display_data. (createGraph
+      // stores a PNG of the figure in the model, which calls renderModel
+      // again with the same figure.)
+      const previous = this._model?.data[this._mimeType];
+      if (JSON.stringify(previous) === JSON.stringify(model.data[this._mimeType])) {
+        return Promise.resolve();
+      }
+      this._model = model;
+      return this.createGraph(model);
     }
 
     // Save off reference to model so that we can regenerate the plot later

js/src/mimeExtension.ts

@@ -2834,9 +2834,13 @@ def make_figure(args, constructor, trace_patch=None, layout_patch=None):
             args, trendline_spec, args["data_frame"], {}, sizeref
         )
         trendline_trace.update(patch)
-        fig.add_trace(
-            trendline_trace, row="all", col="all", exclude_empty_subplots=True
-        )
+        main_rows = nrows - 1 if args.get("marginal_x") is not None else nrows
+        main_cols = ncols - 1 if args.get("marginal_y") is not None else ncols
+        for row in range(1, main_rows + 1):
+            for col in range(1, main_cols + 1):
+                fig.add_trace(
+                    trendline_trace, row=row, col=col, exclude_empty_subplots=True
+                )
         fig.update_traces(selector=-1, showlegend=True)
         if fit_results is not None:
             trendline_rows.append(dict(px_fit_results=fit_results))

plotly/express/_core.py

@@ -33,7 +33,7 @@
     "outputDir": "../plotly/labextension",
     "webpackConfig": "./webpack.config.js",
     "_build": {
-      "load": "static/remoteEntry.1dda3c8f6e5cd2a3.js",
+      "load": "static/remoteEntry.954b872b457cd897.js",
       "mimeExtension": "./mimeExtension"
     }
   }

plotly/labextension/package.json

@@ -264,3 +264,34 @@ def test_overall_trendline(backend):
     params3 = results3["px_fit_results"].iloc[0].params
 
     assert np.all(np.array_equal(params1, params3))
+
+
+@pytest.mark.parametrize(
+    "kwargs",
+    [
+        dict(marginal_x="box", marginal_y="box"),
+        dict(marginal_x="histogram", facet_col="smoker"),
+        dict(marginal_y="violin", facet_row="smoker"),
+    ],
+)
+def test_overall_trendline_skips_marginals(backend, kwargs):
+    df = px.data.tips(return_type=backend)
+    fig = px.scatter(
+        df,
+        x="total_bill",
+        y="tip",
+        color="sex",
+        trendline="ols",
+        trendline_scope="overall",
+        **kwargs,
+    )
+    trendline_axes = [
+        (t.xaxis, t.yaxis) for t in fig.data if t.name == "Overall Trendline"
+    ]
+    scatter_axes = {
+        (t.xaxis, t.yaxis)
+        for t in fig.data
+        if t.type == "scatter" and t.name != "Overall Trendline"
+    }
+    assert len(trendline_axes) == len(scatter_axes)
+    assert set(trendline_axes) == scatter_axes