maidr 1.6.0__py3-none-any.whl → 1.6.1__py3-none-any.whl

maidr/__init__.py

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

maidr/core/plot/candlestick.py

@@ -1,11 +1,15 @@
 from __future__ import annotations
 
+import uuid
+from typing import Union, Dict
 from matplotlib.axes import Axes
 from matplotlib.patches import Rectangle
+import numpy as np
 
 from maidr.core.enum import PlotType
 from maidr.core.plot import MaidrPlot
 from maidr.core.enum.maidr_key import MaidrKey
+from maidr.exception import ExtractionError
 from maidr.util.mplfinance_utils import MplfinanceDataExtractor
 
 
@@ -41,23 +45,48 @@ class CandlestickPlot(MaidrPlot):
         self._maidr_date_nums = kwargs.get("_maidr_date_nums", None)
         self._maidr_original_data = kwargs.get("_maidr_original_data", None)  # Store original data
 
-        # Store the GID for proper selector generation
+        # Store the GID for proper selector generation (legacy/shared)
         self._maidr_gid = None
+        # Modern-path separate gids for body and wick
+        self._maidr_body_gid = None
+        self._maidr_wick_gid = None
         if self._maidr_body_collection:
             self._maidr_gid = self._maidr_body_collection.get_gid()
+            self._maidr_body_gid = self._maidr_gid
         elif self._maidr_wick_collection:
             self._maidr_gid = self._maidr_wick_collection.get_gid()
+            self._maidr_wick_gid = self._maidr_gid
 
     def _extract_plot_data(self) -> list[dict]:
-        """Extract candlestick data from the plot."""
+        """
+        Extract candlestick data from the plot.
+
+        This method processes candlestick plots from both modern (mplfinance.plot) and
+        legacy (original_flavor) pipelines, extracting OHLC data and setting up
+        highlighting elements and GIDs.
+
+        Returns
+        -------
+        list[dict]
+            List of dictionaries containing candlestick data with keys:
+            - 'value': Date string
+            - 'open': Opening price (float)
+            - 'high': High price (float)
+            - 'low': Low price (float)
+            - 'close': Closing price (float)
+            - 'volume': Volume (float, typically 0 for candlestick-only plots)
+        """
 
         # Get the custom collections from kwargs
         body_collection = self._maidr_body_collection
         wick_collection = self._maidr_wick_collection
 
         if body_collection and wick_collection:
-            # Store the GID from the body collection for highlighting
-            self._maidr_gid = body_collection.get_gid()
+            # Store the GIDs from the collections (modern path)
+            self._maidr_body_gid = body_collection.get_gid()
+            self._maidr_wick_gid = wick_collection.get_gid()
+            # Keep legacy gid filled for backward compatibility
+            self._maidr_gid = self._maidr_body_gid or self._maidr_wick_gid
 
             # Use the original collections for highlighting
             self._elements = [body_collection, wick_collection]
@@ -86,12 +115,33 @@ class CandlestickPlot(MaidrPlot):
 
             # Generate a GID for highlighting if none exists
             if not self._maidr_gid:
-                import uuid
-
                 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
+            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(
@@ -117,17 +167,57 @@ class CandlestickPlot(MaidrPlot):
             x_labels = "X"
         return {MaidrKey.X: x_labels, MaidrKey.Y: self.ax.get_ylabel()}
 
-    def _get_selector(self) -> str:
-        """Return the CSS selector for highlighting candlestick elements in the SVG output."""
-        # Use the stored GID if available, otherwise fall back to generic selector
-        if self._maidr_gid:
-            # Use the full GID as the id attribute (since that's what's in the SVG)
-            selector = (
-                f"g[id='{self._maidr_gid}'] > path, g[id='{self._maidr_gid}'] > rect"
-            )
-        else:
-            selector = "g[maidr='true'] > path, g[maidr='true'] > rect"
-        return selector
+    def _get_selector(self) -> Union[str, Dict[str, str]]:
+        """Return selectors for highlighting candlestick elements.
+
+        - Modern path (collections present): return a dict with separate selectors for body, wickLow, wickHigh
+        - Legacy path: return a dict with body and shared wick selectors (no open/close keys)
+        """
+        # Modern path: build structured selectors using separate gids
+        if self._maidr_body_collection and self._maidr_wick_collection and self._maidr_body_gid and self._maidr_wick_gid:
+            # Determine candle count N
+            N = None
+            if self._maidr_original_data is not None:
+                try:
+                    N = len(self._maidr_original_data)
+                except Exception:
+                    N = None
+            if N is None and hasattr(self._maidr_wick_collection, "get_paths"):
+                try:
+                    wick_paths = len(list(self._maidr_wick_collection.get_paths()))
+                    if wick_paths % 2 == 0 and wick_paths > 0:
+                        N = wick_paths // 2
+                except Exception:
+                    pass
+            if N is None and hasattr(self._maidr_body_collection, "get_paths"):
+                try:
+                    body_paths = len(list(self._maidr_body_collection.get_paths()))
+                    if body_paths > 0:
+                        N = body_paths
+                except Exception:
+                    pass
+            if N is None:
+                raise ExtractionError(PlotType.CANDLESTICK, self._maidr_wick_collection)
+
+            selectors = {
+                "body": f"g[id='{self._maidr_body_gid}'] > path",
+                "wickLow": f"g[id='{self._maidr_wick_gid}'] > path:nth-child(-n+{N})",
+                "wickHigh": f"g[id='{self._maidr_wick_gid}'] > path:nth-child(n+{N + 1})",
+            }
+            return selectors
+
+        # Legacy path: build shared-id selectors; omit open/close
+        legacy_selectors = {}
+        if getattr(self, "_maidr_body_gid", None) or self._maidr_gid:
+            body_gid = getattr(self, "_maidr_body_gid", None) or self._maidr_gid
+            legacy_selectors["body"] = f"g[id='{body_gid}'] > path"
+        if getattr(self, "_maidr_wick_gid", None):
+            legacy_selectors["wick"] = f"g[id='{self._maidr_wick_gid}'] > path"
+        if legacy_selectors:
+            return legacy_selectors
+
+        # Fallback
+        return "g[maidr='true'] > path, g[maidr='true'] > rect"
 
     def render(self) -> dict:
         """Initialize the MAIDR schema dictionary with basic plot information."""

maidr/patch/candlestick.py

@@ -2,6 +2,7 @@ import wrapt
 from typing import Any, Callable, Dict, Tuple
 from matplotlib.patches import Rectangle
 from mplfinance import original_flavor
+import numpy as np
 
 from maidr.core.context_manager import ContextManager
 from maidr.core.enum.plot_type import PlotType
@@ -46,10 +47,35 @@ def candlestick(
         # Patch the plotting function.
         plot = wrapped(*args, **kwargs)
 
+    original_data = None
+    date_nums = None
+    if len(args) >= 2:
+        try:
+            quotes = args[1]
+            if quotes is not None:
+                arr = np.asarray(quotes)
+                if arr.ndim == 2 and arr.shape[1] >= 5 and arr.size > 0:
+                    date_nums = arr[:, 0].tolist()
+                    original_data = {
+                        "Open": arr[:, 1].tolist(),
+                        "High": arr[:, 2].tolist(),
+                        "Low": arr[:, 3].tolist(),
+                        "Close": arr[:, 4].tolist(),
+                    }
+        except Exception:
+            pass
+
     axes = []
     for ax in plot:
         axes.append(FigureManager.get_axes(ax))
-    FigureManager.create_maidr(axes, PlotType.CANDLESTICK)
+
+    extra_kwargs: Dict[str, Any] = {}
+    if original_data is not None:
+        extra_kwargs["_maidr_original_data"] = original_data
+    if date_nums is not None:
+        extra_kwargs["_maidr_date_nums"] = date_nums
+
+    FigureManager.create_maidr(axes, PlotType.CANDLESTICK, **extra_kwargs)
 
     return plot
 

maidr/patch/mplfinance.py

@@ -83,9 +83,10 @@ def mplfinance_plot_patch(wrapped, instance, args, kwargs):
         )
 
         if wick_collection and body_collection:
-            gid = f"maidr-{uuid.uuid4()}"
-            wick_collection.set_gid(gid)
-            body_collection.set_gid(gid)
+            wick_gid = f"maidr-{uuid.uuid4()}"
+            body_gid = f"maidr-{uuid.uuid4()}"
+            wick_collection.set_gid(wick_gid)
+            body_collection.set_gid(body_gid)
 
             candlestick_kwargs = dict(
                 kwargs,
@@ -93,6 +94,8 @@ def mplfinance_plot_patch(wrapped, instance, args, kwargs):
                 _maidr_body_collection=body_collection,
                 _maidr_date_nums=date_nums,
                 _maidr_original_data=data,
+                _maidr_wick_gid=wick_gid,
+                _maidr_body_gid=body_gid,
             )
             common(
                 PlotType.CANDLESTICK,

{maidr-1.6.0.dist-info → maidr-1.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maidr
-Version: 1.6.0
+Version: 1.6.1
 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
@@ -28,7 +28,6 @@ Requires-Dist: htmltools>=0.5
 Requires-Dist: lxml>=5.1.0
 Requires-Dist: mplfinance>=0.12.10b0
 Requires-Dist: numpy>=1.26
-Requires-Dist: virtualenv<21,>=20.26.6
 Requires-Dist: wrapt<2,>=1.16.0
 Provides-Extra: jupyter
 Requires-Dist: ipykernel>=6.0.0; extra == 'jupyter'

{maidr-1.6.0.dist-info → maidr-1.6.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-maidr/__init__.py,sha256=bvyrTCLC6rRb_Iu5wCMtnDYCY0tbaZ--c21hFuNMICE,415
+maidr/__init__.py,sha256=n8luuuD48JSxB6D5jXxE2QsGGoeQI-3S9lM4qhb4RPI,415
 maidr/api.py,sha256=gRNLXqUWpFGdD-I7Nu6J0_LeEni9KRAr0TBHwHaDAsc,1928
 maidr/core/__init__.py,sha256=WgxLpSEYMc4k3OyEOf1shOxfEq0ASzppEIZYmE91ThQ,25
 maidr/core/context_manager.py,sha256=6cT7ZGOApSpC-SLD2XZWWU_H08i-nfv-JUlzXOtvWYw,3374
@@ -12,7 +12,7 @@ maidr/core/enum/smooth_keywords.py,sha256=z2kVZZ-mETWWh5reWu_hj9WkJD6WFj7_2-6s1e
 maidr/core/plot/__init__.py,sha256=xDIpRGM-4DfaSSL3nKcXrjdMecCHJ6en4K4nA_fPefQ,83
 maidr/core/plot/barplot.py,sha256=0hBgp__putezvxXc9G3qmaktmAzze3cN8pQMD9iqktE,2116
 maidr/core/plot/boxplot.py,sha256=i11GdNuz_c-hilmhydu3ah-bzyVdFoBkNvRi5lpMrrY,9946
-maidr/core/plot/candlestick.py,sha256=dk1MCU5zqGA2CFLT1_1tGrsB6kYNhsUFLPLNaEi9e04,5363
+maidr/core/plot/candlestick.py,sha256=pDuO7ljGiwpqLUWpMgPYARTZGfLHdEoPVbAoNkv3lV0,9559
 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
@@ -28,7 +28,7 @@ maidr/exception/extraction_error.py,sha256=rd37Oxa9gn2OWFWt9AOH5fv0hNd3sAWGvpDMF
 maidr/patch/__init__.py,sha256=FnkoUQJC2ODhLO37GwgRVSitBCRax42Ti0e4NIAgdO0,236
 maidr/patch/barplot.py,sha256=qdUy5Y8zkMg4dH3fFh93OYzLdar4nl1u5O2Jcw4d2zI,2433
 maidr/patch/boxplot.py,sha256=l7wDD4pDi4ZbsL5EX5XDhPRxgtSIFSrFguMOZ7IC2eg,2845
-maidr/patch/candlestick.py,sha256=NFkzwpxmLBpWmb5s05pjk6obNMQee-xIEZTqGkbhhqM,1776
+maidr/patch/candlestick.py,sha256=R2MgPX5ih9W-RBluvF6jFNJBxETH0eMt7Tzn0Ej9LoU,2652
 maidr/patch/clear.py,sha256=2Sc4CIt5jRGkew3TxFsBZm-uowC9yDSxtraEcXZjmGw,396
 maidr/patch/common.py,sha256=RV2NayjPmcWJVhZJV7nmBCjcH7MPDhW_fIluTOPAATk,880
 maidr/patch/heatmap.py,sha256=uxLLg530Ql9KVC5rxk8vnwPHXBWWHwYgJRkyHY-tJzs,1048
@@ -36,7 +36,7 @@ maidr/patch/highlight.py,sha256=I1dGFHJAnVd0AHVnMJzk_TE8BC8Uv-I6fTzSrJLU5QM,1155
 maidr/patch/histogram.py,sha256=k3N0RUf1SQ2402pwbaY5QyS98KnLWvr9glCHQw9NTko,2378
 maidr/patch/kdeplot.py,sha256=qv-OKzuop2aTrkZgUe2OnLxvV-KMyeXt1Td0_uZeHzE,2338
 maidr/patch/lineplot.py,sha256=kvTAiOddy1g5GMP456Awk21NUEZfn-vWaYXy5GTVtuA,1841
-maidr/patch/mplfinance.py,sha256=73aYyFYnAX-AXqPid8ScfexEU2Y8fC9L_tEidzPcKZo,8008
+maidr/patch/mplfinance.py,sha256=FJYM5xRDMpTwaKZUzT6IjpgsR1UiVnvATZsDTyDxqmY,8154
 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
@@ -51,7 +51,7 @@ maidr/util/mixin/extractor_mixin.py,sha256=oHtwpmS5kARvaLrSO3DKTPQxyFUw9nOcKN7rz
 maidr/util/mixin/merger_mixin.py,sha256=V0qLw_6DUB7X6CQ3BCMpsCQX_ZuwAhoSTm_E4xAJFKM,712
 maidr/widget/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maidr/widget/shiny.py,sha256=wrrw2KAIpE_A6CNQGBtNHauR1DjenA_n47qlFXX9_rk,745
-maidr-1.6.0.dist-info/METADATA,sha256=e3l2lyk61dpyniYkOGEIO2Ycyt10LWgPfM-z6OR8fYU,3193
-maidr-1.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-maidr-1.6.0.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-maidr-1.6.0.dist-info/RECORD,,
+maidr-1.6.1.dist-info/METADATA,sha256=WygnnC777b2MAHatLuMFLRjtoRZIW9gc5Ft1RKHE06I,3154
+maidr-1.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+maidr-1.6.1.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+maidr-1.6.1.dist-info/RECORD,,