opensees-cli 0.2.3__tar.gz → 0.2.4__tar.gz

{opensees_cli-0.2.3 → opensees_cli-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensees_cli
-Version: 0.2.3
+Version: 0.2.4
 Summary: Run OpenSees simulations in the cloud from the command line.
 Author: Minjie Zhu
 License: Proprietary

{opensees_cli-0.2.3 → opensees_cli-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "opensees_cli"
-version = "0.2.3"
+version = "0.2.4"
 description = "Run OpenSees simulations in the cloud from the command line."
 readme = "README.md"
 requires-python = ">=3.9"

{opensees_cli-0.2.3 → opensees_cli-0.2.4}/src/opensees_cli/__init__.py

@@ -1,3 +1,3 @@
 """OpenSees CLI — run structural simulations in the cloud."""
 
-__version__ = "0.2.3"
+__version__ = "0.2.4"

{opensees_cli-0.2.3 → opensees_cli-0.2.4}/src/opensees_cli/admin.py

@@ -11,7 +11,7 @@ from rich.console import Console
 from rich.table import Table
 from typer.core import TyperGroup
 
-from opensees_cli import api, config
+from opensees_cli import __version__, api, config
 from opensees_cli.auth import _to_local, print_quota
 from opensees_cli.files import download as files_download
 from opensees_cli.files import list_files as files_list
@@ -25,6 +25,15 @@ from opensees_cli.run import status as run_status
 _RUNTIME_TOKEN_RE = re.compile(r"^((\d+(?:\.\d+)?)(h|m|s))+$")
 
 
+def _cli_cell(raw: Optional[str], current: str) -> str:
+    v = (raw or "").strip()
+    if not v:
+        return "-"
+    if config.is_older_version(v, current):
+        return f"[yellow]{v}[/yellow]"
+    return v
+
+
 def _parse_runtime_quota(raw: str) -> int:
     """Parse -r: plain digits = seconds; or duration tokens like 2h, 10m, 1h30m, 90s."""
     s = raw.strip().lower().replace(" ", "")
@@ -115,14 +124,17 @@ def list_users():
         console.print("[dim]No users found.[/dim]")
         return
 
-    table = Table(title=f"Users ({len(users)})")
-    table.add_column("Email", style="cyan")
+    current_cli = __version__
+    table = Table(title=f"Users ({len(users)}) · current CLI {current_cli}")
+    # Always show the full email (never ellipsize / crop).
+    table.add_column("Email", style="cyan", overflow="ignore", no_wrap=True)
     table.add_column("Status")
     table.add_column("Enabled")
     table.add_column("Admin")
     table.add_column("Last Login")
     table.add_column("Last Activity")
-    table.add_column("Pinned")
+    table.add_column("CLI", overflow="ignore", no_wrap=True)
+    table.add_column("Pinned", overflow="ignore", no_wrap=True)
 
     for u in users:
         enabled = "[green]yes[/green]" if u.get("enabled") else "[red]no[/red]"
@@ -134,6 +146,7 @@ def list_users():
             admin,
             u.get("last_login_at", "") or "-",
             u.get("last_activity_at", "") or "-",
+            _cli_cell(u.get("last_cli_version"), current_cli),
             u.get("openseespy_version", "") or "-",
         )
     console.print(table)
@@ -205,6 +218,14 @@ def _print_user_info(email: str) -> None:
         console.print(f"  OpenSeesPy:   {pin} (pinned)")
     else:
         console.print("  OpenSeesPy:   [dim]-[/dim] (not pinned)")
+    cli_ver = (r.get("last_cli_version") or "").strip()
+    if cli_ver:
+        if config.is_older_version(cli_ver, __version__):
+            console.print(f"  CLI:          [yellow]{cli_ver}[/yellow]  (behind {__version__})")
+        else:
+            console.print(f"  CLI:          {cli_ver}")
+    else:
+        console.print("  CLI:          [dim]-[/dim]")
     if r.get("last_ip"):
         console.print(f"  Last IP:      {r['last_ip']}")
 

{opensees_cli-0.2.3 → opensees_cli-0.2.4}/src/opensees_cli/auth.py

@@ -2,15 +2,65 @@
 
 import json
 import sys
+import time
 from typing import Any, Dict, Optional, Sequence
 
+import httpx
 import typer
 from rich.console import Console
 
-from opensees_cli import api, config
+from opensees_cli import __version__, api, config
 
 console = Console()
 
+_PYPI_CLI_URL = "https://pypi.org/pypi/opensees_cli/json"
+_PYPI_CACHE_TTL_SEC = 24 * 3600
+
+
+def maybe_print_cli_upgrade(*, latest: Optional[str] = None) -> None:
+    """If a newer opensees_cli is on PyPI, print a one-line pip upgrade hint."""
+    newest = (latest or _pypi_latest_cli_version() or "").strip()
+    if not newest or not config.is_older_version(__version__, newest):
+        return
+    console.print(
+        f"[yellow]A newer opensees_cli is available ({newest}; you have {__version__}).[/yellow]"
+    )
+    console.print("[yellow]Upgrade: pip install -U opensees_cli[/yellow]")
+
+
+def _pypi_latest_cli_version() -> Optional[str]:
+    """Latest PyPI version, cached ~24h. Best-effort; never raises."""
+    if "pytest" in sys.modules:
+        return None
+    cache_path = config.CONFIG_DIR / "pypi_cli_latest.json"
+    now = time.time()
+    try:
+        cached = json.loads(cache_path.read_text(encoding="utf-8"))
+        ver = str(cached.get("version") or "").strip()
+        checked = float(cached.get("checked_at") or 0)
+        if ver and now - checked < _PYPI_CACHE_TTL_SEC:
+            return ver
+    except (OSError, TypeError, ValueError, json.JSONDecodeError):
+        pass
+    try:
+        r = httpx.get(_PYPI_CLI_URL, timeout=2.0)
+        if r.status_code != 200:
+            return None
+        ver = str((r.json().get("info") or {}).get("version") or "").strip()
+    except Exception:
+        return None
+    if not ver:
+        return None
+    try:
+        config._ensure_dir()
+        cache_path.write_text(
+            json.dumps({"version": ver, "checked_at": now}),
+            encoding="utf-8",
+        )
+    except OSError:
+        pass
+    return ver
+
 _CONFIRM_CLI_HINT = (
     "[dim]Use [bold]ops auth confirm[/bold] to confirm the verification code.[/dim]"
 )
@@ -457,7 +507,6 @@ def login(email: Optional[str] = typer.Option(None, "--email", "-e")):
     password = _ask_password()
 
     try:
-        from opensees_cli import __version__
         r = api.post(
             "/auth/login",
             {
@@ -478,6 +527,7 @@ def login(email: Optional[str] = typer.Option(None, "--email", "-e")):
         )
         api.invalidate_session_cache()
         console.print(f"[green]Logged in as [bold]{email}[/bold][/green]")
+        maybe_print_cli_upgrade()
     except api.ApiError as e:
         console.print(f"[red]{e.message}[/red]")
         raise typer.Exit(1)

{opensees_cli-0.2.3 → opensees_cli-0.2.4}/src/opensees_cli/config.py

@@ -14,7 +14,7 @@ import re
 import sys
 import time
 from pathlib import Path
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, Tuple
 
 CONFIG_DIR = Path.home() / ".opensees"
 CREDENTIALS_FILE = CONFIG_DIR / "credentials.json"
@@ -168,26 +168,50 @@ def get_api_url() -> str:
 # OpenSeesPy version (sticky local preference)
 # ---------------------------------------------------------------------------
 
-OPENSEESPY_VERSION_FILE = CONFIG_DIR / "openseespy_version"
+def _openseespy_version_file() -> Path:
+    return CONFIG_DIR / "openseespy_version"
 
 
 def set_openseespy_version(version: str) -> None:
     """Save the sticky OpenSeesPy version preference."""
     _ensure_dir()
-    OPENSEESPY_VERSION_FILE.write_text(version.strip())
+    _openseespy_version_file().write_text(version.strip())
 
 
 def get_openseespy_version() -> Optional[str]:
     """Return the sticky OpenSeesPy version, or None if not set."""
-    if not OPENSEESPY_VERSION_FILE.exists():
+    path = _openseespy_version_file()
+    if not path.exists():
         return None
     try:
-        return OPENSEESPY_VERSION_FILE.read_text().strip() or None
+        return path.read_text().strip() or None
     except OSError:
         return None
 
 
 def clear_openseespy_version() -> None:
     """Clear the sticky OpenSeesPy version preference."""
-    if OPENSEESPY_VERSION_FILE.exists():
-        OPENSEESPY_VERSION_FILE.unlink()
+    path = _openseespy_version_file()
+    if path.exists():
+        path.unlink()
+
+
+def version_tuple(raw: str) -> Tuple[int, ...]:
+    """Numeric dotted version parts, or empty if none (e.g. ``web/1.0.0`` still parses)."""
+    parts: list[int] = []
+    for token in re.findall(r"\d+", (raw or "").strip()):
+        parts.append(int(token))
+        if len(parts) >= 4:
+            break
+    return tuple(parts)
+
+
+def is_older_version(installed: str, latest: str) -> bool:
+    """True when *installed* is a lower dotted version than *latest*."""
+    a, b = version_tuple(installed), version_tuple(latest)
+    if not a or not b:
+        return False
+    n = max(len(a), len(b))
+    a = a + (0,) * (n - len(a))
+    b = b + (0,) * (n - len(b))
+    return a < b

{opensees_cli-0.2.3 → opensees_cli-0.2.4}/src/opensees_cli/main.py

@@ -8,6 +8,7 @@ from opensees_cli import __version__
 from opensees_cli.auth import (
     app as auth_app,
     format_status_json,
+    maybe_print_cli_upgrade,
     print_me,
     print_quota,
 )
@@ -161,6 +162,7 @@ def _print_help() -> None:
 
     console.print()
     console.print("[dim]Run any command with --help for more details.[/dim]")
+    maybe_print_cli_upgrade()
 
 
 @app.callback(invoke_without_command=True)
@@ -221,7 +223,9 @@ def status(
     q = r.get("quota")
     if not q:
         console.print("[dim]No quota info available.[/dim]")
+        maybe_print_cli_upgrade()
         return
     console.print()
     print_quota(q)
+    maybe_print_cli_upgrade()
 

{opensees_cli-0.2.3 → opensees_cli-0.2.4}/src/opensees_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensees_cli
-Version: 0.2.3
+Version: 0.2.4
 Summary: Run OpenSees simulations in the cloud from the command line.
 Author: Minjie Zhu
 License: Proprietary

{opensees_cli-0.2.3 → opensees_cli-0.2.4}/tests/test_admin_commands.py

@@ -16,16 +16,20 @@ class TestListUsers:
                     "is_admin": False,
                     "last_login_at": "2025-01-01T00:00:00Z",
                     "last_activity_at": "",
+                    "last_cli_version": "0.2.1",
                     "openseespy_version": "3.7.1.0",
                 },
             ]
         })
         result = cli_runner.invoke(app, ["admin", "list-users"])
         assert result.exit_code == 0
-        assert "alice@te" in result.output
+        assert "alice@test.com" in result.output
         assert "3.7.1.0" in result.output
-        assert "CLI Version" not in result.output
+        assert "0.2.1" in result.output
+        assert "CLI" in result.output
         assert "Pinned" in result.output
+        from opensees_cli import __version__
+        assert f"current CLI {__version__}" in result.output
 
     def test_list_users_empty(self, cli_runner, admin_creds, patch_httpx, mock_router):
         mock_router.add("GET", "/prod/admin/users", json={"users": []})
@@ -103,7 +107,8 @@ class TestUserInfo:
         assert "alice@test.com" in result.output
         assert "3.7.1.0" in result.output
         assert "pinned" in result.output.lower()
-        assert "CLI version" not in result.output
+        assert "0.2.2" in result.output
+        assert "CLI" in result.output
         assert "Analyses" not in result.output
         assert "Files" not in result.output
 

{opensees_cli-0.2.3 → opensees_cli-0.2.4}/tests/test_auth_commands.py

@@ -5,6 +5,7 @@ from unittest.mock import patch
 
 from opensees_cli.auth import app as auth_app
 from opensees_cli.main import app
+from opensees_cli.auth import maybe_print_cli_upgrade
 
 
 def _patch_password(*passwords):
@@ -93,12 +94,15 @@ class TestLogin:
         assert result.exit_code == 0
         assert "Logged in" in result.output
 
-    def test_login_bad_credentials(self, cli_runner, patch_httpx, mock_router):
-        mock_router.add("POST", "/prod/auth/login", status=400, json={"error": "Incorrect username or password."})
-        with patch("opensees_cli.auth._ask_password", return_value="wrong"):
+    def test_login_stale_cli(self, cli_runner, patch_httpx, mock_router):
+        mock_router.add("POST", "/prod/auth/login", status=400, json={
+            "error": "This CLI (0.2.3) is out of date. Upgrade with: pip install -U opensees_cli",
+            "code": "auth_error",
+        })
+        with patch("opensees_cli.auth._ask_password", return_value="Pass1!"):
             result = cli_runner.invoke(app, ["auth", "login", "-e", "u@t.com"])
         assert result.exit_code == 1
-        assert "Incorrect" in result.output
+        assert "pip install -U opensees_cli" in result.output
 
 
 class TestLogout:
@@ -165,3 +169,16 @@ class TestChangePassword:
             result = cli_runner.invoke(app, ["auth", "change-password"])
         assert result.exit_code == 1
         assert "do not match" in result.output
+
+
+class TestCliUpgradeNag:
+    def test_prints_when_behind(self, capsys):
+        maybe_print_cli_upgrade(latest="99.0.0")
+        out = capsys.readouterr().out
+        assert "pip install -U opensees_cli" in out
+        assert "99.0.0" in out
+
+    def test_silent_when_current(self, capsys):
+        from opensees_cli import __version__
+        maybe_print_cli_upgrade(latest=__version__)
+        assert capsys.readouterr().out == ""

{opensees_cli-0.2.3 → opensees_cli-0.2.4}/tests/test_config.py

@@ -8,6 +8,8 @@ from opensees_cli.config import (
     get_refresh_token,
     get_api_url,
     is_admin,
+    is_older_version,
+    version_tuple,
 )
 
 
@@ -82,3 +84,14 @@ class TestApiUrl:
     def test_env_override(self, monkeypatch):
         monkeypatch.setenv("OPENSEES_API_URL", "https://custom.example/v1")
         assert get_api_url() == "https://custom.example/v1"
+
+
+class TestVersionCompare:
+    def test_older(self):
+        assert is_older_version("0.2.1", "0.2.3")
+        assert not is_older_version("0.2.3", "0.2.3")
+        assert not is_older_version("0.2.4", "0.2.3")
+
+    def test_non_numeric_prefix(self):
+        assert version_tuple("web/1.0.0") == (1, 0, 0)
+        assert not is_older_version("web/1.0.0", "0.2.3")