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

maidr/__init__.py

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

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/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/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.2.dist-info → maidr-1.4.3.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-maidr/__init__.py,sha256=WXjwKTG-ThyAevvEASjvfUbjdOvs1iXAhaOhvkyrreo,415
+maidr/__init__.py,sha256=ronOPGSAyAgb4akYAYumS7KQ4yoWwCZaihDG9qPs7dI,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
@@ -13,14 +13,14 @@ maidr/core/plot/__init__.py,sha256=xDIpRGM-4DfaSSL3nKcXrjdMecCHJ6en4K4nA_fPefQ,8
 maidr/core/plot/barplot.py,sha256=1HfoqyDGKIXkYQnCHN83Ye_faKpNQ3R4wjlbjD5jUyk,2092
 maidr/core/plot/boxplot.py,sha256=i11GdNuz_c-hilmhydu3ah-bzyVdFoBkNvRi5lpMrrY,9946
 maidr/core/plot/candlestick.py,sha256=2eLdvZJSIgv9fW918uTn7ROsEGui7H3YaVGGFtqkBIw,5269
-maidr/core/plot/grouped_barplot.py,sha256=bRcQcvwkF3Q3aZ3PlhbZ6bHI_AfcqdKUMVvlLL94wXM,2078
+maidr/core/plot/grouped_barplot.py,sha256=_zn4XMeEnSiDHtf6t4-z9ErBqg_CijhAS2CCtlHgYIQ,2077
 maidr/core/plot/heatmap.py,sha256=yMS-31tS2GW4peds9LtZesMxmmTV_YfqYO5M_t5KasQ,2521
 maidr/core/plot/histogram.py,sha256=QV5W-6ZJQQcZsrM91JJBX-ONktJzH7yg_et5_bBPfQQ,1525
-maidr/core/plot/lineplot.py,sha256=C3xz6uWXYM_mbTq_geb5bP0JdvhcQf6cpfTs78Y6fCM,3852
+maidr/core/plot/lineplot.py,sha256=nBnTfmKE62Fr-L7i0v6dQhY9EXgwubQ-5ilajPZD6NQ,4327
 maidr/core/plot/maidr_plot.py,sha256=DN4TTRNt_SCqGa_mbkHrnpCk-eUQm71HoFRqs3bB6xk,3868
 maidr/core/plot/maidr_plot_factory.py,sha256=NW2iFScswgXbAC9rAOo4iMkAFsjY43DAvFioGr0yzx4,2732
 maidr/core/plot/mplfinance_barplot.py,sha256=feQlVMGA987EvgFii3V5vH74xGtBMBZhNlulU97vQL8,5184
-maidr/core/plot/mplfinance_lineplot.py,sha256=SVN81tau_IAsj17NZT-UtUEJ8NKBy-WxD1PznZELKHc,9338
+maidr/core/plot/mplfinance_lineplot.py,sha256=tWfMc3sbc-j3lkuyULF_AVGacZ9jRnE6SEm5VkIlfpA,6969
 maidr/core/plot/regplot.py,sha256=b7u6bGTz1IxKahplNUrfwIr_OGSwMJ2BuLgFAVjL0s0,2744
 maidr/core/plot/scatterplot.py,sha256=o0i0uS-wXK9ZrENxneoHbh3-u-2goRONp19Yu9QLsaY,1257
 maidr/exception/__init__.py,sha256=PzaXoYBhyZxMDcJkuxJugDx7jZeseI0El6LpxIwXyG4,46
@@ -51,7 +51,7 @@ maidr/util/regression_line_utils.py,sha256=yFKr-H0whT_su2YVZwNksBLp5EC5s77sr6HUF
 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.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,,
+maidr-1.4.3.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+maidr-1.4.3.dist-info/METADATA,sha256=eBYrdXDE43KDRriEnoVqE0X4mNRZ4RQH1S34D0yjuG4,2664
+maidr-1.4.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+maidr-1.4.3.dist-info/RECORD,,