maidr 0.24.0__py3-none-any.whl → 0.25.1__py3-none-any.whl

maidr/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.24.0"
+__version__ = "0.25.1"
 
 from .api import close, render, save_html, show, stacked
 from .core import Maidr

maidr/api.py

@@ -9,7 +9,6 @@ from matplotlib.container import BarContainer
 from maidr.core import Maidr
 from maidr.core.enum import PlotType
 from maidr.core.figure_manager import FigureManager
-from maidr.util.environment import Environment
 
 
 def render(plot: Any) -> Tag:
@@ -18,7 +17,11 @@ def render(plot: Any) -> Tag:
     return maidr.render()
 
 
-def show(plot: Any, renderer: Literal["auto", "ipython", "browser"] = "auto") -> object:
+def show(
+    plot: Any,
+    renderer: Literal["auto", "ipython", "browser"] = "auto",
+    clear_fig: bool = True,
+) -> object:
     ax = FigureManager.get_axes(plot)
     if isinstance(ax, list):
         for axes in ax:
@@ -26,7 +29,7 @@ def show(plot: Any, renderer: Literal["auto", "ipython", "browser"] = "auto") ->
         return maidr.show(renderer)
     else:
         maidr = FigureManager.get_maidr(ax.get_figure())
-        return maidr.show(renderer)
+        return maidr.show(renderer, clear_fig=clear_fig)
 
 
 def save_html(

maidr/core/maidr.py

@@ -8,6 +8,7 @@ import uuid
 import webbrowser
 from typing import Any, Literal
 
+import matplotlib.pyplot as plt
 from htmltools import HTML, HTMLDocument, Tag, tags
 from lxml import etree
 from matplotlib.figure import Figure
@@ -21,7 +22,8 @@ from maidr.util.environment import Environment
 
 class Maidr:
     """
-    A class to handle the rendering and interaction of matplotlib figures with additional metadata.
+    A class to handle the rendering and interaction
+    of matplotlib figures with additional metadata.
 
     Attributes
     ----------
@@ -84,6 +86,7 @@ class Maidr:
     def show(
         self,
         renderer: Literal["auto", "ipython", "browser"] = "auto",
+        clear_fig: bool = True,
     ) -> object:
         """
         Preview the HTML content using the specified renderer.
@@ -99,6 +102,8 @@ class Maidr:
             Environment.is_interactive_shell() and not Environment.is_notebook()
         ):
             return self._open_plot_in_browser()
+        if clear_fig:
+            plt.close()
         return html.show(renderer)
 
     def clear(self):
@@ -241,7 +246,7 @@ class Maidr:
     def _inject_plot(plot: HTML, maidr: str, maidr_id) -> Tag:
         """Embed the plot and associated MAIDR scripts into the HTML structure."""
         # MAIDR_TS_CDN_URL = "http://localhost:8080/maidr.js"  # DEMO URL
-        MAIDR_TS_CDN_URL = "https://cdn.jsdelivr.net/npm/maidr-ts/dist/maidr.js"
+        MAIDR_TS_CDN_URL = "https://cdn.jsdelivr.net/npm/maidr/dist/maidr.js"
 
         script = f"""
             if (!document.querySelector('script[src="{MAIDR_TS_CDN_URL}"]'))
@@ -263,7 +268,7 @@ class Maidr:
         base_html = tags.div(
             tags.link(
                 rel="stylesheet",
-                href="https://cdn.jsdelivr.net/npm/maidr/dist/maidr_style.min.css",
+                href="https://cdn.jsdelivr.net/npm/maidr/dist/maidr_style.css",
             ),
             tags.script(script, type="text/javascript"),
             tags.div(plot),

{maidr-0.24.0.dist-info → maidr-0.25.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: maidr
-Version: 0.24.0
+Version: 0.25.1
 Summary: Multimodal Access and Interactive Data Representations
 License: GPL-3.0-or-later
 Keywords: accessibility,visualization,sonification,braille,tactile,multimodal,data representation,blind,low vision,visual impairments

{maidr-0.24.0.dist-info → maidr-0.25.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-maidr/__init__.py,sha256=-yA29DZNIT5WC0TxaCRZ-3Ku1LE7bpCosV7ulb6-CnM,357
-maidr/api.py,sha256=GNyYSF8jEOsqCY4ZWLw3hh6RmRDewkWh6DJbzWfEwOA,1721
+maidr/__init__.py,sha256=TAajoEHlYg-imPN5fvMAJZmUwY6Lc18YgvVeeKVOcFE,357
+maidr/api.py,sha256=2PkvPDhpPFEHmM99-jFkXij07GgQ4Rj-KDZ-b_Krc5c,1734
 maidr/core/__init__.py,sha256=WgxLpSEYMc4k3OyEOf1shOxfEq0ASzppEIZYmE91ThQ,25
 maidr/core/context_manager.py,sha256=6cT7ZGOApSpC-SLD2XZWWU_H08i-nfv-JUlzXOtvWYw,3374
 maidr/core/enum/__init__.py,sha256=9ee78L0dlxEx4ulUGVlD-J23UcUZmrGu0rXms54up3c,93
@@ -7,7 +7,7 @@ maidr/core/enum/library.py,sha256=e8ujT_L-McJWfoVJd1ty9K_2bwITnf1j0GPLsnAcHes,10
 maidr/core/enum/maidr_key.py,sha256=ljG0omqzd8K8Yk213N7i7PXGvG-IOlnE5v7o6RoGJzc,795
 maidr/core/enum/plot_type.py,sha256=pyfyIwlq3taqe2Z1sVUSbMsTp5QTvYBlZXsMMMclEVM,293
 maidr/core/figure_manager.py,sha256=e6nI5pGqH0NM3yzt2jeiae4lrBlIOhkDN92GZJ3MNmk,3988
-maidr/core/maidr.py,sha256=lX2fLGNTroup8cT2aEYoCcyXNYticzbh-ufOugNsscM,12624
+maidr/core/maidr.py,sha256=6Sy9pbM4YxKh9hdpbPwk5GeoRTWLPaR_DDZQgEaVmP8,12731
 maidr/core/plot/__init__.py,sha256=xDIpRGM-4DfaSSL3nKcXrjdMecCHJ6en4K4nA_fPefQ,83
 maidr/core/plot/barplot.py,sha256=1HfoqyDGKIXkYQnCHN83Ye_faKpNQ3R4wjlbjD5jUyk,2092
 maidr/core/plot/boxplot.py,sha256=FjXiRdMfNj2czKs0vr8hPXr5SSu1CowyL9ZdWGbcC6s,9353
@@ -37,7 +37,7 @@ maidr/util/mixin/extractor_mixin.py,sha256=oHtwpmS5kARvaLrSO3DKTPQxyFUw9nOcKN7rz
 maidr/util/mixin/merger_mixin.py,sha256=V0qLw_6DUB7X6CQ3BCMpsCQX_ZuwAhoSTm_E4xAJFKM,712
 maidr/widget/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maidr/widget/shiny.py,sha256=wrrw2KAIpE_A6CNQGBtNHauR1DjenA_n47qlFXX9_rk,745
-maidr-0.24.0.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-maidr-0.24.0.dist-info/METADATA,sha256=ZBJhczT19i8z3905Hc0s9wGYzPv-hOlCajjXrkvWxGY,2688
-maidr-0.24.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-maidr-0.24.0.dist-info/RECORD,,
+maidr-0.25.1.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+maidr-0.25.1.dist-info/METADATA,sha256=3FxK0W5YXUnTkQXKXeddmI8PLVA7icaWc6RO1bzaRkw,2688
+maidr-0.25.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+maidr-0.25.1.dist-info/RECORD,,