figpack 0.3.0__tar.gz → 0.3.2__tar.gz

{figpack-0.3.0/figpack.egg-info → figpack-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: figpack
-Version: 0.3.0
+Version: 0.3.2
 Summary: A Python package for creating shareable, interactive visualizations in the browser
 Author-email: Jeremy Magland <jmagland@flatironinstitute.org>
 License: Apache-2.0
@@ -133,7 +133,7 @@ If you use figpack in your research, please cite it:
 
 Or in APA format:
 
-> Magland, J. (2025). figpack (Version 0.3.0) [Computer software]. Zenodo. https://doi.org/10.5281/zenodo.17419621
+> Magland, J. (2025). figpack (Version 0.3.2) [Computer software]. Zenodo. https://doi.org/10.5281/zenodo.17419621
 
 ## Contributing
 

{figpack-0.3.0 → figpack-0.3.2}/README.md

@@ -57,7 +57,7 @@ If you use figpack in your research, please cite it:
 
 Or in APA format:
 
-> Magland, J. (2025). figpack (Version 0.3.0) [Computer software]. Zenodo. https://doi.org/10.5281/zenodo.17419621
+> Magland, J. (2025). figpack (Version 0.3.2) [Computer software]. Zenodo. https://doi.org/10.5281/zenodo.17419621
 
 ## Contributing
 

{figpack-0.3.0 → figpack-0.3.2}/figpack/__init__.py

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

{figpack-0.3.0 → figpack-0.3.2}/figpack/cli.py

@@ -16,9 +16,8 @@ from urllib.parse import urljoin
 import requests
 
 from . import __version__
-from .core._server_manager import CORSRequestHandler
-from .core._view_figure import serve_files, view_figure
-from .core._upload_bundle import _upload_bundle, get_figure_by_source_url
+from .core._view_figure import view_figure
+from .core._upload_bundle import _upload_bundle
 from .extensions import ExtensionManager
 
 MAX_WORKERS_FOR_DOWNLOAD = 16
@@ -250,130 +249,6 @@ def handle_extensions_command(args):
         print("Use 'figpack extensions <command> --help' for more information.")
 
 
-def handle_upload_from_source_url(args) -> None:
-    """
-    Handle the upload-from-source-url command
-
-    Downloads a tar.gz/tgz file from a URL, extracts it, and uploads it as a new figure
-    with the source URL set.
-    """
-    import os
-
-    source_url = args.source_url
-    title = args.title if hasattr(args, "title") else None
-
-    # Get API key from environment variable
-    api_key = os.environ.get("FIGPACK_API_KEY")
-    if not api_key:
-        print(
-            "Error: FIGPACK_API_KEY environment variable must be set to upload figures."
-        )
-        sys.exit(1)
-
-    # Validate URL format
-    if not (source_url.endswith(".tar.gz") or source_url.endswith(".tgz")):
-        print(f"Error: Source URL must point to a .tar.gz or .tgz file: {source_url}")
-        sys.exit(1)
-
-    print(f"Downloading archive from: {source_url}")
-
-    try:
-        # Download the archive
-        response = requests.get(source_url, timeout=120, stream=True)
-        response.raise_for_status()
-
-        # Create temporary file for the archive
-        with tempfile.NamedTemporaryFile(
-            suffix=".tar.gz", delete=False
-        ) as temp_archive:
-            archive_path = temp_archive.name
-
-            # Download with progress indication
-            total_size = int(response.headers.get("content-length", 0))
-            downloaded_size = 0
-
-            for chunk in response.iter_content(chunk_size=8192):
-                if chunk:
-                    temp_archive.write(chunk)
-                    downloaded_size += len(chunk)
-                    if total_size > 0:
-                        progress = (downloaded_size / total_size) * 100
-                        print(
-                            f"Downloaded: {downloaded_size / (1024*1024):.2f} MB ({progress:.1f}%)",
-                            end="\r",
-                        )
-
-            if total_size > 0:
-                print()  # New line after progress
-            print(f"Download complete: {downloaded_size / (1024*1024):.2f} MB")
-
-        # Extract archive to temporary directory
-        print("Extracting archive...")
-        with tempfile.TemporaryDirectory() as extract_dir:
-            extract_path = pathlib.Path(extract_dir)
-
-            try:
-                with tarfile.open(archive_path, "r:gz") as tar:
-                    tar.extractall(path=extract_path)
-                print(f"Extracted to temporary directory")
-            except Exception as e:
-                print(f"Error: Failed to extract archive: {e}")
-                sys.exit(1)
-            finally:
-                # Clean up downloaded archive
-                import os
-
-                try:
-                    os.unlink(archive_path)
-                except Exception:
-                    pass
-
-            # Upload the extracted files
-            print(f"Uploading figure with source URL: {source_url}")
-            try:
-                figure_url = _upload_bundle(
-                    str(extract_path),
-                    api_key=api_key,
-                    title=title,
-                    source_url=source_url,
-                )
-                print(f"\nFigure uploaded successfully!")
-                print(f"Figure URL: {figure_url}")
-            except Exception as e:
-                print(f"Error: Failed to upload figure: {e}")
-                sys.exit(1)
-
-    except requests.exceptions.RequestException as e:
-        print(f"Error: Failed to download archive from {source_url}: {e}")
-        sys.exit(1)
-    except Exception as e:
-        print(f"Error: {e}")
-        sys.exit(1)
-
-
-def handle_find_by_source_url(args) -> None:
-    """
-    Handle the find-by-source-url command
-
-    Queries the API for a figure URL by its source URL.
-    """
-    source_url = args.source_url
-
-    print(f"Querying for figure with source URL: {source_url}")
-
-    try:
-        figure_url = get_figure_by_source_url(source_url)
-
-        if figure_url:
-            print(f"Figure found: {figure_url}")
-        else:
-            print(f"No figure found with source URL: {source_url}")
-            sys.exit(1)
-    except Exception as e:
-        print(f"Error: {e}")
-        sys.exit(1)
-
-
 def download_and_view_archive(url: str, port: int = None) -> None:
     """
     Download a tar.gz/tgz archive from a URL and view it
@@ -495,27 +370,6 @@ def main():
         "extensions", nargs="+", help="Extension package names to uninstall"
     )
 
-    # Upload from URL command
-    upload_from_source_url_parser = subparsers.add_parser(
-        "upload-from-source-url",
-        help="Download a tar.gz/tgz file and upload it as a new figure",
-    )
-    upload_from_source_url_parser.add_argument(
-        "source_url",
-        help="URL to the tar.gz or tgz file (will be set as the figure's source URL)",
-    )
-    upload_from_source_url_parser.add_argument(
-        "--title", help="Optional title for the figure"
-    )
-
-    # Find by source URL command
-    find_by_source_url_parser = subparsers.add_parser(
-        "find-by-source-url", help="Get the figure URL for a given source URL"
-    )
-    find_by_source_url_parser.add_argument(
-        "source_url", help="The source URL to search for"
-    )
-
     args = parser.parse_args()
 
     if args.command == "download":
@@ -528,10 +382,6 @@ def main():
             view_figure(args.archive, port=args.port)
     elif args.command == "extensions":
         handle_extensions_command(args)
-    elif args.command == "upload-from-source-url":
-        handle_upload_from_source_url(args)
-    elif args.command == "find-by-source-url":
-        handle_find_by_source_url(args)
     else:
         parser.print_help()
 

{figpack-0.3.0 → figpack-0.3.2}/figpack/core/_upload_bundle.py

@@ -36,10 +36,16 @@ def _get_batch_signed_urls(figure_url: str, files_batch: list, api_key: str) ->
     payload = {
         "figureUrl": figure_url,
         "files": files_data,
-        "apiKey": api_key,
     }
 
-    response = requests.post(f"{FIGPACK_API_BASE_URL}/upload", json=payload)
+    headers = {
+        "Content-Type": "application/json",
+        "x-api-key": api_key if api_key else "",
+    }
+
+    response = requests.post(
+        f"{FIGPACK_API_BASE_URL}/upload", json=payload, headers=headers
+    )
 
     if not response.ok:
         try:
@@ -128,7 +134,6 @@ def _create_or_get_figure(
     total_size: Optional[int] = None,
     title: Optional[str] = None,
     ephemeral: bool = False,
-    source_url: Optional[str] = None,
 ) -> dict:
     """
     Create a new figure or get existing figure information
@@ -139,7 +144,6 @@ def _create_or_get_figure(
         total_size: Optional total size of files
         title: Optional title for the figure
         ephemeral: Whether to create an ephemeral figure
-        source_url: Optional source URL for the figure (must be unique)
 
     Returns:
         dict: Figure information from the API
@@ -154,8 +158,8 @@ def _create_or_get_figure(
     }
 
     # API key is optional for ephemeral figures
-    if api_key is not None:
-        payload["apiKey"] = api_key
+    # if api_key is not None:
+    #     payload["apiKey"] = api_key
 
     if total_files is not None:
         payload["totalFiles"] = total_files
@@ -165,12 +169,14 @@ def _create_or_get_figure(
         payload["title"] = title
     if ephemeral:
         payload["ephemeral"] = True
-    if source_url is not None:
-        payload["sourceUrl"] = source_url
 
     # Use the same endpoint for both regular and ephemeral figures
     url = f"{FIGPACK_API_BASE_URL}/figures/create"
-    response = requests.post(url, json=payload)
+    headers = {
+        "Content-Type": "application/json",
+        "x-api-key": api_key if api_key else "",
+    }
+    response = requests.post(url, json=payload, headers=headers)
 
     if not response.ok:
         try:
@@ -198,10 +204,16 @@ def _finalize_figure(figure_url: str, api_key: str) -> dict:
     """
     payload = {
         "figureUrl": figure_url,
-        "apiKey": api_key,
     }
 
-    response = requests.post(f"{FIGPACK_API_BASE_URL}/figures/finalize", json=payload)
+    headers = {
+        "Content-Type": "application/json",
+        "x-api-key": api_key if api_key else "",
+    }
+
+    response = requests.post(
+        f"{FIGPACK_API_BASE_URL}/figures/finalize", json=payload, headers=headers
+    )
 
     if not response.ok:
         try:
@@ -226,7 +238,6 @@ def _upload_bundle(
     title: Optional[str] = None,
     ephemeral: bool = False,
     use_consolidated_metadata_only: bool = False,
-    source_url: Optional[str] = None,
 ) -> str:
     """
     Upload the prepared bundle to the cloud using the new database-driven approach
@@ -238,7 +249,6 @@ def _upload_bundle(
         ephemeral: Whether to create an ephemeral figure
         use_consolidated_metadata_only: If True, excludes individual zarr metadata files
             (.zgroup, .zarray, .zattrs) since they are included in .zmetadata
-        source_url: Optional source URL for the figure (must be unique)
     """
     tmpdir_path = pathlib.Path(tmpdir)
 
@@ -267,7 +277,6 @@ def _upload_bundle(
         total_size,
         title=title,
         ephemeral=ephemeral,
-        source_url=source_url,
     )
     figure_info = result.get("figure", {})
     figure_url = figure_info.get("figureUrl")
@@ -402,39 +411,6 @@ def _upload_bundle(
     return figure_url
 
 
-def get_figure_by_source_url(source_url: str) -> Optional[str]:
-    """
-    Query the API for a figure URL by its source URL
-
-    Args:
-        source_url: The source URL to search for
-
-    Returns:
-        Optional[str]: The figure URL if found, None otherwise
-    """
-    payload = {"sourceUrl": source_url}
-
-    response = requests.post(
-        f"{FIGPACK_API_BASE_URL}/figures/find-by-source-url", json=payload
-    )
-
-    if not response.ok:
-        if response.status_code == 404:
-            return None
-        try:
-            error_data = response.json()
-            error_msg = error_data.get("message", "Unknown error")
-        except:
-            error_msg = f"HTTP {response.status_code}"
-        raise Exception(f"Failed to query figure by source URL: {error_msg}")
-
-    response_data = response.json()
-    if not response_data.get("success"):
-        return None
-
-    return response_data.get("figureUrl")
-
-
 def _determine_content_type(file_path: str) -> str:
     """
     Determine content type for upload based on file extension

figpack-0.3.2/figpack-serve/worker/container/app.py

@@ -0,0 +1,249 @@
+import os
+import json
+import tempfile
+import tarfile
+import shutil
+from pathlib import Path
+from http.server import BaseHTTPRequestHandler, HTTPServer
+import sys
+from io import StringIO
+import boto3
+import requests
+
+PORT = int(os.environ.get("PORT", "8080"))
+
+bucket_name = os.environ.get("R2_BUCKET_NAME")
+if not bucket_name:
+    raise ValueError("R2_BUCKET_NAME environment variable is not set")
+
+
+def get_r2_client():
+    """Create and return an S3 client configured for Cloudflare R2."""
+    print("Creating R2 client...")
+    account_id = os.environ.get("R2_ACCOUNT_ID")
+    access_key_id = os.environ.get("R2_ACCESS_KEY_ID")
+    secret_access_key = os.environ.get("R2_SECRET_ACCESS_KEY")
+
+    if not all([account_id, access_key_id, secret_access_key]):
+        raise ValueError("Missing R2 credentials in environment variables")
+
+    endpoint_url = f"https://{account_id}.r2.cloudflarestorage.com"
+    print(f"R2 endpoint URL: {endpoint_url}")
+
+    s3_client = boto3.client(
+        "s3",
+        endpoint_url=endpoint_url,
+        aws_access_key_id=access_key_id,
+        aws_secret_access_key=secret_access_key,
+        region_name="auto",
+    )
+
+    print("R2 client created successfully")
+    return s3_client
+
+
+def upload_directory_to_r2(s3_client, bucket_name, local_dir, bucket_prefix):
+    """
+    Upload all files from local_dir to R2 bucket with the given prefix.
+    Returns the number of files uploaded.
+    """
+    print(
+        f"Starting upload from {local_dir} to bucket {bucket_name} with prefix {bucket_prefix}"
+    )
+    uploaded_count = 0
+    local_path = Path(local_dir)
+
+    for file_path in local_path.rglob("*"):
+        if file_path.is_file():
+            # Get relative path from local_dir
+            relative_path = file_path.relative_to(local_path)
+            # Create S3 key with bucket_prefix
+            s3_key = f"{bucket_prefix}/{relative_path}"
+
+            # Determine content type
+            content_type = "application/octet-stream"
+            suffix = file_path.suffix.lower()
+            if suffix == ".html":
+                content_type = "text/html"
+            elif suffix == ".css":
+                content_type = "text/css"
+            elif suffix == ".js":
+                content_type = "application/javascript"
+            elif suffix == ".json":
+                content_type = "application/json"
+            elif suffix == ".png":
+                content_type = "image/png"
+            elif suffix == ".jpg" or suffix == ".jpeg":
+                content_type = "image/jpeg"
+            elif suffix == ".svg":
+                content_type = "image/svg+xml"
+            elif suffix == ".txt":
+                content_type = "text/plain"
+
+            # Upload file
+            print(f"Uploading file: {s3_key} (Content-Type: {content_type})")
+            with open(file_path, "rb") as f:
+                s3_client.put_object(
+                    Bucket=bucket_name, Key=s3_key, Body=f, ContentType=content_type
+                )
+
+            uploaded_count += 1
+
+    print(f"Upload complete. Total files uploaded: {uploaded_count}")
+    return uploaded_count
+
+
+class Handler(BaseHTTPRequestHandler):
+    def _send(self, code: int, payload: dict):
+        data = json.dumps(payload).encode("utf-8")
+        self.send_response(code)
+        self.send_header("Content-Type", "application/json")
+        self.send_header("Content-Length", str(len(data)))
+        self.end_headers()
+        self.wfile.write(data)
+
+    def do_POST(self):
+        print(f"Received POST request to {self.path}")
+        if self.path != "/run":
+            print(f"Invalid path: {self.path}")
+            self._send(404, {"error": "not found"})
+            return
+
+        print("Parsing request body...")
+        try:
+            length = int(self.headers.get("Content-Length", "0"))
+            raw = self.rfile.read(length)
+            body = json.loads(raw or "{}")
+        except Exception as e:
+            print(f"Error parsing JSON: {e}")
+            self._send(400, {"error": f"invalid json: {e}"})
+            return
+
+        source_url = (body.get("source_url") or "").strip()
+        print(f"Received source_url: {source_url}")
+
+        if not source_url:
+            print("Error: source_url is missing")
+            self._send(400, {"error": "missing source_url"})
+            return
+
+        try:
+            assert source_url.endswith(".tgz") or source_url.endswith(
+                ".tar.gz"
+            ), "source_url must point to a .tgz or .tar.gz file"
+        except AssertionError as e:
+            print(f"Error: Invalid source_url format - {e}")
+            self._send(400, {"error": str(e)})
+            return
+
+        # Extract bucket key from source_url
+        # e.g., https://sandbox.zenodo.org/records/391408/files/hello_figpack.tgz
+        # becomes sandbox.zenodo.org/records/391408/files/hello_figpack.tgz
+        bucket_key = source_url.split("://")[1]
+        print(f"Bucket key: {bucket_key}")
+
+        temp_dir = None
+
+        # Capture stdout
+        stdout_capture = StringIO()
+        old_stdout = sys.stdout
+        sys.stdout = stdout_capture
+
+        try:
+            # Create temporary directory for download and extraction
+            temp_dir = tempfile.mkdtemp()
+            print(f"Created temporary directory: {temp_dir}")
+            download_path = os.path.join(temp_dir, "archive.tar.gz")
+            extract_dir = os.path.join(temp_dir, "extracted")
+
+            # Download the archive
+            print(f"Downloading archive from {source_url}...")
+            response = requests.get(source_url, stream=True, timeout=300)
+            response.raise_for_status()
+            print(f"Download response status: {response.status_code}")
+
+            bytes_downloaded = 0
+            with open(download_path, "wb") as f:
+                for chunk in response.iter_content(chunk_size=8192):
+                    f.write(chunk)
+                    bytes_downloaded += len(chunk)
+            print(f"Download complete. Total bytes: {bytes_downloaded}")
+
+            # Extract the archive
+            print(f"Extracting archive to {extract_dir}...")
+            os.makedirs(extract_dir, exist_ok=True)
+            with tarfile.open(download_path, "r:*") as tar:
+                tar.extractall(path=extract_dir)
+            print("Extraction complete")
+
+            # Get R2 client and upload files
+            s3_client = get_r2_client()
+
+            uploaded_count = upload_directory_to_r2(
+                s3_client, bucket_name, extract_dir, bucket_key
+            )
+
+            # Construct the URL to the uploaded index.html
+            url = f"https://serve-bucket.figpack.org/{bucket_key}/index.html"
+            print(f"Successfully processed request. URL: {url}")
+
+            # Restore stdout and get captured output
+            sys.stdout = old_stdout
+            stdout = stdout_capture.getvalue()
+
+            self._send(
+                200,
+                {
+                    "ok": True,
+                    "url": url,
+                    "files_uploaded": uploaded_count,
+                    "stdout": stdout,
+                },
+            )
+
+        except requests.exceptions.RequestException as e:
+            # Restore stdout on error
+            sys.stdout = old_stdout
+            stdout = stdout_capture.getvalue()
+            print(f"ERROR: Failed to download source_url: {e}")
+            self._send(
+                500, {"error": f"failed to download source_url: {e}", "stdout": stdout}
+            )
+            return
+        except tarfile.TarError as e:
+            # Restore stdout on error
+            sys.stdout = old_stdout
+            stdout = stdout_capture.getvalue()
+            print(f"ERROR: Failed to extract archive: {e}")
+            self._send(
+                500, {"error": f"failed to extract archive: {e}", "stdout": stdout}
+            )
+            return
+        except Exception as e:
+            # Restore stdout on error
+            sys.stdout = old_stdout
+            stdout = stdout_capture.getvalue()
+            print(f"ERROR: Failed to process source_url: {e}")
+            self._send(
+                500, {"error": f"failed to process source_url: {e}", "stdout": stdout}
+            )
+            return
+        finally:
+            # Ensure stdout is always restored
+            sys.stdout = old_stdout
+            # Clean up temporary directory
+            if temp_dir and os.path.exists(temp_dir):
+                print(f"Cleaning up temporary directory: {temp_dir}")
+                shutil.rmtree(temp_dir, ignore_errors=True)
+
+
+def main():
+    print(f"Starting HTTP server on 0.0.0.0:{PORT}")
+    print(f"Using R2 bucket: {bucket_name}")
+    server = HTTPServer(("0.0.0.0", PORT), Handler)
+    print("Server ready, waiting for requests...")
+    server.serve_forever()
+
+
+if __name__ == "__main__":
+    main()

{figpack-0.3.0 → figpack-0.3.2/figpack.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: figpack
-Version: 0.3.0
+Version: 0.3.2
 Summary: A Python package for creating shareable, interactive visualizations in the browser
 Author-email: Jeremy Magland <jmagland@flatironinstitute.org>
 License: Apache-2.0
@@ -133,7 +133,7 @@ If you use figpack in your research, please cite it:
 
 Or in APA format:
 
-> Magland, J. (2025). figpack (Version 0.3.0) [Computer software]. Zenodo. https://doi.org/10.5281/zenodo.17419621
+> Magland, J. (2025). figpack (Version 0.3.2) [Computer software]. Zenodo. https://doi.org/10.5281/zenodo.17419621
 
 ## Contributing
 

{figpack-0.3.0 → figpack-0.3.2}/figpack.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ pyproject.toml
 figpack/__init__.py
 figpack/cli.py
 figpack/extensions.py
+figpack-serve/worker/container/app.py
 figpack.egg-info/PKG-INFO
 figpack.egg-info/SOURCES.txt
 figpack.egg-info/dependency_links.txt

{figpack-0.3.0 → figpack-0.3.2}/figpack.egg-info/top_level.txt

@@ -1,2 +1,3 @@
 figpack
 figpack-documents
+figpack-serve

{figpack-0.3.0 → figpack-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "figpack"
-version = "0.3.0"
+version = "0.3.2"
 description = "A Python package for creating shareable, interactive visualizations in the browser"
 readme = "README.md"
 requires-python = ">=3.8"

{figpack-0.3.0 → figpack-0.3.2}/tests/test_upload_bundle.py

@@ -49,7 +49,6 @@ def test_get_batch_signed_urls(tmp_path):
         called_payload = mock_post.call_args[1]["json"]
         assert "upload" in called_url
         assert called_payload["figureUrl"] == figure_url
-        assert called_payload["apiKey"] == api_key
         assert len(called_payload["files"]) == 2
 
 
@@ -138,7 +137,6 @@ def test_create_or_get_figure():
         assert result["figure"]["status"] == "pending"
 
         mock_post.assert_called_once()
-        assert mock_post.call_args[1]["json"]["apiKey"] == api_key
 
 
 def test_create_or_get_figure_error():
@@ -170,7 +168,6 @@ def test_finalize_figure():
 
         mock_post.assert_called_once()
         assert mock_post.call_args[1]["json"]["figureUrl"] == figure_url
-        assert mock_post.call_args[1]["json"]["apiKey"] == api_key
 
 
 def test_determine_content_type():