Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b12a682121 | ||
|
|
bc16545794 | ||
|
|
a13a1e0b9e | ||
|
|
fc43b897c5 | ||
|
|
d6a925cf11 | ||
|
|
5468b04550 |
30
.github/workflows/tests.yml
vendored
Normal file
30
.github/workflows/tests.yml
vendored
Normal file
@@ -0,0 +1,30 @@
|
||||
name: Tests
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: [master]
|
||||
push:
|
||||
branches: [master]
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
python-version: ['3.11', '3.12', '3.13']
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Python ${{ matrix.python-version }}
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install pyyaml>=6.0 pytest pytest-timeout
|
||||
|
||||
- name: Run tests
|
||||
run: pytest tests/ -v --timeout=60
|
||||
14
CHANGELOG.md
14
CHANGELOG.md
@@ -6,6 +6,20 @@
|
||||
---
|
||||
|
||||
|
||||
## [v0.49.2] OAuth provider support in onboarding (issues #303, #304)
|
||||
|
||||
- **OAuth provider bypass** (closes #303, #304): The first-run onboarding wizard now correctly recognizes OAuth-authenticated providers (GitHub Copilot, OpenAI Codex, Nous Portal, Qwen OAuth) as ready, instead of always demanding an API key.
|
||||
- New `_provider_oauth_authenticated()` helper in `api/onboarding.py` checks `hermes_cli.auth.get_auth_status()` first (authoritative), then falls back to parsing `~/.hermes/auth.json` directly for the known OAuth provider IDs (`openai-codex`, `copilot`, `copilot-acp`, `qwen-oauth`, `nous`).
|
||||
- `_status_from_runtime()` now has an `else` branch for providers not in `_SUPPORTED_PROVIDER_SETUPS`; OAuth-authenticated providers return `provider_ready=True` and `setup_state="ready"`.
|
||||
- The `provider_incomplete` status note no longer says "API key" for OAuth providers — it now says "Run 'hermes auth' or 'hermes model' in a terminal to complete setup."
|
||||
- 19 new tests in `tests/test_sprint34.py`; 738 tests total (up from 719)
|
||||
|
||||
## [v0.49.1] Docker docs + mobile Profiles button (PRs #291, #265)
|
||||
|
||||
- **Two-container Docker setup** (PR #291 / closes #288): New `docker-compose.two-container.yml` for running the Hermes Agent and WebUI as separate containers with shared volumes. Documents the architecture clearly; localhost-only port binding by default.
|
||||
- **Mobile Profiles button** (PR #265 @gabogabucho): Adds Profiles to the mobile bottom navigation bar (last position: Chat → Tasks → Skills → Memory → Spaces → Profiles). Uses `mobileSwitchPanel()` for correct active-highlight behaviour; `data-panel="profiles"` attribute set; SVG matches other nav icons; 3 new tests.
|
||||
- 700 tests total (up from 697)
|
||||
|
||||
## [v0.49.0] First-run onboarding wizard + self-update hardening (PRs #285, #287, #289)
|
||||
|
||||
- **One-shot bootstrap and first-run setup wizard** (PR #285): New users are greeted with a guided onboarding overlay on first load. The wizard checks system status, configures a provider (OpenRouter, Anthropic, OpenAI, or custom OpenAI-compatible endpoint), sets a workspace and optional password, and marks setup as complete — all without leaving the browser.
|
||||
|
||||
26
README.md
26
README.md
@@ -171,6 +171,32 @@ docker run -d \
|
||||
> To expose on a network, change the port to `"8787:8787"` in `docker-compose.yml`
|
||||
> and set `HERMES_WEBUI_PASSWORD` to enable authentication.
|
||||
|
||||
### Two-container setup (Agent + WebUI)
|
||||
|
||||
If you run the Hermes Agent in its own Docker container and want the WebUI
|
||||
in a separate container:
|
||||
|
||||
```bash
|
||||
docker compose -f docker-compose.two-container.yml up -d
|
||||
```
|
||||
|
||||
This starts both containers with shared volumes:
|
||||
|
||||
- **`hermes-home`** — shared `~/.hermes` for config, sessions, skills, memory
|
||||
- **`hermes-agent-src`** — the agent's source code, mounted into the WebUI
|
||||
container so it can install the agent's Python dependencies at startup
|
||||
|
||||
The WebUI's init script automatically installs hermes-agent and all its
|
||||
dependencies (openai, anthropic, etc.) into its own Python environment on
|
||||
first boot. Subsequent restarts reuse the installed packages.
|
||||
|
||||
> **How it works:** The WebUI imports hermes-agent's Python modules directly
|
||||
> (not via HTTP). The shared volume makes the agent source available, and
|
||||
> the init script runs `uv pip install` to set up the dependencies. Both
|
||||
> containers share the same `~/.hermes` directory for config and state.
|
||||
|
||||
See `docker-compose.two-container.yml` for the full configuration.
|
||||
|
||||
---
|
||||
|
||||
## What start.sh discovers automatically
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
> Goal: Full 1:1 parity with the Hermes CLI experience via a clean dark web UI.
|
||||
> Everything you can do from the CLI terminal, you can do from this UI.
|
||||
>
|
||||
> Last updated: v0.49.0 (April 12, 2026) — 697 tests, 697 passing
|
||||
> Last updated: v0.49.1 (April 12, 2026) — 700 tests, 700 passing
|
||||
> Onboarding MVP now writes real Hermes provider config from the Web UI for OpenRouter, Anthropic, OpenAI, and custom OpenAI-compatible endpoints.
|
||||
> Tests: 697 total (697 passing, 0 failures)
|
||||
> Tests: 700 total (700 passing, 0 failures)
|
||||
> Source: <repo>/
|
||||
|
||||
---
|
||||
@@ -49,6 +49,7 @@
|
||||
| v0.48.0 | Gateway session sync | Real-time Telegram/Discord/Slack sessions in sidebar via SSE + DB polling (#274 @bergeouss); +10 tests | 658 |
|
||||
| v0.48.1 | Table inline formatting | `inlineMd()` in table cells — **bold**, *italic*, `code`, links render correctly (PR #278); 0 new tests | 658 |
|
||||
| v0.48.2 | Provider mismatch warning | Toast warning + auth_mismatch error type for provider/model mismatches (#283, fixes #266); +21 tests | 679 |
|
||||
| v0.49.1 | Docker docs + mobile Profiles button | Two-container Docker compose (#291/#288); Profiles button in mobile bottom nav with mobileSwitchPanel, data-panel, correct SVG size and position (#297/#265 @gabogabucho); +3 tests | 700 |
|
||||
| v0.49.0 | First-run onboarding wizard + self-update hardening | One-shot bootstrap + guided setup wizard; provider config persisted to config.yaml + .env; OpenRouter/Anthropic/OpenAI/Custom; wizard hidden after completion (#285); self-update stderr/split-ref/conflict fixes (#287); skip flaky redaction test (#289); +18 tests | 697 |
|
||||
| v0.32 | Auto-compaction handling | Compression detection, /compact command, real context window indicator | 424 |
|
||||
| v0.33 | /insights sync | Opt-in state.db sync so `hermes /insights` includes WebUI sessions | 424 |
|
||||
|
||||
@@ -1164,7 +1164,7 @@ New test cases in `tests/test_sprint26.py`:
|
||||
---
|
||||
|
||||
*Last updated: April 12, 2026*
|
||||
*Current version: v0.49.0 | 697 tests*
|
||||
*Current version: v0.49.1 | 700 tests*
|
||||
*Next sprint: Sprint 24 (Web Polish + Bug Fix Pass)*
|
||||
*Horizon sprint: Sprint 25 (macOS Desktop Application)*
|
||||
*Docs sweep policy: update markdown proactively during PR reviews and after significant releases*
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
> Prerequisites: SSH tunnel is active on port 8786. Open http://localhost:8786 in browser.
|
||||
> Server health check: curl http://127.0.0.1:8786/health should return {"status":"ok"}.
|
||||
>
|
||||
> Automated tests: 697 total (697 passing, 0 skipped, 0 known failures). Includes onboarding coverage for bootstrap/static wizard presence, real provider config persistence (`config.yaml` + `.env`), and the `/api/onboarding/*` backend.
|
||||
> Automated tests: 700 total (700 passing, 0 skipped, 0 known failures). Includes onboarding coverage for bootstrap/static wizard presence, real provider config persistence (`config.yaml` + `.env`), and the `/api/onboarding/*` backend.
|
||||
> Run: `pytest tests/ -v --timeout=60`
|
||||
|
||||
---
|
||||
|
||||
@@ -210,6 +210,64 @@ def _provider_api_key_present(
|
||||
return False
|
||||
|
||||
|
||||
|
||||
def _provider_oauth_authenticated(provider: str, hermes_home: "Path") -> bool:
|
||||
"""Return True if the provider has valid OAuth credentials.
|
||||
|
||||
Checks via hermes_cli.auth.get_auth_status() when available, then falls
|
||||
back to reading auth.json directly for the known OAuth provider IDs
|
||||
(openai-codex, copilot, copilot-acp, qwen-oauth, nous).
|
||||
|
||||
This covers users who authenticated via 'hermes auth' or 'hermes model'
|
||||
but whose provider is not in _SUPPORTED_PROVIDER_SETUPS because it does
|
||||
not use a plain API key.
|
||||
"""
|
||||
provider = (provider or "").strip().lower()
|
||||
if not provider:
|
||||
return False
|
||||
|
||||
# Fast path: ask hermes_cli directly — the authoritative source
|
||||
try:
|
||||
from hermes_cli.auth import get_auth_status as _gas
|
||||
|
||||
status = _gas(provider)
|
||||
if isinstance(status, dict) and status.get("logged_in"):
|
||||
return True
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Fallback: parse auth.json ourselves for known OAuth provider IDs.
|
||||
# Covers deployments where hermes_cli is installed but the import above
|
||||
# fails for an unexpected reason (version mismatch, import cycle, etc.).
|
||||
_known_oauth_providers = {"openai-codex", "copilot", "copilot-acp", "qwen-oauth", "nous"}
|
||||
if provider not in _known_oauth_providers:
|
||||
return False
|
||||
|
||||
try:
|
||||
import json as _j
|
||||
|
||||
auth_path = hermes_home / "auth.json"
|
||||
if not auth_path.exists():
|
||||
return False
|
||||
store = _j.loads(auth_path.read_text(encoding="utf-8"))
|
||||
providers_store = store.get("providers")
|
||||
if not isinstance(providers_store, dict):
|
||||
return False
|
||||
state = providers_store.get(provider)
|
||||
if not isinstance(state, dict):
|
||||
return False
|
||||
# Any non-empty token is enough to confirm the user has credentials.
|
||||
# Token refresh happens at runtime inside the agent.
|
||||
has_token = bool(
|
||||
str(state.get("access_token") or "").strip()
|
||||
or str(state.get("api_key") or "").strip()
|
||||
or str(state.get("refresh_token") or "").strip()
|
||||
)
|
||||
return has_token
|
||||
except Exception:
|
||||
return False
|
||||
|
||||
|
||||
def _status_from_runtime(cfg: dict, imports_ok: bool) -> dict:
|
||||
provider = _extract_current_provider(cfg)
|
||||
model = _extract_current_model(cfg)
|
||||
@@ -226,6 +284,13 @@ def _status_from_runtime(cfg: dict, imports_ok: bool) -> dict:
|
||||
)
|
||||
elif provider in _SUPPORTED_PROVIDER_SETUPS:
|
||||
provider_ready = _provider_api_key_present(provider, cfg, env_values)
|
||||
else:
|
||||
# Unknown / OAuth provider (e.g. openai-codex, copilot, qwen-oauth).
|
||||
# These do not use a plain API key; auth lives in auth.json or a
|
||||
# credential pool managed by hermes_cli.
|
||||
provider_ready = _provider_oauth_authenticated(
|
||||
provider, _get_active_hermes_home()
|
||||
)
|
||||
|
||||
chat_ready = bool(_HERMES_FOUND and imports_ok and provider_ready)
|
||||
|
||||
@@ -243,15 +308,23 @@ def _status_from_runtime(cfg: dict, imports_ok: bool) -> dict:
|
||||
note = f"Hermes is minimally configured and ready to chat via {provider_name}."
|
||||
elif provider_configured:
|
||||
state = "provider_incomplete"
|
||||
missing = (
|
||||
"base URL and API key"
|
||||
if provider == "custom" and not base_url
|
||||
else "API key"
|
||||
)
|
||||
note = (
|
||||
f"Hermes has a saved provider/model selection but still needs the {missing} "
|
||||
"required to chat."
|
||||
)
|
||||
if provider == "custom" and not base_url:
|
||||
note = (
|
||||
"Hermes has a saved provider/model selection but still needs the "
|
||||
"base URL and API key required to chat."
|
||||
)
|
||||
elif provider not in _SUPPORTED_PROVIDER_SETUPS:
|
||||
# OAuth / unsupported provider: avoid misleading "API key" wording.
|
||||
note = (
|
||||
f"Provider '{provider}' is configured but not yet authenticated. "
|
||||
"Run 'hermes auth' or 'hermes model' in a terminal to complete "
|
||||
"setup, then reload the Web UI."
|
||||
)
|
||||
else:
|
||||
note = (
|
||||
"Hermes has a saved provider/model selection but still needs the "
|
||||
"API key required to chat."
|
||||
)
|
||||
else:
|
||||
state = "needs_provider"
|
||||
note = "Hermes is installed, but you still need to choose a provider and save working credentials."
|
||||
|
||||
55
docker-compose.two-container.yml
Normal file
55
docker-compose.two-container.yml
Normal file
@@ -0,0 +1,55 @@
|
||||
# Two-container Docker Compose: Hermes Agent + Hermes WebUI
|
||||
#
|
||||
# This runs the agent and web UI in separate containers connected via
|
||||
# shared volumes. The WebUI installs the agent's Python dependencies
|
||||
# at startup from the shared agent source volume.
|
||||
#
|
||||
# Usage:
|
||||
# docker compose -f docker-compose.two-container.yml up -d
|
||||
#
|
||||
# The agent container runs the gateway (CLI, Telegram, cron, etc.).
|
||||
# The WebUI container serves the browser interface on port 8787.
|
||||
# Both share ~/.hermes for config, sessions, and state.
|
||||
|
||||
services:
|
||||
hermes-agent:
|
||||
image: nousresearch/hermes-agent:latest
|
||||
container_name: hermes-agent
|
||||
volumes:
|
||||
# Persist config, state, sessions, skills, memory across restarts
|
||||
- hermes-home:/root/.hermes
|
||||
# Expose agent source so the WebUI can install dependencies from it
|
||||
- hermes-agent-src:/opt/hermes
|
||||
environment:
|
||||
- HERMES_HOME=/root/.hermes
|
||||
restart: unless-stopped
|
||||
|
||||
hermes-webui:
|
||||
image: ghcr.io/nesquena/hermes-webui:latest
|
||||
container_name: hermes-webui
|
||||
depends_on:
|
||||
- hermes-agent
|
||||
ports:
|
||||
- "127.0.0.1:8787:8787"
|
||||
volumes:
|
||||
# Same hermes home as the agent — shares config, sessions, state
|
||||
- hermes-home:/home/hermeswebui/.hermes
|
||||
# Agent source mounted where docker_init.bash expects it.
|
||||
# At startup the init script runs:
|
||||
# uv pip install /home/hermeswebui/.hermes/hermes-agent
|
||||
# which installs the agent and all its Python dependencies.
|
||||
- hermes-agent-src:/home/hermeswebui/.hermes/hermes-agent
|
||||
environment:
|
||||
- HERMES_WEBUI_HOST=0.0.0.0
|
||||
- HERMES_WEBUI_PORT=8787
|
||||
- HERMES_WEBUI_STATE_DIR=/home/hermeswebui/.hermes/webui-mvp
|
||||
# Match your host user's UID/GID for correct file permissions
|
||||
- WANTED_UID=${UID:-1000}
|
||||
- WANTED_GID=${GID:-1000}
|
||||
# Optional: set a password for remote access
|
||||
# - HERMES_WEBUI_PASSWORD=your-secret-password
|
||||
restart: unless-stopped
|
||||
|
||||
volumes:
|
||||
hermes-home:
|
||||
hermes-agent-src:
|
||||
@@ -14,7 +14,7 @@
|
||||
<body>
|
||||
<div class="layout">
|
||||
<aside class="sidebar">
|
||||
<div class="sidebar-header"><div class="logo">H</div><div><h1 style="margin:0;font-size:15px;font-weight:700;letter-spacing:-.01em">Hermes</h1><div style="font-size:10px;color:var(--muted);opacity:.8;margin-top:1px">v0.49.0</div></div></div>
|
||||
<div class="sidebar-header"><div class="logo">H</div><div><h1 style="margin:0;font-size:15px;font-weight:700;letter-spacing:-.01em">Hermes</h1><div style="font-size:10px;color:var(--muted);opacity:.8;margin-top:1px">v0.49.2</div></div></div>
|
||||
<div class="sidebar-nav">
|
||||
<button class="nav-tab active" data-panel="chat" data-label="Chat" onclick="switchPanel('chat')" title="Chat" data-i18n-title="tab_chat"><svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/></svg></button>
|
||||
<button class="nav-tab" data-panel="tasks" data-label="Tasks" onclick="switchPanel('tasks')" title="Tasks" data-i18n-title="tab_tasks"><svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg></button>
|
||||
@@ -481,6 +481,10 @@
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><path d="M2 4h8l2 2h10v14H2z"/></svg>
|
||||
<span data-i18n="tab_workspaces">Spaces</span>
|
||||
</button>
|
||||
<button class="mobile-nav-btn" data-panel="profiles" onclick="mobileSwitchPanel('profiles')">
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"/><circle cx="12" cy="7" r="4"/></svg>
|
||||
<span data-i18n="tab_profiles">Profiles</span>
|
||||
</button>
|
||||
</nav>
|
||||
<div class="toast" id="toast"></div>
|
||||
<script src="/static/i18n.js"></script>
|
||||
|
||||
@@ -175,3 +175,34 @@ def test_composer_textarea_font_size_mobile():
|
||||
# Check for 16px font-size on the textarea in a mobile breakpoint
|
||||
assert re.search(r'font-size:16px', CSS), \
|
||||
"Composer textarea must have font-size:16px at mobile widths to prevent iOS zoom-on-focus"
|
||||
|
||||
|
||||
|
||||
# ── Profiles button in mobile bottom nav ─────────────────────────────────────
|
||||
|
||||
def test_mobile_profiles_button_present():
|
||||
"""Mobile bottom nav must include a Profiles button (PR #265)."""
|
||||
assert 'data-panel="profiles"' in HTML and 'mobileSwitchPanel' in HTML, \
|
||||
"Mobile nav must have a Profiles button with data-panel='profiles' and mobileSwitchPanel"
|
||||
|
||||
|
||||
def test_mobile_profiles_button_uses_mobileSwitchPanel():
|
||||
"""Profiles mobile nav button must use mobileSwitchPanel, not raw switchPanel."""
|
||||
import re
|
||||
match = re.search(
|
||||
r'<button[^>]*mobile-nav-btn[^>]*data-panel="profiles"[^>]*>|'
|
||||
r'<button[^>]*data-panel="profiles"[^>]*mobile-nav-btn[^>]*>',
|
||||
HTML
|
||||
)
|
||||
assert match, "Could not find mobile-nav-btn with data-panel='profiles'"
|
||||
btn_html = HTML[match.start():match.start()+300]
|
||||
assert "mobileSwitchPanel('profiles')" in btn_html, \
|
||||
"Profiles mobile nav button must call mobileSwitchPanel('profiles')"
|
||||
|
||||
|
||||
def test_mobile_profiles_button_is_last_in_nav():
|
||||
"""Profiles button must appear after Spaces in the mobile bottom nav."""
|
||||
spaces_pos = HTML.find('data-panel="workspaces"')
|
||||
profiles_pos = HTML.rfind('data-panel="profiles"')
|
||||
assert spaces_pos > 0 and profiles_pos > spaces_pos, \
|
||||
"Profiles button must appear after Spaces button in the mobile nav"
|
||||
|
||||
228
tests/test_sprint34.py
Normal file
228
tests/test_sprint34.py
Normal file
@@ -0,0 +1,228 @@
|
||||
"""
|
||||
Sprint 34 Tests: OAuth provider support in onboarding (issues #303, #304).
|
||||
|
||||
Covers:
|
||||
1. _provider_oauth_authenticated() returns True for known OAuth providers
|
||||
with valid tokens in auth.json
|
||||
2. _provider_oauth_authenticated() returns False when auth.json is absent,
|
||||
empty, or has no token data
|
||||
3. _provider_oauth_authenticated() returns False for unknown/API-key providers
|
||||
4. _status_from_runtime() marks copilot/openai-codex as provider_ready when
|
||||
credentials exist
|
||||
5. _status_from_runtime() gives a helpful "hermes auth" note (not "API key")
|
||||
for OAuth providers that have no credentials yet
|
||||
6. API route /api/onboarding/status reflects OAuth-ready state
|
||||
"""
|
||||
|
||||
import json
|
||||
import pathlib
|
||||
import tempfile
|
||||
import unittest.mock
|
||||
|
||||
import pytest
|
||||
|
||||
REPO = pathlib.Path(__file__).parent.parent
|
||||
BASE = "http://127.0.0.1:8788"
|
||||
|
||||
|
||||
# ── Helpers ──────────────────────────────────────────────────────────────────
|
||||
|
||||
def _make_auth_json(provider_id: str, tokens: dict, tmp_dir: pathlib.Path) -> pathlib.Path:
|
||||
"""Write an auth.json with the given tokens for provider_id into tmp_dir."""
|
||||
store = {"providers": {provider_id: tokens}}
|
||||
auth_path = tmp_dir / "auth.json"
|
||||
auth_path.write_text(json.dumps(store), encoding="utf-8")
|
||||
return auth_path
|
||||
|
||||
|
||||
# ── 1–3. _provider_oauth_authenticated unit tests ────────────────────────────
|
||||
|
||||
class TestProviderOAuthAuthenticated:
|
||||
"""Unit tests for the new _provider_oauth_authenticated() helper."""
|
||||
|
||||
def _call(self, provider: str, hermes_home: pathlib.Path) -> bool:
|
||||
# Import fresh so we don't get a stale module reference
|
||||
from api.onboarding import _provider_oauth_authenticated
|
||||
return _provider_oauth_authenticated(provider, hermes_home)
|
||||
|
||||
def test_returns_false_when_auth_json_absent(self, tmp_path):
|
||||
"""No auth.json -> not authenticated."""
|
||||
assert self._call("openai-codex", tmp_path) is False
|
||||
|
||||
def test_openai_codex_with_access_token(self, tmp_path):
|
||||
"""openai-codex with a valid access_token -> authenticated."""
|
||||
_make_auth_json(
|
||||
"openai-codex",
|
||||
{"access_token": "ey.test.token", "refresh_token": "ref123"},
|
||||
tmp_path,
|
||||
)
|
||||
assert self._call("openai-codex", tmp_path) is True
|
||||
|
||||
def test_openai_codex_with_refresh_token_only(self, tmp_path):
|
||||
"""openai-codex with only a refresh_token -> still authenticated."""
|
||||
_make_auth_json(
|
||||
"openai-codex",
|
||||
{"access_token": "", "refresh_token": "ref_only_token"},
|
||||
tmp_path,
|
||||
)
|
||||
assert self._call("openai-codex", tmp_path) is True
|
||||
|
||||
def test_copilot_with_api_key(self, tmp_path):
|
||||
"""copilot with an api_key (GitHub token) -> authenticated."""
|
||||
_make_auth_json("copilot", {"api_key": "ghu_test_token_123"}, tmp_path)
|
||||
assert self._call("copilot", tmp_path) is True
|
||||
|
||||
def test_empty_tokens_returns_false(self, tmp_path):
|
||||
"""All token fields empty -> not authenticated."""
|
||||
_make_auth_json(
|
||||
"openai-codex",
|
||||
{"access_token": "", "refresh_token": "", "api_key": ""},
|
||||
tmp_path,
|
||||
)
|
||||
assert self._call("openai-codex", tmp_path) is False
|
||||
|
||||
def test_missing_provider_key_in_auth_json(self, tmp_path):
|
||||
"""auth.json present but provider key absent -> not authenticated."""
|
||||
store = {"providers": {"some-other-provider": {"access_token": "tok"}}}
|
||||
(tmp_path / "auth.json").write_text(json.dumps(store), encoding="utf-8")
|
||||
assert self._call("openai-codex", tmp_path) is False
|
||||
|
||||
def test_unknown_provider_not_in_oauth_list(self, tmp_path):
|
||||
"""A provider that is not a known OAuth provider -> always False."""
|
||||
_make_auth_json("some-random-provider", {"access_token": "tok"}, tmp_path)
|
||||
assert self._call("some-random-provider", tmp_path) is False
|
||||
|
||||
def test_nous_provider_recognized(self, tmp_path):
|
||||
"""nous is in the known OAuth set."""
|
||||
_make_auth_json("nous", {"access_token": "nous_tok"}, tmp_path)
|
||||
assert self._call("nous", tmp_path) is True
|
||||
|
||||
def test_qwen_oauth_provider_recognized(self, tmp_path):
|
||||
"""qwen-oauth is in the known OAuth set."""
|
||||
_make_auth_json("qwen-oauth", {"access_token": "qwen_tok"}, tmp_path)
|
||||
assert self._call("qwen-oauth", tmp_path) is True
|
||||
|
||||
def test_empty_provider_string_returns_false(self, tmp_path):
|
||||
"""Empty provider string -> False, no crash."""
|
||||
assert self._call("", tmp_path) is False
|
||||
assert self._call(" ", tmp_path) is False
|
||||
|
||||
|
||||
# ── 4–5. _status_from_runtime integration ────────────────────────────────────
|
||||
|
||||
class TestStatusFromRuntimeOAuth:
|
||||
"""_status_from_runtime should treat OAuth providers with tokens as ready."""
|
||||
|
||||
def _call(self, provider: str, model: str, hermes_home: pathlib.Path) -> dict:
|
||||
from api.onboarding import _status_from_runtime
|
||||
import api.onboarding as _ob
|
||||
orig_home = _ob._get_active_hermes_home
|
||||
orig_found = _ob._HERMES_FOUND
|
||||
_ob._get_active_hermes_home = lambda: hermes_home
|
||||
# Simulate hermes-agent being available so we reach the provider logic
|
||||
# (without this, _status_from_runtime short-circuits to agent_unavailable)
|
||||
_ob._HERMES_FOUND = True
|
||||
try:
|
||||
cfg = {"model": {"provider": provider, "default": model}}
|
||||
return _status_from_runtime(cfg, True)
|
||||
finally:
|
||||
_ob._get_active_hermes_home = orig_home
|
||||
_ob._HERMES_FOUND = orig_found
|
||||
|
||||
def test_copilot_ready_when_api_key_in_auth_json(self, tmp_path):
|
||||
"""copilot configured + api_key in auth.json -> provider_ready True."""
|
||||
_make_auth_json("copilot", {"api_key": "ghu_abc123"}, tmp_path)
|
||||
result = self._call("copilot", "gpt-5.4", tmp_path)
|
||||
assert result["provider_configured"] is True
|
||||
assert result["provider_ready"] is True
|
||||
assert result["setup_state"] == "ready"
|
||||
|
||||
def test_openai_codex_ready_when_token_in_auth_json(self, tmp_path):
|
||||
"""openai-codex configured + access_token -> provider_ready True."""
|
||||
_make_auth_json(
|
||||
"openai-codex",
|
||||
{"access_token": "ey.test", "refresh_token": "ref"},
|
||||
tmp_path,
|
||||
)
|
||||
result = self._call("openai-codex", "codex-mini-latest", tmp_path)
|
||||
assert result["provider_configured"] is True
|
||||
assert result["provider_ready"] is True
|
||||
assert result["setup_state"] == "ready"
|
||||
|
||||
def test_copilot_not_ready_without_credentials(self, tmp_path):
|
||||
"""copilot configured but no credentials -> provider_ready False.
|
||||
|
||||
We mock hermes_cli.auth to be unavailable so the function falls through
|
||||
to the auth.json path. With no auth.json the result must be False.
|
||||
"""
|
||||
import unittest.mock
|
||||
|
||||
# Prevent the hermes_cli fast path from finding real credentials
|
||||
with unittest.mock.patch(
|
||||
"api.onboarding._provider_oauth_authenticated",
|
||||
return_value=False,
|
||||
):
|
||||
result = self._call("copilot", "gpt-5.4", tmp_path)
|
||||
|
||||
assert result["provider_configured"] is True
|
||||
assert result["provider_ready"] is False
|
||||
assert result["setup_state"] == "provider_incomplete"
|
||||
|
||||
def test_oauth_incomplete_note_mentions_hermes_auth(self, tmp_path):
|
||||
"""When OAuth provider is incomplete, note should mention hermes auth/model."""
|
||||
result = self._call("openai-codex", "codex-mini-latest", tmp_path)
|
||||
note = result["provider_note"]
|
||||
assert "hermes auth" in note or "hermes model" in note, (
|
||||
f"Expected 'hermes auth' or 'hermes model' in note, got: {note!r}"
|
||||
)
|
||||
|
||||
def test_oauth_incomplete_note_does_not_say_api_key(self, tmp_path):
|
||||
"""OAuth provider incomplete note must not say 'API key' — that's misleading."""
|
||||
result = self._call("copilot", "gpt-5.4", tmp_path)
|
||||
note = result["provider_note"]
|
||||
assert "API key" not in note, (
|
||||
f"Note misleadingly mentions 'API key' for OAuth provider: {note!r}"
|
||||
)
|
||||
|
||||
def test_standard_provider_incomplete_note_still_says_api_key(self, tmp_path):
|
||||
"""For a standard API-key provider (openrouter), note should still say API key."""
|
||||
# openrouter with no .env
|
||||
result = self._call("openrouter", "anthropic/claude-sonnet-4.6", tmp_path)
|
||||
assert result["provider_ready"] is False
|
||||
note = result["provider_note"]
|
||||
assert "API key" in note, (
|
||||
f"Expected 'API key' in note for openrouter, got: {note!r}"
|
||||
)
|
||||
|
||||
|
||||
# ── 6. API endpoint reflects OAuth-ready state ───────────────────────────────
|
||||
|
||||
class TestOnboardingStatusApiOAuth:
|
||||
"""
|
||||
The /api/onboarding/status endpoint should report provider_ready=True
|
||||
when an OAuth provider is configured and has valid credentials.
|
||||
"""
|
||||
|
||||
def test_status_endpoint_returns_200(self):
|
||||
import urllib.request
|
||||
with urllib.request.urlopen(BASE + "/api/onboarding/status", timeout=10) as r:
|
||||
assert r.status == 200
|
||||
data = json.loads(r.read())
|
||||
assert "system" in data
|
||||
assert "provider_ready" in data["system"]
|
||||
|
||||
def test_onboarding_status_has_chat_ready_field(self):
|
||||
import urllib.request
|
||||
with urllib.request.urlopen(BASE + "/api/onboarding/status", timeout=10) as r:
|
||||
data = json.loads(r.read())
|
||||
assert "chat_ready" in data["system"]
|
||||
|
||||
def test_status_setup_state_valid_values(self):
|
||||
"""setup_state must be one of the known string values."""
|
||||
import urllib.request
|
||||
with urllib.request.urlopen(BASE + "/api/onboarding/status", timeout=10) as r:
|
||||
data = json.loads(r.read())
|
||||
valid = {"ready", "provider_incomplete", "needs_provider", "agent_unavailable"}
|
||||
assert data["system"]["setup_state"] in valid, (
|
||||
f"Unexpected setup_state: {data['system']['setup_state']!r}"
|
||||
)
|
||||
Reference in New Issue
Block a user