maidr 0.13.0__py3-none-any.whl → 0.15.0__py3-none-any.whl

maidr/__init__.py

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

maidr/core/figure_manager.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
-from typing import Any
+
 import threading
+from typing import Any
 
 from matplotlib.artist import Artist
 from matplotlib.axes import Axes
@@ -57,17 +58,16 @@ class FigureManager:
             raise ValueError(f"No figure found for axis: {ax}.")
 
         # Add plot to the Maidr object associated with the plot's figure.
-        maidr = cls._get_maidr(ax.get_figure())
+        maidr = cls._get_maidr(ax.get_figure(), plot_type)
         plot = MaidrPlotFactory.create(ax, plot_type, **kwargs)
         maidr.plots.append(plot)
-
         return maidr
 
     @classmethod
-    def _get_maidr(cls, fig: Figure) -> Maidr:
+    def _get_maidr(cls, fig: Figure, plot_type: PlotType) -> Maidr:
         """Retrieve or create a Maidr instance for the given Figure."""
         if fig not in cls.figs.keys():
-            cls.figs[fig] = Maidr(fig)
+            cls.figs[fig] = Maidr(fig, plot_type)
         return cls.figs[fig]
 
     @classmethod

maidr/core/maidr.py

@@ -14,6 +14,7 @@ from matplotlib.figure import Figure
 
 from maidr.core.context_manager import HighlightContextManager
 from maidr.core.enum.maidr_key import MaidrKey
+from maidr.core.enum.plot_type import PlotType
 from maidr.core.plot import MaidrPlot
 from maidr.util.environment import Environment
 
@@ -39,11 +40,13 @@ class Maidr:
         Displays the rendered HTML content in the specified rendering context.
     """
 
-    def __init__(self, fig: Figure) -> None:
+    def __init__(self, fig: Figure, plot_type: PlotType = PlotType.LINE) -> None:
         """Create a new Maidr for the given ``matplotlib.figure.Figure``."""
         self._fig = fig
         self._plots = []
         self.maidr_id = None
+        self.selector_id = Maidr._unique_id()
+        self.plot_type = plot_type
 
     @property
     def fig(self) -> Figure:
@@ -125,7 +128,7 @@ class Maidr:
         maidr = f"\nlet maidr = {json.dumps(self._flatten_maidr(), indent=2)}\n"
 
         # In SVG we will replace maidr=id with the unique id.
-        svg = svg.replace('maidr="true"', f'maidr="{self.maidr_id}"')
+        svg = svg.replace('maidr="true"', f'maidr="{self.selector_id}"')
 
         # Inject plot's svg and MAIDR structure into html tag.
         return Maidr._inject_plot(svg, maidr, self.maidr_id)
@@ -136,13 +139,15 @@ 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:
+            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.maidr_id}'"
+                    "maidr='true'", f"maidr='{self.selector_id}'"
                 )
 
         return maidr if len(maidr) != 1 else maidr[0]

maidr/core/plot/barplot.py

@@ -41,7 +41,7 @@ class BarPlot(MaidrPlot, ContainerExtractorMixin, LevelExtractorMixin, DictMerge
             combined_data = (
                 zip(levels, data) if plot[0].orientation == "vertical" else zip(levels, data)  # type: ignore
             )
-            if len(data) != len(plot):  # type: ignore
+            if len(data) == len(plot):  # type: ignore
                 for x, y in combined_data:  # type: ignore
                     formatted_data.append({"x": x, "y": y})
                 return formatted_data

maidr/core/plot/grouped_barplot.py

@@ -16,7 +16,7 @@ from maidr.util.mixin import (
 class GroupedBarPlot(
     MaidrPlot, ContainerExtractorMixin, LevelExtractorMixin, DictMergerMixin
 ):
-    def __init__(self, ax: Axes, plot_type: PlotType) -> None:
+    def __init__(self, ax: Axes, plot_type: PlotType, **kwargs) -> None:
         super().__init__(ax, plot_type)
         self._support_highlighting = False
 

maidr/core/plot/lineplot.py

@@ -1,41 +1,102 @@
-from __future__ import annotations
-
 from matplotlib.axes import Axes
 from matplotlib.lines import Line2D
 
-from maidr.core.enum import MaidrKey, PlotType
-from maidr.core.plot import MaidrPlot
-from maidr.exception import ExtractionError
-from maidr.util.mixin import LineExtractorMixin
+from maidr.core.enum.maidr_key import MaidrKey
+from maidr.core.enum.plot_type import PlotType
+from maidr.core.plot.maidr_plot import MaidrPlot
+from maidr.exception.extraction_error import ExtractionError
+from maidr.util.environment import Environment
+from maidr.util.mixin.extractor_mixin import LineExtractorMixin
+
+
+class MultiLinePlot(MaidrPlot, LineExtractorMixin):
+    """
+    A class for extracting and processing data from line plots.
+
+    This class can handle both single-line and multi-line plots, extracting
+    coordinate data and line identifiers. It processes matplotlib Line2D objects
+    and converts them into structured data for further processing or visualization.
+
+    Parameters
+    ----------
+    ax : Axes
+        The matplotlib axes object containing the line plot(s).
+    **kwargs : dict
+        Additional keyword arguments to pass to the parent class.
+
+    Attributes
+    ----------
+    type : PlotType
+        Set to PlotType.LINE to identify this as a line plot.
 
+    Notes
+    -----
+    - When using the JavaScript engine, only single-line plots are supported.
+    - For multi-line plots, use the TypeScript engine.
+    - The extracted data structure includes x, y coordinates and line identifiers
+      (fill values) for each point.
+    """
 
-class LinePlot(MaidrPlot, LineExtractorMixin):
-    def __init__(self, ax: Axes) -> None:
+    def __init__(self, ax: Axes, **kwargs):
         super().__init__(ax, PlotType.LINE)
 
     def _get_selector(self) -> str:
         return "g[maidr='true'] > path"
 
     def _extract_plot_data(self) -> list[dict]:
-        plot = self.extract_line(self.ax)
+        plot = self.extract_lines(self.ax)
         data = self._extract_line_data(plot)
+        engine = Environment.get_engine()
+        if engine == "js":
+            if len(data) > 1:
+                raise Exception(
+                    "MultiLine Plot not supported in JS. Use TypeScript Engine for this plot!"
+                )
+            data = data[0]
 
         if data is None:
             raise ExtractionError(self.type, plot)
 
         return data
 
-    def _extract_line_data(self, plot: Line2D | None) -> list[dict] | None:
-        if plot is None or plot.get_xydata() is None:
+    def _extract_line_data(self, plot: list[Line2D] | None) -> list[dict] | None:
+        """
+        Extract data from multiple line objects.
+
+        Parameters
+        ----------
+        plot : list[Line2D] | None
+            List of Line2D objects to extract data from.
+
+        Returns
+        -------
+        list[dict] | None
+            List of dictionaries containing x,y coordinates and line identifiers,
+            or None if the plot data is invalid.
+        """
+        if plot is None or len(plot) == 0:
             return None
 
-        # Tag the elements for highlighting.
-        self._elements.append(plot)
+        all_line_data = []
+
+        # Process each line in the plot
+        for i, line in enumerate(plot):
+            if line.get_xydata() is None:
+                continue
+
+            # Tag the element for highlighting
+            self._elements.append(line)
+
+            # Extract data from this line
+            line_data = [
+                {
+                    MaidrKey.X: float(x),
+                    MaidrKey.Y: float(y),
+                    MaidrKey.FILL: line.get_label(),
+                }
+                for x, y in line.get_xydata()  # type: ignore
+            ]
+
+            all_line_data.append(line_data)
 
-        return [
-            {
-                MaidrKey.X: float(x),
-                MaidrKey.Y: float(y),
-            }
-            for x, y in plot.get_xydata()
-        ]
+        return all_line_data if all_line_data else None

maidr/core/plot/maidr_plot_factory.py

@@ -8,7 +8,7 @@ from maidr.core.plot.boxplot import BoxPlot
 from maidr.core.plot.grouped_barplot import GroupedBarPlot
 from maidr.core.plot.heatmap import HeatPlot
 from maidr.core.plot.histogram import HistPlot
-from maidr.core.plot.lineplot import LinePlot
+from maidr.core.plot.lineplot import MultiLinePlot
 from maidr.core.plot.maidr_plot import MaidrPlot
 from maidr.core.plot.scatterplot import ScatterPlot
 
@@ -39,7 +39,7 @@ class MaidrPlotFactory:
         elif PlotType.HIST == plot_type:
             return HistPlot(ax)
         elif PlotType.LINE == plot_type:
-            return LinePlot(ax)
+            return MultiLinePlot(ax)
         elif PlotType.SCATTER == plot_type:
             return ScatterPlot(ax)
         elif PlotType.DODGED == plot_type or PlotType.STACKED == plot_type:

maidr/patch/lineplot.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import wrapt
-
 from matplotlib.axes import Axes
 from matplotlib.lines import Line2D
 
@@ -10,6 +9,25 @@ from maidr.patch.common import common
 
 
 def line(wrapped, instance, args, kwargs) -> Axes | list[Line2D]:
+    """
+    Wrapper function for line plotting functions in matplotlib and seaborn.
+
+    Parameters
+    ----------
+    wrapped : callable
+        The wrapped function (plot or lineplot)
+    instance : object
+        The object to which the wrapped function belongs
+    args : tuple
+        Positional arguments passed to the wrapped function
+    kwargs : dict
+        Keyword arguments passed to the wrapped function
+
+    Returns
+    -------
+    Axes | list[Line2D]
+        The result of the wrapped function after processing
+    """
     return common(PlotType.LINE, wrapped, instance, args, kwargs)
 
 

maidr/util/mixin/extractor_mixin.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from typing import Any
 
 from matplotlib.axes import Axes
@@ -64,6 +65,16 @@ class LineExtractorMixin:
         # `maidr` package supports the same.
         return ax.get_lines()[-1]
 
+    @staticmethod
+    def extract_lines(ax: Axes) -> list[Line2D] | None:
+        """Retrieve all line objects from Axes, if available."""
+        if ax is None or ax.get_lines() is None:
+            return None
+
+        # Since the upstream MaidrJS library currently supports only the last plot line,
+        # `maidr` package supports the same.
+        return ax.get_lines()
+
 
 class CollectionExtractorMixin:
     @staticmethod

{maidr-0.13.0.dist-info → maidr-0.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: maidr
-Version: 0.13.0
+Version: 0.15.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.13.0.dist-info → maidr-0.15.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-maidr/__init__.py,sha256=l8GxTHYGbPGuc6jgS4bbzP2Caqb90CQYYYwW7LWmbbo,369
+maidr/__init__.py,sha256=5JZ0w4wAfRluMtHwkTW2AMeiJnSuV2DycEcNdpxxHQI,369
 maidr/api.py,sha256=u2WOQ8RWmXpzseEgbZJCB7FFZs7cEy-ya-Q18tGAYB4,1350
 maidr/core/__init__.py,sha256=WgxLpSEYMc4k3OyEOf1shOxfEq0ASzppEIZYmE91ThQ,25
 maidr/core/context_manager.py,sha256=HSzD4wpiALdI4Vm0QTdWqi1MWR5Uqy8BX_lOlCM3JYY,3463
@@ -6,17 +6,17 @@ maidr/core/enum/__init__.py,sha256=9ee78L0dlxEx4ulUGVlD-J23UcUZmrGu0rXms54up3c,9
 maidr/core/enum/library.py,sha256=e8ujT_L-McJWfoVJd1ty9K_2bwITnf1j0GPLsnAcHes,104
 maidr/core/enum/maidr_key.py,sha256=LNtt74d2gurefDNPD3SLLsTxKqO9qTyo3PBAUAyofnc,736
 maidr/core/enum/plot_type.py,sha256=pyfyIwlq3taqe2Z1sVUSbMsTp5QTvYBlZXsMMMclEVM,293
-maidr/core/figure_manager.py,sha256=HyYLIX3QzE-PmatSsTez9MmncTEu0wzPdFktZzE3NQM,3891
-maidr/core/maidr.py,sha256=2tOBxsyG9a_xIq7cg6P1U665WSC3_NkzKxuz1sS3KxU,11459
+maidr/core/figure_manager.py,sha256=rd8XEwqNmfKu1I9zGD1p9g3wVlkMYNCrdLLCg4IzlfQ,3934
+maidr/core/maidr.py,sha256=G7ACqroX80F9z4-tJj6-YFcjvv9--A-qrmH1Syp4jgQ,11717
 maidr/core/plot/__init__.py,sha256=xDIpRGM-4DfaSSL3nKcXrjdMecCHJ6en4K4nA_fPefQ,83
-maidr/core/plot/barplot.py,sha256=iKob48QXYjezxw5Pqw8C_W8KZvQB2fioEGWCtOeQ3JM,2605
+maidr/core/plot/barplot.py,sha256=DGiMbakzER-Czpzekw-yBHXZuzWpBg7ODtJPQ8voI04,2605
 maidr/core/plot/boxplot.py,sha256=roADG8xJYRQlZPYbfGBQSQRw8974lhVnngGKEKXJttk,6090
-maidr/core/plot/grouped_barplot.py,sha256=pRmSAr6obcdjK4PPOt7-U77tMMKLM4lkKOiOklS8TbA,2061
+maidr/core/plot/grouped_barplot.py,sha256=tAiOWwtfsWDwyGdUuCdQ6-f8UQxnsDDwpN30Skk8p-U,2071
 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=iHPJgQ7CByM7UItBMDUy7YnkVV6tBRyW_vY4QoWib34,1140
+maidr/core/plot/lineplot.py,sha256=5FKgT4s6l9Y7Lb7ELJ4SqMo0ItqimEhbKMgoVG_Rmu8,3242
 maidr/core/plot/maidr_plot.py,sha256=_9Ugn3cUwi-URxeTRbDAKDZwASrB65p9TKOXhFX1zbU,3176
-maidr/core/plot/maidr_plot_factory.py,sha256=Ai-vFpn9YhZPQeVQxdjq0prVJNcGZ8NJvS3eKAxxZ_w,1681
+maidr/core/plot/maidr_plot_factory.py,sha256=QGcHK_oquY_M2_KJVEtc5-rBAD-gm7KI1kSD7cduHzg,1691
 maidr/core/plot/scatterplot.py,sha256=sQhT80w0Sp9AsUAZi4v6lfWsHJAvuFcer2aAE2NpAYE,1240
 maidr/exception/__init__.py,sha256=PzaXoYBhyZxMDcJkuxJugDx7jZeseI0El6LpxIwXyG4,46
 maidr/exception/extraction_error.py,sha256=rd37Oxa9gn2OWFWt9AOH5fv0hNd3sAWGvpDMFBuJY2I,607
@@ -28,16 +28,16 @@ maidr/patch/common.py,sha256=bRe4jruUvCIwp1t1E8Q3OuQ0eEyHgpMjXVpsPBZj4C8,843
 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=AIVsEPXMlkyUfYJ2xcU0GtZLpykEhHDLVFZjYnWCq9U,492
+maidr/patch/lineplot.py,sha256=_EyqOp8BcO-kGq9sn8PyNQ8-Bz0FsnHAufXRkTGQzBw,1025
 maidr/patch/scatterplot.py,sha256=JZJXy3vWbJgzZh2zysNrqSA7MRcfSCms6lr_MY5CMD0,526
 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=Y-34424UR8ECHECAuQZ7zKhyk5QC6GOiUeCMRhI06QQ,3132
+maidr/util/mixin/extractor_mixin.py,sha256=lOVDaNsHnOS2aYxiGXAigGjt8WXzcer9MocaipcOh60,3511
 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.13.0.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-maidr-0.13.0.dist-info/METADATA,sha256=WNQKQgPsz3s7J8J5-MK9AsZWJcu6zTfybnoDXRoKJWQ,2688
-maidr-0.13.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-maidr-0.13.0.dist-info/RECORD,,
+maidr-0.15.0.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+maidr-0.15.0.dist-info/METADATA,sha256=_jG9FuP7lS5XtMdPzKjQbJUmtaMFdNb0r-GmDrP9Fps,2688
+maidr-0.15.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+maidr-0.15.0.dist-info/RECORD,,