From 32f898746edf9075ff8f4c40a9ec10ac160c75a2 Mon Sep 17 00:00:00 2001 From: Nicolas Kruchten Date: Sun, 22 Jan 2023 21:32:48 -0500 Subject: [PATCH 1/2] Revert "Set cell_number to 0 if history is not available" This reverts commit 4f6201bb838abac3ffbd9d0498178eb927d99326. --- packages/python/plotly/plotly/io/_base_renderers.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/python/plotly/plotly/io/_base_renderers.py b/packages/python/plotly/plotly/io/_base_renderers.py index 5f42b2d01fc..f4ccd0c0f88 100644 --- a/packages/python/plotly/plotly/io/_base_renderers.py +++ b/packages/python/plotly/plotly/io/_base_renderers.py @@ -609,14 +609,11 @@ def to_mimebundle(self, fig_dict): def build_filename(self): ip = IPython.get_ipython() if IPython else None - if ip: - cell_number = next(ip.history_manager.get_tail(1), (0, -1, ""))[1] + 1 - else: - cell_number = 0 - - return "{dirname}/figure_{cell_number}.html".format( + cell_number = list(ip.history_manager.get_tail(1))[0][1] + 1 if ip else 0 + filename = "{dirname}/figure_{cell_number}.html".format( dirname=self.html_directory, cell_number=cell_number ) + return filename def build_url(self, filename): return filename From 159f1949dec9ed84d1655e4a66afbd0e689b92f7 Mon Sep 17 00:00:00 2001 From: Nicolas Kruchten Date: Sun, 22 Jan 2023 21:43:10 -0500 Subject: [PATCH 2/2] fix for missing cell_number in iframe renderer --- packages/python/plotly/plotly/io/_base_renderers.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/python/plotly/plotly/io/_base_renderers.py b/packages/python/plotly/plotly/io/_base_renderers.py index f4ccd0c0f88..f6cc4f9c1d3 100644 --- a/packages/python/plotly/plotly/io/_base_renderers.py +++ b/packages/python/plotly/plotly/io/_base_renderers.py @@ -609,11 +609,13 @@ def to_mimebundle(self, fig_dict): def build_filename(self): ip = IPython.get_ipython() if IPython else None - cell_number = list(ip.history_manager.get_tail(1))[0][1] + 1 if ip else 0 - filename = "{dirname}/figure_{cell_number}.html".format( + try: + cell_number = list(ip.history_manager.get_tail(1))[0][1] + 1 if ip else 0 + except Exception: + cell_number = 0 + return "{dirname}/figure_{cell_number}.html".format( dirname=self.html_directory, cell_number=cell_number ) - return filename def build_url(self, filename): return filename