figpack 0.2.22__tar.gz → 0.2.24__tar.gz

{figpack-0.2.22/figpack.egg-info → figpack-0.2.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: figpack
-Version: 0.2.22
+Version: 0.2.24
 Summary: A Python package for creating shareable, interactive visualizations in the browser
 Author-email: Jeremy Magland <jmagland@flatironinstitute.org>
 License: Apache-2.0
@@ -71,6 +71,7 @@ Requires-Dist: linkify-it-py>=2.0; extra == "docs"
 Requires-Dist: sphinx-copybutton>=0.5; extra == "docs"
 Requires-Dist: lindi; extra == "docs"
 Requires-Dist: nibabel; extra == "docs"
+Requires-Dist: Pillow; extra == "docs"
 Dynamic: license-file
 
 # figpack

{figpack-0.2.22 → figpack-0.2.24}/figpack/__init__.py

@@ -2,7 +2,7 @@
 figpack - A Python package for creating shareable, interactive visualizations in the browser
 """
 
-__version__ = "0.2.22"
+__version__ = "0.2.24"
 
 from .cli import view_figure
 from .core import FigpackView, FigpackExtension, ExtensionView

{figpack-0.2.22 → figpack-0.2.24}/figpack/core/figpack_view.py

@@ -60,16 +60,23 @@ class FigpackView:
 
         # determine upload
         if upload is None:
-            upload = os.environ.get("FIGPACK_UPLOAD") == "1"
-        else:
-            if upload is True:
-                if ephemeral is True:
-                    # ephemeral is reserved for the case where we don't specify upload
-                    # and we are in a notebook in a remote environment such as
-                    # colab or jupyterhub
-                    raise ValueError("ephemeral cannot be set if upload is set")
-                else:
-                    ephemeral = False  # if we excplicitly set upload=True, force ephemeral=False
+            if os.environ.get("FIGPACK_UPLOAD") == "1":
+                upload = True
+            elif os.environ.get("FIGPACK_UPLOAD") == "0":
+                upload = False
+
+        if upload is True:
+            if ephemeral is True:
+                # ephemeral is reserved for the case where we don't specify upload
+                # and we are in a notebook in a remote environment such as
+                # colab or jupyterhub
+                raise ValueError(
+                    "ephemeral cannot be set to True if upload is set to True"
+                )
+            else:
+                ephemeral = (
+                    False  # if we excplicitly set upload=True, force ephemeral=False
+                )
 
         # determine inline
         if inline is None:
@@ -85,9 +92,13 @@ class FigpackView:
             open_in_browser = os.environ.get("FIGPACK_OPEN_IN_BROWSER") == "1"
 
         # determine ephemeral
-        if ephemeral is None:
+        if ephemeral is None and not upload:
             ephemeral = False  # default to False
-            if _is_in_notebook():
+            if os.environ.get("FIGPACK_REMOTE_ENV") == "1":
+                ephemeral = True
+            elif os.environ.get("FIGPACK_REMOTE_ENV") == "0":
+                ephemeral = False
+            elif _is_in_notebook():
                 if _is_in_colab():
                     # if we are in a notebook and in colab, we should show as uploaded ephemeral
                     print("Detected Google Colab notebook environment.")