Grayscale/nanobot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(providers): standardize oauth_cli_kit error messages across CLI and WebUI

Browse Source
This commit is contained in:
axelray-dev
2026-07-06 12:11:03 +08:00
committed by Xubin Ren
parent 83e4bae7db
commit 6a95877196
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nanobot/cli/commands.py
+1 -1
View File
@@ -2401,7 +2401,7 @@ def _logout_github_copilot() -> None:
try: try:
from nanobot.providers.github_copilot_provider import get_storage from nanobot.providers.github_copilot_provider import get_storage
except ImportError: except ImportError:
console.print("[red]GitHub Copilot provider unavailable. Ensure oauth-cli-kit is installed.[/red]") console.print("[red]oauth_cli_kit not installed. Run: pip install oauth-cli-kit[/red]")
raise typer.Exit(1) raise typer.Exit(1)
storage = get_storage() storage = get_storage()
nanobot/webui/settings_api.py
+12 -4
View File
@@ -1119,7 +1119,9 @@ def login_oauth_provider(query: QueryParams) -> dict[str, Any]:
try: try:
from oauth_cli_kit import get_token, login_oauth_interactive from oauth_cli_kit import get_token, login_oauth_interactive
except ImportError: except ImportError:
raise WebUISettingsError("oauth_cli_kit is not installed", status=500) from None raise WebUISettingsError(
"oauth_cli_kit not installed. Run: pip install oauth-cli-kit", status=500
) from None
try: try:
proxy = resolve_config_env_vars(load_config()).providers.openai_codex.proxy or None proxy = resolve_config_env_vars(load_config()).providers.openai_codex.proxy or None
@@ -1146,7 +1148,9 @@ def login_oauth_provider(query: QueryParams) -> dict[str, Any]:
login_github_copilot, login_github_copilot,
) )
except ImportError: except ImportError:
raise WebUISettingsError("GitHub Copilot OAuth support is unavailable", status=500) from None raise WebUISettingsError(
"oauth_cli_kit not installed. Run: pip install oauth-cli-kit", status=500
) from None
token = get_github_copilot_login_status() token = get_github_copilot_login_status()
if not token: if not token:
@@ -1171,13 +1175,17 @@ def logout_oauth_provider(query: QueryParams) -> dict[str, Any]:
from oauth_cli_kit.providers import OPENAI_CODEX_PROVIDER from oauth_cli_kit.providers import OPENAI_CODEX_PROVIDER
from oauth_cli_kit.storage import FileTokenStorage from oauth_cli_kit.storage import FileTokenStorage
except ImportError: except ImportError:
raise WebUISettingsError("oauth_cli_kit is not installed", status=500) from None raise WebUISettingsError(
"oauth_cli_kit not installed. Run: pip install oauth-cli-kit", status=500
) from None
token_path = FileTokenStorage(token_filename=OPENAI_CODEX_PROVIDER.token_filename).get_token_path() token_path = FileTokenStorage(token_filename=OPENAI_CODEX_PROVIDER.token_filename).get_token_path()
elif spec.name == "github_copilot": elif spec.name == "github_copilot":
try: try:
from nanobot.providers.github_copilot_provider import get_storage from nanobot.providers.github_copilot_provider import get_storage
except ImportError: except ImportError:
raise WebUISettingsError("GitHub Copilot OAuth support is unavailable", status=500) from None raise WebUISettingsError(
"oauth_cli_kit not installed. Run: pip install oauth-cli-kit", status=500
) from None
token_path = get_storage().get_token_path() token_path = get_storage().get_token_path()
else: else:
raise WebUISettingsError("OAuth logout is not supported for this provider") raise WebUISettingsError("OAuth logout is not supported for this provider")