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

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

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

{softmax_cli-0.26.10 → softmax_cli-0.26.12}/src/softmax/__init__.py

@@ -5,7 +5,7 @@ import sys
 from pkgutil import extend_path
 
 from softmax.auth import (
-    DEFAULT_COGAMES_SERVER,
+    DEFAULT_API_SERVER,
     load_cogames_user_token,
     save_cogames_active_token,
 )
@@ -17,13 +17,13 @@ __path__ = extend_path(__path__, __name__)
 
 def login(
     *,
-    login_server: str = DEFAULT_COGAMES_SERVER,
+    api_server: str = DEFAULT_API_SERVER,
     force: bool = False,
     open_browser: bool = True,
 ) -> str:
-    token = None if force else load_cogames_user_token(login_server=login_server)
+    token = None if force else load_cogames_user_token(api_server=api_server)
     if token is not None:
-        save_cogames_active_token(login_server=login_server, token=token)
+        save_cogames_active_token(api_server=api_server, token=token)
         return token
 
     if not sys.stdin.isatty():
@@ -33,8 +33,7 @@ def login(
         )
 
     do_interactive_login_for_token(
-        login_server=login_server,
-        server_to_save_token_under=login_server,
+        api_server=api_server,
         token_kind=TokenKind.COGAMES_USER,
         agent_hint=(
             "If you are a coding agent, ask your human to open the URL below and give you "
@@ -45,10 +44,10 @@ def login(
         open_browser=open_browser,
     )
 
-    token = load_cogames_user_token(login_server=login_server)
+    token = load_cogames_user_token(api_server=api_server)
     if token is None:
-        raise RuntimeError(f"Interactive login did not save a token for {login_server}")
-    save_cogames_active_token(login_server=login_server, token=token)
+        raise RuntimeError(f"Interactive login did not save a token for {api_server}")
+    save_cogames_active_token(api_server=api_server, token=token)
     return token
 
 

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

@@ -13,12 +13,11 @@ from softmax.token_storage import delete_token as delete_stored_token
 from softmax.token_storage import load_token as load_saved_token
 from softmax.token_storage import save_token as save_stored_token
 
-DEFAULT_COGAMES_SERVER = "https://softmax.com/api"
-DEFAULT_COGAMES_API_SERVER = "https://api.observatory.softmax-research.net"
+DEFAULT_API_SERVER = "https://softmax.com/api"
 
 
-def get_login_server() -> str:
-    return os.environ.get("COGAMES_LOGIN_URL", DEFAULT_COGAMES_SERVER)
+def get_api_server() -> str:
+    return os.environ.get("COGAMES_API_URL", DEFAULT_API_SERVER)
 
 
 class WhoAmIResponse(BaseModel):
@@ -31,14 +30,14 @@ class WhoAmIResponse(BaseModel):
     scopes: list[str] = Field(default_factory=list)
 
 
-def build_browser_login_url(login_server: str, *, callback_url: str | None = None) -> str:
+def build_browser_login_url(api_server: str, *, callback_url: str | None = None) -> str:
     """Build the hosted browser sign-in URL for CLI login."""
     params: dict[str, str] = {}
     if callback_url:
         params["callback"] = callback_url
 
     query = urlencode(params)
-    parsed = urlsplit(login_server)
+    parsed = urlsplit(api_server)
     browser_path = parsed.path.rstrip("/").removesuffix("/api") + "/cli-login"
     return urlunsplit((parsed.scheme, parsed.netloc, browser_path, query, ""))
 
@@ -59,35 +58,33 @@ def delete_token(*, token_kind: TokenKind, server: str) -> bool:
     return delete_stored_token(token_kind=token_kind, server=server)
 
 
-def load_cogames_user_token(*, login_server: str) -> str | None:
-    return load_token(token_kind=TokenKind.COGAMES_USER, server=login_server)
+def load_cogames_user_token(*, api_server: str) -> str | None:
+    return load_token(token_kind=TokenKind.COGAMES_USER, server=api_server)
 
 
-def load_current_cogames_token(*, login_server: str) -> str | None:
-    return load_token(token_kind=TokenKind.COGAMES, server=login_server) or load_cogames_user_token(
-        login_server=login_server
-    )
+def load_current_cogames_token(*, api_server: str) -> str | None:
+    return load_token(token_kind=TokenKind.COGAMES, server=api_server) or load_cogames_user_token(api_server=api_server)
 
 
-def save_cogames_active_token(*, login_server: str, token: str) -> None:
-    save_token(token_kind=TokenKind.COGAMES, server=login_server, token=token)
+def save_cogames_active_token(*, api_server: str, token: str) -> None:
+    save_token(token_kind=TokenKind.COGAMES, server=api_server, token=token)
 
 
-def save_cogames_user_token(*, login_server: str, token: str) -> None:
-    save_token(token_kind=TokenKind.COGAMES_USER, server=login_server, token=token)
-    save_cogames_active_token(login_server=login_server, token=token)
+def save_cogames_user_token(*, api_server: str, token: str) -> None:
+    save_token(token_kind=TokenKind.COGAMES_USER, server=api_server, token=token)
+    save_cogames_active_token(api_server=api_server, token=token)
 
 
-def delete_cogames_tokens(*, login_server: str) -> bool:
-    deleted_active = delete_token(token_kind=TokenKind.COGAMES, server=login_server)
-    deleted_user = delete_token(token_kind=TokenKind.COGAMES_USER, server=login_server)
+def delete_cogames_tokens(*, api_server: str) -> bool:
+    deleted_active = delete_token(token_kind=TokenKind.COGAMES, server=api_server)
+    deleted_user = delete_token(token_kind=TokenKind.COGAMES_USER, server=api_server)
     return deleted_active or deleted_user
 
 
 def fetch_cogames_whoami(*, api_server: str | None = None, token: str) -> WhoAmIResponse:
-    server = api_server or DEFAULT_COGAMES_API_SERVER
+    server = api_server or DEFAULT_API_SERVER
     response = httpx.get(
-        f"{server.rstrip('/')}/whoami",
+        f"{server.rstrip('/')}/observatory/whoami",
         headers={"Authorization": f"Bearer {token}"},
         timeout=10.0,
     )
@@ -95,9 +92,9 @@ def fetch_cogames_whoami(*, api_server: str | None = None, token: str) -> WhoAmI
     return WhoAmIResponse.model_validate(response.json())
 
 
-def restore_cogames_user_session(*, login_server: str) -> str | None:
-    user_token = load_cogames_user_token(login_server=login_server)
+def restore_cogames_user_session(*, api_server: str) -> str | None:
+    user_token = load_cogames_user_token(api_server=api_server)
     if user_token is None:
         return None
-    save_cogames_active_token(login_server=login_server, token=user_token)
+    save_cogames_active_token(api_server=api_server, token=user_token)
     return user_token

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

@@ -10,11 +10,11 @@ from rich.panel import Panel
 
 from softmax._console import console
 from softmax.auth import (
-    DEFAULT_COGAMES_SERVER,
+    DEFAULT_API_SERVER,
     build_browser_login_url,
     delete_cogames_tokens,
     fetch_cogames_whoami,
-    get_login_server,
+    get_api_server,
     load_cogames_user_token,
     load_current_cogames_token,
     save_cogames_active_token,
@@ -47,9 +47,9 @@ def _build_manual_set_token_command(server: str | None = None) -> str:
     return "softmax set-token '<TOKEN>'"
 
 
-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
+def _print_non_tty_login_instructions(api_server: str | None = None) -> None:
+    resolved = api_server or get_api_server()
+    is_custom = resolved != DEFAULT_API_SERVER
     auth_url = build_browser_login_url(resolved)
     console.print("Interactive login requires a TTY.", style="red")
     console.print()
@@ -89,17 +89,15 @@ def login_cmd(
         "--server",
         "-s",
         metavar="URL",
-        help="Authentication server URL.",
+        help="API 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)
+    api_server = server or get_api_server()
+    user_token = None if force else load_cogames_user_token(api_server=api_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":
@@ -115,18 +113,17 @@ def login_cmd(
             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")
+        save_cogames_active_token(api_server=api_server, token=user_token)
+        console.print(f"Already authenticated with {urlparse(api_server).hostname}", style="green")
         return
 
     if not sys.stdin.isatty():
-        _print_non_tty_login_instructions(login_server)
+        _print_non_tty_login_instructions(api_server)
         raise typer.Exit(1)
 
     try:
         do_interactive_login_for_token(
-            login_server=login_server,
-            server_to_save_token_under=login_server,
+            api_server=api_server,
             token_kind=TokenKind.COGAMES_USER,
             agent_hint=(
                 "If you are a coding agent, ask your human to open the URL below and give you "
@@ -142,9 +139,9 @@ def login_cmd(
         console.print("Authentication failed.", style="red")
         raise typer.Exit(1) from e
 
-    user_token = load_cogames_user_token(login_server=login_server)
+    user_token = load_cogames_user_token(api_server=api_server)
     assert user_token is not None
-    save_cogames_active_token(login_server=login_server, token=user_token)
+    save_cogames_active_token(api_server=api_server, token=user_token)
     console.print("Authentication successful.", style="green")
 
 
@@ -155,12 +152,12 @@ def logout_cmd(
         "--server",
         "-s",
         metavar="URL",
-        help="Authentication server URL.",
+        help="API server URL.",
     ),
 ) -> None:
     """Remove saved authentication token."""
-    login_server = server or get_login_server()
-    if delete_cogames_tokens(login_server=login_server):
+    api_server = server or get_api_server()
+    if delete_cogames_tokens(api_server=api_server):
         console.print("Logged out.", style="green")
     else:
         console.print("No token found — already logged out.", style="yellow")
@@ -173,11 +170,11 @@ def get_login_url_cmd(
         "--server",
         "-s",
         metavar="URL",
-        help="Authentication server URL.",
+        help="API server URL.",
     ),
 ) -> None:
     """Print a browser sign-in URL for manual login."""
-    print(build_browser_login_url(server or get_login_server()))
+    print(build_browser_login_url(server or get_api_server()))
 
 
 @app.command(name="status")
@@ -187,17 +184,17 @@ def status_cmd(
         "--server",
         "-s",
         metavar="URL",
-        help="Authentication server URL.",
+        help="API server URL.",
     ),
 ) -> None:
     """Check authentication status via /whoami."""
-    login_server = server or get_login_server()
-    token = load_current_cogames_token(login_server=login_server)
+    api_server = server or get_api_server()
+    token = load_current_cogames_token(api_server=api_server)
     if not token:
         console.print("[red]Not authenticated.[/red] Run [cyan]softmax login[/cyan] first.")
         raise typer.Exit(1)
 
-    session = fetch_cogames_whoami(api_server=server, token=token)
+    session = fetch_cogames_whoami(api_server=api_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)
@@ -215,12 +212,12 @@ def get_token_cmd(
         "--server",
         "-s",
         metavar="URL",
-        help="Authentication server URL.",
+        help="API 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)
+    api_server = server or get_api_server()
+    token = load_current_cogames_token(api_server=api_server)
     if not token:
         console.print("[red]No token found.[/red] Run [cyan]softmax login[/cyan] first.", style="bold")
         raise typer.Exit(1)
@@ -235,13 +232,13 @@ def set_token_cmd(
         "--server",
         "-s",
         metavar="URL",
-        help="Authentication server URL.",
+        help="API 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}")
+    api_server = server or get_api_server()
+    save_cogames_user_token(api_server=api_server, token=token)
+    print(f"\nToken saved for {api_server}")
 
 
 _register_optional_apps()

{softmax_cli-0.26.10 → softmax_cli-0.26.12}/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
+from softmax.auth import DEFAULT_API_SERVER
 
 
 def _get_tournament_client_class() -> type[Any]:
@@ -26,7 +26,7 @@ class _PlayerAPI:
         self,
         token: str,
         *,
-        server: str = DEFAULT_COGAMES_API_SERVER,
+        server: str = DEFAULT_API_SERVER,
     ) -> list[Any]:
         with _create_client(token=token, server=server) as client:
             return client.list_players()
@@ -39,7 +39,7 @@ def login(
     token: str,
     player_id: str,
     *,
-    server: str = DEFAULT_COGAMES_API_SERVER,
+    server: str = DEFAULT_API_SERVER,
 ) -> str:
     with _create_client(token=token, server=server) as client:
         return client.login_player(player_id).token
@@ -49,7 +49,7 @@ def login_response(
     token: str,
     player_id: str,
     *,
-    server: str = DEFAULT_COGAMES_API_SERVER,
+    server: str = DEFAULT_API_SERVER,
 ) -> Any:
     with _create_client(token=token, server=server) as client:
         return client.login_player(player_id)

{softmax_cli-0.26.10 → softmax_cli-0.26.12}/src/softmax/perform_login.py

@@ -269,11 +269,11 @@ def _create_app(session: _CLIAuthSession) -> FastAPI:
     return app
 
 
-def _validate_token(*, login_server: str, token: str) -> bool | None:
-    validate_url = f"{login_server.rstrip('/')}/validate"
+def _validate_token(*, api_server: str, token: str) -> bool | None:
+    whoami_url = f"{api_server.rstrip('/')}/observatory/whoami"
     try:
         response = httpx.get(
-            validate_url,
+            whoami_url,
             headers={"Authorization": f"Bearer {token}"},
             timeout=5.0,
         )
@@ -282,8 +282,8 @@ def _validate_token(*, login_server: str, token: str) -> bool | None:
 
     if response.status_code == 200:
         data = response.json()
-        return bool(data.get("valid"))
-    if response.status_code in {400, 401, 403, 404}:
+        return data.get("subject_type") != "anonymous"
+    if response.status_code in {400, 401, 403}:
         return False
     return None
 
@@ -304,7 +304,7 @@ def _print_login_instructions(*, auth_url: str, agent_hint: str | None) -> None:
     console.print()
 
 
-def _start_manual_token_prompt(*, session: _CLIAuthSession, login_server: str) -> None:
+def _start_manual_token_prompt(*, session: _CLIAuthSession, api_server: str) -> None:
     def prompt_loop() -> None:
         while not session.auth_completed.is_set():
             try:
@@ -317,7 +317,7 @@ def _start_manual_token_prompt(*, session: _CLIAuthSession, login_server: str) -
             if not token:
                 continue
 
-            validation_result = _validate_token(login_server=login_server, token=token)
+            validation_result = _validate_token(api_server=api_server, token=token)
             if validation_result is False:
                 console.print("Invalid token. Please try again.", style="red")
                 continue
@@ -360,11 +360,11 @@ def _wait_for_callback_server_to_start(*, session: _CLIAuthSession, port: int, t
 
 def do_interactive_login_for_token(
     *,
-    login_server: str,
-    server_to_save_token_under: str,
+    api_server: str,
     token_kind: TokenKind,
     agent_hint: str | None,
     open_browser: bool,
+    save_token_under: str | None = None,
 ) -> None:
     """Run the CLI browser login flow and save the resulting token."""
     assert sys.stdin.isatty(), "This function should only be called when stdin is a TTY"
@@ -378,18 +378,19 @@ def do_interactive_login_for_token(
         callback_url = f"http://127.0.0.1:{port}/callback"
     session.error = None
 
-    auth_url = build_browser_login_url(login_server, callback_url=callback_url)
+    auth_url = build_browser_login_url(api_server, callback_url=callback_url)
     _print_login_instructions(auth_url=auth_url, agent_hint=agent_hint)
     if open_browser:
         _open_browser(url=auth_url)
 
-    _start_manual_token_prompt(session=session, login_server=login_server)
+    _start_manual_token_prompt(session=session, api_server=api_server)
     session.auth_completed.wait()
     if session.error:
         raise RuntimeError(session.error)
     if not session.token:
         raise RuntimeError("No token received")
 
-    save_token(token_kind=token_kind, server=server_to_save_token_under, token=session.token)
-    print(f"\nToken saved for {server_to_save_token_under}")
+    token_server = save_token_under or api_server
+    save_token(token_kind=token_kind, server=token_server, token=session.token)
+    print(f"\nToken saved for {token_server}")
     print()

{softmax_cli-0.26.10 → softmax_cli-0.26.12}/src/softmax/token_storage.py

@@ -45,6 +45,7 @@ def _load_token_data(*, token_file_name: str) -> dict:
 
 
 def load_token(*, token_kind: TokenKind, server: str) -> str | None:
+    server = server.rstrip("/")
     data = _load_token_data(token_file_name=_token_file_name(token_kind=token_kind))
     assert isinstance(data, dict), "Token storage file must contain a mapping at the top level"
 
@@ -57,6 +58,7 @@ def load_token(*, token_kind: TokenKind, server: str) -> str | None:
 
 
 def save_token(*, token_kind: TokenKind, server: str, token: str) -> None:
+    server = server.rstrip("/")
     token_file_name = _token_file_name(token_kind=token_kind)
     token_storage_key = _token_storage_key(token_kind=token_kind)
     data = _load_token_data(token_file_name=token_file_name)
@@ -76,6 +78,7 @@ def save_token(*, token_kind: TokenKind, server: str, token: str) -> None:
 
 
 def delete_token(*, token_kind: TokenKind, server: str) -> bool:
+    server = server.rstrip("/")
     token_file_name = _token_file_name(token_kind=token_kind)
     token_storage_key = _token_storage_key(token_kind=token_kind)
     data = _load_token_data(token_file_name=token_file_name)

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

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

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

@@ -28,13 +28,12 @@ def test_authenticate_accepts_pasted_token(
     monkeypatch.setattr("softmax.perform_login._find_free_port", lambda: 43123)
     monkeypatch.setattr("softmax.perform_login._run_server", lambda *, session, port: None)
     monkeypatch.setattr("softmax.perform_login._wait_for_callback_server_to_start", lambda *, session, port: False)
-    monkeypatch.setattr("softmax.perform_login._validate_token", lambda *, login_server, token: True)
+    monkeypatch.setattr("softmax.perform_login._validate_token", lambda *, api_server, token: True)
     monkeypatch.setattr(sys.stdin, "isatty", lambda: True)
     monkeypatch.setattr(builtins, "input", lambda _prompt="": "manual-token-123")
 
     do_interactive_login_for_token(
-        login_server="https://softmax.com/api",
-        server_to_save_token_under="https://softmax.com/api",
+        api_server="https://softmax.com/api",
         token_kind=TokenKind.COGAMES,
         agent_hint=COGAMES_AGENT_HINT,
         open_browser=False,
@@ -63,12 +62,11 @@ def test_authenticate_skips_browser_when_requested(
     )
     monkeypatch.setattr(
         "softmax.perform_login._start_manual_token_prompt",
-        lambda *, session, login_server: auth_module._finish_authentication(session, token="manual-token-456"),
+        lambda *, session, api_server: auth_module._finish_authentication(session, token="manual-token-456"),
     )
 
     do_interactive_login_for_token(
-        login_server="https://softmax.com/api",
-        server_to_save_token_under="https://softmax.com/api",
+        api_server="https://softmax.com/api",
         token_kind=TokenKind.COGAMES,
         agent_hint=COGAMES_AGENT_HINT,
         open_browser=False,
@@ -100,12 +98,11 @@ def test_authenticate_falls_back_to_manual_when_callback_server_fails(
     )
     monkeypatch.setattr(
         "softmax.perform_login._start_manual_token_prompt",
-        lambda *, session, login_server: auth_module._finish_authentication(session, token="manual-token-789"),
+        lambda *, session, api_server: auth_module._finish_authentication(session, token="manual-token-789"),
     )
 
     do_interactive_login_for_token(
-        login_server="https://softmax.com/api",
-        server_to_save_token_under="https://softmax.com/api",
+        api_server="https://softmax.com/api",
         token_kind=TokenKind.COGAMES,
         agent_hint=COGAMES_AGENT_HINT,
         open_browser=True,
@@ -132,12 +129,11 @@ def test_authenticate_reprompts_after_invalid_token(
     validation_results = iter([False, True])
     monkeypatch.setattr(
         "softmax.perform_login._validate_token",
-        lambda *, login_server, token: next(validation_results),
+        lambda *, api_server, token: next(validation_results),
     )
 
     do_interactive_login_for_token(
-        login_server="https://softmax.com/api",
-        server_to_save_token_under="https://softmax.com/api",
+        api_server="https://softmax.com/api",
         token_kind=TokenKind.COGAMES,
         agent_hint=COGAMES_AGENT_HINT,
         open_browser=False,
@@ -166,15 +162,15 @@ def test_generic_authenticator_does_not_print_cogames_agent_hint(
     monkeypatch.setattr("softmax.perform_login._run_server", lambda *, session, port: None)
     monkeypatch.setattr(
         "softmax.perform_login._start_manual_token_prompt",
-        lambda *, session, login_server: auth_module._finish_authentication(session, token="manual-token-000"),
+        lambda *, session, api_server: auth_module._finish_authentication(session, token="manual-token-000"),
     )
 
     do_interactive_login_for_token(
-        login_server="https://softmax.com/api",
-        server_to_save_token_under="token-key",
+        api_server="https://softmax.com/api",
         token_kind=TokenKind.OBSERVATORY,
         agent_hint=None,
         open_browser=False,
+        save_token_under="token-key",
     )
     output = capsys.readouterr().out
     assert "Open this URL in any browser to sign in:" in output
@@ -193,15 +189,15 @@ def test_generic_authenticator_works_without_agent_hint(
     monkeypatch.setattr("softmax.perform_login._run_server", lambda *, session, port: None)
     monkeypatch.setattr(
         "softmax.perform_login._start_manual_token_prompt",
-        lambda *, session, login_server: auth_module._finish_authentication(session, token="manual-token-001"),
+        lambda *, session, api_server: auth_module._finish_authentication(session, token="manual-token-001"),
     )
 
     do_interactive_login_for_token(
-        login_server="https://softmax.com/api",
-        server_to_save_token_under="token-key",
+        api_server="https://softmax.com/api",
         token_kind=TokenKind.OBSERVATORY,
         agent_hint=None,
         open_browser=False,
+        save_token_under="token-key",
     )
 
 
@@ -254,8 +250,7 @@ def test_interactive_login_requires_tty(
 
     with pytest.raises(AssertionError, match="only be called when stdin is a TTY"):
         do_interactive_login_for_token(
-            login_server="https://softmax.com/api",
-            server_to_save_token_under="https://softmax.com/api",
+            api_server="https://softmax.com/api",
             token_kind=TokenKind.COGAMES,
             agent_hint=COGAMES_AGENT_HINT,
             open_browser=False,

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

@@ -91,7 +91,7 @@ def test_softmax_cogames_player_list_uses_expected_defaults(monkeypatch: pytest.
 
     assert cast(Any, softmax).cogames.player.list("softmax-token") == ["alpha", "beta"]
     assert captured == {
-        "server_url": "https://api.observatory.softmax-research.net",
+        "server_url": "https://softmax.com/api",
         "token": "softmax-token",
     }
 
@@ -112,7 +112,7 @@ def test_softmax_cogames_login_returns_player_token(monkeypatch: pytest.MonkeyPa
             return None
 
         def login_player(self, player_id: str) -> FakeLoginResponse:
-            assert self.server_url == "https://api.observatory.softmax-research.net"
+            assert self.server_url == "https://softmax.com/api"
             assert self.token == "softmax-token"
             assert player_id == "ply_alpha"
             return FakeLoginResponse()