maidr 1.2.1__tar.gz → 1.3.0__tar.gz

{maidr-1.2.1 → maidr-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: maidr
-Version: 1.2.1
+Version: 1.3.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
@@ -26,14 +26,11 @@ Classifier: Topic :: Scientific/Engineering :: Visualization
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Text Processing :: Markup :: HTML
 Requires-Dist: htmltools (>=0.5)
-Requires-Dist: jupyter (>=1.0.0,<2.0.0)
 Requires-Dist: lxml (>=5.1.0)
 Requires-Dist: matplotlib (>=3.8)
 Requires-Dist: mplfinance (>=0.12.10b0,<0.13.0)
 Requires-Dist: numpy (>=1.26)
 Requires-Dist: seaborn (>=0.12)
-Requires-Dist: statsmodels (>=0.14.4,<0.15.0)
-Requires-Dist: virtualenv (>=20.26.6,<21.0.0)
 Requires-Dist: wrapt (>=1.16.0,<2.0.0)
 Project-URL: Homepage, https://xability.github.io/py-maidr
 Project-URL: Repository, https://github.com/xability/py-maidr

{maidr-1.2.1 → maidr-1.3.0}/maidr/__init__.py

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

{maidr-1.2.1 → maidr-1.3.0}/maidr/core/maidr.py

@@ -8,7 +8,7 @@ import os
 import tempfile
 import uuid
 import webbrowser
-from typing import Any, Literal
+from typing import Any, Literal, cast
 
 import matplotlib.pyplot as plt
 from htmltools import HTML, HTMLDocument, Tag, tags
@@ -102,14 +102,20 @@ class Maidr:
             The renderer to use for the HTML preview.
         """
         html = self._create_html_tag(use_iframe=True)  # Always use iframe for display
-        _renderer = Environment.get_renderer()
-        if _renderer == "browser" or (
-            Environment.is_interactive_shell() and not Environment.is_notebook()
-        ):
+
+        # Use the passed renderer parameter, fallback to auto-detection
+        if renderer == "auto":
+            _renderer = cast(Literal["ipython", "browser"], Environment.get_renderer())
+        else:
+            _renderer = renderer
+
+        # Only try browser opening if explicitly requested as browser and not in notebook
+        if _renderer == "browser" and not Environment.is_notebook():
             return self._open_plot_in_browser()
+
         if clear_fig:
             plt.close()
-        return html.show(renderer)
+        return html.show(_renderer)
 
     def clear(self):
         self._plots = []

{maidr-1.2.1 → maidr-1.3.0}/maidr/core/plot/lineplot.py

@@ -8,6 +8,7 @@ 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.mixin.extractor_mixin import LineExtractorMixin
+import uuid
 
 
 class MultiLinePlot(MaidrPlot, LineExtractorMixin):
@@ -42,62 +43,75 @@ class MultiLinePlot(MaidrPlot, LineExtractorMixin):
         super().__init__(ax, PlotType.LINE)
 
     def _get_selector(self) -> Union[str, List[str]]:
-        return ["g[maidr='true'] > path"]
+        # Return selectors for all lines that have data
+        all_lines = self.ax.get_lines()
+        if not all_lines:
+            return ["g[maidr='true'] > path"]
+
+        selectors = []
+        for line in all_lines:
+            # Only create selectors for lines that have data (same logic as _extract_line_data)
+            xydata = line.get_xydata()
+            if xydata is None or not xydata.size:  # type: ignore
+                continue
+            gid = line.get_gid()
+            if gid:
+                selectors.append(f"g[id='{gid}'] path")
+            else:
+                selectors.append("g[maidr='true'] > path")
+
+        if not selectors:
+            return ["g[maidr='true'] > path"]
+
+        return selectors
 
-    def _extract_plot_data(self) -> list[dict]:
-        plot = self.extract_lines(self.ax)
-        data = self._extract_line_data(plot)
+    def _extract_plot_data(self) -> Union[List[List[dict]], None]:
+        data = self._extract_line_data()
 
         if data is None:
-            raise ExtractionError(self.type, plot)
+            raise ExtractionError(self.type, None)
 
         return data
 
-    def _extract_line_data(
-        self, plot: Union[List[Line2D], None]
-    ) -> Union[List[dict], None]:
+    def _extract_line_data(self) -> Union[List[List[dict]], None]:
         """
-        Extract data from multiple line objects.
-
-        Parameters
-        ----------
-        plot : list[Line2D] | None
-            List of Line2D objects to extract data from.
+        Extract data from all line objects and return as separate arrays.
 
         Returns
         -------
-        list[dict] | None
-            List of dictionaries containing x,y coordinates and line identifiers,
-            or None if the plot data is invalid.
+        list[list[dict]] | None
+            List of lists, where each inner list contains dictionaries with x,y coordinates
+            and line identifiers for one line, or None if the plot data is invalid.
         """
-        if plot is None or len(plot) == 0:
+        all_lines = self.ax.get_lines()
+        if not all_lines:
             return None
 
-        all_line_data = []
+        all_lines_data = []
 
-        # Process each line in the plot
-        for i, line in enumerate(plot):
-            if line.get_xydata() is None:
+        for line in all_lines:
+            xydata = line.get_xydata()
+            if xydata is None or not xydata.size:  # type: ignore
                 continue
 
-            # Tag the element for highlighting
             self._elements.append(line)
 
-            # Extract data from this line
+            # Assign unique GID to each line if not already set
+            if line.get_gid() is None:
+                unique_gid = f"maidr-{uuid.uuid4()}"
+                line.set_gid(unique_gid)
 
             label: str = line.get_label()  # type: ignore
             line_data = [
                 {
                     MaidrKey.X: float(x),
                     MaidrKey.Y: float(y),
-                    # 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 ""),
                 }
                 for x, y in line.get_xydata()  # type: ignore
             ]
-            if len(line_data) > 0:
-                all_line_data.append(line_data)
 
-        return all_line_data if all_line_data else None
+            if line_data:
+                all_lines_data.append(line_data)
+
+        return all_lines_data if all_lines_data else None

maidr-1.3.0/maidr/patch/lineplot.py

@@ -0,0 +1,49 @@
+from __future__ import annotations
+
+import wrapt
+from matplotlib.axes import Axes
+from matplotlib.lines import Line2D
+
+from maidr.core.enum import PlotType
+from maidr.patch.common import common
+from maidr.core.enum.smooth_keywords import SMOOTH_KEYWORDS
+from maidr.core.context_manager import ContextManager
+from maidr.core.figure_manager import FigureManager
+
+
+def line(wrapped, instance, args, kwargs) -> Axes | list[Line2D]:
+    """
+    Wrapper for line plotting functions that creates a single MAIDR plot per axes to handle
+    multiline plots (matplotlib) and single-call plots (seaborn) correctly by preventing
+    multiple MAIDR layers and using internal context to avoid cyclic processing.
+    """
+    # Don't proceed if the call is made internally by the patched function.
+    if ContextManager.is_internal_context():
+        return wrapped(*args, **kwargs)
+
+    # Set the internal context to avoid cyclic processing.
+    with ContextManager.set_internal_context():
+        # Patch the plotting function.
+        plot = wrapped(*args, **kwargs)
+
+    # Get the axes from the plot result (works for both matplotlib and seaborn)
+    ax = FigureManager.get_axes(plot)
+    if ax is None:
+        # If we can't get axes from plot, try from instance
+        ax = instance if isinstance(instance, Axes) else getattr(instance, "axes", None)
+
+    # Check if a MAIDR plot already exists for this axes
+    if ax is not None and not hasattr(ax, "_maidr_plot_created"):
+        # Create MAIDR plot only once for this axes using common()
+        common(PlotType.LINE, lambda *a, **k: plot, instance, args, kwargs)
+        # Mark that a MAIDR plot has been created for this axes
+        setattr(ax, "_maidr_plot_created", True)
+
+    return plot
+
+
+# Patch matplotlib function.
+wrapt.wrap_function_wrapper(Axes, "plot", line)
+
+# Patch seaborn function.
+wrapt.wrap_function_wrapper("seaborn", "lineplot", line)

{maidr-1.2.1 → maidr-1.3.0}/maidr/util/environment.py

@@ -1,5 +1,6 @@
 import json
 import os
+import sys
 
 
 class Environment:
@@ -24,10 +25,19 @@ class Environment:
         try:
             from IPython import get_ipython  # type: ignore
 
-            return get_ipython() is not None and (
-                "ipykernel" in str(get_ipython())
-                or "google.colab" in str(get_ipython())
-            )
+            ipy = get_ipython()
+            if ipy is not None:
+                # Check for Pyodide/JupyterLite specific indicators
+                ipy_str = str(ipy).lower()
+                if "pyodide" in ipy_str or "jupyterlite" in ipy_str:
+                    return True
+                # Check for other notebook indicators
+                if "ipykernel" in str(ipy) or "google.colab" in str(ipy):
+                    return True
+                # Check for Pyodide platform
+                if sys.platform == "emscripten":
+                    return True
+            return False
         except ImportError:
             return False
 
@@ -61,10 +71,19 @@ class Environment:
             ipy = (  # pyright: ignore[reportUnknownVariableType]
                 IPython.get_ipython()  # pyright: ignore[reportUnknownMemberType, reportPrivateImportUsage]
             )
-            renderer = "ipython" if ipy else "browser"
+            if ipy is not None:
+                # Check for Pyodide/JupyterLite
+                ipy_str = str(ipy).lower()
+                if "pyodide" in ipy_str or "jupyterlite" in ipy_str:
+                    return "ipython"
+                # Check for Pyodide platform
+                if sys.platform == "emscripten":
+                    return "ipython"
+                return "ipython"
+            else:
+                return "browser"
         except ImportError:
-            renderer = "browser"
-        return renderer
+            return "browser"
 
     @staticmethod
     def initialize_llm_secrets(unique_id: str) -> str:

{maidr-1.2.1 → maidr-1.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "maidr"
-version = "1.2.1"
+version = "1.3.0"
 description = "Multimodal Access and Interactive Data Representations"
 authors = [
     "JooYoung Seo <jseo1005@illinois.edu>",
@@ -40,20 +40,20 @@ numpy = ">=1.26"
 seaborn = ">=0.12"
 lxml = ">=5.1.0"
 htmltools = ">=0.5"
-jupyter = "^1.0.0"
 wrapt = "^1.16.0"
-virtualenv = "^20.26.6"
 mplfinance = "^0.12.10b0"
-statsmodels = "^0.14.4"
 
 [tool.poetry.group.dev.dependencies]
 black = "23.3.0"
 pre-commit = "^3.3.2"
 pytest = "^7.3.2"
-python-semantic-release = "^8.7.0"
+python-semantic-release = "9.21.0"
 pytest-mock = "^3.12.0"
 tox = "^4.13.0"
 quartodoc = "^0.7.5"
+jupyter = "^1.0.0"
+virtualenv = "^20.26.6"
+statsmodels = "^0.14.4"
 
 [tool.black]
 line-length = 88

maidr-1.2.1/maidr/patch/lineplot.py

@@ -1,39 +0,0 @@
-from __future__ import annotations
-
-import wrapt
-from matplotlib.axes import Axes
-from matplotlib.lines import Line2D
-
-from maidr.core.enum import PlotType
-from maidr.patch.common import common
-from maidr.core.enum.smooth_keywords import SMOOTH_KEYWORDS
-
-
-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)
-
-
-# Patch matplotlib function.
-wrapt.wrap_function_wrapper(Axes, "plot", line)
-
-# Patch seaborn function.
-wrapt.wrap_function_wrapper("seaborn", "lineplot", line)