arrayview 0.43.0__tar.gz → 0.43.1__tar.gz

{arrayview-0.43.0 → arrayview-0.43.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: arrayview
-Version: 0.43.0
+Version: 0.43.1
 Summary: Fast multi-dimensional array viewer
 Project-URL: Home, https://github.com/oscarvanderheide/arrayview
 Project-URL: Source, https://github.com/oscarvanderheide/arrayview

{arrayview-0.43.0 → arrayview-0.43.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "arrayview"
-version = "0.43.0"
+version = "0.43.1"
 description = "Fast multi-dimensional array viewer"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.12"

{arrayview-0.43.0 → arrayview-0.43.1}/src/arrayview/_diagnostics.py

@@ -96,7 +96,8 @@ _DIAGNOSES: list[tuple[str, str, str, str]] = [
     (r"did not start the viewer script", ACTION,
      "VS Code opened an integrated-browser tab, but the tab did not navigate "
      "to the ArrayView page.",
-     _RETRY + "  If it repeats, reload the VS Code window."),
+     _RELOAD + "  Retrying without reloading sends the next launch to the "
+     "same stuck browser."),
     (r"did not render a frame|did not become ready",
      ACTION,
      "The viewer opened but showed no frame before the deadline — usually a "

{arrayview-0.43.0 → arrayview-0.43.1}/src/arrayview/_routes_loading.py

@@ -137,32 +137,33 @@ def register_loading_routes(app, *, notify_shells, setup_rgb) -> None:
         staging_dir = validated_staging_directory(abs_path, claimed_staging)
         if claimed_staging and staging_dir is None:
             raise HTTPException(status_code=400, detail="invalid source staging directory")
-        unsafe_mount = direct_network_mount(abs_path)
-        if unsafe_mount is not None:
-            return {
-                "error": (
-                    f"Direct server access to network mount {unsafe_mount.mountpoint!r} "
-                    "is refused. Launch the file through the arrayview CLI so it can "
-                    "be staged safely."
-                )
-            }
-        nested_source_mount = network_mount_below(abs_path)
-        if nested_source_mount is not None:
-            return {
-                "error": (
-                    f"Source discovery would enter network mount "
-                    f"{nested_source_mount.mountpoint!r}; copy the collection locally first."
-                )
-            }
-        if source_may_require_sibling_discovery(abs_path):
-            nested_sibling_mount = network_mount_below(os.path.dirname(abs_path))
-            if nested_sibling_mount is not None:
+        if os.environ.get("ARRAYVIEW_SKIP_SOURCE_STAGING", "1") == "0":
+            unsafe_mount = direct_network_mount(abs_path)
+            if unsafe_mount is not None:
                 return {
                     "error": (
-                        f"Related-file discovery would enter network mount "
-                        f"{nested_sibling_mount.mountpoint!r}; copy the series locally first."
+                        f"Direct server access to network mount {unsafe_mount.mountpoint!r} "
+                        "is refused. Launch the file through the arrayview CLI so it can "
+                        "be staged safely."
                     )
                 }
+            nested_source_mount = network_mount_below(abs_path)
+            if nested_source_mount is not None:
+                return {
+                    "error": (
+                        f"Source discovery would enter network mount "
+                        f"{nested_source_mount.mountpoint!r}; copy the collection locally first."
+                    )
+                }
+            if source_may_require_sibling_discovery(abs_path):
+                nested_sibling_mount = network_mount_below(os.path.dirname(abs_path))
+                if nested_sibling_mount is not None:
+                    return {
+                        "error": (
+                            f"Related-file discovery would enter network mount "
+                            f"{nested_sibling_mount.mountpoint!r}; copy the series locally first."
+                        )
+                    }
         for pattern in dir_patterns or []:
             pattern_path = lexical_abspath(str(pattern))
             scan_root = scan_root_before_magic(pattern_path)

{arrayview-0.43.0 → arrayview-0.43.1}/src/arrayview/_routes_rendering.py

@@ -23,7 +23,7 @@ from arrayview._render import (
     render_rgb_rgba,
     render_rgba,
 )
-from arrayview._session import HEAVY_OP_LIMIT_BYTES, SESSIONS
+from arrayview._session import HEAVY_OP_LIMIT_BYTES, SESSIONS, _schedule_prefetch
 from arrayview._synthetic_mri import (
     _qmri_adjust_vmin_vmax,
     qmri_display_slice,
@@ -276,6 +276,21 @@ def register_rendering_routes(app, *, get_session_or_404) -> None:
                     mosaic_cols,
                 )
         render_ms = (time.perf_counter() - render_t0) * 1000.0
+        # This endpoint is what compare mode polls per scroll step (the live
+        # WS path has its own prefetch call). Without this, a second array
+        # open puts every pane on the request-then-wait path with nothing
+        # warmed ahead, which is a much bigger hit than the extra data alone.
+        # No per-request direction field here (stateless HTTP), so infer it
+        # from the index this session last rendered, mirroring the WS guard.
+        if slice_dim >= 0 and dim_z < 0:
+            prev_idx = getattr(session, "_http_prefetch_prev_idx", None)
+            direction = 1
+            if prev_idx is not None and len(prev_idx) == len(idx_tuple):
+                delta = idx_tuple[slice_dim] - prev_idx[slice_dim]
+                if delta:
+                    direction = 1 if delta > 0 else -1
+            session._http_prefetch_prev_idx = idx_tuple
+            _schedule_prefetch(session, dim_x, dim_y, list(idx_tuple), slice_dim, direction)
         encode_t0 = time.perf_counter()
         img = _pil_image().fromarray(rgba[:, :, :3], mode="RGB")
         buf = io.BytesIO()

{arrayview-0.43.0 → arrayview-0.43.1}/src/arrayview/_routes_vectorfield.py

@@ -79,26 +79,27 @@ def register_vectorfield_routes(app) -> None:
         staging_dir = validated_staging_directory(filepath, claimed_staging)
         if claimed_staging and staging_dir is None:
             raise HTTPException(status_code=400, detail="invalid source staging directory")
-        unsafe_mount = direct_network_mount(filepath)
-        if unsafe_mount is not None:
-            return {
-                "error": (
-                    f"Direct server access to network mount {unsafe_mount.mountpoint!r} "
-                    "is refused; launch through the arrayview CLI."
-                )
-            }
-        nested_mount = network_mount_below(filepath)
-        if source_may_require_sibling_discovery(filepath):
-            nested_mount = nested_mount or network_mount_below(
-                os.path.dirname(filepath)
-            )
-        if nested_mount is not None:
-            return {
-                "error": (
-                    f"Vector-field discovery would enter network mount "
-                    f"{nested_mount.mountpoint!r}; copy it locally first."
+        if os.environ.get("ARRAYVIEW_SKIP_SOURCE_STAGING", "1") == "0":
+            unsafe_mount = direct_network_mount(filepath)
+            if unsafe_mount is not None:
+                return {
+                    "error": (
+                        f"Direct server access to network mount {unsafe_mount.mountpoint!r} "
+                        "is refused; launch through the arrayview CLI."
+                    )
+                }
+            nested_mount = network_mount_below(filepath)
+            if source_may_require_sibling_discovery(filepath):
+                nested_mount = nested_mount or network_mount_below(
+                    os.path.dirname(filepath)
                 )
-            }
+            if nested_mount is not None:
+                return {
+                    "error": (
+                        f"Vector-field discovery would enter network mount "
+                        f"{nested_mount.mountpoint!r}; copy it locally first."
+                    )
+                }
         components_dim = body.get("components_dim")
         session = SESSIONS.get(sid)
         if not session:

{arrayview-0.43.0 → arrayview-0.43.1}/src/arrayview/_session.py

@@ -141,14 +141,22 @@ _OVERLAY_PREFETCH_POOL = None
 _PREFETCH_LOCK = threading.Lock()
 
 
+_PREFETCH_WORKERS: int = max(2, min(4, os.cpu_count() or 2))
+
+
 def _get_prefetch_pool():
     global _PREFETCH_POOL
     with _PREFETCH_LOCK:
         if _PREFETCH_POOL is None or _PREFETCH_POOL._shutdown:
             import concurrent.futures
 
+            # One pool is shared by every open session (see _schedule_prefetch).
+            # A single worker meant a second open array serialized behind the
+            # first array's lookahead, so scrolling any pane lagged. Size like
+            # _RENDER_WORKERS so a handful of concurrently open arrays each get
+            # a lane.
             _PREFETCH_POOL = concurrent.futures.ThreadPoolExecutor(
-                max_workers=1, thread_name_prefix="arrayview-prefetch"
+                max_workers=_PREFETCH_WORKERS, thread_name_prefix="arrayview-prefetch"
             )
         return _PREFETCH_POOL
 
@@ -674,6 +682,7 @@ __all__ = [
     "_render",
     # Prefetch
     "_PREFETCH_POOL",
+    "_PREFETCH_WORKERS",
     "_OVERLAY_PREFETCH_POOL",
     "_PREFETCH_LOCK",
     "_get_prefetch_pool",

{arrayview-0.43.0 → arrayview-0.43.1}/src/arrayview/_source_safety.py

@@ -713,6 +713,14 @@ def prepare_source(path: str, *, timeout: float | None = None) -> PreparedSource
     """Preflight and, for a network file, make a bounded local snapshot."""
     absolute = lexical_abspath(path)
     mount = mount_for_path(absolute)
+    if os.environ.get("ARRAYVIEW_SKIP_SOURCE_STAGING", "1") != "0":
+        # Network-source staging is opt-in, not the default: use the source
+        # path directly, exactly like a local file. This is the pre-staging
+        # behavior (fast open, but a dropped network mount while the file is
+        # memory-mapped can wedge the process in a way not even `kill -9`
+        # recovers from — see docs/loading.md). Set
+        # ARRAYVIEW_SKIP_SOURCE_STAGING=0 to restore the safety copy.
+        return PreparedSource(absolute, absolute, None, mount)
     if mount is None or mount.filesystem not in _NETWORK_FILESYSTEMS:
         unsafe_discovery = discovery_network_mount(absolute)
         if unsafe_discovery is not None: