maidr 1.6.1__tar.gz → 1.7.0__tar.gz

{maidr-1.6.1 → maidr-1.7.0}/CHANGELOG.md

@@ -1,6 +1,14 @@
 # CHANGELOG
 
 
+## v1.7.0 (2025-08-21)
+
+### Features
+
+- Format date in candlestick ([#234](https://github.com/xability/py-maidr/pull/234),
+  [`ffe03f7`](https://github.com/xability/py-maidr/commit/ffe03f7a2368ef33a4266692e7b652daafa14a30))
+
+
 ## v1.6.1 (2025-08-13)
 
 ### Bug Fixes

{maidr-1.6.1 → maidr-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maidr
-Version: 1.6.1
+Version: 1.7.0
 Summary: Multimodal Access and Interactive Data Representations
 Project-URL: Homepage, https://xability.github.io/py-maidr
 Project-URL: Repository, https://github.com/xability/py-maidr

maidr-1.7.0/example/candle_stick/test_data_daily_current_year.csv

@@ -0,0 +1,11 @@
+Date,Open,High,Low,Close,Volume
+2024-01-15,3050.72,3066.95,3050.72,3066.91,510301237
+2024-01-16,3078.96,3085.20,3074.87,3078.27,524848878
+2024-01-17,3080.80,3083.95,3072.15,3074.62,585634570
+2024-01-18,3075.10,3078.34,3065.89,3076.78,544288522
+2024-01-19,3087.02,3097.77,3080.23,3085.18,566117910
+2024-01-22,3081.25,3093.09,3073.58,3093.08,460757054
+2024-01-23,3080.33,3088.33,3075.82,3087.01,366044400
+2024-01-24,3089.28,3102.61,3084.73,3091.84,434953689
+2024-01-25,3084.18,3098.06,3078.80,3094.04,454607412
+2024-01-26,3090.75,3098.20,3083.26,3096.63,408390424

maidr-1.7.0/example/candle_stick/test_data_daily_mixed_years.csv

@@ -0,0 +1,11 @@
+Date,Open,High,Low,Close,Volume
+2023-12-15,3050.72,3066.95,3050.72,3066.91,510301237
+2023-12-18,3078.96,3085.20,3074.87,3078.27,524848878
+2023-12-19,3080.80,3083.95,3072.15,3074.62,585634570
+2023-12-20,3075.10,3078.34,3065.89,3076.78,544288522
+2023-12-21,3087.02,3097.77,3080.23,3085.18,566117910
+2023-12-22,3081.25,3093.09,3073.58,3093.08,460757054
+2024-01-02,3080.33,3088.33,3075.82,3087.01,366044400
+2024-01-03,3089.28,3102.61,3084.73,3091.84,434953689
+2024-01-04,3084.18,3098.06,3078.80,3094.04,454607412
+2024-01-05,3090.75,3098.20,3083.26,3096.63,408390424

maidr-1.7.0/example/candle_stick/test_data_hourly.csv

@@ -0,0 +1,11 @@
+Date,Open,High,Low,Close,Volume
+2024-01-15 09:00:00,3050.72,3066.95,3050.72,3066.91,510301237
+2024-01-15 10:00:00,3078.96,3085.20,3074.87,3078.27,524848878
+2024-01-15 11:00:00,3080.80,3083.95,3072.15,3074.62,585634570
+2024-01-15 12:00:00,3075.10,3078.34,3065.89,3076.78,544288522
+2024-01-15 13:00:00,3087.02,3097.77,3080.23,3085.18,566117910
+2024-01-15 14:00:00,3081.25,3093.09,3073.58,3093.08,460757054
+2024-01-15 15:00:00,3080.33,3088.33,3075.82,3087.01,366044400
+2024-01-15 16:00:00,3089.28,3102.61,3084.73,3091.84,434953689
+2024-01-16 09:00:00,3084.18,3098.06,3078.80,3094.04,454607412
+2024-01-16 10:00:00,3090.75,3098.20,3083.26,3096.63,408390424

maidr-1.7.0/example/candle_stick/test_data_minute.csv

@@ -0,0 +1,11 @@
+Date,Open,High,Low,Close,Volume
+2024-01-15 09:30:00,3050.72,3066.95,3050.72,3066.91,510301237
+2024-01-15 09:31:00,3078.96,3085.20,3074.87,3078.27,524848878
+2024-01-15 09:32:00,3080.80,3083.95,3072.15,3074.62,585634570
+2024-01-15 09:33:00,3075.10,3078.34,3065.89,3076.78,544288522
+2024-01-15 09:34:00,3087.02,3097.77,3080.23,3085.18,566117910
+2024-01-15 09:35:00,3081.25,3093.09,3073.58,3093.08,460757054
+2024-01-15 09:36:00,3080.33,3088.33,3075.82,3087.01,366044400
+2024-01-15 09:37:00,3089.28,3102.61,3084.73,3091.84,434953689
+2024-01-15 09:38:00,3084.18,3098.06,3078.80,3094.04,454607412
+2024-01-15 09:39:00,3090.75,3098.20,3083.26,3096.63,408390424

maidr-1.7.0/example/candle_stick/test_data_weekly.csv

@@ -0,0 +1,11 @@
+Date,Open,High,Low,Close,Volume
+2024-01-01,3050.72,3066.95,3050.72,3066.91,510301237
+2024-01-08,3078.96,3085.20,3074.87,3078.27,524848878
+2024-01-15,3080.80,3083.95,3072.15,3074.62,585634570
+2024-01-22,3075.10,3078.34,3065.89,3076.78,544288522
+2024-01-29,3087.02,3097.77,3080.23,3085.18,566117910
+2024-02-05,3081.25,3093.09,3073.58,3093.08,460757054
+2024-02-12,3080.33,3088.33,3075.82,3087.01,366044400
+2024-02-19,3089.28,3102.61,3084.73,3091.84,434953689
+2024-02-26,3084.18,3098.06,3078.80,3094.04,454607412
+2024-03-04,3090.75,3098.20,3083.26,3096.63,408390424

{maidr-1.6.1 → maidr-1.7.0}/maidr/__init__.py

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

{maidr-1.6.1 → maidr-1.7.0}/maidr/core/plot/candlestick.py

@@ -44,6 +44,7 @@ class CandlestickPlot(MaidrPlot):
         self._maidr_body_collection = kwargs.get("_maidr_body_collection", None)
         self._maidr_date_nums = kwargs.get("_maidr_date_nums", None)
         self._maidr_original_data = kwargs.get("_maidr_original_data", None)  # Store original data
+        self._maidr_datetime_converter = kwargs.get("_maidr_datetime_converter", None)
 
         # Store the GID for proper selector generation (legacy/shared)
         self._maidr_gid = None
@@ -91,63 +92,64 @@ class CandlestickPlot(MaidrPlot):
             # Use the original collections for highlighting
             self._elements = [body_collection, wick_collection]
 
-            # Use the utility class to extract data
-            data = MplfinanceDataExtractor.extract_candlestick_data(
-                body_collection, wick_collection, self._maidr_date_nums, self._maidr_original_data
-            )
-            return data
-
-        # Fallback to original detection method
-        if not self.axes:
-            return []
-
-        ax_ohlc = self.axes[0]
-
-        # Look for Rectangle patches (original_flavor candlestick)
-        body_rectangles = []
-        for patch in ax_ohlc.patches:
-            if isinstance(patch, Rectangle):
-                body_rectangles.append(patch)
-
-        if body_rectangles:
-            # Set elements for highlighting
-            self._elements = body_rectangles
-
-            # Generate a GID for highlighting if none exists
-            if not self._maidr_gid:
-                self._maidr_gid = f"maidr-{uuid.uuid4()}"
-                # Set GID on all rectangles
-                for rect in body_rectangles:
-                    rect.set_gid(self._maidr_gid)
-            # Keep a dedicated body gid for legacy dict selectors
-            self._maidr_body_gid = getattr(self, "_maidr_body_gid", None) or self._maidr_gid
-
-            # Assign a shared gid to wick Line2D (vertical 2-point lines) on the same axis
-            wick_lines = []
-            for line in ax_ohlc.get_lines():
-                try:
-                    xydata = line.get_xydata()
-                    if xydata is None:
+            # Use datetime converter for enhanced data extraction
+            if self._maidr_datetime_converter is not None:
+                data = self._maidr_datetime_converter.extract_candlestick_data(
+                    self.axes[0], wick_collection, body_collection
+                )
+                return data
+
+            # Fallback to original detection method
+            if not self.axes:
+                return []
+
+            ax_ohlc = self.axes[0]
+
+            # Look for Rectangle patches (original_flavor candlestick)
+            body_rectangles = []
+            for patch in ax_ohlc.patches:
+                if isinstance(patch, Rectangle):
+                    body_rectangles.append(patch)
+
+            if body_rectangles:
+                # Set elements for highlighting
+                self._elements = body_rectangles
+
+                # Generate a GID for highlighting if none exists
+                if not self._maidr_gid:
+                    self._maidr_gid = f"maidr-{uuid.uuid4()}"
+                    # Set GID on all rectangles
+                    for rect in body_rectangles:
+                        rect.set_gid(self._maidr_gid)
+                # Keep a dedicated body gid for legacy dict selectors
+                self._maidr_body_gid = getattr(self, "_maidr_body_gid", None) or self._maidr_gid
+
+                # Assign a shared gid to wick Line2D (vertical 2-point lines) on the same axis
+                wick_lines = []
+                for line in ax_ohlc.get_lines():
+                    try:
+                        xydata = line.get_xydata()
+                        if xydata is None:
+                            continue
+                        xy_arr = np.asarray(xydata)
+                        if xy_arr.ndim == 2 and xy_arr.shape[0] == 2 and xy_arr.shape[1] >= 2:
+                            x0 = float(xy_arr[0, 0])
+                            x1 = float(xy_arr[1, 0])
+                            if abs(x0 - x1) < 1e-10:
+                                wick_lines.append(line)
+                    except Exception:
                         continue
-                    xy_arr = np.asarray(xydata)
-                    if xy_arr.ndim == 2 and xy_arr.shape[0] == 2 and xy_arr.shape[1] >= 2:
-                        x0 = float(xy_arr[0, 0])
-                        x1 = float(xy_arr[1, 0])
-                        if abs(x0 - x1) < 1e-10:
-                            wick_lines.append(line)
-                except Exception:
-                    continue
-            if wick_lines:
-                if not getattr(self, "_maidr_wick_gid", None):
-                    self._maidr_wick_gid = f"maidr-{uuid.uuid4()}"
-                for line in wick_lines:
-                    line.set_gid(self._maidr_wick_gid)
-
-            # Use the utility class to extract data
-            data = MplfinanceDataExtractor.extract_rectangle_candlestick_data(
-                body_rectangles, self._maidr_date_nums, self._maidr_original_data
-            )
-            return data
+                if wick_lines:
+                    if not getattr(self, "_maidr_wick_gid", None):
+                        self._maidr_wick_gid = f"maidr-{uuid.uuid4()}"
+                    for line in wick_lines:
+                        line.set_gid(self._maidr_wick_gid)
+
+                # Use the utility class to extract data
+                data = MplfinanceDataExtractor.extract_rectangle_candlestick_data(
+                    body_rectangles, self._maidr_date_nums, self._maidr_original_data
+                )
+                return data
 
         return []
 

{maidr-1.6.1 → maidr-1.7.0}/maidr/core/plot/mplfinance_barplot.py

@@ -31,6 +31,10 @@ class MplfinanceBarPlot(
         self._custom_patches = kwargs.get("_maidr_patches", None)
         # Store date numbers for volume bars (from mplfinance)
         self._maidr_date_nums = kwargs.get("_maidr_date_nums", None)
+
+        # Store datetime converter if available
+        self._maidr_datetime_converter = kwargs.get("_maidr_datetime_converter", None)
+
         # Store custom title
 
     def set_title(self, title: str) -> None:
@@ -48,6 +52,13 @@ class MplfinanceBarPlot(
         )
         data = self._extract_bar_container_data(plot)
         levels = self.extract_level(self.ax)
+
+        # Ensure we have valid data and levels before processing
+        if data is None or levels is None:
+            if data is None:
+                raise ExtractionError(self.type, plot)
+            return []
+
         formatted_data = []
         combined_data = list(
             zip(levels, data)
@@ -78,7 +89,13 @@ class MplfinanceBarPlot(
         # Set elements for highlighting (use the patches directly)
         self._elements = sorted_patches
 
-        # Use the utility class to extract data
+        # Use datetime converter for enhanced data extraction
+        if self._maidr_datetime_converter is not None:
+            data = self._maidr_datetime_converter.extract_volume_data(self.ax)
+            if data:  # Only use if successful
+                return [{"x": item[0], "y": item[1]} for item in data]
+
+        # Fallback to existing logic
         return MplfinanceDataExtractor.extract_volume_data(
             sorted_patches, self._maidr_date_nums
         )

{maidr-1.6.1 → maidr-1.7.0}/maidr/core/plot/mplfinance_lineplot.py

@@ -23,6 +23,9 @@ class MplfinanceLinePlot(MaidrPlot, LineExtractorMixin):
     def __init__(self, ax: Axes, **kwargs):
         super().__init__(ax, PlotType.LINE)
 
+        # Store datetime converter if available
+        self._maidr_datetime_converter = kwargs.get("_maidr_datetime_converter", None)
+
     def _get_selector(self) -> Union[str, List[str]]:
         """Return selectors for all lines that have data."""
         all_lines = self.ax.get_lines()
@@ -101,10 +104,15 @@ class MplfinanceLinePlot(MaidrPlot, LineExtractorMixin):
                 if np.isnan(x) or np.isnan(y) or np.isinf(x) or np.isinf(y):
                     continue
 
-                # Handle x-value conversion - could be string (date) or numeric
-                if isinstance(x, str):
-                    x_value = x  # Keep string as-is (for dates)
+                # Use datetime converter for enhanced data extraction
+                datetime_converter = getattr(line, "_maidr_datetime_converter", None) or self._maidr_datetime_converter
+                if datetime_converter is not None:
+                    # Convert x-coordinate (matplotlib index) to formatted datetime
+                    x_value = datetime_converter.get_formatted_datetime(int(round(x)))
+                    if x_value is None:
+                        x_value = float(x)  # Fallback to numeric
                 else:
+                    # Fallback to existing logic
                     # Check if we have date numbers from mplfinance
                     if date_nums is not None and i < len(date_nums):
                         # Use the date number to convert to date string

{maidr-1.6.1 → maidr-1.7.0}/maidr/patch/mplfinance.py

@@ -8,6 +8,7 @@ from matplotlib.lines import Line2D
 from maidr.core.enum import PlotType
 from maidr.patch.common import common
 from maidr.core.context_manager import ContextManager
+from maidr.util.datetime_conversion import create_datetime_converter
 
 
 def mplfinance_plot_patch(wrapped, instance, args, kwargs):
@@ -53,26 +54,37 @@ def mplfinance_plot_patch(wrapped, instance, args, kwargs):
         elif volume_ax is None and "volume" in ax.get_ylabel().lower():
             volume_ax = ax
 
-    # Try to extract date numbers from the data
+    # Try to extract date numbers from the data (existing logic preserved)
     date_nums = None
     data = None
+    datetime_converter = None
+
     if len(args) > 0:
         data = args[0]
     elif "data" in kwargs:
         data = kwargs["data"]
 
     if data is not None:
+        # Existing date_nums logic (preserved)
         if hasattr(data, "Date_num"):
             date_nums = list(data["Date_num"])
         elif hasattr(data, "index"):
             # fallback: use index if it's a DatetimeIndex
             try:
                 import matplotlib.dates as mdates
-
                 date_nums = [mdates.date2num(d) for d in data.index]
             except Exception:
                 pass
 
+        # Create datetime converter for DatetimeIndex data
+        if hasattr(data, "index") and hasattr(data.index, "dtype"):
+            if "datetime" in str(data.index.dtype).lower():
+                datetime_converter = create_datetime_converter(data)
+
+                # Use enhanced converter's date_nums for mplfinance compatibility
+                if date_nums is None and hasattr(datetime_converter, 'date_nums'):
+                    date_nums = datetime_converter.date_nums
+
     # Process and register the Candlestick plot
     if price_ax:
         wick_collection = next(
@@ -97,6 +109,10 @@ def mplfinance_plot_patch(wrapped, instance, args, kwargs):
                 _maidr_wick_gid=wick_gid,
                 _maidr_body_gid=body_gid,
             )
+
+            # Add datetime converter
+            if datetime_converter is not None:
+                candlestick_kwargs["_maidr_datetime_converter"] = datetime_converter
             common(
                 PlotType.CANDLESTICK,
                 lambda *a, **k: price_ax,
@@ -129,6 +145,11 @@ def mplfinance_plot_patch(wrapped, instance, args, kwargs):
                 _maidr_patches=volume_patches,
                 _maidr_date_nums=date_nums,
             )
+
+            # Add datetime converter
+            if datetime_converter is not None:
+                bar_kwargs["_maidr_datetime_converter"] = datetime_converter  # type: ignore
+
             common(PlotType.BAR, lambda *a, **k: volume_ax, instance, args, bar_kwargs)
 
     # Process and register Moving Averages as LINE plots
@@ -196,6 +217,10 @@ def mplfinance_plot_patch(wrapped, instance, args, kwargs):
             if date_nums is not None:
                 setattr(line, "_maidr_date_nums", date_nums)
 
+            # Store datetime converter
+            if datetime_converter is not None:
+                setattr(line, "_maidr_datetime_converter", datetime_converter)
+
             # Ensure GID is set for highlighting
             if line.get_gid() is None:
                 gid = f"maidr-{uuid.uuid4()}"
@@ -207,6 +232,11 @@ def mplfinance_plot_patch(wrapped, instance, args, kwargs):
         # Register all valid lines as a single LINE plot
         if valid_lines:
             line_kwargs = dict(kwargs)
+
+            # Add datetime converter
+            if datetime_converter is not None:
+                line_kwargs["_maidr_datetime_converter"] = datetime_converter
+
             common(PlotType.LINE, lambda *a, **k: price_ax, instance, args, line_kwargs)
 
     if not original_returnfig: