maidr 0.23.1__tar.gz → 0.25.0__tar.gz

{maidr-0.23.1 → maidr-0.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: maidr
-Version: 0.23.1
+Version: 0.25.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.23.1 → maidr-0.25.0}/maidr/__init__.py

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

{maidr-0.23.1 → maidr-0.25.0}/maidr/core/enum/maidr_key.py

@@ -30,6 +30,8 @@ class MaidrKey(str, Enum):
     Q2 = "q2"
     Q3 = "q3"
     UPPER_OUTLIER = "upperOutliers"
+    IQ = "iq"
+    MEDIAN = "median"
 
     # Grouped bar and heatmap plot keys.
     FILL = "fill"

{maidr-0.23.1 → maidr-0.25.0}/maidr/core/maidr.py

@@ -122,7 +122,10 @@ class Maidr:
 
     def _create_html_tag(self) -> Tag:
         """Create the MAIDR HTML using HTML tags."""
-        tagged_elements = [element for plot in self._plots for element in plot.elements]
+        tagged_elements: list[Any] = [
+            element for plot in self._plots for element in plot.elements
+        ]
+
         selector_ids = []
         for i, plot in enumerate(self._plots):
             for _ in plot.elements:
@@ -149,7 +152,7 @@ class Maidr:
         for i, plot in enumerate(self._plots):
             schema = plot.schema
 
-            if MaidrKey.SELECTOR in schema:
+            if MaidrKey.SELECTOR in schema and plot.type != PlotType.BOX:
                 if isinstance(schema[MaidrKey.SELECTOR], str):
                     schema[MaidrKey.SELECTOR] = schema[MaidrKey.SELECTOR].replace(
                         "maidr='true'", f"maidr='{self.selector_ids[i]}'"
@@ -238,7 +241,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}"]'))
@@ -260,7 +263,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.23.1 → maidr-0.25.0}/maidr/core/plot/boxplot.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import uuid
+
 from matplotlib.axes import Axes
 
 from maidr.core.enum import MaidrKey, PlotType
@@ -119,6 +121,40 @@ class BoxPlotExtractor:
         return data
 
 
+class BoxPlotElementsExtractor:
+    def __init__(self, orientation: str = "vert"):
+        self.orientation = orientation
+
+    def extract_whiskers(self, whiskers: list) -> list[dict]:
+        return self._extract_extremes(whiskers, MaidrKey.Q1, MaidrKey.Q3)
+
+    def extract_caps(self, caps: list) -> list[dict]:
+        return self._extract_extremes(caps, MaidrKey.MIN, MaidrKey.MAX)
+
+    def _extract_extremes(
+        self, extremes: list, start_key: MaidrKey, end_key: MaidrKey
+    ) -> list[dict]:
+        elements = []
+
+        for start, end in zip(extremes[::2], extremes[1::2]):
+            elements.append(
+                {
+                    start_key.value: start,
+                    end_key.value: end,
+                }
+            )
+
+        return elements
+
+    def extract_outliers(self, fliers: list, caps: list):
+        elements = []
+
+        for outlier, _ in zip(fliers, caps):
+            elements.append(outlier)
+
+        return elements
+
+
 class BoxPlot(
     MaidrPlot,
     ContainerExtractorMixin,
@@ -131,7 +167,33 @@ class BoxPlot(
         self._bxp_stats = kwargs.pop("bxp_stats", None)
         self._orientation = kwargs.pop("orientation", "vert")
         self._bxp_extractor = BoxPlotExtractor(orientation=self._orientation)
-        self._support_highlighting = False
+        self._bxp_elements_extractor = BoxPlotElementsExtractor(
+            orientation=self._orientation
+        )
+        self._support_highlighting = True
+        self.elements_map = {
+            "min": [],
+            "max": [],
+            "median": [],
+            "boxes": [],
+            "outliers": [],
+        }
+
+    def _get_selector(self) -> list[dict]:
+        mins, maxs, medians, boxes, outliers = self.elements_map.values()
+        selector = []
+        for min, max, median, box, outlier in zip(mins, maxs, medians, boxes, outliers):
+            selector.append(
+                {
+                    MaidrKey.LOWER_OUTLIER.value: ["g[id=" + outlier + "] > g > use"],
+                    MaidrKey.MIN.value: "g[id=" + min + "] > path",
+                    MaidrKey.MAX.value: "g[id=" + max + "] > path",
+                    MaidrKey.Q2.value: "g[id=" + median + "] > path",
+                    MaidrKey.IQ.value: "g[id=" + box + "] > path",
+                    MaidrKey.UPPER_OUTLIER.value: ["g[id=" + outlier + "] > g > use"],
+                }
+            )
+        return selector if self._orientation == "vert" else list(reversed(selector))
 
     def render(self) -> dict:
         base_schema = super().render()
@@ -150,11 +212,14 @@ class BoxPlot(
         if bxp_stats is None:
             return None
 
-        bxp_maidr = []
         whiskers = self._bxp_extractor.extract_whiskers(bxp_stats["whiskers"])
         caps = self._bxp_extractor.extract_caps(bxp_stats["caps"])
         medians = self._bxp_extractor.extract_medians(bxp_stats["medians"])
         outliers = self._bxp_extractor.extract_outliers(bxp_stats["fliers"], caps)
+
+        caps_elements = self._bxp_elements_extractor.extract_caps(bxp_stats["caps"])
+        bxp_maidr = []
+
         levels = (
             self.extract_level(self.ax, MaidrKey.X)
             if self._orientation == "vert"
@@ -163,6 +228,47 @@ class BoxPlot(
         if levels is None:
             levels = []
 
+        _pairs = [(e["min"], e["max"]) for e in caps_elements if e]
+
+        if _pairs:
+            mins, maxs = map(list, zip(*_pairs))
+        else:
+            mins, maxs = [], []
+
+        elements = []
+
+        for element in mins:
+            gid = "maidr-" + str(uuid.uuid4())
+            element.set_gid(gid)
+            self.elements_map["min"].append(gid)
+            elements.append(element)
+
+        for element in maxs:
+            gid = "maidr-" + str(uuid.uuid4())
+            element.set_gid(gid)
+            self.elements_map["max"].append(gid)
+            elements.append(element)
+
+        for element in bxp_stats["medians"]:
+            gid = "maidr-" + str(uuid.uuid4())
+            element.set_gid(gid)
+            self.elements_map["median"].append(gid)
+            elements.append(element)
+
+        for element in bxp_stats["boxes"]:
+            gid = "maidr-" + str(uuid.uuid4())
+            element.set_gid(gid)
+            self.elements_map["boxes"].append(gid)
+            elements.append(element)
+
+        for element in bxp_stats["fliers"]:
+            gid = "maidr-" + str(uuid.uuid4())
+            element.set_gid(gid)
+            self.elements_map["outliers"].append(gid)
+            elements.append(element)
+
+        self._elements.extend(elements)
+
         for whisker, cap, median, outlier, level in zip(
             whiskers, caps, medians, outliers, levels
         ):

{maidr-0.23.1 → maidr-0.25.0}/maidr/core/plot/lineplot.py

@@ -90,7 +90,8 @@ class MultiLinePlot(MaidrPlot, LineExtractorMixin):
                 {
                     MaidrKey.X: float(x),
                     MaidrKey.Y: float(y),
-                    # Replace labels starting with '_child' with an empty string to exclude
+                    # Replace labels starting with '_child'
+                    # with an empty string to exclude
                     # internal or non-relevant labels from being used as identifiers.
                     MaidrKey.FILL: (label if not label.startswith("_child") else ""),
                 }

{maidr-0.23.1 → maidr-0.25.0}/maidr/patch/highlight.py

@@ -5,7 +5,6 @@ import uuid
 import wrapt
 from matplotlib.backends.backend_svg import XMLWriter
 from matplotlib.collections import PathCollection, QuadMesh
-from matplotlib.figure import Figure
 from matplotlib.lines import Line2D
 from matplotlib.patches import Patch
 
@@ -20,8 +19,10 @@ def inject_maidr_attribute(wrapped, instance, args, kwargs):
 
 
 def tag_elements(wrapped, instance, args, kwargs):
-    id = str(uuid.uuid4())
-    instance.set_gid(id)
+    id = str(instance.get_gid())
+    if not id.startswith("maidr-"):
+        id = "maidr-" + str(uuid.uuid4())
+        instance.set_gid(id)
     with HighlightContextManager.set_maidr_element(instance, id):
         return wrapped(*args, **kwargs)
 

{maidr-0.23.1 → maidr-0.25.0}/pyproject.toml

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