feat(auth): added auth-gateway forward-proxy and broker usage/migrate endpoints
- Added `omp auth-gateway serve/token/status` — a forward-proxy injecting broker credentials for OpenAI Chat, Anthropic Messages, and OpenAI Responses wire formats. - Added `GET /v1/usage` to auth-broker and auth-gateway; usage cache switched to 5-min per-credential TTL with jitter and last-good fallback on failure. - Added `AuthStorage.setConfigApiKey/removeConfigApiKey/clearConfigApiKeys` so `models.yml` `apiKey` beats OAuth tokens without overriding `--api-key`. - Added `omp auth-broker migrate --from-local` for idempotent upload of local SQLite/env credentials to the broker.
This commit is contained in:
@@ -102,14 +102,14 @@ def test_model_pool_single(env: dict[str, str]) -> None:
|
||||
def test_model_pool_csv_parses(monkeypatch: pytest.MonkeyPatch, env: dict[str, str]) -> None:
|
||||
monkeypatch.setenv(
|
||||
"ROBOMP_MODEL",
|
||||
" p-codex/gpt-5.4 , p-anthropic/claude-sonnet-4-6 ,, p-anthropic/claude-opus-4-7 ",
|
||||
" codex/gpt-5.4 , anthropic/claude-sonnet-4-6 ,, anthropic/claude-opus-4-7 ",
|
||||
)
|
||||
reset_settings_cache()
|
||||
cfg = Settings() # type: ignore[call-arg]
|
||||
assert cfg.model_pool == (
|
||||
"p-codex/gpt-5.4",
|
||||
"p-anthropic/claude-sonnet-4-6",
|
||||
"p-anthropic/claude-opus-4-7",
|
||||
"codex/gpt-5.4",
|
||||
"anthropic/claude-sonnet-4-6",
|
||||
"anthropic/claude-opus-4-7",
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -101,21 +101,21 @@ def test_pragma_value_last_wins() -> None:
|
||||
|
||||
|
||||
def test_resolve_model_alias_precedence() -> None:
|
||||
pool = ("p-anthropic/claude-sonnet-4-6", "p-openai/gpt-5.5", "p-openai/gpt-5.5-mini")
|
||||
pool = ("anthropic/claude-sonnet-4-6", "openai/gpt-5.5", "openai/gpt-5.5-mini")
|
||||
# Short-name-after-slash beats substring.
|
||||
assert resolve_model_alias("gpt-5.5", pool) == "p-openai/gpt-5.5"
|
||||
assert resolve_model_alias("gpt-5.5", pool) == "openai/gpt-5.5"
|
||||
# Substring is fallback.
|
||||
assert resolve_model_alias("gpt", pool) == "p-openai/gpt-5.5"
|
||||
assert resolve_model_alias("claude", pool) == "p-anthropic/claude-sonnet-4-6"
|
||||
assert resolve_model_alias("gpt", pool) == "openai/gpt-5.5"
|
||||
assert resolve_model_alias("claude", pool) == "anthropic/claude-sonnet-4-6"
|
||||
|
||||
|
||||
def test_resolve_model_alias_full_id() -> None:
|
||||
pool = ("p-openai/gpt-5.5", "p-anthropic/claude-sonnet-4-6")
|
||||
assert resolve_model_alias("p-openai/gpt-5.5", pool) == "p-openai/gpt-5.5"
|
||||
pool = ("openai/gpt-5.5", "anthropic/claude-sonnet-4-6")
|
||||
assert resolve_model_alias("openai/gpt-5.5", pool) == "openai/gpt-5.5"
|
||||
|
||||
|
||||
def test_resolve_model_alias_no_match() -> None:
|
||||
pool = ("p-anthropic/claude-sonnet-4-6",)
|
||||
pool = ("anthropic/claude-sonnet-4-6",)
|
||||
assert resolve_model_alias("gpt", pool) is None
|
||||
assert resolve_model_alias("", pool) is None
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ from robomp.worker import DirectiveInfo, _resolve_pragma_overrides
|
||||
def settings_with_pool(monkeypatch: pytest.MonkeyPatch, env: dict[str, str]) -> Settings:
|
||||
monkeypatch.setenv(
|
||||
"ROBOMP_MODEL",
|
||||
"p-anthropic/claude-sonnet-4-6,p-openai/gpt-5.5,p-openai/gpt-5.5-mini",
|
||||
"anthropic/claude-sonnet-4-6,openai/gpt-5.5,openai/gpt-5.5-mini",
|
||||
)
|
||||
reset_settings_cache()
|
||||
return Settings() # type: ignore[call-arg]
|
||||
@@ -30,14 +30,14 @@ def test_directive_without_pragmas_means_no_override(settings_with_pool: Setting
|
||||
def test_model_pragma_resolves_to_pool_entry(settings_with_pool: Settings) -> None:
|
||||
directive = DirectiveInfo(body="run", author="can1357", pragmas=(("model", "gpt"),))
|
||||
model_override, thinking_override = _resolve_pragma_overrides(directive, settings_with_pool)
|
||||
assert model_override == "p-openai/gpt-5.5"
|
||||
assert model_override == "openai/gpt-5.5"
|
||||
assert thinking_override is None
|
||||
|
||||
|
||||
def test_model_alias_exact_short_name(settings_with_pool: Settings) -> None:
|
||||
directive = DirectiveInfo(body="run", author="can1357", pragmas=(("model", "gpt-5.5-mini"),))
|
||||
model_override, _ = _resolve_pragma_overrides(directive, settings_with_pool)
|
||||
assert model_override == "p-openai/gpt-5.5-mini"
|
||||
assert model_override == "openai/gpt-5.5-mini"
|
||||
|
||||
|
||||
def test_unmatched_model_alias_falls_back_to_random_pick(settings_with_pool: Settings) -> None:
|
||||
@@ -66,7 +66,7 @@ def test_both_pragmas_resolved_together(settings_with_pool: Settings) -> None:
|
||||
pragmas=(("model", "claude"), ("thinking", "medium")),
|
||||
)
|
||||
model_override, thinking_override = _resolve_pragma_overrides(directive, settings_with_pool)
|
||||
assert model_override == "p-anthropic/claude-sonnet-4-6"
|
||||
assert model_override == "anthropic/claude-sonnet-4-6"
|
||||
assert thinking_override == "medium"
|
||||
|
||||
|
||||
@@ -77,4 +77,4 @@ def test_last_value_wins_for_duplicate_keys(settings_with_pool: Settings) -> Non
|
||||
pragmas=(("model", "claude"), ("model", "gpt")),
|
||||
)
|
||||
model_override, _ = _resolve_pragma_overrides(directive, settings_with_pool)
|
||||
assert model_override == "p-openai/gpt-5.5"
|
||||
assert model_override == "openai/gpt-5.5"
|
||||
|
||||
Reference in New Issue
Block a user