maidr 0.16.1__py3-none-any.whl → 0.17.0__py3-none-any.whl

maidr/__init__.py

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

maidr/api.py

@@ -20,16 +20,31 @@ def render(plot: Any) -> Tag:
 
 def show(plot: Any, renderer: Literal["auto", "ipython", "browser"] = "auto") -> object:
     ax = FigureManager.get_axes(plot)
-    maidr = FigureManager.get_maidr(ax.get_figure())
-    return maidr.show(renderer)
+    htmls = []
+    if type(ax) is list:
+        for axes in ax:
+            maidr = FigureManager.get_maidr(axes.get_figure())
+            htmls.append(maidr.render())
+        return htmls[-1].show(renderer)
+    else:
+        maidr = FigureManager.get_maidr(ax.get_figure())
+        return maidr.show(renderer)
 
 
 def save_html(
     plot: Any, file: str, *, lib_dir: str | None = "lib", include_version: bool = True
 ) -> str:
     ax = FigureManager.get_axes(plot)
-    maidr = FigureManager.get_maidr(ax.get_figure())
-    return maidr.save_html(file, lib_dir=lib_dir, include_version=include_version)
+    htmls = []
+    if type(ax) is list:
+        for axes in ax:
+            maidr = FigureManager.get_maidr(axes.get_figure())
+            htmls.append(maidr.render())
+        htmls[-1].save_html(file, libdir=lib_dir, include_version=include_version)
+        return htmls[-1]
+    else:
+        maidr = FigureManager.get_maidr(ax.get_figure())
+        return maidr.save_html(file, lib_dir=lib_dir, include_version=include_version)
 
 
 def stacked(plot: Axes | BarContainer) -> Maidr:

maidr/core/maidr.py

@@ -139,7 +139,7 @@ class Maidr:
 
     def _flatten_maidr(self) -> dict | list[dict]:
         """Return a single plot schema or a list of schemas from the Maidr instance."""
-        if self.plot_type == PlotType.LINE:
+        if self.plot_type in (PlotType.LINE, PlotType.DODGED, PlotType.STACKED):
             self._plots = [self._plots[0]]
         maidr = [plot.schema for plot in self._plots]
 
@@ -149,8 +149,13 @@ class Maidr:
                 plot[MaidrKey.SELECTOR] = plot[MaidrKey.SELECTOR].replace(
                     "maidr='true'", f"maidr='{self.selector_id}'"
                 )
-
-        return maidr if len(maidr) != 1 else maidr[0]
+        engine = Environment.get_engine()
+        if engine == "js":
+            return maidr if len(maidr) != 1 else maidr[0]
+        return {
+            "id": Maidr._unique_id(),
+            "subplots": [[{"id": Maidr._unique_id(), "layers": maidr}]],
+        }
 
     def _get_svg(self) -> HTML:
         """Extract the chart SVG from ``matplotlib.figure.Figure``."""
@@ -200,6 +205,7 @@ class Maidr:
 
         engine = Environment.get_engine()
 
+        # 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_js_script = f"""

maidr/core/plot/barplot.py

@@ -38,10 +38,10 @@ class BarPlot(MaidrPlot, ContainerExtractorMixin, LevelExtractorMixin, DictMerge
         levels = self.extract_level(self.ax)
         if engine == "ts":
             formatted_data = []
-            combined_data = (
-                zip(levels, data) if plot[0].orientation == "vertical" else zip(levels, data)  # type: ignore
+            combined_data = list(
+                zip(levels, data) if plot[0].orientation == "vertical" else zip(data, levels)  # type: ignore
             )
-            if len(data) == len(plot):  # type: ignore
+            if combined_data:  # type: ignore
                 for x, y in combined_data:  # type: ignore
                     formatted_data.append({"x": x, "y": y})
                 return formatted_data

maidr/patch/barplot.py

@@ -52,16 +52,18 @@ def bar(
         bottom = kwargs.get("bottom")
         if bottom is not None:
             plot_type = PlotType.STACKED
-    elif args:
-        x = args[0]
-        is_numeric = False
-        if isinstance(x, np.ndarray) and np.issubdtype(x.dtype, np.number):
-            is_numeric = True
-        elif isinstance(x, (list, tuple)) and x and isinstance(x[0], Number):
-            is_numeric = True
-        if is_numeric:
-            plot_type = PlotType.DODGED
+    else:
+        if len(args) >= 3:
+            real_width = args[2]
+        else:
+            real_width = kwargs.get("width", 0.8)
+
+        align = kwargs.get("align", "center")
 
+        if (isinstance(real_width, (int, float)) and float(real_width) < 0.8) or (
+            align == "edge"
+        ):
+            plot_type = PlotType.DODGED
     return common(plot_type, wrapped, instance, args, kwargs)
 
 

maidr/util/mixin/extractor_mixin.py

@@ -45,9 +45,36 @@ class LevelExtractorMixin:
 
         level = None
         if MaidrKey.X == key:
-            level = [label.get_text() for label in ax.get_xticklabels()]
+            ticks = ax.get_xticks()
+            labels = [label.get_text() for label in ax.get_xticklabels()]
+
+            if hasattr(ax, "dataLim") and ax.dataLim.width != 0:
+                # Use the actual data limits rather than padded view limits
+                data_x_min, data_x_max = ax.dataLim.x0, ax.dataLim.x0 + ax.dataLim.width
+                # Filter tick labels to only those within the actual data range
+                valid_indices = [
+                    i for i, pos in enumerate(ticks) if data_x_min <= pos <= data_x_max
+                ]
+                labels = [labels[i] for i in valid_indices if i < len(labels)]
+
+            level = labels
         elif MaidrKey.Y == key:
-            level = [label.get_text() for label in ax.get_yticklabels()]
+            ticks = ax.get_yticks()
+            labels = [label.get_text() for label in ax.get_yticklabels()]
+
+            if hasattr(ax, "dataLim") and ax.dataLim.height != 0:
+                # Use the actual data limits rather than padded view limits
+                data_y_min, data_y_max = (
+                    ax.dataLim.y0,
+                    ax.dataLim.y0 + ax.dataLim.height,
+                )
+                # Filter tick labels to only those within the actual data range
+                valid_indices = [
+                    i for i, pos in enumerate(ticks) if data_y_min <= pos <= data_y_max
+                ]
+                labels = [labels[i] for i in valid_indices if i < len(labels)]
+
+            level = labels
         elif MaidrKey.FILL == key:
             level = [container.get_label() for container in ax.containers]
 

{maidr-0.16.1.dist-info → maidr-0.17.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: maidr
-Version: 0.16.1
+Version: 0.17.0
 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.16.1.dist-info → maidr-0.17.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-maidr/__init__.py,sha256=YLVnqJKygx0YZzQQ51K7_BCx-FX9rfpLo-HhoF0ufZI,369
-maidr/api.py,sha256=u2WOQ8RWmXpzseEgbZJCB7FFZs7cEy-ya-Q18tGAYB4,1350
+maidr/__init__.py,sha256=AYJCYrGlBnEnS5wvW5Et0HzM56fv4fB3HCdfFK66fto,369
+maidr/api.py,sha256=iVPdD8D2cRmfGuTWNuElBSbrGH4akxPXYEyf_e-MWHg,1870
 maidr/core/__init__.py,sha256=WgxLpSEYMc4k3OyEOf1shOxfEq0ASzppEIZYmE91ThQ,25
 maidr/core/context_manager.py,sha256=HSzD4wpiALdI4Vm0QTdWqi1MWR5Uqy8BX_lOlCM3JYY,3463
 maidr/core/enum/__init__.py,sha256=9ee78L0dlxEx4ulUGVlD-J23UcUZmrGu0rXms54up3c,93
@@ -7,9 +7,9 @@ maidr/core/enum/library.py,sha256=e8ujT_L-McJWfoVJd1ty9K_2bwITnf1j0GPLsnAcHes,10
 maidr/core/enum/maidr_key.py,sha256=LNtt74d2gurefDNPD3SLLsTxKqO9qTyo3PBAUAyofnc,736
 maidr/core/enum/plot_type.py,sha256=pyfyIwlq3taqe2Z1sVUSbMsTp5QTvYBlZXsMMMclEVM,293
 maidr/core/figure_manager.py,sha256=rd8XEwqNmfKu1I9zGD1p9g3wVlkMYNCrdLLCg4IzlfQ,3934
-maidr/core/maidr.py,sha256=G7ACqroX80F9z4-tJj6-YFcjvv9--A-qrmH1Syp4jgQ,11717
+maidr/core/maidr.py,sha256=aw9JZHGS090guSF1l67xr_BU1quHojHSQz2Yn2-wD8s,12038
 maidr/core/plot/__init__.py,sha256=xDIpRGM-4DfaSSL3nKcXrjdMecCHJ6en4K4nA_fPefQ,83
-maidr/core/plot/barplot.py,sha256=DGiMbakzER-Czpzekw-yBHXZuzWpBg7ODtJPQ8voI04,2605
+maidr/core/plot/barplot.py,sha256=b7r0cz3yMZzWwiTJVUy1yWBXhv_oN9rwEb6hfKVg3Zs,2600
 maidr/core/plot/boxplot.py,sha256=roADG8xJYRQlZPYbfGBQSQRw8974lhVnngGKEKXJttk,6090
 maidr/core/plot/grouped_barplot.py,sha256=tAiOWwtfsWDwyGdUuCdQ6-f8UQxnsDDwpN30Skk8p-U,2071
 maidr/core/plot/heatmap.py,sha256=_Hn_wXsu-BQBYs4YO440-WRhmXAJ1WeBndBGVEUAP5M,2447
@@ -21,7 +21,7 @@ maidr/core/plot/scatterplot.py,sha256=sQhT80w0Sp9AsUAZi4v6lfWsHJAvuFcer2aAE2NpAY
 maidr/exception/__init__.py,sha256=PzaXoYBhyZxMDcJkuxJugDx7jZeseI0El6LpxIwXyG4,46
 maidr/exception/extraction_error.py,sha256=rd37Oxa9gn2OWFWt9AOH5fv0hNd3sAWGvpDMFBuJY2I,607
 maidr/patch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maidr/patch/barplot.py,sha256=X2vsC_OMGk5ubMc29YZ1il5D5loYtJ5scjCy5gk098g,2412
+maidr/patch/barplot.py,sha256=iCoYaqlHou6_rSnbjfZwpRU8ENnYcfQ9JCdUxhrSgCA,2416
 maidr/patch/boxplot.py,sha256=Mcz94pSf7PT3SyRsI8TDrIKVdEmiiUQouXvd05mtnfw,2846
 maidr/patch/clear.py,sha256=2Sc4CIt5jRGkew3TxFsBZm-uowC9yDSxtraEcXZjmGw,396
 maidr/patch/common.py,sha256=bRe4jruUvCIwp1t1E8Q3OuQ0eEyHgpMjXVpsPBZj4C8,843
@@ -33,11 +33,11 @@ maidr/patch/scatterplot.py,sha256=JZJXy3vWbJgzZh2zysNrqSA7MRcfSCms6lr_MY5CMD0,52
 maidr/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maidr/util/environment.py,sha256=xtfibTH4RXW2GC7R_9OQo119BTe5M3bx0u13eFZaiZs,4554
 maidr/util/mixin/__init__.py,sha256=aGJZNhtWh77yIVPc7ipIZm1OajigjMtCWYKPuDWTC-c,217
-maidr/util/mixin/extractor_mixin.py,sha256=lOVDaNsHnOS2aYxiGXAigGjt8WXzcer9MocaipcOh60,3511
+maidr/util/mixin/extractor_mixin.py,sha256=AjpgCo_dgASdTwFumfgDOoVCVioxDDoqFWphaBj5gz4,4764
 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.16.1.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-maidr-0.16.1.dist-info/METADATA,sha256=n7ZkOMo86zBmTCugcRgI1-7SSgJ_0OXnvHt2dRfC3yQ,2688
-maidr-0.16.1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-maidr-0.16.1.dist-info/RECORD,,
+maidr-0.17.0.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+maidr-0.17.0.dist-info/METADATA,sha256=xXcEWUWeA_lR30cXjAiCPyuNgO-e3-7mfwG2ggy5Su4,2688
+maidr-0.17.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+maidr-0.17.0.dist-info/RECORD,,