maidr 0.22.0__tar.gz → 0.22.1__tar.gz

{maidr-0.22.0 → maidr-0.22.1}/PKG-INFO

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

@@ -1,6 +1,6 @@
-__version__ = "0.22.0"
+__version__ = "0.22.1"
 
-from .api import close, render, save_html, set_engine, show, stacked
+from .api import close, render, save_html, show, stacked
 from .core import Maidr
 from .core.enum import PlotType
 from .patch import (

{maidr-0.22.0 → maidr-0.22.1}/maidr/api.py

@@ -53,7 +53,3 @@ def stacked(plot: Axes | BarContainer) -> Maidr:
 def close(plot: Any) -> None:
     ax = FigureManager.get_axes(plot)
     FigureManager.destroy(ax.get_figure())
-
-
-def set_engine(engine: Literal["js", "ts"] = "js"):
-    Environment._set_engine(engine=engine)

{maidr-0.22.0 → maidr-0.22.1}/maidr/core/maidr.py

@@ -142,19 +142,6 @@ class Maidr:
 
     def _flatten_maidr(self) -> dict | list[dict]:
         """Return a single plot schema or a list of schemas from the Maidr instance."""
-        # To support legacy JS Engine we will just return the format in this way
-        # but soon enough this should be deprecated and when we will completely
-        # transition to TypeScript :)
-        engine = Environment.get_engine()
-        if engine == "js":
-            if self.plot_type in (PlotType.LINE, PlotType.DODGED, PlotType.STACKED):
-                self._plots = [self._plots[0]]
-            maidr = [plot.schema for plot in self._plots]
-
-            return maidr if len(maidr) != 1 else maidr[0]
-
-        # Now let's start building the maidr object for the newer TypeScript engine
-
         if self.plot_type in (PlotType.DODGED, PlotType.STACKED):
             self._plots = [self._plots[0]]
 
@@ -251,27 +238,10 @@ class Maidr:
     @staticmethod
     def _inject_plot(plot: HTML, maidr: str, maidr_id) -> Tag:
         """Embed the plot and associated MAIDR scripts into the HTML structure."""
-
-        engine = Environment.get_engine()
-
         # 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_js_script = f"""
-            if (!document.querySelector('script[src="https://cdn.jsdelivr.net/npm/maidr/dist/maidr.min.js"]')) {{
-                var script = document.createElement('script');
-                script.type = 'text/javascript';
-                script.src = 'https://cdn.jsdelivr.net/npm/maidr/dist/maidr.min.js';
-                script.addEventListener('load', function() {{
-                    window.init("{maidr_id}");
-                }});
-                document.head.appendChild(script);
-            }} else {{
-                window.init("{maidr_id}");
-            }}
-        """
-
-        maidr_ts_script = f"""
+        script = f"""
             if (!document.querySelector('script[src="{MAIDR_TS_CDN_URL}"]'))
             {{
                 var script = document.createElement('script');
@@ -288,8 +258,6 @@ class Maidr:
             }}
         """
 
-        script = maidr_js_script if engine == "js" else maidr_ts_script
-
         base_html = tags.div(
             tags.link(
                 rel="stylesheet",
@@ -299,14 +267,12 @@ class Maidr:
             tags.div(plot),
         )
 
-        is_quarto = os.getenv("IS_QUARTO") == "True"
+        # is_quarto = os.getenv("IS_QUARTO") == "True"
 
         # Render the plot inside an iframe if in a Jupyter notebook, Google Colab
         # or VSCode notebook. No need for iframe if this is a Quarto document.
         # For TypeScript we will use iframe by default for now
-        if (Environment.is_notebook() and not is_quarto) or (
-            engine == "ts" and Environment.is_notebook()
-        ):
+        if Environment.is_notebook():
             unique_id = "iframe_" + Maidr._unique_id()
 
             def generate_iframe_script(unique_id: str) -> str:

{maidr-0.22.0 → maidr-0.22.1}/maidr/core/plot/barplot.py

@@ -3,10 +3,9 @@ from __future__ import annotations
 from matplotlib.axes import Axes
 from matplotlib.container import BarContainer
 
-from maidr.core.enum import MaidrKey, PlotType
+from maidr.core.enum import PlotType
 from maidr.core.plot import MaidrPlot
 from maidr.exception import ExtractionError
-from maidr.util.environment import Environment
 from maidr.util.mixin import (
     ContainerExtractorMixin,
     DictMergerMixin,
@@ -18,35 +17,20 @@ class BarPlot(MaidrPlot, ContainerExtractorMixin, LevelExtractorMixin, DictMerge
     def __init__(self, ax: Axes) -> None:
         super().__init__(ax, PlotType.BAR)
 
-    def _extract_axes_data(self) -> dict:
-        engine = Environment.get_engine()
-
-        base_schema = super()._extract_axes_data()
-        bar_ax_schema = {}
-        if engine == "js":
-            bar_ax_schema = {
-                MaidrKey.X: {
-                    MaidrKey.LEVEL: self.extract_level(self.ax),
-                },
-            }
-        return self.merge_dict(base_schema, bar_ax_schema)
-
     def _extract_plot_data(self) -> list:
-        engine = Environment.get_engine()
         plot = self.extract_container(self.ax, BarContainer, include_all=True)
         data = self._extract_bar_container_data(plot)
         levels = self.extract_level(self.ax)
-        if engine == "ts":
-            formatted_data = []
-            combined_data = list(
-                zip(levels, data) if plot[0].orientation == "vertical" else zip(data, levels)  # type: ignore
-            )
-            if combined_data:  # type: ignore
-                for x, y in combined_data:  # type: ignore
-                    formatted_data.append({"x": x, "y": y})
-                return formatted_data
-            if len(formatted_data) == 0:
-                raise ExtractionError(self.type, plot)
+        formatted_data = []
+        combined_data = list(
+            zip(levels, data) if plot[0].orientation == "vertical" else zip(data, levels)  # type: ignore
+        )
+        if combined_data:  # type: ignore
+            for x, y in combined_data:  # type: ignore
+                formatted_data.append({"x": x, "y": y})
+            return formatted_data
+        if len(formatted_data) == 0:
+            raise ExtractionError(self.type, plot)
         if data is None:
             raise ExtractionError(self.type, plot)
 

{maidr-0.22.0 → maidr-0.22.1}/maidr/core/plot/lineplot.py

@@ -7,7 +7,6 @@ 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
 
 
@@ -43,20 +42,11 @@ class MultiLinePlot(MaidrPlot, LineExtractorMixin):
         super().__init__(ax, PlotType.LINE)
 
     def _get_selector(self) -> Union[str, List[str]]:
-        if Environment.get_engine() == "js":
-            return "g[maidr='true'] > path"
         return ["g[maidr='true'] > path"]
 
     def _extract_plot_data(self) -> list[dict]:
         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)
@@ -94,11 +84,15 @@ class MultiLinePlot(MaidrPlot, LineExtractorMixin):
             self._elements.append(line)
 
             # Extract data from this line
+
+            label: str = line.get_label()  # type: ignore
             line_data = [
                 {
                     MaidrKey.X: float(x),
                     MaidrKey.Y: float(y),
-                    MaidrKey.FILL: line.get_label(),
+                    # 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
             ]

{maidr-0.22.0 → maidr-0.22.1}/maidr/core/plot/maidr_plot.py

@@ -5,7 +5,6 @@ from abc import ABC, abstractmethod
 from matplotlib.axes import Axes
 
 from maidr.core.enum import MaidrKey, PlotType
-from maidr.util.environment import Environment
 
 
 class MaidrPlot(ABC):
@@ -26,7 +25,8 @@ class MaidrPlot(ABC):
     type : PlotType
         The specific type of the plot.
     _schema : dict
-        A dictionary containing structured data about the plot, including type, title, axes labels, and data.
+        A dictionary containing structured data about the plot, including type, title,
+        axes labels, and data.
 
     Methods
     -------
@@ -70,17 +70,7 @@ class MaidrPlot(ABC):
 
     def _extract_axes_data(self) -> dict:
         """Extract the plot's axes data"""
-        engine = Environment.get_engine()
-        if engine == "ts":
-            return {MaidrKey.X: self.ax.get_xlabel(), MaidrKey.Y: self.ax.get_ylabel()}
-        return {
-            MaidrKey.X: {
-                MaidrKey.LABEL: self.ax.get_xlabel(),
-            },
-            MaidrKey.Y: {
-                MaidrKey.LABEL: self.ax.get_ylabel(),
-            },
-        }
+        return {MaidrKey.X: self.ax.get_xlabel(), MaidrKey.Y: self.ax.get_ylabel()}
 
     @abstractmethod
     def _extract_plot_data(self) -> list | dict:

{maidr-0.22.0 → maidr-0.22.1}/maidr/core/plot/scatterplot.py

@@ -7,7 +7,6 @@ from matplotlib.collections import PathCollection
 from maidr.core.enum import MaidrKey, PlotType
 from maidr.core.plot import MaidrPlot
 from maidr.exception import ExtractionError
-from maidr.util.environment import Environment
 from maidr.util.mixin import CollectionExtractorMixin
 
 
@@ -16,8 +15,6 @@ class ScatterPlot(MaidrPlot, CollectionExtractorMixin):
         super().__init__(ax, PlotType.SCATTER)
 
     def _get_selector(self) -> str | list[str]:
-        if Environment.get_engine() == "js":
-            return "g[maidr='true'] > use"
         return ["g[maidr='true'] > g > use"]
 
     def _extract_plot_data(self) -> list[dict]:

{maidr-0.22.0 → maidr-0.22.1}/maidr/util/environment.py

@@ -1,21 +1,10 @@
 import json
 import os
-from typing import Literal
 
 
 class Environment:
     _engine = "ts"
 
-    @classmethod
-    def _set_engine(cls, engine: Literal["js", "ts"]) -> None:
-        """Set the engine to use for the MAIDR instance."""
-        cls._engine = engine
-
-    @classmethod
-    def get_engine(cls) -> str:
-        """Get the engine to use for the MAIDR instance."""
-        return cls._engine
-
     @staticmethod
     def is_interactive_shell() -> bool:
         """Return True if the environment is an interactive shell."""

{maidr-0.22.0 → maidr-0.22.1}/pyproject.toml

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