maidr 1.2.2__tar.gz → 1.3.0__tar.gz

{maidr-1.2.2 → maidr-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: maidr
-Version: 1.2.2
+Version: 1.3.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
@@ -26,14 +26,11 @@ Classifier: Topic :: Scientific/Engineering :: Visualization
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Text Processing :: Markup :: HTML
 Requires-Dist: htmltools (>=0.5)
-Requires-Dist: jupyter (>=1.0.0,<2.0.0)
 Requires-Dist: lxml (>=5.1.0)
 Requires-Dist: matplotlib (>=3.8)
 Requires-Dist: mplfinance (>=0.12.10b0,<0.13.0)
 Requires-Dist: numpy (>=1.26)
 Requires-Dist: seaborn (>=0.12)
-Requires-Dist: statsmodels (>=0.14.4,<0.15.0)
-Requires-Dist: virtualenv (>=20.26.6,<21.0.0)
 Requires-Dist: wrapt (>=1.16.0,<2.0.0)
 Project-URL: Homepage, https://xability.github.io/py-maidr
 Project-URL: Repository, https://github.com/xability/py-maidr

{maidr-1.2.2 → maidr-1.3.0}/maidr/__init__.py

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

{maidr-1.2.2 → maidr-1.3.0}/maidr/core/maidr.py

@@ -8,7 +8,7 @@ import os
 import tempfile
 import uuid
 import webbrowser
-from typing import Any, Literal
+from typing import Any, Literal, cast
 
 import matplotlib.pyplot as plt
 from htmltools import HTML, HTMLDocument, Tag, tags
@@ -102,14 +102,20 @@ class Maidr:
             The renderer to use for the HTML preview.
         """
         html = self._create_html_tag(use_iframe=True)  # Always use iframe for display
-        _renderer = Environment.get_renderer()
-        if _renderer == "browser" or (
-            Environment.is_interactive_shell() and not Environment.is_notebook()
-        ):
+
+        # Use the passed renderer parameter, fallback to auto-detection
+        if renderer == "auto":
+            _renderer = cast(Literal["ipython", "browser"], Environment.get_renderer())
+        else:
+            _renderer = renderer
+
+        # Only try browser opening if explicitly requested as browser and not in notebook
+        if _renderer == "browser" and not Environment.is_notebook():
             return self._open_plot_in_browser()
+
         if clear_fig:
             plt.close()
-        return html.show(renderer)
+        return html.show(_renderer)
 
     def clear(self):
         self._plots = []

{maidr-1.2.2 → maidr-1.3.0}/maidr/util/environment.py

@@ -1,5 +1,6 @@
 import json
 import os
+import sys
 
 
 class Environment:
@@ -24,10 +25,19 @@ class Environment:
         try:
             from IPython import get_ipython  # type: ignore
 
-            return get_ipython() is not None and (
-                "ipykernel" in str(get_ipython())
-                or "google.colab" in str(get_ipython())
-            )
+            ipy = get_ipython()
+            if ipy is not None:
+                # Check for Pyodide/JupyterLite specific indicators
+                ipy_str = str(ipy).lower()
+                if "pyodide" in ipy_str or "jupyterlite" in ipy_str:
+                    return True
+                # Check for other notebook indicators
+                if "ipykernel" in str(ipy) or "google.colab" in str(ipy):
+                    return True
+                # Check for Pyodide platform
+                if sys.platform == "emscripten":
+                    return True
+            return False
         except ImportError:
             return False
 
@@ -61,10 +71,19 @@ class Environment:
             ipy = (  # pyright: ignore[reportUnknownVariableType]
                 IPython.get_ipython()  # pyright: ignore[reportUnknownMemberType, reportPrivateImportUsage]
             )
-            renderer = "ipython" if ipy else "browser"
+            if ipy is not None:
+                # Check for Pyodide/JupyterLite
+                ipy_str = str(ipy).lower()
+                if "pyodide" in ipy_str or "jupyterlite" in ipy_str:
+                    return "ipython"
+                # Check for Pyodide platform
+                if sys.platform == "emscripten":
+                    return "ipython"
+                return "ipython"
+            else:
+                return "browser"
         except ImportError:
-            renderer = "browser"
-        return renderer
+            return "browser"
 
     @staticmethod
     def initialize_llm_secrets(unique_id: str) -> str:

{maidr-1.2.2 → maidr-1.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "maidr"
-version = "1.2.2"
+version = "1.3.0"
 description = "Multimodal Access and Interactive Data Representations"
 authors = [
     "JooYoung Seo <jseo1005@illinois.edu>",
@@ -40,11 +40,8 @@ numpy = ">=1.26"
 seaborn = ">=0.12"
 lxml = ">=5.1.0"
 htmltools = ">=0.5"
-jupyter = "^1.0.0"
 wrapt = "^1.16.0"
-virtualenv = "^20.26.6"
 mplfinance = "^0.12.10b0"
-statsmodels = "^0.14.4"
 
 [tool.poetry.group.dev.dependencies]
 black = "23.3.0"
@@ -54,6 +51,9 @@ python-semantic-release = "9.21.0"
 pytest-mock = "^3.12.0"
 tox = "^4.13.0"
 quartodoc = "^0.7.5"
+jupyter = "^1.0.0"
+virtualenv = "^20.26.6"
+statsmodels = "^0.14.4"
 
 [tool.black]
 line-length = 88