maidr 0.13.0__py3-none-any.whl → 0.14.0__py3-none-any.whl

maidr/__init__.py

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

maidr/core/maidr.py

@@ -44,6 +44,7 @@ class Maidr:
         self._fig = fig
         self._plots = []
         self.maidr_id = None
+        self.selector_id = Maidr._unique_id()
 
     @property
     def fig(self) -> Figure:
@@ -125,7 +126,7 @@ class Maidr:
         maidr = f"\nlet maidr = {json.dumps(self._flatten_maidr(), indent=2)}\n"
 
         # In SVG we will replace maidr=id with the unique id.
-        svg = svg.replace('maidr="true"', f'maidr="{self.maidr_id}"')
+        svg = svg.replace('maidr="true"', f'maidr="{self.selector_id}"')
 
         # Inject plot's svg and MAIDR structure into html tag.
         return Maidr._inject_plot(svg, maidr, self.maidr_id)
@@ -142,7 +143,7 @@ class Maidr:
         for plot in maidr:
             if MaidrKey.SELECTOR in plot:
                 plot[MaidrKey.SELECTOR] = plot[MaidrKey.SELECTOR].replace(
-                    "maidr='true'", f"maidr='{self.maidr_id}'"
+                    "maidr='true'", f"maidr='{self.selector_id}'"
                 )
 
         return maidr if len(maidr) != 1 else maidr[0]

maidr/core/plot/barplot.py

@@ -41,7 +41,7 @@ class BarPlot(MaidrPlot, ContainerExtractorMixin, LevelExtractorMixin, DictMerge
             combined_data = (
                 zip(levels, data) if plot[0].orientation == "vertical" else zip(levels, data)  # type: ignore
             )
-            if len(data) != len(plot):  # type: ignore
+            if len(data) == len(plot):  # type: ignore
                 for x, y in combined_data:  # type: ignore
                     formatted_data.append({"x": x, "y": y})
                 return formatted_data

maidr/core/plot/lineplot.py

@@ -6,6 +6,7 @@ from matplotlib.lines import Line2D
 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 LineExtractorMixin
 
 
@@ -19,6 +20,9 @@ class LinePlot(MaidrPlot, LineExtractorMixin):
     def _extract_plot_data(self) -> list[dict]:
         plot = self.extract_line(self.ax)
         data = self._extract_line_data(plot)
+        engine = Environment.get_engine()
+        if engine == "ts":
+            data = [data]
 
         if data is None:
             raise ExtractionError(self.type, plot)

{maidr-0.13.0.dist-info → maidr-0.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: maidr
-Version: 0.13.0
+Version: 0.14.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

{maidr-0.13.0.dist-info → maidr-0.14.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-maidr/__init__.py,sha256=l8GxTHYGbPGuc6jgS4bbzP2Caqb90CQYYYwW7LWmbbo,369
+maidr/__init__.py,sha256=YHLH1St1nSRY7D2GUwqgZPSgGdYODkUylSw3xzDwsqQ,369
 maidr/api.py,sha256=u2WOQ8RWmXpzseEgbZJCB7FFZs7cEy-ya-Q18tGAYB4,1350
 maidr/core/__init__.py,sha256=WgxLpSEYMc4k3OyEOf1shOxfEq0ASzppEIZYmE91ThQ,25
 maidr/core/context_manager.py,sha256=HSzD4wpiALdI4Vm0QTdWqi1MWR5Uqy8BX_lOlCM3JYY,3463
@@ -7,14 +7,14 @@ maidr/core/enum/library.py,sha256=e8ujT_L-McJWfoVJd1ty9K_2bwITnf1j0GPLsnAcHes,10
 maidr/core/enum/maidr_key.py,sha256=LNtt74d2gurefDNPD3SLLsTxKqO9qTyo3PBAUAyofnc,736
 maidr/core/enum/plot_type.py,sha256=pyfyIwlq3taqe2Z1sVUSbMsTp5QTvYBlZXsMMMclEVM,293
 maidr/core/figure_manager.py,sha256=HyYLIX3QzE-PmatSsTez9MmncTEu0wzPdFktZzE3NQM,3891
-maidr/core/maidr.py,sha256=2tOBxsyG9a_xIq7cg6P1U665WSC3_NkzKxuz1sS3KxU,11459
+maidr/core/maidr.py,sha256=9x1-CTvp7RGnEZTUdWleruxSM6Rsou3pQr_VI9IijnI,11511
 maidr/core/plot/__init__.py,sha256=xDIpRGM-4DfaSSL3nKcXrjdMecCHJ6en4K4nA_fPefQ,83
-maidr/core/plot/barplot.py,sha256=iKob48QXYjezxw5Pqw8C_W8KZvQB2fioEGWCtOeQ3JM,2605
+maidr/core/plot/barplot.py,sha256=DGiMbakzER-Czpzekw-yBHXZuzWpBg7ODtJPQ8voI04,2605
 maidr/core/plot/boxplot.py,sha256=roADG8xJYRQlZPYbfGBQSQRw8974lhVnngGKEKXJttk,6090
 maidr/core/plot/grouped_barplot.py,sha256=pRmSAr6obcdjK4PPOt7-U77tMMKLM4lkKOiOklS8TbA,2061
 maidr/core/plot/heatmap.py,sha256=_Hn_wXsu-BQBYs4YO440-WRhmXAJ1WeBndBGVEUAP5M,2447
 maidr/core/plot/histogram.py,sha256=QV5W-6ZJQQcZsrM91JJBX-ONktJzH7yg_et5_bBPfQQ,1525
-maidr/core/plot/lineplot.py,sha256=iHPJgQ7CByM7UItBMDUy7YnkVV6tBRyW_vY4QoWib34,1140
+maidr/core/plot/lineplot.py,sha256=TAqajxACVjs8ydIf_AiqUzwnfPdFydHhxc_TGDFsxcc,1282
 maidr/core/plot/maidr_plot.py,sha256=_9Ugn3cUwi-URxeTRbDAKDZwASrB65p9TKOXhFX1zbU,3176
 maidr/core/plot/maidr_plot_factory.py,sha256=Ai-vFpn9YhZPQeVQxdjq0prVJNcGZ8NJvS3eKAxxZ_w,1681
 maidr/core/plot/scatterplot.py,sha256=sQhT80w0Sp9AsUAZi4v6lfWsHJAvuFcer2aAE2NpAYE,1240
@@ -37,7 +37,7 @@ maidr/util/mixin/extractor_mixin.py,sha256=Y-34424UR8ECHECAuQZ7zKhyk5QC6GOiUeCMR
 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-0.13.0.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-maidr-0.13.0.dist-info/METADATA,sha256=WNQKQgPsz3s7J8J5-MK9AsZWJcu6zTfybnoDXRoKJWQ,2688
-maidr-0.13.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-maidr-0.13.0.dist-info/RECORD,,
+maidr-0.14.0.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+maidr-0.14.0.dist-info/METADATA,sha256=2wr_G1PtwvMel2JVhADxYONzNHFPpEBbtyDe7zNIwNc,2688
+maidr-0.14.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+maidr-0.14.0.dist-info/RECORD,,