maidr 0.16.1__tar.gz → 0.17.0__tar.gz

{maidr-0.16.1 → maidr-0.17.0}/PKG-INFO

@@ -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 → maidr-0.17.0}/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-0.16.1 → maidr-0.17.0}/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-0.16.1 → maidr-0.17.0}/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-0.16.1 → maidr-0.17.0}/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-0.16.1 → maidr-0.17.0}/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-0.16.1 → maidr-0.17.0}/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 → maidr-0.17.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "maidr"
-version = "0.16.1"
+version = "0.17.0"
 description = "Multimodal Access and Interactive Data Representations"
 authors = [
     "JooYoung Seo <jseo1005@illinois.edu>",