maidr 1.4.1__tar.gz → 1.4.3__tar.gz

{maidr-1.4.1 → maidr-1.4.3}/PKG-INFO

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

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

{maidr-1.4.1 → maidr-1.4.3}/maidr/core/enum/smooth_keywords.py

@@ -2,8 +2,11 @@
 SMOOTH_KEYWORDS = [
     "smooth",
     "lowess",
+    "loess",
     "regression",
     "linear regression",
+    "linear fit",
+    "fit",
     "kde",
     "density",
     "gaussian",

{maidr-1.4.1 → maidr-1.4.3}/maidr/core/plot/grouped_barplot.py

@@ -24,7 +24,6 @@ class GroupedBarPlot(
         grouped_ax_schema = {
             MaidrKey.X.value: self.ax.get_xlabel(),
             MaidrKey.Y.value: self.ax.get_ylabel(),
-            MaidrKey.FILL.value: self.ax.get_title(),
         }
         return self.merge_dict(base_ax_schema, grouped_ax_schema)
 
@@ -44,6 +43,9 @@ class GroupedBarPlot(
             return None
 
         x_level = self.extract_level(self.ax)
+        if x_level is None:
+            return None
+
         data = []
 
         self._elements.extend(

{maidr-1.4.1 → maidr-1.4.3}/maidr/core/plot/lineplot.py

@@ -87,9 +87,14 @@ class MultiLinePlot(MaidrPlot, LineExtractorMixin):
         if not all_lines:
             return None
 
+        # Try to get series names from legend
+        legend_labels = []
+        if self.ax.legend_ is not None:
+            legend_labels = [text.get_text() for text in self.ax.legend_.get_texts()]
+
         all_lines_data = []
 
-        for line in all_lines:
+        for i, line in enumerate(all_lines):
             xydata = line.get_xydata()
             if xydata is None or not xydata.size:  # type: ignore
                 continue
@@ -102,11 +107,19 @@ class MultiLinePlot(MaidrPlot, LineExtractorMixin):
                 line.set_gid(unique_gid)
 
             label: str = line.get_label()  # type: ignore
+
+            # Try to get the series name from legend labels
+            line_type = ""
+            if legend_labels and i < len(legend_labels):
+                line_type = legend_labels[i]
+            elif not label.startswith("_child"):
+                line_type = label
+
             line_data = [
                 {
                     MaidrKey.X: float(x),
                     MaidrKey.Y: float(y),
-                    MaidrKey.FILL: (label if not label.startswith("_child") else ""),
+                    **({MaidrKey.FILL: line_type} if line_type else {}),
                 }
                 for x, y in line.get_xydata()  # type: ignore
             ]

{maidr-1.4.1 → maidr-1.4.3}/maidr/core/plot/mplfinance_lineplot.py

@@ -23,7 +23,6 @@ class MplfinanceLinePlot(MaidrPlot, LineExtractorMixin):
 
     def __init__(self, ax: Axes, **kwargs):
         super().__init__(ax, PlotType.LINE)
-        self._line_titles = []  # Store line titles separately
 
     def _get_selector(self) -> Union[str, List[str]]:
         """Return selectors for all lines that have data."""
@@ -48,65 +47,6 @@ class MplfinanceLinePlot(MaidrPlot, LineExtractorMixin):
 
         return selectors
 
-    def _extract_axes_data(self) -> dict:
-        """
-        Extract axis labels for the plot.
-
-        Returns
-        -------
-        dict
-            Dictionary containing x and y axis labels with custom y-label for moving averages.
-        """
-        x_labels = self.ax.get_xlabel()
-        if not x_labels:
-            x_labels = self.extract_shared_xlabel(self.ax)
-        if not x_labels:
-            x_labels = "Date"
-
-        # Get the period from the first line for y-axis label
-        ma_period = self._extract_moving_average_period()
-        y_label = (
-            f"{ma_period}-day mav price ($)"
-            if ma_period
-            else "Moving Average Price ($)"
-        )
-
-        return {MaidrKey.X: x_labels, MaidrKey.Y: y_label}
-
-    def _extract_moving_average_periods(self) -> List[str]:
-        """
-        Extract all moving average periods from the _maidr_ma_period attributes set by the mplfinance patch.
-
-        Returns
-        -------
-        List[str]
-            List of moving average periods (e.g., ["3", "6", "30"]).
-        """
-        all_lines = self.ax.get_lines()
-        periods = []
-        for line in all_lines:
-            # Get the period that was stored by the mplfinance patch
-            ma_period = getattr(line, "_maidr_ma_period", None)
-            if ma_period is not None:
-                periods.append(str(ma_period))
-
-        # Remove duplicates and sort
-        periods = sorted(list(set(periods)))
-
-        return periods
-
-    def _extract_moving_average_period(self) -> str:
-        """
-        Extract the moving average period from the _maidr_ma_period attribute set by the mplfinance patch.
-
-        Returns
-        -------
-        str
-            The moving average period (e.g., "3", "6", "30") or empty string if no period found.
-        """
-        periods = self._extract_moving_average_periods()
-        return periods[0] if periods else ""
-
     def _extract_plot_data(self) -> Union[List[List[dict]], None]:
         """Extract data from mplfinance moving average lines."""
         data = self._extract_line_data()
@@ -151,17 +91,6 @@ class MplfinanceLinePlot(MaidrPlot, LineExtractorMixin):
                 line.set_gid(unique_gid)
 
             label: str = line.get_label()  # type: ignore
-
-            # Get the period for this specific line
-            ma_period = getattr(line, "_maidr_ma_period", None)
-
-            # Create title for this line
-            line_title = (
-                f"{ma_period}-Day Moving Average Line Plot"
-                if ma_period
-                else "Moving Average Line Plot"
-            )
-
             line_data = []
 
             # Check if this line has date numbers from mplfinance
@@ -188,22 +117,12 @@ class MplfinanceLinePlot(MaidrPlot, LineExtractorMixin):
                 point_data = {
                     MaidrKey.X: x_value,
                     MaidrKey.Y: float(y),
+                    MaidrKey.FILL: (label if not label.startswith("_child") else ""),
                 }
                 line_data.append(point_data)
 
             if line_data:
-                # Create line data with title, axes, and points structure
-                line_with_metadata = {
-                    "title": line_title,
-                    "axes": {
-                        "x": "Date",
-                        "y": f"{ma_period}-day mav price ($)"
-                        if ma_period
-                        else "Moving Average Price ($)",
-                    },
-                    "points": line_data,
-                }
-                all_lines_data.append(line_with_metadata)
+                all_lines_data.append(line_data)
 
         return all_lines_data if all_lines_data else None
 
@@ -226,38 +145,43 @@ class MplfinanceLinePlot(MaidrPlot, LineExtractorMixin):
         """
         return MplfinanceDataExtractor._convert_date_num_to_string(x_value)
 
-    def _extract_line_titles(self) -> List[str]:
+    def _extract_moving_average_periods(self) -> List[str]:
         """
-        Extract titles for all moving average lines.
+        Extract all moving average periods from the _maidr_ma_period attributes set by the mplfinance patch.
 
         Returns
         -------
         List[str]
-            List of titles for each line.
+            List of moving average periods (e.g., ["3", "6", "30"]).
         """
         all_lines = self.ax.get_lines()
-        titles = []
-
+        periods = []
         for line in all_lines:
+            # Get the period that was stored by the mplfinance patch
             ma_period = getattr(line, "_maidr_ma_period", None)
-            title = (
-                f"{ma_period}-Day Moving Average Line Plot"
-                if ma_period
-                else "Moving Average Line Plot"
-            )
-            titles.append(title)
+            if ma_period is not None:
+                periods.append(str(ma_period))
 
-        return titles
+        # Remove duplicates and sort
+        periods = sorted(list(set(periods)))
+
+        return periods
+
+    def _extract_moving_average_period(self) -> str:
+        """
+        Extract the moving average period from the _maidr_ma_period attribute set by the mplfinance patch.
+
+        Returns
+        -------
+        str
+            The moving average period (e.g., "3", "6", "30") or empty string if no period found.
+        """
+        periods = self._extract_moving_average_periods()
+        return periods[0] if periods else ""
 
     def render(self) -> dict:
         """Initialize the MAIDR schema dictionary with basic plot information."""
-        # Use the first line's period for the main title
-        ma_period = self._extract_moving_average_period()
-        title = (
-            f"{ma_period}-Day Moving Averages Line Plot"
-            if ma_period
-            else "Moving Averages Line Plot"
-        )
+        title = "Moving Average Line Plot"
 
         maidr_schema = {
             MaidrKey.TYPE: self.type,

{maidr-1.4.1 → maidr-1.4.3}/maidr/patch/regplot.py

@@ -5,11 +5,10 @@ from matplotlib.axes import Axes
 from matplotlib.lines import Line2D
 from maidr.core.enum import PlotType
 from maidr.patch.common import common
-import numpy as np
 from maidr.core.context_manager import ContextManager
 import uuid
 from maidr.core.enum.smooth_keywords import SMOOTH_KEYWORDS
-from maidr.util.regression_line_utils import find_regression_line
+from maidr.util.regression_line_utils import find_smooth_lines_by_label
 
 
 def regplot(wrapped, instance, args, kwargs) -> Axes:
@@ -23,27 +22,34 @@ def regplot(wrapped, instance, args, kwargs) -> Axes:
         # Prevent any MAIDR layer registration during plotting when scatter=False
         with ContextManager.set_internal_context():
             ax = wrapped(*args, **kwargs)
+
     axes = ax if isinstance(ax, Axes) else ax.axes if hasattr(ax, "axes") else None
     if axes is not None:
-        regression_line = find_regression_line(axes)
-        if regression_line is not None:
-            # ---
-            # Assign a unique gid to the regression line if not already set.
-            # This is necessary because the SVG output may contain many <g> and <path> tags,
-            # and only the regression line should be uniquely selectable for accessibility and highlighting.
-            # By setting a unique gid, we ensure the backend and frontend can generate a reliable selector
-            # (e.g., g[id='maidr-...'] path) that matches only the intended regression line.
-            # ---
-            if regression_line.get_gid() is None:
+        # Find and register all smooth lines
+        smooth_lines = find_smooth_lines_by_label(axes)
+        for line in smooth_lines:
+            # If line doesn't have a gid yet, assign one and register
+            if line.get_gid() is None:
                 new_gid = f"maidr-{uuid.uuid4()}"
-                regression_line.set_gid(new_gid)
-            common(
-                PlotType.SMOOTH,
-                lambda *a, **k: ax,
-                instance,
-                args,
-                dict(kwargs, regression_line=regression_line),
-            )
+                line.set_gid(new_gid)
+                common(
+                    PlotType.SMOOTH,
+                    lambda *a, **k: ax,
+                    instance,
+                    args,
+                    dict(kwargs, regression_line=line),
+                )
+            else:
+                # Even if it has a gid, register it as a smooth layer
+                # This handles the case where patched_plot already assigned a gid
+                common(
+                    PlotType.SMOOTH,
+                    lambda *a, **k: ax,
+                    instance,
+                    args,
+                    dict(kwargs, regression_line=line),
+                )
+
     return ax
 
 
@@ -53,7 +59,8 @@ def patched_plot(wrapped, instance, args, kwargs):
     """
     # Call the original plot function
     lines = wrapped(*args, **kwargs)
-    # lines can be a list of Line2D objects
+
+    # Check each line for smooth keywords and register if found
     for line in lines:
         if isinstance(line, Line2D):
             label = line.get_label() or ""
@@ -72,6 +79,7 @@ def patched_plot(wrapped, instance, args, kwargs):
                     args,
                     dict(kwargs, regression_line=line),
                 )
+
     return lines
 
 

maidr-1.4.3/maidr/util/regression_line_utils.py

@@ -0,0 +1,69 @@
+from matplotlib.lines import Line2D
+from matplotlib.axes import Axes
+import numpy as np
+from typing import List, Union
+from maidr.core.enum.smooth_keywords import SMOOTH_KEYWORDS
+
+
+def find_regression_line(axes: Axes) -> Union[Line2D, None]:
+    """
+    Helper to find the regression line (Line2D) in the given axes.
+    """
+    return next(
+        (
+            artist
+            for artist in axes.get_children()
+            if isinstance(artist, Line2D)
+            and artist.get_label() not in (None, "", "_nolegend_")
+            and artist.get_xydata() is not None
+            and np.asarray(artist.get_xydata()).size > 0
+        ),
+        None,
+    )
+
+
+def find_smooth_lines_by_label(axes: Axes) -> List[Line2D]:
+    """
+    Helper to find all smooth/regression lines (Line2D) in the given axes by checking their labels.
+
+    This function detects smooth lines by examining their labels for smooth-related keywords
+    or generic '_child' labels that are commonly created by seaborn's regplot function.
+
+    Parameters
+    ----------
+    axes : matplotlib.axes.Axes
+        The matplotlib axes object to search for smooth lines.
+
+    Returns
+    -------
+    List[Line2D]
+        List of Line2D objects that have labels matching smooth keywords or generic '_child' labels.
+
+    Examples
+    --------
+    >>> import matplotlib.pyplot as plt
+    >>> import seaborn as sns
+    >>>
+    >>> fig, ax = plt.subplots()
+    >>> # Create a regplot with smooth line
+    >>> sns.regplot(x=[1, 2, 3], y=[1, 2, 3], ax=ax, lowess=True)
+    >>>
+    >>> # Find smooth lines
+    >>> smooth_lines = find_smooth_lines_by_label(ax)
+    >>> print(f"Found {len(smooth_lines)} smooth lines")
+    """
+    smooth_lines = []
+    for line in axes.get_lines():
+        if isinstance(line, Line2D):
+            label = line.get_label() or ""
+            label_str = str(label)
+
+            # Check if label matches smooth keywords
+            if any(key in label_str.lower() for key in SMOOTH_KEYWORDS):
+                smooth_lines.append(line)
+            # Also check for seaborn regplot lines with generic labels (like '_child0', '_child1')
+            elif label_str.startswith("_child"):
+                # Lines with _child labels are likely smooth lines from seaborn regplot
+                smooth_lines.append(line)
+
+    return smooth_lines

{maidr-1.4.1 → maidr-1.4.3}/pyproject.toml

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

maidr-1.4.1/maidr/util/regression_line_utils.py

@@ -1,19 +0,0 @@
-from matplotlib.lines import Line2D
-import numpy as np
-
-
-def find_regression_line(axes):
-    """
-    Helper to find the regression line (Line2D) in the given axes.
-    """
-    return next(
-        (
-            artist
-            for artist in axes.get_children()
-            if isinstance(artist, Line2D)
-            and artist.get_label() not in (None, "", "_nolegend_")
-            and artist.get_xydata() is not None
-            and np.asarray(artist.get_xydata()).size > 0
-        ),
-        None,
-    )