figpack 0.2.2__tar.gz → 0.2.4__tar.gz

{figpack-0.2.2/figpack.egg-info → figpack-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: figpack
-Version: 0.2.2
+Version: 0.2.4
 Summary: A Python package for creating shareable, interactive visualizations in the browser
 Author-email: Jeremy Magland <jmagland@flatironinstitute.org>
 License: Apache-2.0

{figpack-0.2.2 → figpack-0.2.4}/figpack/__init__.py

@@ -2,4 +2,4 @@
 figpack - A Python package for creating shareable, interactive visualizations in the browser
 """
 
-__version__ = "0.2.2"
+__version__ = "0.2.4"

{figpack-0.2.2 → figpack-0.2.4}/figpack/core/_server_manager.py

@@ -138,11 +138,17 @@ class ProcessServerManager:
             self._create_process_info_file()
         return self._temp_dir
 
-    def create_figure_subdir(self) -> pathlib.Path:
+    def create_figure_subdir(
+        self, *, _local_figure_name: Optional[str] = None
+    ) -> pathlib.Path:
         """Create a unique subdirectory for a figure within the process temp dir."""
         temp_dir = self.get_temp_dir()
-        figure_id = str(uuid.uuid4())[:8]  # Short unique ID
-        figure_dir = temp_dir / f"figure_{figure_id}"
+        local_figure_name = (
+            "figure_" + str(uuid.uuid4())[:8]
+            if _local_figure_name is None
+            else _local_figure_name
+        )
+        figure_dir = temp_dir / f"{local_figure_name}"
         figure_dir.mkdir(exist_ok=True)
         return figure_dir
 

{figpack-0.2.2 → figpack-0.2.4}/figpack/core/_show_view.py

@@ -38,6 +38,19 @@ def _is_in_notebook() -> bool:
         return False
 
 
+def _is_in_colab():
+    try:
+        import google.colab  # type: ignore
+
+        return True
+    except ImportError:
+        return False
+
+
+def _is_in_jupyterhub():
+    return "JUPYTERHUB_USER" in os.environ
+
+
 def _display_inline_iframe(url: str, height: int) -> None:
     """
     Display an iframe inline in a Jupyter notebook.
@@ -75,10 +88,12 @@ def _show_view(
     port: Union[int, None] = None,
     allow_origin: Union[str, None] = None,
     upload: bool = False,
+    ephemeral: bool = False,
     title: Union[str, None] = None,
     description: Union[str, None] = None,
     inline: Union[bool, None] = None,
     inline_height: int = 600,
+    _local_figure_name: Union[str, None] = None,
 ):
     # Determine if we should use inline display
     use_inline = inline
@@ -91,16 +106,17 @@ def _show_view(
         with tempfile.TemporaryDirectory(prefix="figpack_upload_") as tmpdir:
             prepare_figure_bundle(view, tmpdir, title=title, description=description)
 
-            # Check for required environment variable
+            # Check for API key - required for regular uploads, optional for ephemeral
             api_key = os.environ.get("FIGPACK_API_KEY")
-            if not api_key:
+            if not ephemeral and not api_key:
                 raise EnvironmentError(
                     "FIGPACK_API_KEY environment variable must be set to upload views."
                 )
 
             # Upload the bundle
-            print("Starting upload...")
-            figure_url = _upload_bundle(tmpdir, api_key, title=title)
+            figure_url = _upload_bundle(
+                tmpdir, api_key, title=title, ephemeral=ephemeral
+            )
 
             if use_inline:
                 # For uploaded figures, display the remote URL inline and continue
@@ -121,7 +137,9 @@ def _show_view(
         server_manager = ProcessServerManager.get_instance()
 
         # Create figure subdirectory in process temp directory
-        figure_dir = server_manager.create_figure_subdir()
+        figure_dir = server_manager.create_figure_subdir(
+            _local_figure_name=_local_figure_name
+        )
 
         # Prepare the figure bundle in the subdirectory
         prepare_figure_bundle(

{figpack-0.2.2 → figpack-0.2.4}/figpack/core/_upload_bundle.py

@@ -11,7 +11,7 @@ import requests
 
 from .. import __version__
 
-from .config import FIGPACK_API_BASE_URL
+from .config import FIGPACK_API_BASE_URL, FIGPACK_BUCKET
 
 thisdir = pathlib.Path(__file__).parent.resolve()
 
@@ -133,33 +133,46 @@ def _create_or_get_figure(
     total_files: int = None,
     total_size: int = None,
     title: str = None,
+    ephemeral: bool = False,
 ) -> dict:
     """
     Create a new figure or get existing figure information
 
     Args:
         figure_hash: The hash of the figure
-        api_key: The API key for authentication
+        api_key: The API key for authentication (required for non-ephemeral)
         total_files: Optional total number of files
         total_size: Optional total size of files
         title: Optional title for the figure
+        ephemeral: Whether to create an ephemeral figure
 
     Returns:
         dict: Figure information from the API
     """
+    # Validate API key requirement
+    if not ephemeral and api_key is None:
+        raise ValueError("API key is required for non-ephemeral figures")
+
     payload = {
         "figureHash": figure_hash,
-        "apiKey": api_key,
         "figpackVersion": __version__,
+        "bucket": FIGPACK_BUCKET,
     }
 
+    # API key is optional for ephemeral figures
+    if api_key is not None:
+        payload["apiKey"] = api_key
+
     if total_files is not None:
         payload["totalFiles"] = total_files
     if total_size is not None:
         payload["totalSize"] = total_size
     if title is not None:
         payload["title"] = title
+    if ephemeral:
+        payload["ephemeral"] = True
 
+    # Use the same endpoint for both regular and ephemeral figures
     response = requests.post(f"{FIGPACK_API_BASE_URL}/api/figures/create", json=payload)
 
     if not response.ok:
@@ -212,16 +225,16 @@ def _finalize_figure(figure_url: str, api_key: str) -> dict:
     return response_data
 
 
-def _upload_bundle(tmpdir: str, api_key: str, title: str = None) -> str:
+def _upload_bundle(
+    tmpdir: str, api_key: str, title: str = None, ephemeral: bool = False
+) -> str:
     """
     Upload the prepared bundle to the cloud using the new database-driven approach
     """
     tmpdir_path = pathlib.Path(tmpdir)
 
     # Compute deterministic figure ID based on file contents
-    print("Computing deterministic figure ID...")
     figure_hash = _compute_deterministic_figure_hash(tmpdir_path)
-    print(f"Figure hash: {figure_hash}")
 
     # Collect all files to upload
     all_files = []
@@ -239,17 +252,15 @@ def _upload_bundle(tmpdir: str, api_key: str, title: str = None) -> str:
 
     # Find available figure ID and create/get figure in database with metadata
     result = _create_or_get_figure(
-        figure_hash, api_key, total_files, total_size, title=title
+        figure_hash, api_key, total_files, total_size, title=title, ephemeral=ephemeral
     )
     figure_info = result.get("figure", {})
     figure_url = figure_info.get("figureUrl")
 
     if figure_info["status"] == "completed":
-        print(f"Figure already exists at: {figure_url}")
+        print(f"Figure already exists. No upload needed.")
         return figure_url
 
-    print(f"Using figure URL: {figure_url}")
-
     files_to_upload = all_files
     total_files_to_upload = len(files_to_upload)
 

{figpack-0.2.2 → figpack-0.2.4}/figpack/core/config.py

@@ -3,3 +3,5 @@ import os
 FIGPACK_API_BASE_URL = os.getenv(
     "FIGPACK_API_BASE_URL", "https://figpack-api.vercel.app"
 )
+
+FIGPACK_BUCKET = os.getenv("FIGPACK_BUCKET", "figpack-figures")

{figpack-0.2.2 → figpack-0.2.4}/figpack/core/figpack_view.py

@@ -18,7 +18,8 @@ class FigpackView:
         port: Union[int, None] = None,
         open_in_browser: bool = False,
         allow_origin: Union[str, None] = None,
-        upload: bool = False,
+        upload: Union[bool, None] = None,
+        ephemeral: Union[bool, None] = None,
         _dev: bool = False,
         title: Union[str, None] = None,
         description: Union[str, None] = None,
@@ -33,13 +34,37 @@ class FigpackView:
             open_in_browser: Whether to open in browser automatically
             allow_origin: CORS allow origin header
             upload: Whether to upload the figure
+            ephemeral: Whether to upload as ephemeral figure (None=auto-detect, True=force ephemeral, False=force regular)
             _dev: Development mode flag
             title: Title for the browser tab and figure
             description: Description text (markdown supported) for the figure
             inline: Whether to display inline in notebook (None=auto-detect, True=force inline, False=force browser)
             inline_height: Height in pixels for inline iframe display (default: 600)
         """
-        from ._show_view import _show_view
+        from ._show_view import (
+            _show_view,
+            _is_in_notebook,
+            _is_in_colab,
+            _is_in_jupyterhub,
+        )
+
+        if ephemeral is None and upload is None:
+            # If we haven't specified both, then let's check if we're in a notebook in a non-local environment
+            if _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.")
+                    upload = True
+                    ephemeral = True
+                if _is_in_jupyterhub():
+                    # if we are in a notebook and in jupyterhub, we should show as uploaded ephemeral
+                    print("Detected JupyterHub notebook environment.")
+                    upload = True
+                    ephemeral = True
+
+        # Validate ephemeral parameter
+        if ephemeral and not upload:
+            raise ValueError("ephemeral=True requires upload=True to be set")
 
         if _dev:
             if port is None:
@@ -50,8 +75,15 @@ class FigpackView:
             if upload:
                 raise ValueError("Cannot upload when _dev is True.")
 
+            # make a random figure name
+            import random
+            import string
+
+            _local_figure_name = "fig_" + "".join(
+                random.choices(string.ascii_lowercase + string.digits, k=8)
+            )
             print(
-                f"For development, run figpack-gui in dev mode and use http://localhost:5173?data=http://localhost:{port}/data.zarr"
+                f"For development, run figpack-gui in dev mode and use http://localhost:5173?data=http://localhost:{port}/{_local_figure_name}/data.zarr"
             )
             open_in_browser = False
 
@@ -61,10 +93,12 @@ class FigpackView:
             open_in_browser=open_in_browser,
             allow_origin=allow_origin,
             upload=upload,
+            ephemeral=ephemeral,
             title=title,
             description=description,
             inline=inline,
             inline_height=inline_height,
+            _local_figure_name=_local_figure_name if _dev else None,
         )
 
     def _write_to_zarr_group(self, group: zarr.Group) -> None: