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

maidr/__init__.py

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

maidr/api.py

@@ -21,7 +21,7 @@ def render(plot: Any) -> Tag:
 def show(plot: Any, renderer: Literal["auto", "ipython", "browser"] = "auto") -> object:
     ax = FigureManager.get_axes(plot)
     htmls = []
-    if type(ax) is list:
+    if isinstance(ax, list):
         for axes in ax:
             maidr = FigureManager.get_maidr(axes.get_figure())
             htmls.append(maidr.render())
@@ -36,7 +36,7 @@ def save_html(
 ) -> str:
     ax = FigureManager.get_axes(plot)
     htmls = []
-    if type(ax) is list:
+    if isinstance(ax, list):
         for axes in ax:
             maidr = FigureManager.get_maidr(axes.get_figure())
             htmls.append(maidr.render())

maidr/core/enum/maidr_key.py

@@ -35,7 +35,7 @@ class MaidrKey(str, Enum):
     LABELS = "labels"
 
     # Histogram plot keys.
-    X_MIN = "xmin"
-    X_MAX = "xmax"
-    Y_MIN = "ymin"
-    Y_MAX = "ymax"
+    X_MIN = "xMin"
+    X_MAX = "xMax"
+    Y_MIN = "yMin"
+    Y_MAX = "yMax"

maidr/core/maidr.py

@@ -6,7 +6,7 @@ import os
 import tempfile
 import uuid
 import webbrowser
-from typing import Literal
+from typing import Any, Literal
 
 from htmltools import HTML, HTMLDocument, Tag, tags
 from lxml import etree
@@ -139,23 +139,66 @@ 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 in (PlotType.LINE, PlotType.DODGED, PlotType.STACKED):
-            self._plots = [self._plots[0]]
-        maidr = [plot.schema for plot in self._plots]
-
-        # Replace the selector having maidr='true' with maidr={self.maidr_id}
-        for plot in maidr:
-            if MaidrKey.SELECTOR in plot:
-                plot[MaidrKey.SELECTOR] = plot[MaidrKey.SELECTOR].replace(
-                    "maidr='true'", f"maidr='{self.selector_id}'"
-                )
+        # To support legacy JS Engine we will just return the format in this way
+        # but soon enough this should be deprecated and when we will completely
+        # transition to TypeScript :)
         engine = Environment.get_engine()
         if engine == "js":
+            if self.plot_type in (PlotType.LINE, PlotType.DODGED, PlotType.STACKED):
+                self._plots = [self._plots[0]]
+            maidr = [plot.schema for plot in self._plots]
+            for plot in maidr:
+                if MaidrKey.SELECTOR in plot:
+                    plot[MaidrKey.SELECTOR] = plot[MaidrKey.SELECTOR].replace(
+                        "maidr='true'", f"maidr='{self.selector_id}'"
+                    )
             return maidr if len(maidr) != 1 else maidr[0]
-        return {
-            "id": Maidr._unique_id(),
-            "subplots": [[{"id": Maidr._unique_id(), "layers": maidr}]],
-        }
+
+        # Now let's start building the maidr object for the newer TypeScript engine
+
+        plot_schemas = []
+
+        for plot in self._plots:
+            schema = plot.schema
+            if MaidrKey.SELECTOR in schema:
+                schema[MaidrKey.SELECTOR] = schema[MaidrKey.SELECTOR].replace(
+                    "maidr='true'", f"maidr='{self.selector_id}'"
+                )
+            plot_schemas.append(
+                {
+                    "schema": schema,
+                    "row": getattr(plot, "row_index", 0),
+                    "col": getattr(plot, "col_index", 0),
+                }
+            )
+
+        max_row = max([plot.get("row", 0) for plot in plot_schemas], default=0)
+        max_col = max([plot.get("col", 0) for plot in plot_schemas], default=0)
+
+        subplot_grid: list[list[dict[str, str | list[Any]]]] = [
+            [{} for _ in range(max_col + 1)] for _ in range(max_row + 1)
+        ]
+
+        position_groups = {}
+        for plot in plot_schemas:
+            pos = (plot.get("row", 0), plot.get("col", 0))
+            if pos not in position_groups:
+                position_groups[pos] = []
+            position_groups[pos].append(plot["schema"])
+
+        for (row, col), layers in position_groups.items():
+            if subplot_grid[row][col]:
+                subplot_grid[row][col]["layers"].append(layers)
+            else:
+                subplot_grid[row][col] = {"id": Maidr._unique_id(), "layers": layers}
+
+        for i in range(len(subplot_grid)):
+            subplot_grid[i] = [
+                cell if cell is not None else {"id": Maidr._unique_id(), "layers": []}
+                for cell in subplot_grid[i]
+            ]
+
+        return {"id": Maidr._unique_id(), "subplots": subplot_grid}
 
     def _get_svg(self) -> HTML:
         """Extract the chart SVG from ``matplotlib.figure.Figure``."""

maidr/core/plot/maidr_plot.py

@@ -41,6 +41,9 @@ class MaidrPlot(ABC):
         self.ax = ax
         self._support_highlighting = True
         self._elements = []
+        ss = self.ax.get_subplotspec()
+        self.row_index = ss.rowspan.start
+        self.col_index = ss.colspan.start
 
         # MAIDR data
         self.type = plot_type

maidr/core/plot/scatterplot.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import numpy.ma as ma
-
 from matplotlib.axes import Axes
 from matplotlib.collections import PathCollection
 
@@ -36,8 +35,12 @@ class ScatterPlot(MaidrPlot, CollectionExtractorMixin):
 
         return [
             {
-                MaidrKey.X: float(x),
-                MaidrKey.Y: float(y),
+                "points": [
+                    {
+                        MaidrKey.X: float(x),
+                        MaidrKey.Y: float(y),
+                    }
+                    for x, y in ma.getdata(plot.get_offsets())
+                ]
             }
-            for x, y in ma.getdata(plot.get_offsets())
         ]

maidr/patch/scatterplot.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import wrapt
-
 from matplotlib.axes import Axes
 from matplotlib.collections import PathCollection
 

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

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

@@ -1,13 +1,13 @@
-maidr/__init__.py,sha256=AYJCYrGlBnEnS5wvW5Et0HzM56fv4fB3HCdfFK66fto,369
-maidr/api.py,sha256=iVPdD8D2cRmfGuTWNuElBSbrGH4akxPXYEyf_e-MWHg,1870
+maidr/__init__.py,sha256=9RllXJL4rpu3WSbebir45U3QFkUqf9Wq51Y373ExVhw,369
+maidr/api.py,sha256=m4fkbW2gV9yhHq0uMi5_DW35VWh5v0wFGqT00ceR5Wc,1878
 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
 maidr/core/enum/library.py,sha256=e8ujT_L-McJWfoVJd1ty9K_2bwITnf1j0GPLsnAcHes,104
-maidr/core/enum/maidr_key.py,sha256=LNtt74d2gurefDNPD3SLLsTxKqO9qTyo3PBAUAyofnc,736
+maidr/core/enum/maidr_key.py,sha256=rDNpl7edBAHs869ECw5gMz_AKxetK-BXJ25BIJ-xTNU,736
 maidr/core/enum/plot_type.py,sha256=pyfyIwlq3taqe2Z1sVUSbMsTp5QTvYBlZXsMMMclEVM,293
 maidr/core/figure_manager.py,sha256=rd8XEwqNmfKu1I9zGD1p9g3wVlkMYNCrdLLCg4IzlfQ,3934
-maidr/core/maidr.py,sha256=aw9JZHGS090guSF1l67xr_BU1quHojHSQz2Yn2-wD8s,12038
+maidr/core/maidr.py,sha256=iEi59R4oLuSIOocEhWzdQCRE3FvvPmzE2LiR5mmZjWk,13811
 maidr/core/plot/__init__.py,sha256=xDIpRGM-4DfaSSL3nKcXrjdMecCHJ6en4K4nA_fPefQ,83
 maidr/core/plot/barplot.py,sha256=b7r0cz3yMZzWwiTJVUy1yWBXhv_oN9rwEb6hfKVg3Zs,2600
 maidr/core/plot/boxplot.py,sha256=roADG8xJYRQlZPYbfGBQSQRw8974lhVnngGKEKXJttk,6090
@@ -15,9 +15,9 @@ maidr/core/plot/grouped_barplot.py,sha256=tAiOWwtfsWDwyGdUuCdQ6-f8UQxnsDDwpN30Sk
 maidr/core/plot/heatmap.py,sha256=_Hn_wXsu-BQBYs4YO440-WRhmXAJ1WeBndBGVEUAP5M,2447
 maidr/core/plot/histogram.py,sha256=QV5W-6ZJQQcZsrM91JJBX-ONktJzH7yg_et5_bBPfQQ,1525
 maidr/core/plot/lineplot.py,sha256=OQQtJb7lmO-lZTQfhqMV4sfztyuEicZfe95y9nIhfTo,3280
-maidr/core/plot/maidr_plot.py,sha256=_9Ugn3cUwi-URxeTRbDAKDZwASrB65p9TKOXhFX1zbU,3176
+maidr/core/plot/maidr_plot.py,sha256=9z8I_W4o_NWvz-S5QFp1kB0L23AHvt0PDxRhxgeJcmY,3299
 maidr/core/plot/maidr_plot_factory.py,sha256=QGcHK_oquY_M2_KJVEtc5-rBAD-gm7KI1kSD7cduHzg,1691
-maidr/core/plot/scatterplot.py,sha256=sQhT80w0Sp9AsUAZi4v6lfWsHJAvuFcer2aAE2NpAYE,1240
+maidr/core/plot/scatterplot.py,sha256=fre5FNhGVoQkm8V2CP9nxhjHN5ZyzptCrVmse_KCU1Q,1353
 maidr/exception/__init__.py,sha256=PzaXoYBhyZxMDcJkuxJugDx7jZeseI0El6LpxIwXyG4,46
 maidr/exception/extraction_error.py,sha256=rd37Oxa9gn2OWFWt9AOH5fv0hNd3sAWGvpDMFBuJY2I,607
 maidr/patch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -29,7 +29,7 @@ maidr/patch/heatmap.py,sha256=uxLLg530Ql9KVC5rxk8vnwPHXBWWHwYgJRkyHY-tJzs,1048
 maidr/patch/highlight.py,sha256=2DOO1tLDpXDtGd8DAPpnDOtq2_rWViPS7IDn9TbBXyA,925
 maidr/patch/histogram.py,sha256=tnyKkTMuzDXdyQBywhpHZgH3i2mXzOCSyfUSRM0tfUg,1315
 maidr/patch/lineplot.py,sha256=_EyqOp8BcO-kGq9sn8PyNQ8-Bz0FsnHAufXRkTGQzBw,1025
-maidr/patch/scatterplot.py,sha256=JZJXy3vWbJgzZh2zysNrqSA7MRcfSCms6lr_MY5CMD0,526
+maidr/patch/scatterplot.py,sha256=kln6zZwjVsdQzICalo-RnBOJrx1BnIB2xYUwItHvSNY,525
 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
@@ -37,7 +37,7 @@ maidr/util/mixin/extractor_mixin.py,sha256=AjpgCo_dgASdTwFumfgDOoVCVioxDDoqFWpha
 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.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,,
+maidr-0.19.0.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+maidr-0.19.0.dist-info/METADATA,sha256=VtQpcXHI79GE85Ab9im8KfodMDr4ZCFte-lsNVY74do,2688
+maidr-0.19.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+maidr-0.19.0.dist-info/RECORD,,