maidr 1.4.1__py3-none-any.whl → 1.4.2__py3-none-any.whl

maidr/__init__.py

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

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/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/util/regression_line_utils.py

@@ -1,8 +1,11 @@
 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):
+def find_regression_line(axes: Axes) -> Union[Line2D, None]:
     """
     Helper to find the regression line (Line2D) in the given axes.
     """
@@ -17,3 +20,50 @@ def find_regression_line(axes):
         ),
         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.dist-info → maidr-1.4.2.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-maidr/__init__.py,sha256=rjIWNGJRb5ksabBvZv4Ia2vq3YIhfCUr2sytbDXnV4U,415
+maidr/__init__.py,sha256=WXjwKTG-ThyAevvEASjvfUbjdOvs1iXAhaOhvkyrreo,415
 maidr/api.py,sha256=F43mXWsxc7tHdlZqbRlEWkc-RjJVo_zgxCn3NiLBY58,1764
 maidr/core/__init__.py,sha256=WgxLpSEYMc4k3OyEOf1shOxfEq0ASzppEIZYmE91ThQ,25
 maidr/core/context_manager.py,sha256=6cT7ZGOApSpC-SLD2XZWWU_H08i-nfv-JUlzXOtvWYw,3374
@@ -6,7 +6,7 @@ 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=ljG0omqzd8K8Yk213N7i7PXGvG-IOlnE5v7o6RoGJzc,795
 maidr/core/enum/plot_type.py,sha256=7Orx3b_0NdpI_PtVJfLyJPh4qBqYMTsYBBr8VwOtiAM,347
-maidr/core/enum/smooth_keywords.py,sha256=VlpIX1BaoX8efwIrT72GIptxguTpiPtJvvJUPMoaFSQ,194
+maidr/core/enum/smooth_keywords.py,sha256=z2kVZZ-mETWWh5reWu_hj9WkJD6WFj7_2-6s1e4C1JE,236
 maidr/core/figure_manager.py,sha256=jXs-Prkeru1Pahj21hjh8BAwXM9ZFUZ3GFfKUfIRX_M,4117
 maidr/core/maidr.py,sha256=dxoJsvFyqhyv7PFHsYZrGAVnNmyjW0v0eng45cxhrf4,16325
 maidr/core/plot/__init__.py,sha256=xDIpRGM-4DfaSSL3nKcXrjdMecCHJ6en4K4nA_fPefQ,83
@@ -37,7 +37,7 @@ maidr/patch/histogram.py,sha256=k3N0RUf1SQ2402pwbaY5QyS98KnLWvr9glCHQw9NTko,2378
 maidr/patch/kdeplot.py,sha256=qv-OKzuop2aTrkZgUe2OnLxvV-KMyeXt1Td0_uZeHzE,2338
 maidr/patch/lineplot.py,sha256=og42V0tWBKCnf6idT3pLsIj3QBvKjg8aUN-k1udPRVw,1901
 maidr/patch/mplfinance.py,sha256=oxRhtKWnC-Fr9EBNS1RF-nKJKCKOPbtg4mseLsP1kMI,7967
-maidr/patch/regplot.py,sha256=Ciz43C5XZfWK6wtVWrlV0WNz4R__rcgdqVE9OCaXXRk,3236
+maidr/patch/regplot.py,sha256=k86ekd0E4XJ_L1u85zObuDnxuXlM83z7tKtyXRTj2rI,3240
 maidr/patch/scatterplot.py,sha256=kln6zZwjVsdQzICalo-RnBOJrx1BnIB2xYUwItHvSNY,525
 maidr/util/__init__.py,sha256=eRJZfRpDX-n7UoV3JXw_9Lbfu_qNl_D0W1UTvLL-Iv4,81
 maidr/util/dedup_utils.py,sha256=RpgPL5p-3oULUHaTCZJaQKhPHfyPkvBLHMt8lAGpJ5A,438
@@ -47,11 +47,11 @@ maidr/util/mixin/extractor_mixin.py,sha256=oHtwpmS5kARvaLrSO3DKTPQxyFUw9nOcKN7rz
 maidr/util/mixin/merger_mixin.py,sha256=V0qLw_6DUB7X6CQ3BCMpsCQX_ZuwAhoSTm_E4xAJFKM,712
 maidr/util/mplfinance_utils.py,sha256=AvDzvAAQbMsPZxcxWr3DwctZMp4xW5CkQEBezWTk1mY,13704
 maidr/util/plot_detection.py,sha256=bVSocZMGCLP6CduRSpOmwIzLFWEBnNdYN9T1ULfVPMw,3893
-maidr/util/regression_line_utils.py,sha256=P8RQLixTby2JLz73XZgNiu96C2Ct3pNe4ENRWOjgT8M,509
+maidr/util/regression_line_utils.py,sha256=yFKr-H0whT_su2YVZwNksBLp5EC5s77sr6HUFgNcsyY,2329
 maidr/util/svg_utils.py,sha256=2gyzBtNKFHs0utrw1iOlxTmznzivOWQMV2aW8zu2c8E,1442
 maidr/widget/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maidr/widget/shiny.py,sha256=wrrw2KAIpE_A6CNQGBtNHauR1DjenA_n47qlFXX9_rk,745
-maidr-1.4.1.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-maidr-1.4.1.dist-info/METADATA,sha256=rGSOkUIcGPVk2z2SgpfMy1EP_B7m0HgpStq3h1SKdK4,2664
-maidr-1.4.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-maidr-1.4.1.dist-info/RECORD,,
+maidr-1.4.2.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+maidr-1.4.2.dist-info/METADATA,sha256=9Wm3c8aZvsWjAGCGtGmPVUa6_xDCqaobGN_Asl6uS0c,2664
+maidr-1.4.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+maidr-1.4.2.dist-info/RECORD,,