softmax-cli 0.26.8__tar.gz → 0.26.10__tar.gz

{softmax_cli-0.26.8/src/softmax_cli.egg-info → softmax_cli-0.26.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: softmax-cli
-Version: 0.26.8
+Version: 0.26.10
 Summary: Softmax CLI — authentication and account tools
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11

{softmax_cli-0.26.8 → softmax_cli-0.26.10}/src/softmax/auth.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import os
 from urllib.parse import urlencode, urlsplit, urlunsplit
 
 import httpx
@@ -16,6 +17,10 @@ DEFAULT_COGAMES_SERVER = "https://softmax.com/api"
 DEFAULT_COGAMES_API_SERVER = "https://api.observatory.softmax-research.net"
 
 
+def get_login_server() -> str:
+    return os.environ.get("COGAMES_LOGIN_URL", DEFAULT_COGAMES_SERVER)
+
+
 class WhoAmIResponse(BaseModel):
     user_email: str
     is_softmax_team_member: bool = False

{softmax_cli-0.26.8 → softmax_cli-0.26.10}/src/softmax/cli.py

@@ -4,6 +4,7 @@ import importlib
 import importlib.util
 import sys
 
+import httpx
 import typer
 from rich.panel import Panel
 
@@ -13,6 +14,7 @@ from softmax.auth import (
     build_browser_login_url,
     delete_cogames_tokens,
     fetch_cogames_whoami,
+    get_login_server,
     load_cogames_user_token,
     load_current_cogames_token,
     save_cogames_active_token,
@@ -39,15 +41,16 @@ def _register_optional_apps() -> None:
     app.add_typer(cogames_cli.app, name="cogames", rich_help_panel="Local Games")
 
 
-def _build_manual_set_token_command(*, login_server: str) -> str:
-    command = "softmax set-token '<TOKEN>'"
-    if login_server != DEFAULT_COGAMES_SERVER:
-        command += f" --login-server '{login_server}'"
-    return command
+def _build_manual_set_token_command(server: str | None = None) -> str:
+    if server:
+        return f"softmax set-token --server '{server}' '<TOKEN>'"
+    return "softmax set-token '<TOKEN>'"
 
 
-def _print_non_tty_login_instructions(*, login_server: str) -> None:
-    auth_url = build_browser_login_url(login_server)
+def _print_non_tty_login_instructions(login_server: str | None = None) -> None:
+    resolved = login_server or get_login_server()
+    is_custom = resolved != DEFAULT_COGAMES_SERVER
+    auth_url = build_browser_login_url(resolved)
     console.print("Interactive login requires a TTY.", style="red")
     console.print()
     console.print("Open this URL in any browser to sign in:", style="yellow")
@@ -56,7 +59,7 @@ def _print_non_tty_login_instructions(*, login_server: str) -> None:
     console.print()
     console.print("Copy the auth token from the browser, then run:", style="yellow")
     console.print()
-    console.print("    ", _build_manual_set_token_command(login_server=login_server))
+    console.print("    ", _build_manual_set_token_command(resolved if is_custom else None))
     console.print()
     console.print(
         Panel(
@@ -70,12 +73,6 @@ def _print_non_tty_login_instructions(*, login_server: str) -> None:
 
 @app.command(name="login")
 def login_cmd(
-    login_server: str = typer.Option(
-        DEFAULT_COGAMES_SERVER,
-        "--login-server",
-        metavar="URL",
-        help="Authentication server URL",
-    ),
     no_browser: bool = typer.Option(
         False,
         "--no-browser",
@@ -87,18 +84,43 @@ def login_cmd(
         "-f",
         help="Re-authenticate even if already logged in",
     ),
+    server: str | None = typer.Option(
+        None,
+        "--server",
+        "-s",
+        metavar="URL",
+        help="Authentication server URL.",
+    ),
 ) -> None:
     """Sign in to Softmax."""
     from urllib.parse import urlparse  # noqa: PLC0415
 
+    login_server = server or get_login_server()
+    is_default_server = login_server == DEFAULT_COGAMES_SERVER
     user_token = None if force else load_cogames_user_token(login_server=login_server)
+    if user_token is not None:
+        api_server = None if is_default_server else login_server
+        try:
+            whoami = fetch_cogames_whoami(api_server=api_server, token=user_token)
+            if whoami.subject_type == "anonymous":
+                console.print("Saved token is no longer valid. Re-authenticating...", style="yellow")
+                user_token = None
+        except httpx.HTTPStatusError as exc:
+            if exc.response.status_code == 401:
+                console.print("Saved token is no longer valid. Re-authenticating...", style="yellow")
+                user_token = None
+            else:
+                console.print(f"Could not verify token (HTTP {exc.response.status_code}), proceeding.", style="yellow")
+        except httpx.HTTPError:
+            console.print("Could not reach server to verify token. Proceeding with saved token.", style="yellow")
+
     if user_token is not None:
         save_cogames_active_token(login_server=login_server, token=user_token)
         console.print(f"Already authenticated with {urlparse(login_server).hostname}", style="green")
         return
 
     if not sys.stdin.isatty():
-        _print_non_tty_login_instructions(login_server=login_server)
+        _print_non_tty_login_instructions(login_server)
         raise typer.Exit(1)
 
     try:
@@ -110,7 +132,7 @@ def login_cmd(
                 "If you are a coding agent, ask your human to open the URL below and give you "
                 "the auth token. Then paste the token into this window or run:\n"
                 "\n"
-                f"{_build_manual_set_token_command(login_server=login_server)}"
+                f"{_build_manual_set_token_command(server)}"
             ),
             open_browser=not no_browser,
         )
@@ -128,14 +150,16 @@ def login_cmd(
 
 @app.command(name="logout")
 def logout_cmd(
-    login_server: str = typer.Option(
-        DEFAULT_COGAMES_SERVER,
-        "--login-server",
+    server: str | None = typer.Option(
+        None,
+        "--server",
+        "-s",
         metavar="URL",
-        help="Authentication server URL",
+        help="Authentication server URL.",
     ),
 ) -> None:
     """Remove saved authentication token."""
+    login_server = server or get_login_server()
     if delete_cogames_tokens(login_server=login_server):
         console.print("Logged out.", style="green")
     else:
@@ -144,42 +168,39 @@ def logout_cmd(
 
 @app.command(name="get-login-url")
 def get_login_url_cmd(
-    login_server: str = typer.Option(
-        DEFAULT_COGAMES_SERVER,
-        "--login-server",
+    server: str | None = typer.Option(
+        None,
+        "--server",
+        "-s",
         metavar="URL",
-        help="Authentication server URL",
+        help="Authentication server URL.",
     ),
 ) -> None:
     """Print a browser sign-in URL for manual login."""
-    print(build_browser_login_url(login_server))
+    print(build_browser_login_url(server or get_login_server()))
 
 
 @app.command(name="status")
 def status_cmd(
-    login_server: str = typer.Option(
-        DEFAULT_COGAMES_SERVER,
-        "--login-server",
-        metavar="URL",
-        help="Authentication server URL",
-    ),
     server: str | None = typer.Option(
         None,
         "--server",
         "-s",
         metavar="URL",
-        help="API server URL for /whoami verification. Defaults to --login-server when"
-        " that is overridden, otherwise the production Observatory API.",
+        help="Authentication server URL.",
     ),
 ) -> None:
     """Check authentication status via /whoami."""
+    login_server = server or get_login_server()
     token = load_current_cogames_token(login_server=login_server)
     if not token:
         console.print("[red]Not authenticated.[/red] Run [cyan]softmax login[/cyan] first.")
         raise typer.Exit(1)
 
-    api_server = server or (login_server if login_server != DEFAULT_COGAMES_SERVER else None)
-    session = fetch_cogames_whoami(api_server=api_server, token=token)
+    session = fetch_cogames_whoami(api_server=server, token=token)
+    if session.subject_type == "anonymous":
+        console.print("[red]Token is invalid or expired.[/red] Run [cyan]softmax login[/cyan] to re-authenticate.")
+        raise typer.Exit(1)
     console.print("[green]Authenticated[/green]")
     console.print(f"user_email: {session.user_email}")
     console.print(f"subject_type: {session.subject_type}")
@@ -189,14 +210,16 @@ def status_cmd(
 
 @app.command(name="get-token")
 def get_token_cmd(
-    login_server: str = typer.Option(
-        DEFAULT_COGAMES_SERVER,
-        "--login-server",
+    server: str | None = typer.Option(
+        None,
+        "--server",
+        "-s",
         metavar="URL",
-        help="Authentication server URL",
+        help="Authentication server URL.",
     ),
 ) -> None:
     """Print the saved token to stdout (for scripting)."""
+    login_server = server or get_login_server()
     token = load_current_cogames_token(login_server=login_server)
     if not token:
         console.print("[red]No token found.[/red] Run [cyan]softmax login[/cyan] first.", style="bold")
@@ -207,14 +230,16 @@ def get_token_cmd(
 @app.command(name="set-token")
 def set_token_cmd(
     token: str = typer.Argument(help="Bearer token to save"),
-    login_server: str = typer.Option(
-        DEFAULT_COGAMES_SERVER,
-        "--login-server",
+    server: str | None = typer.Option(
+        None,
+        "--server",
+        "-s",
         metavar="URL",
-        help="Authentication server URL",
+        help="Authentication server URL.",
     ),
 ) -> None:
     """Manually set a token (for CI or headless environments)."""
+    login_server = server or get_login_server()
     save_cogames_user_token(login_server=login_server, token=token)
     print(f"\nToken saved for {login_server}")
 

{softmax_cli-0.26.8 → softmax_cli-0.26.10}/src/softmax/cogames.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import importlib
 from typing import Any
 
-from softmax.auth import DEFAULT_COGAMES_API_SERVER, DEFAULT_COGAMES_SERVER
+from softmax.auth import DEFAULT_COGAMES_API_SERVER
 
 
 def _get_tournament_client_class() -> type[Any]:
@@ -16,9 +16,9 @@ def _get_tournament_client_class() -> type[Any]:
     return tournament_client_module.TournamentServerClient
 
 
-def _create_client(*, token: str, server: str, login_server: str) -> Any:
+def _create_client(*, token: str, server: str) -> Any:
     client_class = _get_tournament_client_class()
-    return client_class(server_url=server, token=token, login_server=login_server)
+    return client_class(server_url=server, token=token)
 
 
 class _PlayerAPI:
@@ -27,9 +27,8 @@ class _PlayerAPI:
         token: str,
         *,
         server: str = DEFAULT_COGAMES_API_SERVER,
-        login_server: str = DEFAULT_COGAMES_SERVER,
     ) -> list[Any]:
-        with _create_client(token=token, server=server, login_server=login_server) as client:
+        with _create_client(token=token, server=server) as client:
             return client.list_players()
 
 
@@ -41,9 +40,8 @@ def login(
     player_id: str,
     *,
     server: str = DEFAULT_COGAMES_API_SERVER,
-    login_server: str = DEFAULT_COGAMES_SERVER,
 ) -> str:
-    with _create_client(token=token, server=server, login_server=login_server) as client:
+    with _create_client(token=token, server=server) as client:
         return client.login_player(player_id).token
 
 
@@ -52,9 +50,8 @@ def login_response(
     player_id: str,
     *,
     server: str = DEFAULT_COGAMES_API_SERVER,
-    login_server: str = DEFAULT_COGAMES_SERVER,
 ) -> Any:
-    with _create_client(token=token, server=server, login_server=login_server) as client:
+    with _create_client(token=token, server=server) as client:
         return client.login_player(player_id)
 
 

{softmax_cli-0.26.8 → softmax_cli-0.26.10/src/softmax_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: softmax-cli
-Version: 0.26.8
+Version: 0.26.10
 Summary: Softmax CLI — authentication and account tools
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11

{softmax_cli-0.26.8 → softmax_cli-0.26.10}/tests/test_auth_login.py

@@ -146,12 +146,8 @@ def test_authenticate_reprompts_after_invalid_token(
     assert "Invalid token. Please try again." in capsys.readouterr().out
 
 
-def test_manual_command_includes_nondefault_login_server() -> None:
-    assert _build_manual_set_token_command(login_server="https://softmax.com/api") == "softmax set-token '<TOKEN>'"
-    assert (
-        _build_manual_set_token_command(login_server="https://example.ngrok.app/api")
-        == "softmax set-token '<TOKEN>' --login-server 'https://example.ngrok.app/api'"
-    )
+def test_manual_command_format() -> None:
+    assert _build_manual_set_token_command() == "softmax set-token '<TOKEN>'"
 
 
 def test_generic_authenticator_does_not_print_cogames_agent_hint(
@@ -294,3 +290,60 @@ def test_save_token_raises_for_malformed_storage_section(
             server="https://softmax.com/api",
             token="abc",
         )
+
+
+def test_status_fails_for_anonymous_session(
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path,
+) -> None:
+    monkeypatch.setenv("HOME", str(tmp_path))
+    save_token(token_kind=TokenKind.COGAMES, server="https://softmax.com/api", token="bad-token")
+
+    class FakeResponse:
+        def raise_for_status(self) -> None:
+            return None
+
+        def json(self) -> dict[str, object]:
+            return {
+                "user_email": "unknown",
+                "is_softmax_team_member": False,
+                "is_softmax_admin": False,
+                "subject_type": "anonymous",
+                "subject_id": None,
+                "owner_user_id": None,
+                "scopes": [],
+            }
+
+    monkeypatch.setattr("softmax.auth.httpx.get", lambda *args, **kwargs: FakeResponse())
+
+    result = runner.invoke(app, ["status"])
+    assert result.exit_code == 1
+    assert "invalid or expired" in result.stdout
+
+
+def test_login_detects_anonymous_whoami_as_invalid_token(
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path,
+) -> None:
+    monkeypatch.setenv("HOME", str(tmp_path))
+    save_token(token_kind=TokenKind.COGAMES_USER, server="https://softmax.com/api", token="stale-token")
+
+    class FakeResponse:
+        def raise_for_status(self) -> None:
+            return None
+
+        def json(self) -> dict[str, object]:
+            return {
+                "user_email": "unknown",
+                "is_softmax_team_member": False,
+                "is_softmax_admin": False,
+                "subject_type": "anonymous",
+                "subject_id": None,
+                "owner_user_id": None,
+                "scopes": [],
+            }
+
+    monkeypatch.setattr("softmax.auth.httpx.get", lambda *args, **kwargs: FakeResponse())
+
+    result = runner.invoke(app, ["login", "--no-browser"])
+    assert "no longer valid" in result.stdout

{softmax_cli-0.26.8 → softmax_cli-0.26.10}/tests/test_python_api.py

@@ -74,10 +74,9 @@ def test_softmax_cogames_player_list_uses_expected_defaults(monkeypatch: pytest.
     captured: dict[str, object] = {}
 
     class FakeClient:
-        def __init__(self, *, server_url: str, token: str, login_server: str) -> None:
+        def __init__(self, *, server_url: str, token: str) -> None:
             captured["server_url"] = server_url
             captured["token"] = token
-            captured["login_server"] = login_server
 
         def __enter__(self) -> "FakeClient":
             return self
@@ -94,7 +93,6 @@ def test_softmax_cogames_player_list_uses_expected_defaults(monkeypatch: pytest.
     assert captured == {
         "server_url": "https://api.observatory.softmax-research.net",
         "token": "softmax-token",
-        "login_server": "https://softmax.com/api",
     }
 
 
@@ -103,10 +101,9 @@ def test_softmax_cogames_login_returns_player_token(monkeypatch: pytest.MonkeyPa
         token = "player-token"
 
     class FakeClient:
-        def __init__(self, *, server_url: str, token: str, login_server: str) -> None:
+        def __init__(self, *, server_url: str, token: str) -> None:
             self.server_url = server_url
             self.token = token
-            self.login_server = login_server
 
         def __enter__(self) -> "FakeClient":
             return self
@@ -117,7 +114,6 @@ def test_softmax_cogames_login_returns_player_token(monkeypatch: pytest.MonkeyPa
         def login_player(self, player_id: str) -> FakeLoginResponse:
             assert self.server_url == "https://api.observatory.softmax-research.net"
             assert self.token == "softmax-token"
-            assert self.login_server == "https://softmax.com/api"
             assert player_id == "ply_alpha"
             return FakeLoginResponse()
 
@@ -132,7 +128,7 @@ def test_softmax_cogames_login_response_returns_full_response(monkeypatch: pytes
         expires_at = "2026-02-21T12:00:00Z"
 
     class FakeClient:
-        def __init__(self, *, server_url: str, token: str, login_server: str) -> None:
+        def __init__(self, *, server_url: str, token: str) -> None:
             pass
 
         def __enter__(self) -> "FakeClient":