mint-sdk 1.2.7__tar.gz → 1.2.8__tar.gz

{mint_sdk-1.2.7 → mint_sdk-1.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: mint-sdk
-Version: 1.2.7
+Version: 1.2.8
 Summary: MINT Plugin SDK - Build analysis plugins for the MINT (Mass-spec INtegrated Toolkit) platform
 Project-URL: Homepage, https://github.com/MorscherLab/MINT
 Project-URL: Documentation, https://github.com/MorscherLab/MINT/tree/main/packages/sdk-python#readme

{mint_sdk-1.2.7 → mint_sdk-1.2.8}/src/mint_sdk/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.2.7'
-__version_tuple__ = version_tuple = (1, 2, 7)
+__version__ = version = '1.2.8'
+__version_tuple__ = version_tuple = (1, 2, 8)
 
 __commit_id__ = commit_id = None

{mint_sdk-1.2.7 → mint_sdk-1.2.8}/src/mint_sdk/deploy_command.py

@@ -11,12 +11,13 @@ from __future__ import annotations
 import json
 import sys
 import time
+import zipfile
 from collections.abc import Callable
-from contextlib import nullcontext, redirect_stdout
+from contextlib import nullcontext, redirect_stdout, suppress
 from pathlib import Path
 from typing import Any, NoReturn
 
-from packaging.utils import canonicalize_name
+from packaging.utils import canonicalize_name, canonicalize_version
 
 from mint_sdk.client import ConflictError
 
@@ -113,6 +114,21 @@ def _normalize_plugin_name(value: str) -> str:
     return str(canonicalize_name(value))
 
 
+def _bundle_version(bundle: Path) -> str | None:
+    """Return the plugin version in a ``.mint`` manifest; None for a legacy bundle without one."""
+    with zipfile.ZipFile(bundle) as zf:
+        if "manifest.json" not in zf.namelist():
+            return None
+        return str(json.loads(zf.read("manifest.json"))["plugin"]["version"])
+
+
+def _is_version(entry: dict[str, Any] | None, version: str | None) -> bool:
+    """True when *entry* is loaded at *version* (any version when it is unknown)."""
+    if entry is None:
+        return False
+    return version is None or canonicalize_version(entry["version"]) == canonicalize_version(version)
+
+
 def _conflict_message(error: ConflictError) -> str:
     body = error.body if isinstance(error.body, dict) else {}
     detail = body.get("detail")
@@ -202,9 +218,21 @@ def cmd_deploy(
 
     plugin_name = result.get("name") or ""
     restart_required = result.get("restart_required", True)
+    # The old process keeps answering until the restart lands, so "loaded"
+    # only counts once the entry reports the version this bundle carries.
+    bundle_version = _bundle_version(bundle)
 
     if restart_required and restart:
         if not json_output:
+            # Best-effort note only; a failed lookup must not block the restart.
+            with suppress(Exception):
+                running = _loaded_plugin_entry(client, plugin_name) if plugin_name and bundle_version else None
+                if _is_version(running, bundle_version):
+                    print(
+                        f"Note: {plugin_name} {bundle_version} is already loaded; "
+                        "cannot confirm the restart picks up this build.",
+                        file=sys.stderr,
+                    )
             print("Restarting platform ...")
         client.admin.restart()
         if not wait_for(
@@ -231,12 +259,13 @@ def cmd_deploy(
     def _loaded() -> bool:
         nonlocal entry
         entry = _loaded_plugin_entry(client, plugin_name) if plugin_name else None
-        return entry is not None
+        return _is_version(entry, bundle_version)
 
     if plugin_name and not wait_for(_loaded, timeout=timeout):
+        seen = f" (loaded {entry['version']}, bundle {bundle_version})" if entry else ""
         _fail(
             f"Plugin '{plugin_name}' was installed but did not appear as loaded within "
-            f"{timeout:.0f}s. Check Admin → Plugins or the server logs on {target}.",
+            f"{timeout:.0f}s{seen}. Check Admin → Plugins or the server logs on {target}.",
             json_output=json_output,
         )
 

{mint_sdk-1.2.7 → mint_sdk-1.2.8}/src/mint_sdk/docs/bundled/frontend.json

@@ -1,6 +1,6 @@
 {
   "sdk": "frontend",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "categories": {
     "components": [
       {

{mint_sdk-1.2.7 → mint_sdk-1.2.8}/tests/test_deploy_command.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import json
+import zipfile
 from pathlib import Path
 from types import SimpleNamespace
 from unittest.mock import Mock
@@ -53,8 +54,15 @@ class FakeClient:
         return {"status": "ok"}
 
 
+def _write_bundle(path: Path, version: str) -> Path:
+    path.parent.mkdir(parents=True, exist_ok=True)
+    with zipfile.ZipFile(path, "w") as zf:
+        zf.writestr("manifest.json", json.dumps({"plugin": {"version": version}}))
+    return path
+
+
 def _fake_build(project_dir: Path, **_: object) -> Path:
-    return project_dir / "dist" / "demo-1.0.0.mint"
+    return _write_bundle(project_dir / "dist" / "demo-1.0.0.mint", "1.0.0")
 
 
 def test_wait_for_swallows_exceptions_until_timeout() -> None:
@@ -139,6 +147,56 @@ def test_deploy_success_restarts_and_waits_for_load(tmp_path: Path, capsys) -> N
     assert "/demo" in out
 
 
+def test_deploy_waits_for_bundle_version_when_old_process_still_answers(
+    tmp_path: Path, capsys, monkeypatch
+) -> None:
+    client = FakeClient(
+        upload_result={"success": True, "name": "demo-plugin", "restart_required": True},
+        loaded=[{"name": "demo-plugin", "version": "0.9.0", "routes_prefix": "/demo"}],
+    )
+    old = client.plugins.list()
+    new = {"loaded": [{"name": "demo-plugin", "version": "1.0.0", "routes_prefix": "/demo"}]}
+    stale_after_restart = iter([old])  # the old process answers once more before it exits
+    client.plugins.list = lambda: old if client.restart_calls == 0 else next(stale_after_restart, new)
+    monkeypatch.setattr("mint_sdk.deploy_command.time.sleep", lambda _: None)
+
+    cmd_deploy(
+        path=str(tmp_path),
+        get_client=lambda base_url=None: client,
+        build=_fake_build,
+        timeout=5,
+    )
+
+    assert "Deployed demo-plugin 1.0.0" in capsys.readouterr().out
+
+
+def test_deploy_restarts_when_pre_restart_plugin_list_fails(tmp_path: Path, monkeypatch) -> None:
+    client = FakeClient(
+        upload_result={"success": True, "name": "demo-plugin", "restart_required": True},
+        loaded=[{"name": "demo-plugin", "version": "1.0.0", "routes_prefix": "/demo"}],
+    )
+    old_list = client.plugins.list
+    calls = iter([ConnectionError("dropped")])
+
+    def flaky_list() -> dict:
+        error = next(calls, None)
+        if error:
+            raise error
+        return old_list()
+
+    client.plugins.list = flaky_list
+    monkeypatch.setattr("mint_sdk.deploy_command.time.sleep", lambda _: None)
+
+    cmd_deploy(
+        path=str(tmp_path),
+        get_client=lambda base_url=None: client,
+        build=_fake_build,
+        timeout=5,
+    )
+
+    assert client.restart_calls == 1
+
+
 def test_deploy_failure_exits_with_conflict_hint(tmp_path: Path, capsys) -> None:
     client = FakeClient(
         upload_result={
@@ -237,7 +295,7 @@ def test_deploy_times_out_when_plugin_never_loads(tmp_path: Path, capsys, monkey
 def test_deploy_forwards_force_flag(tmp_path: Path) -> None:
     client = FakeClient(
         upload_result={"success": True, "name": "demo-plugin", "restart_required": False},
-        loaded=[{"name": "demo-plugin"}],
+        loaded=[{"name": "demo-plugin", "version": "1.0.0"}],
     )
 
     cmd_deploy(
@@ -262,8 +320,7 @@ def test_deploy_builds_before_contacting_server(tmp_path: Path) -> None:
 
 
 def test_deploy_prebuilt_bundle_skips_build(tmp_path: Path, capsys) -> None:
-    bundle = tmp_path / "demo-1.0.0.mint"
-    bundle.write_bytes(b"bundle")
+    bundle = _write_bundle(tmp_path / "demo-1.0.0.mint", "1.0.0")
     client = FakeClient(
         upload_result={"success": True, "name": "demo-plugin", "restart_required": False},
         loaded=[{"name": "demo-plugin", "version": "1.0.0", "routes_prefix": "/demo"}],
@@ -316,6 +373,20 @@ def test_deploy_json_keeps_build_logs_off_stdout(tmp_path: Path, capsys) -> None
     )
 
 
+def test_deploy_legacy_bundle_without_manifest_waits_for_presence(tmp_path: Path, capsys) -> None:
+    bundle = tmp_path / "demo.mint"
+    with zipfile.ZipFile(bundle, "w") as zf:
+        zf.writestr("demo-1.0.0-py3-none-any.whl", b"")
+    client = FakeClient(
+        upload_result={"success": True, "name": "demo-plugin", "restart_required": False},
+        loaded=[{"name": "demo-plugin", "version": "1.0.0", "routes_prefix": "/demo"}],
+    )
+
+    cmd_deploy(bundle_path=str(bundle), get_client=lambda base_url=None: client, timeout=5)
+
+    assert "Deployed demo-plugin 1.0.0" in capsys.readouterr().out
+
+
 def test_deploy_rejects_missing_prebuilt_bundle(tmp_path: Path, capsys) -> None:
     with pytest.raises(SystemExit):
         cmd_deploy(