datex-studio-cli 0.4.22__tar.gz → 0.4.23__tar.gz

{datex_studio_cli-0.4.22 → datex_studio_cli-0.4.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: datex-studio-cli
-Version: 0.4.22
+Version: 0.4.23
 Summary: CLI for Datex Studio low-code platform, designed for LLM-based AI agents
 Project-URL: Homepage, https://github.com/datex/datex-studio-cli
 Project-URL: Documentation, https://github.com/datex/datex-studio-cli

{datex_studio_cli-0.4.22 → datex_studio_cli-0.4.23}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "datex-studio-cli"
-version = "0.4.22"
+version = "0.4.23"
 description = "CLI for Datex Studio low-code platform, designed for LLM-based AI agents"
 readme = "README.md"
 license = "MIT"

{datex_studio_cli-0.4.22 → datex_studio_cli-0.4.23}/src/dxs/__init__.py

@@ -1,4 +1,4 @@
 """Datex Studio CLI - Command-line interface for Datex Studio platform."""
 
-__version__ = "0.4.22"
+__version__ = "0.4.23"
 __app_name__ = "dxs"

{datex_studio_cli-0.4.22 → datex_studio_cli-0.4.23}/src/dxs/cli.py

@@ -731,7 +731,8 @@ def update_cmd(yes: bool, check_only: bool) -> None:
         click.echo("  The upgrade will run in the background once dxs exits.", err=True)
         click.echo(f"  Log: {log_path}", err=True)
         click.echo(
-            "  The outcome will be reported the next time you run dxs — give it a minute.",
+            "  The outcome will be reported the next time you run dxs — allow a couple of "
+            "minutes; the helper retries while PyPI's CDN catches up after a fresh release.",
             err=True,
         )
         return

{datex_studio_cli-0.4.22 → datex_studio_cli-0.4.23}/src/dxs/utils/update_check.py

@@ -58,6 +58,7 @@ UPDATE_PENDING_FILE = "update_pending.json"
 UPDATE_PENDING_STALE_SECONDS = 15 * 60
 
 _HELPER_MAX_TRIES = 300  # ~5 min of 1s polls per waited-on PID
+_HELPER_UPGRADE_ATTEMPTS = 3  # upgrade retries while PyPI's CDN catches up
 
 _CREATE_NO_WINDOW = 0x08000000
 _CREATE_NEW_PROCESS_GROUP = 0x00000200
@@ -159,16 +160,23 @@ def is_newer(candidate: str, current: str) -> bool:
 
 
 def detect_upgrade_argv() -> list[str]:
-    """Best-effort detection of how dxs was installed, as an argv list."""
+    """Best-effort detection of how dxs was installed, as an argv list.
+
+    Every variant bypasses the installer's local index cache: uv and pip
+    honor PyPI's ``max-age=600`` on the simple index, so right after a
+    release they can resolve against an up-to-10-minute-old cached index
+    and conclude "nothing to upgrade" even though the live JSON query that
+    triggered the upgrade already saw the new version.
+    """
     exe = sys.executable
     # uv tool installs land under ~/.local/share/uv/tools/<pkg>/...
     if "/uv/tools/" in exe or "\\uv\\tools\\" in exe:
-        return ["uv", "tool", "upgrade", PACKAGE_NAME]
+        return ["uv", "tool", "upgrade", "--no-cache", PACKAGE_NAME]
     # pipx installs land under ~/.local/pipx/venvs/<pkg>/...
     if "/pipx/" in exe or "\\pipx\\" in exe:
-        return ["pipx", "upgrade", PACKAGE_NAME]
+        return ["pipx", "upgrade", "--pip-args=--no-cache-dir", PACKAGE_NAME]
     # Fallback: pip in whatever interpreter the user is on
-    return [exe, "-m", "pip", "install", "--upgrade", PACKAGE_NAME]
+    return [exe, "-m", "pip", "install", "--upgrade", "--no-cache-dir", PACKAGE_NAME]
 
 
 def detect_upgrade_command() -> str:
@@ -224,7 +232,14 @@ def perform_upgrade_posix(argv: list[str]) -> None:
     os.execvp(argv[0], argv)  # noqa: S606 - deliberate process replacement
 
 
-def _windows_helper_script(argv: list[str], pid: int, ppid: int, log_path: Path) -> str:
+def _windows_helper_script(
+    argv: list[str],
+    pid: int,
+    ppid: int,
+    log_path: Path,
+    python_exe: str,
+    target_version: str,
+) -> str:
     """Generate the detached cmd helper that performs a Windows upgrade.
 
     The helper waits for two PIDs: this python process and its parent —
@@ -233,11 +248,19 @@ def _windows_helper_script(argv: list[str], pid: int, ppid: int, log_path: Path)
     something else — dxs launched from a shell, or a recycled PID — is
     never awaited, and bounded so a wedged process can't pin the helper
     forever (the upgrade then runs anyway and the log records the real
-    error). ``ping -n 2`` is the sleep: ``timeout`` requires an
+    error). ``ping -n N`` is the sleep: ``timeout`` requires an
     interactive console and fails in a detached process.
+
+    After each upgrade attempt the helper reads the installed version back
+    through the tool venv's own interpreter and compares it to the target
+    the CLI decided to install. A mismatch retries after ~30s, up to
+    {_HELPER_UPGRADE_ATTEMPTS} attempts: PyPI's CDN can keep serving a
+    pre-release index for a few minutes after a publish, so a single
+    "nothing to upgrade" pass must not be final.
     """
     cmdline = subprocess.list2cmdline(argv)
     log = str(log_path)
+    ver_file = f"{log}.ver"
     lines = [
         "@echo off",
         "setlocal",
@@ -260,9 +283,28 @@ def _windows_helper_script(argv: list[str], pid: int, ppid: int, log_path: Path)
         "goto wait_parent",
         ")",
         ":run",
-        f'echo [dxs update] running: {cmdline} >> "{log}"',
+        "set ATTEMPT=0",
+        ":attempt",
+        "set /a ATTEMPT+=1",
+        f'echo [dxs update] attempt %ATTEMPT%: {cmdline} >> "{log}"',
         f'{cmdline} >> "{log}" 2>&1',
         f'echo [dxs update] upgrader exit code: %errorlevel% >> "{log}"',
+        "set NEWVER=",
+        f'"{python_exe}" -c "import dxs; print(dxs.__version__)" > "{ver_file}" 2>>"{log}"',
+        f'set /p NEWVER=<"{ver_file}"',
+        f'del "{ver_file}" >nul 2>&1',
+        f'if "%NEWVER%"=="{target_version}" goto verified',
+        f'echo [dxs update] installed version is %NEWVER%, wanted {target_version} >> "{log}"',
+        f"if %ATTEMPT% GEQ {_HELPER_UPGRADE_ATTEMPTS} goto giveup",
+        f'echo [dxs update] waiting 30s for the package index to catch up... >> "{log}"',
+        "ping -n 31 127.0.0.1 >nul",
+        "goto attempt",
+        ":giveup",
+        f'echo [dxs update] giving up after %ATTEMPT% attempts >> "{log}"',
+        "goto end",
+        ":verified",
+        f'echo [dxs update] verified: now on %NEWVER% >> "{log}"',
+        ":end",
         "endlocal",
         "",
     ]
@@ -302,7 +344,14 @@ def perform_upgrade_windows(argv: list[str], latest: str) -> Path:
     home = get_datex_home()
     log_path = home / UPDATE_LOG_FILE
     helper_path = home / UPDATE_HELPER_FILE
-    script = _windows_helper_script(argv, pid=os.getpid(), ppid=os.getppid(), log_path=log_path)
+    script = _windows_helper_script(
+        argv,
+        pid=os.getpid(),
+        ppid=os.getppid(),
+        log_path=log_path,
+        python_exe=sys.executable,
+        target_version=latest,
+    )
     helper_path.write_text(script, newline="")
     _write_pending(
         {