arrayview 0.35.2__py3-none-any.whl → 0.36.0__py3-none-any.whl

arrayview/_launcher.py

@@ -2590,6 +2590,11 @@ _PERSIST_DAEMON_CONNECT_TIMEOUT_SECONDS = float(
 _PERSIST_DAEMON_IDLE_SECONDS = float(
     os.environ.get("ARRAYVIEW_PERSIST_IDLE_SECONDS", "1800")
 )
+# How long a daemon whose initial load failed keeps serving so the opener can
+# read the reason from /metadata/<sid> before the port is released.
+_FAILED_LOAD_EXIT_GRACE_SECONDS = float(
+    os.environ.get("ARRAYVIEW_FAILED_LOAD_EXIT_GRACE_SECONDS", "30")
+)
 
 
 def _join_query_values(values: _CSVValues) -> str:
@@ -4169,6 +4174,7 @@ def _serve_daemon(
         owner="persistent" if persist else "transient",
     )
     # Register sid as pending so /metadata can poll while data loads.
+    _initial_load_failed = threading.Event()
     _session_mod.PENDING_SESSIONS.add(sid)
     _pending_event = threading.Event()
     _session_mod.PENDING_SESSION_EVENTS[sid] = _pending_event
@@ -4349,6 +4355,18 @@ def _serve_daemon(
                 sid_tag=sid_tag,
                 error_type=type(exc).__name__,
             )
+            # This runs on a daemon thread, so re-raising only kills the thread
+            # and writes to a stderr nobody reads. Record why the sid will never
+            # become ready so /metadata can report it instead of returning 404
+            # until the opener gives up.
+            _session_mod.FAILED_PENDING_SESSIONS[sid] = (
+                str(exc) or type(exc).__name__
+            )
+            _vprint(
+                f"[ArrayView] Failed to load {filepath}: {exc}",
+                flush=True,
+            )
+            _initial_load_failed.set()
             raise
         finally:
             _session_mod.PENDING_SESSIONS.discard(sid)
@@ -4357,6 +4375,32 @@ def _serve_daemon(
 
     threading.Thread(target=_load, daemon=True).start()
 
+    def _exit_if_initial_load_failed() -> None:
+        """Release the port when the file this daemon exists to serve won't load.
+
+        uvicorn starts before the load finishes, so a failed load otherwise
+        leaves a server with no session holding the port until the connect
+        timeout expires minutes later — and answering /ping the whole time. The
+        grace period is only so the opener can read the failure from
+        /metadata/<sid> before the port goes away.
+        """
+        _initial_load_failed.wait()
+        time.sleep(_FAILED_LOAD_EXIT_GRACE_SECONDS)
+        if _session_mod.SESSIONS or _session_mod.VIEWER_SOCKETS:
+            return  # something else is using this server; leave it alone
+        _trace_launch_event(
+            "daemon.exiting",
+            reason="initial_load_failed",
+            instance_tag=_launch_trace_tag(record.instance_id),
+        )
+        try:
+            registry.remove(record.instance_id)
+        except Exception:
+            pass
+        os._exit(0)
+
+    threading.Thread(target=_exit_if_initial_load_failed, daemon=True).start()
+
     if persist:
         _wait_for_viewer_close(
             idle_seconds=_PERSIST_DAEMON_IDLE_SECONDS,

arrayview/_routes_loading.py

@@ -18,6 +18,7 @@ from arrayview._lifecycle import (
 )
 from arrayview._session import (
     CANCELLED_PENDING_SESSIONS,
+    FAILED_PENDING_SESSIONS,
     PENDING_SESSION_EVENTS,
     PENDING_SESSIONS,
     SESSIONS,
@@ -263,6 +264,7 @@ def register_loading_routes(app, *, notify_shells, setup_rgb) -> None:
             # the real Session instead of seeing a transient 404.
             sid = requested_sid or uuid.uuid4().hex
             pending_event = threading.Event()
+            FAILED_PENDING_SESSIONS.pop(sid, None)
             PENDING_SESSIONS.add(sid)
             PENDING_SESSION_EVENTS[sid] = pending_event
             signature_before_load = file_signature(abs_path)
@@ -293,12 +295,14 @@ def register_loading_routes(app, *, notify_shells, setup_rgb) -> None:
                     ]
                     commit_pending_session(sid, session)
                 except Exception as exc:
-                    # Keep the server alive and make the failure visible in its
-                    # log. The opener will fail closed when metadata never
-                    # becomes ready, while a retry creates a fresh request.
+                    # Keep the server alive, and record why this sid will never
+                    # become ready. Without the record the opener cannot tell a
+                    # failed load from a slow one and burns its whole deadline
+                    # on a file that raised immediately.
                     import traceback
 
                     traceback.print_exc()
+                    FAILED_PENDING_SESSIONS[sid] = str(exc) or exc.__class__.__name__
                 finally:
                     PENDING_SESSIONS.discard(sid)
                     CANCELLED_PENDING_SESSIONS.discard(sid)

arrayview/_routes_query.py

@@ -211,6 +211,14 @@ def register_query_routes(app, *, get_session_or_404, pil_image, pil_imageops) -
         # request; the opener retries until the pending Session is published.
         if sid in _session_mod.PENDING_SESSIONS:
             return Response(status_code=404, headers={"Retry-After": "1"})
+        # A load that raised is terminal. Say so with a distinct status and the
+        # real reason, so the caller stops polling and can show the user why
+        # this file will never open instead of waiting out its deadline.
+        load_error = _session_mod.FAILED_PENDING_SESSIONS.get(sid)
+        if load_error is not None:
+            return Response(
+                status_code=422, content=load_error.encode(), media_type="text/plain"
+            )
         session = await wait_for_session_ready(sid)
         if not session:
             return Response(status_code=404)

arrayview/_session.py

@@ -41,6 +41,10 @@ _window_process = None
 PENDING_SESSIONS: set = set()  # sids whose data is still loading in a background thread
 PENDING_SESSION_EVENTS: dict[str, threading.Event] = {}
 CANCELLED_PENDING_SESSIONS: set[str] = set()
+# sid -> why its background load failed. A load that raises must be reportable:
+# without this the opener cannot tell "still loading" from "will never load" and
+# waits out its whole deadline on a file that failed in the first second.
+FAILED_PENDING_SESSIONS: dict[str, str] = {}
 
 
 def file_signature(filepath: str):
@@ -575,6 +579,7 @@ __all__ = [
     "_window_process",
     "PENDING_SESSIONS",
     "PENDING_SESSION_EVENTS",
+    "FAILED_PENDING_SESSIONS",
     "wait_for_session_ready",
     # Render thread pool
     "_RENDER_QUEUE",

arrayview/_viewer.html

@@ -9278,7 +9278,20 @@
         function formatValueGroup(values, options = {}) {
             const finite = (Array.isArray(values) ? values : [values]).filter(Number.isFinite);
             const cap = Math.max(0, Math.min(8, Math.trunc(options.maxDecimals ?? 7)));
-            const minDecimals = Math.max(0, Math.min(cap, Math.trunc(options.minDecimals ?? 2)));
+            // Decimals worth showing depend on magnitude. Two was applied at
+            // every scale, so a range topping out near 1890 read as "1890.04"
+            // when the hundredths carry no information. The floor is only ever
+            // lowered for large values, never raised, so small ranges keep the
+            // precision they had. The search below can still add decimals when
+            // values would otherwise collide.
+            const _defaultMinDecimals = (vals) => {
+                const m = Math.max(...vals.filter(Number.isFinite).map(v => Math.abs(v)));
+                if (!(m > 0) || !Number.isFinite(m)) return 2;
+                return Math.max(0, Math.min(2, 3 - Math.floor(Math.log10(m))));
+            };
+            const minDecimals = Math.max(0, Math.min(cap, Math.trunc(
+                options.minDecimals ?? _defaultMinDecimals(finite)
+            )));
             const ordinaryLo = options.ordinaryLo ?? 1e-4;
             const ordinaryHi = options.ordinaryHi ?? 1e6;
             const fallback = {
@@ -14242,6 +14255,41 @@
 
         /* ── JS: Initialization and Metadata Fetch ────────────────── */
 
+        // The backend serves this page as soon as its port is up, which can be
+        // seconds before a large array has finished loading. While the session
+        // is still loading /metadata answers 404 with a Retry-After header; an
+        // unknown or released sid answers 404 without one, and a load that
+        // failed answers 422 with the reason. Keep waiting only for the first.
+        async function fetchMetadataWithRetry(sid, timeoutMs = 180000) {
+            const deadline = Date.now() + timeoutMs;
+            for (;;) {
+                const res = await proxyFetch(`/metadata/${sid}`);
+                if (res.ok) return { data: await res.json() };
+                if (res.status === 422) {
+                    let reason = '';
+                    try { reason = (await res.text()).trim(); } catch (_e) {}
+                    return { error: reason || 'This file could not be loaded.', status: 422 };
+                }
+                const pending = res.status === 404 && res.headers.get('Retry-After');
+                if (!pending || Date.now() >= deadline) {
+                    return { error: null, status: res.status };
+                }
+                await new Promise(r => setTimeout(r, 300));
+            }
+        }
+
+        function showMetadataError(result) {
+            const msg = result.error
+                ? result.error
+                : (result.status === 404
+                    ? 'Session not found or expired.'
+                    : `Server error ${result.status} — check Python console for details.`);
+            document.getElementById('loading-overlay').innerHTML =
+                `<div style="color:#c55;font-size:16px;font-family:monospace;max-width:60ch;text-align:center;line-height:1.5;padding:0 2em">${
+                    msg.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
+                }</div>`;
+        }
+
         async function init() {
             // Loading spinner is in static HTML — body.av-loading set by server template.
             if (!sid) { hideLoadingOverlay(); drawPlasmaDemo(); return; }
@@ -14260,26 +14308,24 @@
                 );
                 data = await Promise.race([_metadataFromWs, httpFallback]);
                 if (!data) {
-                    // Both failed — try direct HTTP without timeout
-                    const res = await proxyFetch(`/metadata/${sid}`);
-                    if (!res.ok) {
-                        reportParent('metadata-http-error', { status: res.status, sid });
-                        const msg = res.status === 404 ? 'Session not found or expired.' : `Server error ${res.status} — check Python console for details.`;
-                        document.getElementById('loading-overlay').innerHTML = `<div style="color:#c55;font-size:18px;font-family:monospace">${msg}</div>`;
+                    // Both failed — wait out a still-loading session.
+                    const result = await fetchMetadataWithRetry(sid);
+                    if (!result.data) {
+                        reportParent('metadata-http-error', { status: result.status, sid });
+                        showMetadataError(result);
                         return;
                     }
-                    data = await res.json();
+                    data = result.data;
                 }
             } else {
                 // HTTP transport mode (VS Code) — use traditional fetch
-                const res = await proxyFetch(`/metadata/${sid}`);
-                if (!res.ok) {
-                    reportParent('metadata-http-error', { status: res.status, sid });
-                    const msg = res.status === 404 ? 'Session not found or expired.' : `Server error ${res.status} — check Python console for details.`;
-                    document.getElementById('loading-overlay').innerHTML = `<div style="color:#c55;font-size:18px;font-family:monospace">${msg}</div>`;
+                const result = await fetchMetadataWithRetry(sid);
+                if (!result.data) {
+                    reportParent('metadata-http-error', { status: result.status, sid });
+                    showMetadataError(result);
                     return;
                 }
-                data = await res.json();
+                data = result.data;
             }
 
             await _loadOverlayLabelValues();
@@ -35919,9 +35965,12 @@
                 return `${x.toFixed(1)},${y.toFixed(1)}`;
             }).join(' ');
             const distLabel = distance.toFixed(1) + ' px';
+            // Share the colorbar's formatter so the same value does not read
+            // differently here than it does on the colorbar.
+            const _lpFmt = formatValueGroup([vMin, vMax]);
             const fmtVal = v => {
                 if (v === null || !isFinite(v)) return '?';
-                return Math.abs(v) < 0.01 || Math.abs(v) >= 1e4 ? v.toExponential(2) : v.toFixed(2);
+                return _lpFmt.format(v);
             };
             _lineProfileOverlay.innerHTML = `
                 <svg width="${W}" height="${H}" xmlns="http://www.w3.org/2000/svg">

arrayview/_vscode_extension.py

@@ -54,7 +54,7 @@ _VSCODE_EXT_INSTALLED = False  # cached so we only check once per process
 _VSCODE_EXT_FRESH_INSTALL = False  # True if we just installed it this session
 _VSCODE_EXT_RELOAD_REQUIRED = False  # installed files are newer than the live host
 _VSCODE_EXT_INSTALL_FAILED = False  # automatic install could not complete safely
-_VSCODE_EXT_VERSION = "0.14.76"  # current bundled extension version
+_VSCODE_EXT_VERSION = "0.14.87"  # current bundled extension version
 _VSCODE_CONFIGURED_PORTS: set[int] = set()
 
 def _bundled_vscode_vsix_version(vsix_path: str) -> str | None:
@@ -633,6 +633,47 @@ def _ensure_vscode_extension(*, is_remote: bool | None = None) -> bool:
 # ---------------------------------------------------------------------------
 
 
+def _port_has_listener(port: int) -> bool:
+    """Return True when something is listening on ``port`` on loopback."""
+    import socket
+
+    for family, addr in ((socket.AF_INET, "127.0.0.1"), (socket.AF_INET6, "::1")):
+        sock = socket.socket(family, socket.SOCK_STREAM)
+        try:
+            sock.settimeout(0.15)
+            if sock.connect_ex((addr, port)) == 0:
+                return True
+        except OSError:
+            continue
+        finally:
+            sock.close()
+    return False
+
+
+def _stale_arrayview_port_keys(attrs: dict, keep_port: int) -> list[str]:
+    """Return ArrayView port entries that no longer have a live server.
+
+    Every launch on a fresh port used to leave its entry behind for good. On a
+    tunnel those entries keep telling VS Code to forward ports nothing serves,
+    which competes for a limited per-tunnel forwarding budget. Only entries
+    ArrayView wrote are considered, and only when their port is dead, so a
+    second concurrent ArrayView server is never disturbed.
+    """
+    stale: list[str] = []
+    for key, value in list(attrs.items()):
+        if not isinstance(value, dict) or value.get("label") != "ArrayView":
+            continue
+        if key == str(keep_port):
+            continue
+        try:
+            candidate = int(key)
+        except (TypeError, ValueError):
+            continue
+        if not _port_has_listener(candidate):
+            stale.append(key)
+    return stale
+
+
 def _configure_vscode_port_preview(
     port: int,
     *,
@@ -686,8 +727,11 @@ def _configure_vscode_port_preview(
         }
         current = attrs.get(str(port))
         updated = {**current, **desired} if isinstance(current, dict) else desired
-        if current == updated:
+        stale = _stale_arrayview_port_keys(attrs, port)
+        if current == updated and not stale:
             return
+        for key in stale:
+            attrs.pop(key, None)
         attrs[str(port)] = updated
         with open(path, "w") as f:
             json.dump(settings, f, indent=2)

{arrayview-0.35.2.dist-info → arrayview-0.36.0.dist-info}/METADATA

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

{arrayview-0.35.2.dist-info → arrayview-0.36.0.dist-info}/RECORD

@@ -13,7 +13,7 @@ arrayview/_instance_registry.py,sha256=h7vyvCl0LTt9R8sDB1Vxe4a-KzfkLVuwrSw_ANpPT
 arrayview/_io.py,sha256=jJ4FQEHggSHCz2zi3ZQK4NjoJpBt3OkklQbM4_Jp1f8,61303
 arrayview/_launch_plan.py,sha256=UwmxmSZIFfutVZRhdlTZdrszCkxZMoSK99VvQHD-Mac,22192
 arrayview/_launch_trace.py,sha256=sKNIEDSpI8OgEC0aSpcWJPu0zdHFcKpQr-sPfsfiTz8,3711
-arrayview/_launcher.py,sha256=T455aghgzP329pmNMdVWIjreVPR3JGz9zkE8bf1nKTg,204399
+arrayview/_launcher.py,sha256=ZBAvni9fgMW0Wj51RM1baDx3VH2jEaG2DP26A3OmFyU,206372
 arrayview/_lifecycle.py,sha256=SzLBjoDq7pj9jnq12oERmM9HA_2N4Y-CxwCRsfK4Q1s,3840
 arrayview/_overlays.py,sha256=TsMnXrP_BNSzCj4k8hbWNM-M5lcrro0xA_wusvAdLLw,4622
 arrayview/_platform.py,sha256=RCCHtOaj3hZIlzENfeLbqO0MRZu-OfiVHGu1-jhpMeY,26461
@@ -21,11 +21,11 @@ arrayview/_render.py,sha256=wVvwxQtZ7ldWYZTzlg2CS-esnPHlpSXMW_z22eh-rU0,30296
 arrayview/_routes_analysis.py,sha256=b2yiPm3qiapFPcBZWpltZrsTKNkFyHYV7o1O2ZrzVUo,32320
 arrayview/_routes_drop.py,sha256=FC4e7STdCo3hYIA0C4Yy9Ka2UKFx7nLDU5dkujmc1Vo,12477
 arrayview/_routes_export.py,sha256=Ha8mMO2E9TlRL5x25-ADV8_8xUiC-jRz9N1oWwgKOsg,3898
-arrayview/_routes_loading.py,sha256=PHXyXn-iJZyt35dPwRNf30_18UauylJBwbpysi0hzn0,33824
+arrayview/_routes_loading.py,sha256=yYzf7NJeE8fLviCbAcXMSiAtSlLVY-wHwfdUqDOBCNA,34055
 arrayview/_routes_persistence.py,sha256=T03csHb7ppGT-8yMDf227XkqhnhjgSLYj0RW2wmg59g,17176
 arrayview/_routes_preferences.py,sha256=78i0OhwVJ9JF2RNazWecctU1-PI_PhNAv7bBIVxuYNU,4483
 arrayview/_routes_preload.py,sha256=KOsankNguxdIWmFW9iZcY9p2SvUN1mOKY7KkW1qMGcc,1729
-arrayview/_routes_query.py,sha256=FLf-IToSWrC7T8rfUnlbo2nWexgDOhvbooKIvF7m9iY,15364
+arrayview/_routes_query.py,sha256=lzCoaz1fkRYC99QFBw0_6pLIlDEVNn99y_yH-q6DKzk,15825
 arrayview/_routes_rendering.py,sha256=OiYvdYE2PnTXVo9fUdWN1JvZ-VvUTUgGA7LYGrmMDSo,21688
 arrayview/_routes_segmentation.py,sha256=x2bBjQffZryeTMmOH38YdBWethw1o3KpA8V0chJcZHI,23599
 arrayview/_routes_state.py,sha256=8TyTURrJKV0taVYK7c9L-Dcx_At-fhHI1l0-4OQMpU0,11615
@@ -33,22 +33,22 @@ arrayview/_routes_vectorfield.py,sha256=QDUTG46cMEm-FjFWeIs2cv3b494K_Y80c2Ff8DRK
 arrayview/_routes_websocket.py,sha256=V5k_LhVw2pafItcuK5Q5kYYR4kmGfCRcaz7NRFG43S0,29043
 arrayview/_segmentation.py,sha256=aENWHmefrKDScXhcZL1X3KgYXE784dpMkmFFo83qnrw,7377
 arrayview/_server.py,sha256=NV6tRHo2OVR-PuSutGDAkYYSafD2exZfggUoUcXzti0,11797
-arrayview/_session.py,sha256=GFcReSWye7SMryaEIuqy5QjQCmjngsk4WUvvWG0tw6A,22330
+arrayview/_session.py,sha256=eNE4GQBhvKKCAB_DkfIpjVDMBRo4CD9X3pJbaZmNVH8,22641
 arrayview/_session_spec.py,sha256=mKDfMRsPYQdEmN9hLXmDU_9N7etiDyBXr8mz-fB8QBo,6825
 arrayview/_shell.html,sha256=vNa2Kiwx_eoB5H329jolYafLhwJDCH9DsJafBqvVMWU,13194
 arrayview/_synthetic_mri.py,sha256=CNL-2WC835i6WCqkvmWBCO6WQ5w7HE5trNb8OyEfe64,7365
 arrayview/_torch.py,sha256=13sqIMCUu_-b9SQ9KfDCExDz2UMStL87EDVjnbJxAEo,7536
 arrayview/_vectorfield.py,sha256=eDqMCMEGjO8Jdt-6Auh01cz3WD9dbF7xYUWD9xHAf1E,8115
-arrayview/_viewer.html,sha256=26xtUFu0g6ZNfBy_bcHLYpQp79f6WtLHgWKOIqEJB1I,1884918
+arrayview/_viewer.html,sha256=jwqjyk4Vl5aUFAVdGmM-CRETldBcqpVIZmUSO9LZ0Jc,1887238
 arrayview/_vscode.py,sha256=EKnGN2zrjlybc4FQOmYA8BvYdtkcJbLHDEdgtvO7ul4,837
 arrayview/_vscode_browser.py,sha256=kTdux_l-xax5qYEX2zU5xGscceBrnlZUaX1i28bZ0jI,18950
-arrayview/_vscode_extension.py,sha256=BNIaMjbVOANwO4TmT5Lxk3kwAxEujKg2WcZQtYYLva8,28552
+arrayview/_vscode_extension.py,sha256=n4dcV5x2gxCx3o0ghd2tmtJYLVwrhYDp9GEQKBQFS_M,30137
 arrayview/_vscode_signal.py,sha256=8pGVjuzUzIu9bNSZkczF8guzblS1oHyefFplAebrjBU,45559
-arrayview/arrayview-opener.vsix,sha256=zvqqtzbl3kW9W7GGkACA5XvtIJkpj4NqdYauMnN4r7Y,34699
+arrayview/arrayview-opener.vsix,sha256=zYr0bpA2WN_oL8sNq0vCF4SqsRZlNiDncl-K7A8o3PM,38458
 arrayview/gsap.min.js,sha256=VGihm4idI0E1uqrWezWsiScB9F_jMosn7qs6pPSkeac,72304
 arrayview/todo.md,sha256=4rzoaIY4nJJACDHPJKeqP8guasCMxeRQ1cyNLxUYink,999
-arrayview-0.35.2.dist-info/METADATA,sha256=7vfM0N_tScssKX51C6CKVl31xg_IcrmC-okuesY8_-k,2345
-arrayview-0.35.2.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-arrayview-0.35.2.dist-info/entry_points.txt,sha256=FQSz3M11B-zaVLDyXofKUDvMhHASz7OjmoLgI4nn7ko,105
-arrayview-0.35.2.dist-info/licenses/LICENSE,sha256=34OivjM9faB2QaPjZpMRTIiSx31V3U9cEyQ6F2k-bH0,1062
-arrayview-0.35.2.dist-info/RECORD,,
+arrayview-0.36.0.dist-info/METADATA,sha256=RFS3W_onLeEjsc_EGYKynB7-kqPYdGnEgx3LziJ-bnU,2345
+arrayview-0.36.0.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+arrayview-0.36.0.dist-info/entry_points.txt,sha256=FQSz3M11B-zaVLDyXofKUDvMhHASz7OjmoLgI4nn7ko,105
+arrayview-0.36.0.dist-info/licenses/LICENSE,sha256=34OivjM9faB2QaPjZpMRTIiSx31V3U9cEyQ6F2k-bH0,1062
+arrayview-0.36.0.dist-info/RECORD,,