arrayview 0.26.2__py3-none-any.whl → 0.26.3__py3-none-any.whl

arrayview/_launch_plan.py

@@ -0,0 +1,285 @@
+"""Data-only launch routing primitives and environment snapshots."""
+
+from __future__ import annotations
+
+from dataclasses import asdict, dataclass
+from enum import Enum
+import json
+import os
+import socket
+import sys
+import urllib.request
+
+_LOOPBACK_HOST = "localhost"
+_PING_TIMEOUT_SECONDS = 0.2
+
+_SNAPSHOT_ENV_KEYS = (
+    "ARRAYVIEW_WINDOW",
+    "ARRAYVIEW_WINDOW_ID",
+    "DISPLAY",
+    "TERM_PROGRAM",
+    "VSCODE_AGENT_FOLDER",
+    "VSCODE_INJECTION",
+    "VSCODE_IPC_HOOK_CLI",
+    "WAYLAND_DISPLAY",
+    "SSH_CLIENT",
+    "SSH_CONNECTION",
+)
+
+
+class _StrEnum(str, Enum):
+    def __str__(self) -> str:
+        return self.value
+
+
+class Invocation(_StrEnum):
+    CLI = "cli"
+    PYTHON = "python"
+    JUPYTER = "jupyter"
+    JULIA = "julia"
+    STDIO = "stdio"
+    CODEX = "codex"
+
+
+class Environment(_StrEnum):
+    TERMINAL = "terminal"
+    VSCODE_LOCAL = "vscode_local"
+    VSCODE_REMOTE = "vscode_remote"
+    SSH = "ssh"
+    JUPYTER = "jupyter"
+    JULIA = "julia"
+
+
+class Transport(_StrEnum):
+    HTTP = "http"
+    STDIO_FILE = "stdio_file"
+    STDIO_SHM = "stdio_shm"
+    NONE = "none"
+
+
+class ServerOwner(_StrEnum):
+    EXISTING = "existing"
+    SPAWNED_DAEMON = "spawned_daemon"
+    IN_PROCESS = "in_process"
+    PERSISTENT = "persistent"
+    EXTERNAL = "external"
+
+
+class Display(_StrEnum):
+    NATIVE = "native"
+    BROWSER = "browser"
+    VSCODE = "vscode"
+    INLINE = "inline"
+    NONE = "none"
+
+
+class Registration(_StrEnum):
+    HTTP_LOAD = "http_load"
+    DAEMON_STARTUP = "daemon_startup"
+    IN_PROCESS_SESSION = "in_process_session"
+    STDIO_REGISTER = "stdio_register"
+    RELAY = "relay"
+
+
+@dataclass(frozen=True)
+class ServerSnapshot:
+    port: int
+    port_busy: bool
+    arrayview_server_alive: bool
+    server_pid: int | None = None
+    server_hostname: str | None = None
+
+
+@dataclass(frozen=True)
+class LaunchEnvironmentSnapshot:
+    invocation: Invocation
+    requested_window: str | None
+    environment: Environment
+    platform: str
+    env_vars: dict[str, str]
+    config_default: str | None
+    native_backend: str | None
+    server: ServerSnapshot
+    in_jupyter: bool
+    in_julia: bool
+    in_vscode_terminal: bool
+    is_vscode_remote: bool
+    in_vscode_tunnel: bool
+    ssh_connection: bool
+    ssh_client: bool
+    hostname: str
+
+    def to_dict(self) -> dict:
+        return asdict(self)
+
+
+@dataclass(frozen=True)
+class LaunchRequest:
+    port: int
+    requested_window: str | None = None
+
+
+@dataclass(frozen=True)
+class LaunchPlan:
+    invocation: Invocation
+    environment: Environment
+    transport: Transport
+    server_owner: ServerOwner
+    display: Display
+    registration: Registration
+    fallback_display: Display | None = None
+    fallback_allowed: bool = False
+
+
+def snapshot_launch_environment(
+    port: int,
+    invocation: Invocation | str,
+    requested_window: str | None = None,
+) -> LaunchEnvironmentSnapshot:
+    """Capture launch-relevant facts without importing the server stack."""
+    inv = _coerce_invocation(invocation)
+    env_vars = _snapshot_env_vars()
+    in_jupyter = _platform_bool("_in_jupyter")
+    in_julia = _platform_bool("_is_julia_env")
+    in_vscode_terminal = _platform_bool("_in_vscode_terminal")
+    is_vscode_remote = _platform_bool("_is_vscode_remote")
+    in_vscode_tunnel = _platform_bool("_in_vscode_tunnel")
+    ssh_connection = bool(os.environ.get("SSH_CONNECTION"))
+    ssh_client = bool(os.environ.get("SSH_CLIENT"))
+    environment = _classify_environment(
+        in_jupyter=in_jupyter,
+        in_julia=in_julia,
+        in_vscode_terminal=in_vscode_terminal,
+        is_vscode_remote=is_vscode_remote,
+        ssh_connection=ssh_connection,
+        ssh_client=ssh_client,
+    )
+
+    return LaunchEnvironmentSnapshot(
+        invocation=inv,
+        requested_window=requested_window,
+        environment=environment,
+        platform=sys.platform,
+        env_vars=env_vars,
+        config_default=_config_window_default(environment.value),
+        native_backend=_native_window_gui(),
+        server=_server_snapshot(port),
+        in_jupyter=in_jupyter,
+        in_julia=in_julia,
+        in_vscode_terminal=in_vscode_terminal,
+        is_vscode_remote=is_vscode_remote,
+        in_vscode_tunnel=in_vscode_tunnel,
+        ssh_connection=ssh_connection,
+        ssh_client=ssh_client,
+        hostname=socket.gethostname(),
+    )
+
+
+def _coerce_invocation(value: Invocation | str) -> Invocation:
+    if isinstance(value, Invocation):
+        return value
+    return Invocation(value)
+
+
+def _snapshot_env_vars() -> dict[str, str]:
+    return {key: os.environ[key] for key in _SNAPSHOT_ENV_KEYS if key in os.environ}
+
+
+def _platform_bool(name: str) -> bool:
+    try:
+        from arrayview import _platform
+
+        return bool(getattr(_platform, name)())
+    except Exception:
+        return False
+
+
+def _native_window_gui() -> str | None:
+    try:
+        from arrayview._platform import _native_window_gui as native_window_gui
+
+        return native_window_gui()
+    except Exception:
+        return None
+
+
+def _config_window_default(environment: str) -> str | None:
+    try:
+        from arrayview._config import load_config
+
+        cfg = load_config()
+    except Exception:
+        return None
+    window_cfg = cfg.get("window", {})
+    if not isinstance(window_cfg, dict):
+        return None
+    env_key = "vscode" if environment in {"vscode_local", "vscode_remote"} else environment
+    value = window_cfg.get(env_key) or window_cfg.get("default")
+    if isinstance(value, str):
+        return value.strip().lower() or None
+    return None
+
+
+def _classify_environment(
+    *,
+    in_jupyter: bool,
+    in_julia: bool,
+    in_vscode_terminal: bool,
+    is_vscode_remote: bool,
+    ssh_connection: bool,
+    ssh_client: bool,
+) -> Environment:
+    if in_jupyter:
+        return Environment.JUPYTER
+    if in_julia:
+        return Environment.JULIA
+    if is_vscode_remote:
+        return Environment.VSCODE_REMOTE
+    if in_vscode_terminal:
+        return Environment.VSCODE_LOCAL
+    if ssh_connection or ssh_client:
+        return Environment.SSH
+    return Environment.TERMINAL
+
+
+def _server_snapshot(port: int) -> ServerSnapshot:
+    payload = _ping_arrayview_server(port)
+    return ServerSnapshot(
+        port=port,
+        port_busy=_port_busy(port),
+        arrayview_server_alive=payload is not None,
+        server_pid=_int_or_none(payload.get("pid")) if payload else None,
+        server_hostname=_str_or_none(payload.get("hostname")) if payload else None,
+    )
+
+
+def _port_busy(port: int) -> bool:
+    try:
+        with socket.create_connection(
+            (_LOOPBACK_HOST, port), timeout=_PING_TIMEOUT_SECONDS
+        ):
+            return True
+    except OSError:
+        return False
+
+
+def _ping_arrayview_server(port: int) -> dict | None:
+    url = f"http://{_LOOPBACK_HOST}:{port}/ping"
+    try:
+        with urllib.request.urlopen(url, timeout=_PING_TIMEOUT_SECONDS) as resp:
+            if resp.status != 200:
+                return None
+            payload = json.loads(resp.read().decode("utf-8"))
+    except Exception:
+        return None
+    if payload.get("ok") is True and payload.get("service") == "arrayview":
+        return payload
+    return None
+
+
+def _int_or_none(value: object) -> int | None:
+    return value if isinstance(value, int) else None
+
+
+def _str_or_none(value: object) -> str | None:
+    return value if isinstance(value, str) else None

arrayview/_launcher.py

@@ -33,6 +33,7 @@ from arrayview._platform import (
     _is_vscode_remote,
     _in_vscode_tunnel,
     _can_native_window,
+    _native_window_gui,
     _find_vscode_ipc_hook,
     _is_julia_env,
     _in_julia_jupyter,
@@ -249,6 +250,7 @@ def _open_webview(
 
     icon_path = _get_icon_png_path() or ""
     inline_html_b64 = None
+    gui_name = _native_window_gui() or ""
 
     if shell_port is not None:
         shell_html = _build_inline_shell_html(url, shell_port)
@@ -258,14 +260,14 @@ def _open_webview(
     if inline_html_b64:
         script_lines = [
             "import sys, base64, webview",
-            "u, w, h, icon, html_b64, ready_file = sys.argv[1], int(sys.argv[2]), int(sys.argv[3]), sys.argv[4], sys.argv[5], sys.argv[6]",
+            "u, w, h, icon, html_b64, ready_file, gui = sys.argv[1], int(sys.argv[2]), int(sys.argv[3]), sys.argv[4], sys.argv[5], sys.argv[6], sys.argv[7]",
             "html = base64.b64decode(html_b64.encode()).decode()",
             "class Api:",
             "    def set_title(self, title):",
             "        try: webview.windows[0].set_title(str(title)[:240])",
             "        except Exception: pass",
             "win = webview.create_window('ArrayView', html=html, width=w, height=h, background_color='#0c0c0c', js_api=Api())",
-            "kw = {'gui': 'qt'} if sys.platform.startswith('linux') else {}",
+            "kw = {'gui': gui} if gui else {}",
             "def _start_func():",
             "    if ready_file:",
             "        try:",
@@ -298,6 +300,7 @@ def _open_webview(
                 icon_path,
                 inline_html_b64,
                 ready_file or "",
+                gui_name,
             ],
             stdout=subprocess.DEVNULL,
             stderr=subprocess.PIPE if capture_stderr else subprocess.DEVNULL,
@@ -306,13 +309,13 @@ def _open_webview(
     # URL mode — direct load (used when shell_port not provided)
     script_lines = [
         "import sys, webview",
-        "u, w, h, icon, ready_file = sys.argv[1], int(sys.argv[2]), int(sys.argv[3]), sys.argv[4], sys.argv[5]",
+        "u, w, h, icon, ready_file, gui = sys.argv[1], int(sys.argv[2]), int(sys.argv[3]), sys.argv[4], sys.argv[5], sys.argv[6]",
         "class Api:",
         "    def set_title(self, title):",
         "        try: webview.windows[0].set_title(str(title)[:240])",
         "        except Exception: pass",
         "win = webview.create_window('ArrayView', u, width=w, height=h, background_color='#0c0c0c', js_api=Api())",
-        "kw = {'gui': 'qt'} if sys.platform.startswith('linux') else {}",
+        "kw = {'gui': gui} if gui else {}",
         "def _start_func():",
         "    if ready_file:",
         "        try:",
@@ -344,6 +347,7 @@ def _open_webview(
             str(win_h),
             icon_path,
             ready_file or "",
+            gui_name,
         ],
         stdout=subprocess.DEVNULL,
         stderr=subprocess.PIPE if capture_stderr else subprocess.DEVNULL,
@@ -368,6 +372,7 @@ def _open_webview_with_fallback(
     sockets_before = (
         _session_mod.VIEWER_SOCKETS
     )  # capture count so we detect a NEW connection
+    shell_sockets_before = len(_session_mod.SHELL_SOCKETS)
 
     def _read_stderr():
         try:
@@ -390,14 +395,18 @@ def _open_webview_with_fallback(
                 _open_browser(url, floating=floating)
                 return
 
-        # Phase 2: process is alive — wait up to 8 s for a NEW viewer WebSocket to connect.
-        # We compare against sockets_before so an already-open browser tab doesn't
-        # falsely confirm that the native window launched successfully.
+        # Phase 2: process is alive — wait up to 8 s for a NEW viewer or shell
+        # WebSocket.  The native shell connection proves pywebview is usable;
+        # the embedded viewer iframe can legitimately connect later.
         import arrayview._session as _sm
 
         for _ in range(80):
             time.sleep(0.1)
-            if _sm.VIEWER_SOCKETS > sockets_before:
+            shell_connected = (
+                shell_port is not None
+                and len(_sm.SHELL_SOCKETS) > shell_sockets_before
+            )
+            if _sm.VIEWER_SOCKETS > sockets_before or shell_connected:
                 _vprint("[ArrayView] Native window connected successfully", flush=True)
                 if sys.platform == "darwin":
                     subprocess.Popen(
@@ -530,6 +539,21 @@ def _server_viewer_connections_seen(port: int, timeout: float = 0.5) -> int:
     return 0
 
 
+def _server_shell_sockets_open(port: int, timeout: float = 0.5) -> int:
+    """Return the daemon's current native shell WebSocket count."""
+    url = f"http://{_LOOPBACK_HOST}:{port}/ping"
+    try:
+        with urllib.request.urlopen(url, timeout=timeout) as resp:
+            if resp.status != 200:
+                return 0
+            payload = json.loads(resp.read().decode("utf-8"))
+            if payload.get("ok") is True and payload.get("service") == "arrayview":
+                return int(payload.get("shell_sockets") or 0)
+    except Exception:
+        pass
+    return 0
+
+
 def _wait_for_viewer_connection(
     port: int,
     *,
@@ -545,6 +569,23 @@ def _wait_for_viewer_connection(
     return False
 
 
+def _wait_for_native_shell_or_viewer_connection(
+    port: int,
+    *,
+    viewer_before: int,
+    timeout: float = 8.0,
+) -> bool:
+    """Wait until pywebview proves it is alive via shell or viewer WebSocket."""
+    deadline = time.monotonic() + timeout
+    while time.monotonic() < deadline:
+        if _server_viewer_connections_seen(port, timeout=0.3) > viewer_before:
+            return True
+        if _server_shell_sockets_open(port, timeout=0.3) > 0:
+            return True
+        time.sleep(0.1)
+    return False
+
+
 def _terminate_native_process(proc: subprocess.Popen | None) -> None:
     if proc is None or proc.poll() is not None:
         return
@@ -554,6 +595,64 @@ def _terminate_native_process(proc: subprocess.Popen | None) -> None:
         return
 
 
+def _open_cli_native_shell_after_server(
+    *,
+    port: int,
+    sid: str,
+    name: str,
+    compare_sids: "_CompareSids | None",
+    win_w: int,
+    win_h: int,
+) -> bool:
+    """Open a CLI native shell and return whether it is usable."""
+    url_shell = _shell_url(port, sid, name, compare_sids=compare_sids)
+    viewer_before = _server_viewer_connections_seen(port)
+    opened, proc = _open_webview_cli_tracked(url_shell, win_w, win_h)
+    if opened and _wait_for_native_shell_or_viewer_connection(
+        port, viewer_before=viewer_before
+    ):
+        return True
+    if opened:
+        _vprint(
+            "[ArrayView] Native window did not connect to the backend; falling back to browser",
+            flush=True,
+        )
+    _terminate_native_process(proc)
+    return False
+
+
+def _activate_early_cli_native_shell(
+    *,
+    port: int,
+    sid: str,
+    name: str,
+    proc: subprocess.Popen | None,
+) -> bool:
+    """Attach an already-started preload shell to a spawned daemon session."""
+    viewer_before = _server_viewer_connections_seen(port)
+    try:
+        notify_result = _notify_existing_session(
+            port,
+            sid,
+            name,
+            url=_viewer_path(sid),
+            wait=True,
+        )
+        notified = bool(notify_result.get("notified"))
+    except Exception:
+        notified = False
+    if notified and _wait_for_native_shell_or_viewer_connection(
+        port, viewer_before=viewer_before
+    ):
+        return True
+    _vprint(
+        "[ArrayView] Native window did not connect to the backend; falling back to browser",
+        flush=True,
+    )
+    _terminate_native_process(proc)
+    return False
+
+
 # ── Server Port Utilities ─────────────────────────────────────────
 
 
@@ -862,23 +961,21 @@ def _open_cli_existing_server_view(
         _vprint(f"Injected into existing window (port {port})")
         return
     if notify_webview and not notified:
-        url_shell = _shell_url(port, sid, name, compare_sids=compare_sids)
-        seen_before = _server_viewer_connections_seen(port)
-        opened, proc = _open_webview_cli_tracked(url_shell, 1200, 800)
-        if not opened or not _wait_for_viewer_connection(port, before=seen_before):
-            if opened:
-                _vprint(
-                    "[ArrayView] Native window did not connect to the backend; falling back to browser",
-                    flush=True,
-                )
-            _terminate_native_process(proc)
+        native_ready = _open_cli_native_shell_after_server(
+            port=port,
+            sid=sid,
+            name=name,
+            compare_sids=compare_sids,
+            win_w=1200,
+            win_h=800,
+        )
+        if not native_ready:
             _vprint("[ArrayView] Falling back to browser", flush=True)
             _print_viewer_location(url)
             _open_browser(
                 url,
                 blocking=True,
                 title=f"ArrayView: {name}",
-                filepath=base_file,
                 floating=floating,
             )
         return
@@ -889,7 +986,6 @@ def _open_cli_existing_server_view(
         blocking=True,
         force_vscode=(window_mode == "vscode"),
         title=f"ArrayView: {name}",
-        filepath=base_file,
         floating=floating,
     )
 
@@ -1056,7 +1152,6 @@ def _handle_cli_spawned_daemon(
 
     early_webview_opened = False
     early_webview_proc = None
-    early_webview_notified = False
     early_webview_connected = False
     if (
         use_webview
@@ -1083,29 +1178,12 @@ def _handle_cli_spawned_daemon(
         sys.exit(1)
 
     if early_webview_opened:
-        seen_before = _server_viewer_connections_seen(port)
-        try:
-            notify_result = _notify_existing_session(
-                port,
-                sid,
-                name,
-                url=_viewer_path(sid),
-                wait=True,
-            )
-            early_webview_notified = bool(notify_result.get("notified"))
-        except Exception:
-            early_webview_notified = False
-        if early_webview_notified:
-            early_webview_connected = _wait_for_viewer_connection(
-                port,
-                before=seen_before,
-            )
-        if not early_webview_connected:
-            _vprint(
-                "[ArrayView] Native window did not connect to the backend; falling back to browser",
-                flush=True,
-            )
-            _terminate_native_process(early_webview_proc)
+        early_webview_connected = _activate_early_cli_native_shell(
+            port=port,
+            sid=sid,
+            name=name,
+            proc=early_webview_proc,
+        )
 
     should_retry_webview = use_webview and not (
         early_webview_opened and not early_webview_connected
@@ -1154,16 +1232,15 @@ def _open_cli_spawned_view(
     if _should_notify_webview(use_webview, overlay_sid):
         if webview_already_opened:
             return
-        url_shell = _shell_url(port, sid, name, compare_sids=compare_sids)
-        seen_before = _server_viewer_connections_seen(port)
-        opened, proc = _open_webview_cli_tracked(url_shell, 1400, 900)
-        if not opened or not _wait_for_viewer_connection(port, before=seen_before):
-            if opened:
-                _vprint(
-                    "[ArrayView] Native window did not connect to the backend; falling back to browser",
-                    flush=True,
-                )
-            _terminate_native_process(proc)
+        native_ready = _open_cli_native_shell_after_server(
+            port=port,
+            sid=sid,
+            name=name,
+            compare_sids=compare_sids,
+            win_w=1400,
+            win_h=900,
+        )
+        if not native_ready:
             _vprint("[ArrayView] Falling back to browser", flush=True)
             _print_viewer_location(url)
             _open_browser(

arrayview/_platform.py

@@ -415,18 +415,23 @@ def _can_native_window() -> bool:
     # Plain SSH (no VS Code): the display is on the client machine, not here.
     if os.environ.get("SSH_CLIENT") or os.environ.get("SSH_CONNECTION"):
         return False
+    return _native_window_gui() is not None
+
+
+def _native_window_gui() -> str | None:
+    """Return the pywebview GUI backend name to use, or None if unavailable."""
     if importlib.util.find_spec("webview") is None:
-        return False
+        return None
     if sys.platform in ("darwin", "win32"):
-        return True
-    # Linux/BSD: need a display server AND pywebview's GUI bindings
+        return ""
+    # Linux/BSD: need a display server AND pywebview's GUI bindings.
     if not (os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY")):
-        return False
-
-    return (
-        importlib.util.find_spec("qtpy") is not None
-        or importlib.util.find_spec("gi") is not None
-    )
+        return None
+    if importlib.util.find_spec("qtpy") is not None:
+        return "qt"
+    if importlib.util.find_spec("gi") is not None:
+        return "gtk"
+    return None
 
 
 # ---------------------------------------------------------------------------

arrayview/_server.py

@@ -154,6 +154,7 @@ def ping():
         "hostname": socket.gethostname(),
         "viewer_sockets": _session_mod.VIEWER_SOCKETS,
         "viewer_connections_seen": _session_mod.VIEWER_CONNECTIONS_SEEN,
+        "shell_sockets": len(_session_mod.SHELL_SOCKETS),
     }
 
 

arrayview/_viewer.html

@@ -11985,6 +11985,8 @@
             rectRoiMode = true;
             _roiShape = 'rect';
             _roiVisible = true;
+            hideAllPixelInfo();
+            _resetDimbarHover();
             canvas.style.cursor = 'crosshair';
             if (qmriActive) qmriViews.forEach(v => { v.canvas.style.cursor = 'crosshair'; });
             showStatus('ROI mode: rect · drag to draw');
@@ -11995,6 +11997,7 @@
 
         function _deactivateRoiInteraction({ clear = false } = {}) {
             rectRoiMode = false;
+            _roiSuppressPixelInfo = false;
             _roiShape = 'rect';
             _roiFreehandPts = [];
             _floodFillTolerance = 0.1;
@@ -14518,6 +14521,11 @@
         }
         function showPixelInfo(el, payload, cx, cy) {
             if (!el || !_pixelInfoVisible) return;
+            if (rectRoiMode && _roiSuppressPixelInfo) {
+                el.style.display = 'none';
+                delete el.dataset.pixelInfoKey;
+                return;
+            }
             const key = (payload && typeof payload === 'object')
                 ? `${payload.valueText ?? ''}|${payload.rawX ?? ''}|${payload.rawY ?? ''}`
                 : String(payload ?? '');
@@ -14530,6 +14538,7 @@
         }
 
         let _pixelHoverThrottle = false;
+        let _roiSuppressPixelInfo = false;
         const _pixelFmt = (v, contextValues = null) => formatScalarValue(v, { contextValues, maxDecimals: 7, minDecimals: 3 });
         function _activeNumericContext(view = null) {
             const vals = view && view.displayState
@@ -14538,6 +14547,17 @@
             return vals.filter(Number.isFinite);
         }
         function fetchPixelInfo(opts) {
+            if (rectRoiMode) {
+                const roiIdx = _roiHitIndexForCanvasEvent(opts.event, opts.canvas, opts.imgW, opts.imgH);
+                _roiSuppressPixelInfo = _roiHasStats(roiIdx);
+                if (_roiSuppressPixelInfo) {
+                    if (opts.displayEl) {
+                        opts.displayEl.style.display = 'none';
+                        delete opts.displayEl.dataset.pixelInfoKey;
+                    }
+                    return false;
+                }
+            }
             const indices = Array.isArray(opts.indices) ? opts.indices : [];
             if (!indices.length || indices.some(v => !Number.isFinite(v))) return false;
             const rect = opts.canvas.getBoundingClientRect();
@@ -16259,6 +16279,20 @@
             }
             return false;
         }
+        function _roiHasStats(idx) {
+            return idx >= 0 && !!(_rois[idx] && (_rois[idx].stats || _rois[idx].qmriStats));
+        }
+        function _roiHitIndexForCanvasEvent(e, cv, imgW, imgH) {
+            if (!rectRoiMode || !cv || !imgW || !imgH) return -1;
+            const rect = cv.getBoundingClientRect();
+            if (!rect.width || !rect.height) return -1;
+            const cx = (e.clientX - rect.left) * imgW / rect.width;
+            const cy = (e.clientY - rect.top) * imgH / rect.height;
+            for (let i = _rois.length - 1; i >= 0; i--) {
+                if (_pointInRoi(_rois[i], cx, cy)) return i;
+            }
+            return -1;
+        }
         function _updateRoiPanel() {
             renderIsland();
         }
@@ -16533,25 +16567,27 @@
             for (let i = _rois.length - 1; i >= 0; i--) {
                 if (_pointInRoi(_rois[i], cx, cy)) { hitIdx = i; break; }
             }
-            const piEl = document.getElementById('main-pixel-info');
-            if (hitIdx < 0 || (!_rois[hitIdx].stats && !_rois[hitIdx].qmriStats)) { ttip.style.display = 'none'; if (_pixelInfoVisible) piEl.style.display = ''; return; }
+            _roiSuppressPixelInfo = _roiHasStats(hitIdx);
+            if (!_roiSuppressPixelInfo) { ttip.style.display = 'none'; return; }
             const s = _rois[hitIdx].stats;
             const q = _rois[hitIdx].qmriStats;
             const c = _roiColors[hitIdx % _roiColors.length];
             if (Array.isArray(q) && q.length && q[0].stats) {
-                const ttipQ = document.getElementById('roi-stats-tooltip');
+                const ttipQ = _getRoiRowTooltip();
                 if (ttipQ) {
                     ttipQ.innerHTML = _buildRoiTooltipContent(hitIdx);
-                    ttipQ.style.display = 'block';
                     _positionRoiRowTooltip({clientX: e.clientX, clientY: e.clientY});
+                    ttipQ.classList.add('visible');
                 }
-                if (_pixelInfoVisible) piEl.style.display = 'none';
+                const piEl = document.getElementById('main-pixel-info');
+                if (_pixelInfoVisible && piEl) piEl.style.display = 'none';
                 return;
             }
             const fmt = v => { const a = Math.abs(v); if (a === 0) return '0'; if (a >= 1e4 || (a < 1e-2 && a > 0)) return v.toExponential(3); return parseFloat(v.toPrecision(4)).toString(); };
             ttip.innerHTML = `<span style="color:${c.stroke};font-weight:bold">${hitIdx+1}</span> ${fmt(s.mean)} \u00B1 ${fmt(s.std)}`;
             ttip.style.display = 'block';
-            if (_pixelInfoVisible) piEl.style.display = 'none';
+            const piEl = document.getElementById('main-pixel-info');
+            if (_pixelInfoVisible && piEl) piEl.style.display = 'none';
             const par = ttip.offsetParent;
             if (par) {
                 const pr = par.getBoundingClientRect();
@@ -16690,8 +16726,10 @@
                 roiDragging = false;
                 _drawAllRois(); // clear in-progress preview
             }
+            _roiSuppressPixelInfo = false;
             const ttip = document.getElementById('roi-hover-tooltip');
             if (ttip) ttip.style.display = 'none';
+            _hideRoiRowTooltip();
             const piEl = document.getElementById('main-pixel-info');
             if (piEl) piEl.style.display = 'none';
         });
@@ -23209,7 +23247,8 @@
                         for (let ii = _rois.length - 1; ii >= 0; ii--) {
                             if (_pointInRoi(_rois[ii], cx, cy)) { hitIdx = ii; break; }
                         }
-                        if (hitIdx < 0 || (!_rois[hitIdx].stats && !_rois[hitIdx].qmriStats)) {
+                        _roiSuppressPixelInfo = _roiHasStats(hitIdx);
+                        if (!_roiSuppressPixelInfo) {
                             const t = document.getElementById('roi-hover-tooltip');
                             if (t) t.style.display = 'none';
                             if (_pixelInfoVisible && view.pixelInfoEl) view.pixelInfoEl.style.display = 'none';
@@ -23217,11 +23256,11 @@
                         }
                         const q = _rois[hitIdx].qmriStats;
                         if (Array.isArray(q) && q.length && q[0].stats) {
-                            const tq = document.getElementById('roi-stats-tooltip');
+                            const tq = _getRoiRowTooltip();
                             if (tq) {
                                 tq.innerHTML = _buildRoiTooltipContent(hitIdx);
-                                tq.classList.add('visible');
                                 _positionRoiRowTooltip({clientX: e.clientX, clientY: e.clientY});
+                                tq.classList.add('visible');
                             }
                             if (_pixelInfoVisible && view.pixelInfoEl) view.pixelInfoEl.style.display = 'none';
                             return;
@@ -23237,6 +23276,7 @@
                         }
                     });
                     cv.addEventListener('mouseleave', () => {
+                        _roiSuppressPixelInfo = false;
                         const tq = document.getElementById('roi-stats-tooltip');
                         if (tq) tq.classList.remove('visible');
                     });

arrayview/_vscode_signal.py

@@ -283,65 +283,23 @@ def _open_direct_via_shm(
     title: str | None = None,
     floating: bool = False,
 ) -> bool:
-    """Write a direct-mode signal file with shared memory parameters.
+    """Compatibility shim for the canonical SHM direct-mode helper."""
+    import warnings
 
-    Places the array in POSIX shared memory so the extension-spawned subprocess
-    can read it without any disk I/O.
-    """
-    import atexit
-    import sys as _sys
-    from multiprocessing.shared_memory import SharedMemory
-
-    import numpy as np
-
-    arr = np.ascontiguousarray(data)
-    shm = SharedMemory(create=True, size=arr.nbytes)
-    np.ndarray(arr.shape, dtype=arr.dtype, buffer=shm.buf)[:] = arr
-
-    # The subprocess will unlink the SHM after reading it.  Unregister from
-    # Python's resource tracker so it doesn't warn about "leaked" SHM at exit.
-    from multiprocessing import resource_tracker
-    try:
-        resource_tracker.unregister(f"/{shm.name}", "shared_memory")
-    except Exception:
-        pass
-
-    # Keep the shm alive until the subprocess reads it (or this process exits).
-    _ACTIVE_SHM.append(shm)
+    from arrayview._vscode_shm import _open_direct_via_shm as _canonical_open_direct_via_shm
 
-    def _cleanup():
-        try:
-            shm.close()
-        except Exception:
-            pass
-        try:
-            shm.unlink()
-        except Exception:
-            pass
-
-    atexit.register(_cleanup)
-
-    payload: dict = {
-        "action": "open-preview",
-        "mode": "direct",
-        "shm": {
-            "name": shm.name,
-            "shape": ",".join(str(int(s)) for s in arr.shape),
-            "dtype": str(arr.dtype),
-        },
-        "arrayName": name,
-        "pythonPath": _sys.executable,
-        "maxAgeMs": _VSCODE_SIGNAL_MAX_AGE_MS,
-    }
-    if title:
-        payload["title"] = title
-    if floating:
-        payload["floating"] = True
-    return _write_vscode_signal(payload, skip_compat=True)
-
-
-# Shared memory blocks kept alive until process exit or subprocess reads them.
-_ACTIVE_SHM: list = []
+    warnings.warn(
+        "arrayview._vscode_signal._open_direct_via_shm is deprecated; "
+        "use arrayview._vscode_shm._open_direct_via_shm",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    return _canonical_open_direct_via_shm(
+        data,
+        name=name,
+        title=title,
+        floating=floating,
+    )
 
 
 def _schedule_remote_open_retries(
@@ -772,3 +730,19 @@ def _write_vscode_signal(payload: dict, delay: float = 0.0, skip_compat: bool =
         return True
     except Exception:
         return False
+
+
+def __getattr__(name: str):
+    if name == "_ACTIVE_SHM":
+        import warnings
+
+        from arrayview._vscode_shm import _ACTIVE_SHM
+
+        warnings.warn(
+            "arrayview._vscode_signal._ACTIVE_SHM is deprecated; "
+            "use arrayview._vscode_shm._ACTIVE_SHM",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return _ACTIVE_SHM
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

{arrayview-0.26.2.dist-info → arrayview-0.26.3.dist-info}/METADATA

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

{arrayview-0.26.2.dist-info → arrayview-0.26.3.dist-info}/RECORD

@@ -9,10 +9,11 @@ arrayview/_diff.py,sha256=mSIo1ArNxkrB0v2iUMy3dezJOlpos0xNu1V_umNUMhU,5677
 arrayview/_icon.png,sha256=a8RTAbvweLhh3hzD5eGg76Peq-KSDcS6YrCphRb_HEs,2748
 arrayview/_imaging.py,sha256=MQX1uy4m1lofOeoLDhCp6cHO5p_V5fXm4qlSu9Ykn-c,534
 arrayview/_io.py,sha256=z9gFRI7OneCnm5jBTLwdkDARrHF-LyqHspksYQx1lTg,11585
-arrayview/_launcher.py,sha256=oToBEnso80kbGNT0G9XB7xeRd7XWs_Hi-F53wLe-68E,136733
+arrayview/_launch_plan.py,sha256=kiWitWvKe2Wetj_pS1M8OtaSqZ11aWF6KDDD6IPnKIM,7393
+arrayview/_launcher.py,sha256=WhS-rgV0fwmeldUQfcs68AkG1alD04-UpmH93_ws_50,138470
 arrayview/_lifecycle.py,sha256=oFD05gNYAu6OBIUFcKmPfT-_Hp03KaI2oK8komUXtJY,937
 arrayview/_overlays.py,sha256=C-qDZFBOgwJQL84XxFoMAX3qyfNa2EI5N-AlOvXeoTI,1634
-arrayview/_platform.py,sha256=xyEksBuhg4rmHE2IKxIXt0o2J_yCbfEJfR_01micXOo,18231
+arrayview/_platform.py,sha256=gWZ5_yPN1B_kqiUewRl0lKjOZmB6jGw7X71hmFxJ_PQ,18428
 arrayview/_render.py,sha256=UCUx8YD8Q38GDTajHhnmEMUUUali-8PLvoBOHvUmaYc,28684
 arrayview/_routes_analysis.py,sha256=ipws39Q0e6ZtYsxXk4ZcbRKlD7LPAt_Iehf_kDjo1Yo,16272
 arrayview/_routes_export.py,sha256=Ha8mMO2E9TlRL5x25-ADV8_8xUiC-jRz9N1oWwgKOsg,3898
@@ -26,23 +27,23 @@ arrayview/_routes_state.py,sha256=TmxC__NPPsvg59jM2D_FRc_oPv1wWbRmUr6t6ukVj64,11
 arrayview/_routes_vectorfield.py,sha256=P8avWU8jDH173YQ4Kfpzs8SZz5gIL4ki0-Gc6pGA9w4,7383
 arrayview/_routes_websocket.py,sha256=7mKy52OyCSRIGcsKx02VWGY1qTxGjB22RVeS2Ev833A,16092
 arrayview/_segmentation.py,sha256=aENWHmefrKDScXhcZL1X3KgYXE784dpMkmFFo83qnrw,7377
-arrayview/_server.py,sha256=HpgoSxW76Rp8q_BnBBtuHdrpmdzHfxVRphSoydtTkR8,7733
+arrayview/_server.py,sha256=x9_B3Su5BGxfpEho3RknXeG06_QIrvMIhmSU0SaEWKU,7791
 arrayview/_session.py,sha256=OD3f2Q2gubZt1ftoIwfPX3SfKmCvPYy_FbplmmSnLSg,17427
 arrayview/_shell.html,sha256=xzHIB-kRX12okubZoqdrgsWDY8CCLteg5jtXxDQru8U,11624
 arrayview/_stdio_server.py,sha256=ECwUGHuO6KUx4TlQPPzqFZoL48HOTFc0n2ckCPo69Mc,33954
 arrayview/_synthetic_mri.py,sha256=zb613sIke-yljrILKYn_f-1SB6T4XsB4f916STgAp4M,6756
 arrayview/_torch.py,sha256=13sqIMCUu_-b9SQ9KfDCExDz2UMStL87EDVjnbJxAEo,7536
 arrayview/_vectorfield.py,sha256=eDqMCMEGjO8Jdt-6Auh01cz3WD9dbF7xYUWD9xHAf1E,8115
-arrayview/_viewer.html,sha256=3-IDDxLCkeMbuIp31dR1ae8hi0ulq2QX96P8QbUyA0E,1538008
+arrayview/_viewer.html,sha256=GuK-5KpSOpAvrkMiEiQZ1xs1v-Au8HyYQgc2-eQm0iE,1539699
 arrayview/_vscode.py,sha256=laTHzOL6YnUsZYFX0fAR3aAMBFpPLL6cF9KArBl3nAI,988
 arrayview/_vscode_browser.py,sha256=EzYEl4ZdxD_njqIfHywqw3ovy3p2SaWX9c03Kzd_Xh0,7458
 arrayview/_vscode_extension.py,sha256=v17e4IVJkTpHmuJMhuL2VPPWwbmsCCDWnbEzdONwH3I,12953
 arrayview/_vscode_shm.py,sha256=Rm5DapeorNwhnLnVz5fkXcctkQqTzii9uLxnOxxIMU4,2238
-arrayview/_vscode_signal.py,sha256=rSDPEjFeX4dl2PnlBMlVsFO_lmRhgJ7eHlNmNDY4h9U,33840
+arrayview/_vscode_signal.py,sha256=xy7HcQdLrbcUSDLuDX5pERzwrfHtKfaJ2nry_Su76tI,33072
 arrayview/arrayview-opener.vsix,sha256=uxIm_06uI9RC7N54SpckwhkjIh0yKLXDv613hvJTgV0,19098
 arrayview/gsap.min.js,sha256=VGihm4idI0E1uqrWezWsiScB9F_jMosn7qs6pPSkeac,72304
-arrayview-0.26.2.dist-info/METADATA,sha256=sazLVlN3xN1zUgSTLeUfNDe26FsnvIVDaZ7chzzuSEI,2161
-arrayview-0.26.2.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-arrayview-0.26.2.dist-info/entry_points.txt,sha256=FQSz3M11B-zaVLDyXofKUDvMhHASz7OjmoLgI4nn7ko,105
-arrayview-0.26.2.dist-info/licenses/LICENSE,sha256=34OivjM9faB2QaPjZpMRTIiSx31V3U9cEyQ6F2k-bH0,1062
-arrayview-0.26.2.dist-info/RECORD,,
+arrayview-0.26.3.dist-info/METADATA,sha256=Fp9WT0LXPGkC7qk8uUxly06qYvYxH9050iIFKhK_73Y,2161
+arrayview-0.26.3.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+arrayview-0.26.3.dist-info/entry_points.txt,sha256=FQSz3M11B-zaVLDyXofKUDvMhHASz7OjmoLgI4nn7ko,105
+arrayview-0.26.3.dist-info/licenses/LICENSE,sha256=34OivjM9faB2QaPjZpMRTIiSx31V3U9cEyQ6F2k-bH0,1062
+arrayview-0.26.3.dist-info/RECORD,,