arrayview 0.31.2__py3-none-any.whl → 0.31.3__py3-none-any.whl

arrayview/_routes_loading.py

@@ -141,7 +141,8 @@ def register_loading_routes(app, *, notify_shells, setup_rgb) -> None:
         else:
             for existing in SESSIONS.values():
                 if existing.filepath and os.path.abspath(existing.filepath) == abs_path:
-                    return {"sid": existing.sid, "name": existing.name, "notified": False}
+                    if acquire_session_leases([existing.sid]):
+                        return {"sid": existing.sid, "name": existing.name, "notified": False}
         if not dir_patterns and not os.environ.get("ARRAYVIEW_SKIP_RAM_GUARD"):
             from ._io import FULL_LOAD_EXTS
 

arrayview/_session.py

@@ -283,6 +283,7 @@ class Session:
         self.fft_original_data = None
         self.fft_axes = None
         self.data_version = 0  # incremented by /reload when file is reloaded
+        self.viewer_leases = 1  # one release is required for each tab using this SID
 
         self.rgb_axis = None  # set by _setup_rgb(); axis index in actual shape
         self.spatial_shape = data.shape  # shape without rgb_axis (set by _setup_rgb)

arrayview/_vscode_browser.py

@@ -16,7 +16,7 @@ from enum import Enum
 
 from arrayview._session import _vprint
 from arrayview._platform import _in_vscode_terminal, _is_vscode_remote
-from arrayview._vscode_extension import _configure_vscode_port_preview, _ensure_vscode_extension, _VSCODE_EXT_FRESH_INSTALL
+from arrayview._vscode_extension import _configure_vscode_port_preview, _ensure_vscode_extension
 from arrayview._vscode_signal import (
     AckState,
     _open_via_signal_file,
@@ -133,9 +133,13 @@ def _open_browser(
         if is_remote:
             # Remote/tunnel: install extension + write signal file.
             ext_ok = _ensure_vscode_extension()
-            if ext_ok and _VSCODE_EXT_FRESH_INSTALL:
-                time.sleep(1.5)
-
+            from arrayview import _vscode_extension as _extension_state
+            if not ext_ok and _extension_state._VSCODE_EXT_RELOAD_REQUIRED:
+                return OpenResult(
+                    OpenState.FAILED,
+                    "vscode-extension",
+                    "ArrayView updated its VS Code opener; reload this VS Code window once, then retry",
+                )
             # URL-based mode: port is forwarded by VS Code and the viewer
             # connects via WebSocket through the devtunnel.
             _configure_vscode_port_preview(parsed_port)
@@ -172,8 +176,13 @@ def _open_browser(
             # Local VS Code terminal (or --window vscode forced): install extension + signal file.
             _configure_vscode_port_preview(parsed_port)
             ext_ok = _ensure_vscode_extension()
-            if ext_ok and _VSCODE_EXT_FRESH_INSTALL:
-                time.sleep(1.5)
+            from arrayview import _vscode_extension as _extension_state
+            if not ext_ok and _extension_state._VSCODE_EXT_RELOAD_REQUIRED:
+                return OpenResult(
+                    OpenState.FAILED,
+                    "vscode-extension",
+                    "ArrayView updated its VS Code opener; reload this VS Code window once, then retry",
+                )
             # Always write the signal file: the extension may already be
             # installed even if _ensure failed (e.g. `code` CLI not found).
             request = _open_via_signal_file(

arrayview/_vscode_extension.py

@@ -5,7 +5,9 @@ from __future__ import annotations
 import json
 import os
 import re
+import signal
 import subprocess
+import time
 import zipfile
 from importlib.resources import files as _pkg_files
 
@@ -44,7 +46,8 @@ def _vscode_app_bundle() -> str | None:
 
 _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_VERSION = "0.14.40"  # current bundled extension version
+_VSCODE_EXT_RELOAD_REQUIRED = False  # installed files are newer than the live host
+_VSCODE_EXT_VERSION = "0.14.41"  # current bundled extension version
 
 def _bundled_vscode_vsix_version(vsix_path: str) -> str | None:
     """Return the bundled opener extension version recorded inside the VSIX."""
@@ -92,19 +95,43 @@ def _patch_vscode_extension_metadata(version: str) -> None:
             )
 
 
-def _remove_old_extension_versions(current_version: str) -> None:
-    """Delete extension directories for versions older than current_version.
+def _version_tuple(version: str) -> tuple[int, ...] | None:
+    """Return a numeric version tuple, or ``None`` for unknown formats."""
+    try:
+        return tuple(int(part) for part in version.split("."))
+    except (AttributeError, TypeError, ValueError):
+        return None
+
+
+def _extension_bases(*, remote: bool | None = None) -> tuple[str, ...]:
+    """Return extension roots for the active VS Code host."""
+    local = os.path.expanduser("~/.vscode/extensions")
+    remote_base = os.path.expanduser("~/.vscode-server/extensions")
+    if remote is True:
+        if os.path.isdir(os.path.expanduser("~/.vscode-server")):
+            return (remote_base,)
+        # `code tunnel` uses ~/.vscode/extensions on the remote host, while
+        # Remote-SSH uses ~/.vscode-server/extensions.
+        return (local,)
+    if remote is False:
+        return (local,)
+    return (local, remote_base)
+
+
+def _remove_old_extension_versions(
+    current_version: str, *, remote: bool | None = None
+) -> None:
+    """Delete older extension directories without ever deleting a newer build.
 
     When multiple versions of arrayview-opener are installed side-by-side,
     VS Code may load an older version instead of the latest.  Removing stale
     directories ensures the correct version is picked up on the next reload.
+    Cleanup is scoped to the active local or remote extension host.
     """
     import shutil
 
-    for ext_base in (
-        os.path.expanduser("~/.vscode-server/extensions"),
-        os.path.expanduser("~/.vscode/extensions"),
-    ):
+    current_key = _version_tuple(current_version)
+    for ext_base in _extension_bases(remote=remote):
         if not os.path.isdir(ext_base):
             continue
         try:
@@ -118,6 +145,9 @@ def _remove_old_extension_versions(current_version: str) -> None:
             version_str = entry[len(prefix) :]
             if version_str == current_version:
                 continue  # keep
+            version_key = _version_tuple(version_str)
+            if current_key is None or version_key is None or version_key > current_key:
+                continue
             old_dir = os.path.join(ext_base, entry)
             try:
                 shutil.rmtree(old_dir)
@@ -126,7 +156,12 @@ def _remove_old_extension_versions(current_version: str) -> None:
                 _vprint(f"[ArrayView] could not remove {entry}: {exc}", flush=True)
 
 
-def _extension_on_disk(version: str, vsix_path: str | None = None) -> bool:
+def _extension_on_disk(
+    version: str,
+    vsix_path: str | None = None,
+    *,
+    remote: bool | None = None,
+) -> bool:
     """Return True if the extension directory for *version* exists on disk.
 
     When *vsix_path* is given, also verifies that the installed extension
@@ -136,10 +171,7 @@ def _extension_on_disk(version: str, vsix_path: str | None = None) -> bool:
     """
     import hashlib
 
-    for base in (
-        os.path.expanduser("~/.vscode/extensions"),
-        os.path.expanduser("~/.vscode-server/extensions"),
-    ):
+    for base in _extension_bases(remote=remote):
         ext_dir = os.path.join(base, f"arrayview.arrayview-opener-{version}")
         if not os.path.isdir(ext_dir):
             continue
@@ -165,6 +197,88 @@ def _extension_on_disk(version: str, vsix_path: str | None = None) -> bool:
     return False
 
 
+def _newer_extension_on_disk(version: str, *, remote: bool) -> str | None:
+    """Return the newest installed opener newer than *version*, if any."""
+    wanted = _version_tuple(version)
+    if wanted is None:
+        return None
+    prefix = "arrayview.arrayview-opener-"
+    newer: list[tuple[tuple[int, ...], str]] = []
+    for base in _extension_bases(remote=remote):
+        try:
+            entries = os.listdir(base)
+        except OSError:
+            continue
+        for entry in entries:
+            if not entry.startswith(prefix):
+                continue
+            candidate = entry[len(prefix) :]
+            key = _version_tuple(candidate)
+            if key is not None and key > wanted:
+                newer.append((key, candidate))
+    return max(newer)[1] if newer else None
+
+
+def _active_extension_version() -> str | None:
+    """Return the opener version advertised by this terminal's live host."""
+    window_id = os.environ.get("ARRAYVIEW_WINDOW_ID")
+    if not window_id:
+        ipc = _find_vscode_ipc_hook()
+        if ipc:
+            import hashlib
+
+            window_id = hashlib.sha256(ipc.encode()).hexdigest()[:16]
+    if not window_id:
+        return None
+    registration = os.path.expanduser(f"~/.arrayview/window-{window_id}.json")
+    try:
+        with open(registration) as file:
+            value = json.load(file).get("extensionVersion")
+        # An existing registration without a version belongs to a legacy host.
+        return value if isinstance(value, str) else ""
+    except (OSError, TypeError, ValueError):
+        return None
+
+
+def _wait_for_active_extension_version(version: str, timeout: float = 15.0) -> bool:
+    """Wait for an updated extension host registration after installation."""
+    deadline = time.monotonic() + timeout
+    while time.monotonic() < deadline:
+        if _active_extension_version() == version:
+            return True
+        time.sleep(0.1)
+    return _active_extension_version() == version
+
+
+def _run_extension_installer(command: list[str], env: dict[str, str]) -> subprocess.CompletedProcess:
+    """Run VS Code's installer without leaving its server-cli child behind."""
+    process = subprocess.Popen(
+        command,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        text=True,
+        env=env,
+        start_new_session=os.name != "nt",
+    )
+    try:
+        stdout, stderr = process.communicate(timeout=30)
+    except subprocess.TimeoutExpired:
+        if os.name == "nt":
+            process.kill()
+        else:
+            os.killpg(process.pid, signal.SIGTERM)
+        try:
+            process.communicate(timeout=2)
+        except subprocess.TimeoutExpired:
+            if os.name == "nt":
+                process.kill()
+            else:
+                os.killpg(process.pid, signal.SIGKILL)
+            process.communicate()
+        raise
+    return subprocess.CompletedProcess(command, process.returncode, stdout, stderr)
+
+
 def _ensure_vscode_extension() -> bool:
     """Install the bundled arrayview-opener VS Code extension for local VS Code use.
 
@@ -180,9 +294,9 @@ def _ensure_vscode_extension() -> bool:
     The authoritative version is read from the bundled VSIX — no hardcoded
     version constant needed.
     """
-    global _VSCODE_EXT_INSTALLED, _VSCODE_EXT_FRESH_INSTALL
-    if _VSCODE_EXT_INSTALLED:
-        return True
+    global _VSCODE_EXT_INSTALLED, _VSCODE_EXT_FRESH_INSTALL, _VSCODE_EXT_RELOAD_REQUIRED
+    _VSCODE_EXT_FRESH_INSTALL = False
+    _VSCODE_EXT_RELOAD_REQUIRED = False
 
     vsix_path = str(_pkg_files("arrayview").joinpath("arrayview-opener.vsix"))
     if not os.path.isfile(vsix_path):
@@ -195,8 +309,18 @@ def _ensure_vscode_extension() -> bool:
     # Fast path: correct version and content already installed — no reinstall
     # needed.  Reinstalling with --force triggers an extension-host reload,
     # which creates a ~10-15s gap during which the signal file can be missed.
-    _remove_old_extension_versions(ext_version)
-    if _extension_on_disk(ext_version, vsix_path):
+    is_remote = _is_vscode_remote()
+    active_version = _active_extension_version()
+    if _extension_on_disk(ext_version, vsix_path, remote=is_remote):
+        if active_version not in (None, ext_version):
+            _VSCODE_EXT_RELOAD_REQUIRED = True
+            _vprint(
+                f"[ArrayView] opener v{ext_version} is installed, but this VS Code "
+                "window is still running an older extension host; reload this window",
+                flush=True,
+            )
+            return False
+        _remove_old_extension_versions(ext_version, remote=is_remote)
         _VSCODE_EXT_INSTALLED = True
         _vprint(
             f"[ArrayView] extension v{ext_version} already installed — skipping reinstall",
@@ -204,6 +328,23 @@ def _ensure_vscode_extension() -> bool:
         )
         return True
 
+    newer_version = _newer_extension_on_disk(ext_version, remote=is_remote)
+    if newer_version is not None:
+        if active_version not in (None, newer_version):
+            _VSCODE_EXT_RELOAD_REQUIRED = True
+            _vprint(
+                f"[ArrayView] newer opener v{newer_version} is installed, but this "
+                "VS Code window is still running an older extension host; reload this window",
+                flush=True,
+            )
+            return False
+        _VSCODE_EXT_INSTALLED = True
+        _vprint(
+            f"[ArrayView] newer extension v{newer_version} is installed — keeping it",
+            flush=True,
+        )
+        return True
+
     code = _find_code_cli()
     if not code:
         return False
@@ -214,12 +355,8 @@ def _ensure_vscode_extension() -> bool:
         env["VSCODE_IPC_HOOK_CLI"] = ipc
 
     try:
-        r = subprocess.run(
-            [code, "--install-extension", vsix_path, "--force"],
-            capture_output=True,
-            text=True,
-            timeout=30,
-            env=env,
+        r = _run_extension_installer(
+            [code, "--install-extension", vsix_path, "--force"], env
         )
         combined = (r.stdout or "") + (r.stderr or "")
         install_failed = (
@@ -247,9 +384,23 @@ def _ensure_vscode_extension() -> bool:
                 pass  # non-critical
             _VSCODE_EXT_INSTALLED = True
             _VSCODE_EXT_FRESH_INSTALL = True
+            _remove_old_extension_versions(ext_version, remote=is_remote)
+            if active_version not in (None, ext_version):
+                if not _wait_for_active_extension_version(ext_version):
+                    _VSCODE_EXT_RELOAD_REQUIRED = True
+                    _vprint(
+                        "[ArrayView] VS Code installed the new opener, but this window "
+                        "is still running the old extension host; reload this VS Code window",
+                        flush=True,
+                    )
+                    return False
             return True
+        if active_version not in (None, ext_version):
+            _VSCODE_EXT_RELOAD_REQUIRED = True
         print(f"[ArrayView] extension install failed: {combined.strip()!r}", flush=True)
     except Exception as exc:
+        if active_version not in (None, ext_version):
+            _VSCODE_EXT_RELOAD_REQUIRED = True
         print(f"[ArrayView] extension install error: {exc}", flush=True)
     return False
 

arrayview/_vscode_signal.py

@@ -49,6 +49,7 @@ class SignalRequest:
     server_id: str | None
     ack_path: Path
     written: bool
+    extension_version: str | None = None
 
     def __bool__(self) -> bool:
         return self.written
@@ -129,6 +130,28 @@ def _wait_for_vscode_ack(
                         message=f"ACK {key} does not match request",
                         payload=payload,
                     )
+            if request.extension_version is not None:
+                try:
+                    actual_version = tuple(
+                        int(part) for part in payload["extensionVersion"].split(".")
+                    )
+                    required_version = tuple(
+                        int(part) for part in request.extension_version.split(".")
+                    )
+                except (AttributeError, KeyError, TypeError, ValueError):
+                    return AckResult(
+                        AckState.INVALID,
+                        request.request_id,
+                        message="ACK extensionVersion is missing or invalid",
+                        payload=payload,
+                    )
+                if actual_version < required_version:
+                    return AckResult(
+                        AckState.INVALID,
+                        request.request_id,
+                        message="ACK extensionVersion is older than required",
+                        payload=payload,
+                    )
             result = AckResult(
                 state,
                 request.request_id,
@@ -403,6 +426,10 @@ def _open_via_signal_file(
         "requestId": request_id,
         "ackPath": str(ack_path),
     }
+    from arrayview._vscode_extension import _VSCODE_EXT_VERSION
+    payload["requiredExtensionVersion"] = _VSCODE_EXT_VERSION
+    if _is_vscode_remote():
+        payload["remoteOnly"] = True
     if window_id:
         payload["windowId"] = window_id
     if server_id:
@@ -419,6 +446,7 @@ def _open_via_signal_file(
         server_id,
         ack_path,
         written,
+        _VSCODE_EXT_VERSION,
     )
 
 

{arrayview-0.31.2.dist-info → arrayview-0.31.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arrayview
-Version: 0.31.2
+Version: 0.31.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.31.2.dist-info → arrayview-0.31.3.dist-info}/RECORD

@@ -18,7 +18,7 @@ arrayview/_platform.py,sha256=U1XPqEjPeqy3l_xJh9Rmn_3d_6Fh_clJUcA0uR6QBGA,19043
 arrayview/_render.py,sha256=wVvwxQtZ7ldWYZTzlg2CS-esnPHlpSXMW_z22eh-rU0,30296
 arrayview/_routes_analysis.py,sha256=QTTdZrq6bXBAxqrAPf4-3_ANZPv0b8VXyPK8mW_Xe1s,31629
 arrayview/_routes_export.py,sha256=Ha8mMO2E9TlRL5x25-ADV8_8xUiC-jRz9N1oWwgKOsg,3898
-arrayview/_routes_loading.py,sha256=pqhiOaH-hXdCR8P9X26JHm_psR5gurT1N4vh8BIuwcw,21864
+arrayview/_routes_loading.py,sha256=0lhbFAtTQS3K0LGuOFxxVjtJ9gtqnCU-8vzdL04CL9Q,21931
 arrayview/_routes_persistence.py,sha256=T03csHb7ppGT-8yMDf227XkqhnhjgSLYj0RW2wmg59g,17176
 arrayview/_routes_preload.py,sha256=KOsankNguxdIWmFW9iZcY9p2SvUN1mOKY7KkW1qMGcc,1729
 arrayview/_routes_query.py,sha256=vEwkNWKVkwTOBswGU079gf_C0fWbO4Bgvg0U7jusBCU,5227
@@ -29,7 +29,7 @@ arrayview/_routes_vectorfield.py,sha256=P8avWU8jDH173YQ4Kfpzs8SZz5gIL4ki0-Gc6pGA
 arrayview/_routes_websocket.py,sha256=6WCK665MGAbCpOhkxQdEnJN7o1CYB4e2_VB4ilgmr-I,18722
 arrayview/_segmentation.py,sha256=aENWHmefrKDScXhcZL1X3KgYXE784dpMkmFFo83qnrw,7377
 arrayview/_server.py,sha256=XqrC1jbQ_wke4_YgxZ-1xACmUFPYxq2hEU--namvtqA,10407
-arrayview/_session.py,sha256=NXhx1-XbMNqqsF-A57wmmW2rE9jOUbWtXtjgQRl0b7s,21683
+arrayview/_session.py,sha256=_JYLC-Upnxysh114GjIAyZFJRCgTQJTkFcFZFhJb4Ds,21769
 arrayview/_session_spec.py,sha256=AEqt_5eXIYdlWkJeeVBmG_MqSUgmVDZCTNaMkdRTZ5Y,6969
 arrayview/_shell.html,sha256=xzHIB-kRX12okubZoqdrgsWDY8CCLteg5jtXxDQru8U,11624
 arrayview/_synthetic_mri.py,sha256=CNL-2WC835i6WCqkvmWBCO6WQ5w7HE5trNb8OyEfe64,7365
@@ -37,13 +37,13 @@ arrayview/_torch.py,sha256=13sqIMCUu_-b9SQ9KfDCExDz2UMStL87EDVjnbJxAEo,7536
 arrayview/_vectorfield.py,sha256=eDqMCMEGjO8Jdt-6Auh01cz3WD9dbF7xYUWD9xHAf1E,8115
 arrayview/_viewer.html,sha256=42OHpTAuXsFLB5AGLJhCRs1qw9oIqjEXJjq3i9EKm9c,1789431
 arrayview/_vscode.py,sha256=uY3SYJYjgzuYCbdycmm53ZaPNJIPPtGiIQZKBUobMz4,871
-arrayview/_vscode_browser.py,sha256=7WjnJwN--bppJmSv8TFjJWG0_IpGwGqHkNI6ubjxgE8,11785
-arrayview/_vscode_extension.py,sha256=UZqjMPJASvz8U6moa-cX7xVJhbvwpVSmCHXd-wc_W4Y,13423
-arrayview/_vscode_signal.py,sha256=9WZKG3CqZKA9yG6GvSVmkunQs-0DwmRNy5wML4dD0p0,45107
-arrayview/arrayview-opener.vsix,sha256=QeeLuH0h0sFN_tBXIRmFOdm4owSrZ4_aLSQPe7KbOR0,21352
+arrayview/_vscode_browser.py,sha256=r5IX9pLF73NykhOIgZXYJTv1CLqiXnBOstHxCYiMBmk,12355
+arrayview/_vscode_extension.py,sha256=SR21698fF6crdqNE0G1Q5rLNdD-CLRvq8cvd0Zv5rf0,19481
+arrayview/_vscode_signal.py,sha256=P-Ia1f8KNZGPiqCtHrgxTSFhYjxiqt4ZOrgibApQ6Dw,46404
+arrayview/arrayview-opener.vsix,sha256=R5_TSw2R6hXb8BeCWREXOZ71ZRFLZbxdrR2ix7HWV7o,22214
 arrayview/gsap.min.js,sha256=VGihm4idI0E1uqrWezWsiScB9F_jMosn7qs6pPSkeac,72304
-arrayview-0.31.2.dist-info/METADATA,sha256=ID8dLoV42W9GRgXawTdg4nupId1kmrlnxMcPNYspMcc,2054
-arrayview-0.31.2.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-arrayview-0.31.2.dist-info/entry_points.txt,sha256=FQSz3M11B-zaVLDyXofKUDvMhHASz7OjmoLgI4nn7ko,105
-arrayview-0.31.2.dist-info/licenses/LICENSE,sha256=34OivjM9faB2QaPjZpMRTIiSx31V3U9cEyQ6F2k-bH0,1062
-arrayview-0.31.2.dist-info/RECORD,,
+arrayview-0.31.3.dist-info/METADATA,sha256=7M_qfaHSxJuUBuagK3QMzT3Ie58CzANAnmsrCOqOHlA,2054
+arrayview-0.31.3.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+arrayview-0.31.3.dist-info/entry_points.txt,sha256=FQSz3M11B-zaVLDyXofKUDvMhHASz7OjmoLgI4nn7ko,105
+arrayview-0.31.3.dist-info/licenses/LICENSE,sha256=34OivjM9faB2QaPjZpMRTIiSx31V3U9cEyQ6F2k-bH0,1062
+arrayview-0.31.3.dist-info/RECORD,,