252 lines
10 KiB
Python
252 lines
10 KiB
Python
"""
|
|
Regression tests for resolve_model_provider — issue #1744.
|
|
|
|
When an OpenRouter model ID ends in a colon-suffixed tag like ``:free``,
|
|
``:beta``, ``:thinking``, the ``@provider:model`` qualifier produced by
|
|
``model_with_provider_context`` collides with the ``rsplit(":", 1)`` grammar
|
|
inside ``resolve_model_provider``. The resolver would incorrectly peel the
|
|
suffix into the provider field instead of keeping it attached to the model.
|
|
|
|
E.g. ``@openrouter:tencent/hy3-preview:free`` was resolved as
|
|
``model="free", provider="openrouter:tencent/hy3-preview"`` instead of the
|
|
correct ``model="tencent/hy3-preview:free", provider="openrouter"``.
|
|
|
|
The fix (api/config.py ~line 1370) validates the rsplit result: if the
|
|
provider hint is not a known provider and not a custom provider, it falls
|
|
back to ``split(":", 1)`` so trailing suffixes stay with the model.
|
|
"""
|
|
|
|
from api.config import resolve_model_provider, model_with_provider_context
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Helper: simulate a config where provider != openrouter so that
|
|
# model_with_provider_context actually qualifies the ID.
|
|
# ---------------------------------------------------------------------------
|
|
def _set_config_provider(provider: str, default_model: str = "claude-sonnet-4.6"):
|
|
"""Temporarily set the model config provider for testing."""
|
|
import api.config as cfg_mod
|
|
old = dict(cfg_mod.cfg.get("model", {}))
|
|
cfg_mod.cfg["model"] = {"provider": provider, "default": default_model}
|
|
return old, cfg_mod
|
|
|
|
|
|
def _restore_config(old, cfg_mod):
|
|
cfg_mod.cfg["model"] = old
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Tests
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def test_openrouter_free_suffix_survives_provider_qualification():
|
|
"""tencent/hy3-preview:free must resolve correctly when qualified."""
|
|
import api.config as cfg_mod
|
|
old, cfg_mod = _set_config_provider("anthropic")
|
|
try:
|
|
qualified = model_with_provider_context("tencent/hy3-preview:free", "openrouter")
|
|
model, provider, _ = resolve_model_provider(qualified)
|
|
assert provider == "openrouter", f"expected provider='openrouter', got '{provider}'"
|
|
assert model == "tencent/hy3-preview:free", f"expected model='tencent/hy3-preview:free', got '{model}'"
|
|
finally:
|
|
_restore_config(old, cfg_mod)
|
|
|
|
|
|
def test_openrouter_free_suffix_nvidia():
|
|
"""nvidia/nemotron-3-super-120b-a12b:free — same bug class."""
|
|
import api.config as cfg_mod
|
|
old, cfg_mod = _set_config_provider("anthropic")
|
|
try:
|
|
qualified = model_with_provider_context("nvidia/nemotron-3-super-120b-a12b:free", "openrouter")
|
|
model, provider, _ = resolve_model_provider(qualified)
|
|
assert provider == "openrouter"
|
|
assert model == "nvidia/nemotron-3-super-120b-a12b:free"
|
|
finally:
|
|
_restore_config(old, cfg_mod)
|
|
|
|
|
|
def test_openrouter_free_suffix_arcee():
|
|
"""arcee-ai/trinity-large-preview:free — same bug class."""
|
|
import api.config as cfg_mod
|
|
old, cfg_mod = _set_config_provider("anthropic")
|
|
try:
|
|
qualified = model_with_provider_context("arcee-ai/trinity-large-preview:free", "openrouter")
|
|
model, provider, _ = resolve_model_provider(qualified)
|
|
assert provider == "openrouter"
|
|
assert model == "arcee-ai/trinity-large-preview:free"
|
|
finally:
|
|
_restore_config(old, cfg_mod)
|
|
|
|
|
|
def test_openrouter_thinking_suffix():
|
|
"""Models ending in :thinking should also be preserved."""
|
|
import api.config as cfg_mod
|
|
old, cfg_mod = _set_config_provider("anthropic")
|
|
try:
|
|
qualified = model_with_provider_context("some/model:thinking", "openrouter")
|
|
model, provider, _ = resolve_model_provider(qualified)
|
|
assert provider == "openrouter"
|
|
assert model == "some/model:thinking"
|
|
finally:
|
|
_restore_config(old, cfg_mod)
|
|
|
|
|
|
def test_custom_provider_rsplit_still_works():
|
|
"""custom:my-key:model must still parse correctly via rsplit."""
|
|
qualified = "@custom:my-key:some-model"
|
|
model, provider, _ = resolve_model_provider(qualified)
|
|
assert provider == "custom:my-key", f"expected provider='custom:my-key', got '{provider}'"
|
|
assert model == "some-model", f"expected model='some-model', got '{model}'"
|
|
|
|
|
|
def test_known_provider_single_colon():
|
|
"""@openrouter:simple-model — no suffix, should still work."""
|
|
qualified = "@openrouter:simple-model"
|
|
model, provider, _ = resolve_model_provider(qualified)
|
|
assert provider == "openrouter"
|
|
assert model == "simple-model"
|
|
|
|
|
|
def test_known_provider_anthropic():
|
|
"""@anthropic:claude-sonnet-4.6 — standard case."""
|
|
qualified = "@anthropic:claude-sonnet-4.6"
|
|
model, provider, _ = resolve_model_provider(qualified)
|
|
assert provider == "anthropic"
|
|
assert model == "claude-sonnet-4.6"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Issue #1776 — custom provider + :free / :beta / :thinking suffix
|
|
#
|
|
# The PR #1762 fix for #1744 skipped the rsplit-fallback when the provider
|
|
# hint started with "custom:", on the assumption that custom-provider model
|
|
# IDs route directly without further heuristics. But "@custom:my-key:model:free"
|
|
# trips the same rsplit grammar collision: rsplit yields
|
|
# provider="custom:my-key:model", bare="free"
|
|
# and the custom-prefix guard skips the fallback → wrong routing.
|
|
#
|
|
# The fix detects the over-split structurally: custom hints carry exactly
|
|
# one segment after "custom:" (see api/config.py:1363 where the slug is
|
|
# constructed as "custom:" + entry_name), so any rsplit result of the form
|
|
# "custom:<a>:<b>" with bare model "<c>" has eaten one model segment. Peel
|
|
# it back so the model becomes "<b>:<c>".
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def test_custom_provider_free_suffix_1776():
|
|
"""@custom:my-key:some-model:free → custom:my-key + some-model:free (#1776)."""
|
|
qualified = "@custom:my-key:some-model:free"
|
|
model, provider, _ = resolve_model_provider(qualified)
|
|
assert provider == "custom:my-key", f"expected provider='custom:my-key', got '{provider}'"
|
|
assert model == "some-model:free", f"expected model='some-model:free', got '{model}'"
|
|
|
|
|
|
def test_custom_provider_beta_suffix_1776():
|
|
"""@custom:my-key:some-model:beta — same bug class as :free."""
|
|
qualified = "@custom:my-key:some-model:beta"
|
|
model, provider, _ = resolve_model_provider(qualified)
|
|
assert provider == "custom:my-key"
|
|
assert model == "some-model:beta"
|
|
|
|
|
|
def test_custom_provider_thinking_suffix_1776():
|
|
"""@custom:my-key:some-model:thinking — same bug class as :free."""
|
|
qualified = "@custom:my-key:some-model:thinking"
|
|
model, provider, _ = resolve_model_provider(qualified)
|
|
assert provider == "custom:my-key"
|
|
assert model == "some-model:thinking"
|
|
|
|
|
|
def test_custom_provider_preview_suffix_1776():
|
|
"""@custom:my-key:some-model:preview — same bug class, no allowlist needed."""
|
|
qualified = "@custom:my-key:some-model:preview"
|
|
model, provider, _ = resolve_model_provider(qualified)
|
|
assert provider == "custom:my-key"
|
|
assert model == "some-model:preview"
|
|
|
|
|
|
def test_custom_provider_slashed_model_with_free_suffix_1776():
|
|
"""@custom:my-key:org/model:free — custom hint + slashed model + suffix."""
|
|
qualified = "@custom:my-key:org/model:free"
|
|
model, provider, _ = resolve_model_provider(qualified)
|
|
assert provider == "custom:my-key"
|
|
assert model == "org/model:free"
|
|
|
|
|
|
def test_custom_provider_ipv4_port_slug_no_false_peel():
|
|
"""host:port in custom slug must not trigger #1776 peel — avoids ``8080:model``."""
|
|
qualified = "@custom:10.8.71.41:8080:Qwen3-235B"
|
|
model, provider, _ = resolve_model_provider(qualified)
|
|
assert provider == "custom:10.8.71.41:8080"
|
|
assert model == "Qwen3-235B"
|
|
|
|
|
|
def test_custom_provider_hostname_port_slug_no_false_peel():
|
|
qualified = "@custom:proxy.internal:8443:Qwen3-235B"
|
|
model, provider, _ = resolve_model_provider(qualified)
|
|
assert provider == "custom:proxy.internal:8443"
|
|
assert model == "Qwen3-235B"
|
|
|
|
|
|
def test_custom_provider_localhost_port_slug_no_false_peel():
|
|
qualified = "@custom:localhost:11434:llama3.2"
|
|
model, provider, _ = resolve_model_provider(qualified)
|
|
assert provider == "custom:localhost:11434"
|
|
assert model == "llama3.2"
|
|
|
|
|
|
def test_model_with_provider_context_custom_ipv4_port_roundtrip():
|
|
"""Mirrors WebUI /start payload: bare model + custom:<host>:<port> provider."""
|
|
import api.config as cfg_mod
|
|
|
|
old = dict(cfg_mod.cfg.get("model", {}))
|
|
cfg_mod.cfg["model"] = {"provider": "custom", "default": "gpt-5.5"}
|
|
try:
|
|
wrapped = model_with_provider_context("Qwen3-235B", "custom:10.8.71.41:8080")
|
|
assert wrapped == "@custom:10.8.71.41:8080:Qwen3-235B"
|
|
model, provider, _ = resolve_model_provider(wrapped)
|
|
assert provider == "custom:10.8.71.41:8080"
|
|
assert model == "Qwen3-235B"
|
|
finally:
|
|
cfg_mod.cfg["model"] = old
|
|
|
|
|
|
def test_endpoint_custom_slug_matching_ollama_base_url_uses_ollama_provider():
|
|
"""Issue #2271: endpoint-derived custom slugs must not force CUSTOM_* keys."""
|
|
import api.config as cfg_mod
|
|
|
|
old = dict(cfg_mod.cfg.get("model", {}))
|
|
cfg_mod.cfg["model"] = {
|
|
"provider": "ollama",
|
|
"default": "ministral-3:latest",
|
|
"base_url": "http://lan-box.local:11434/v1",
|
|
}
|
|
try:
|
|
model, provider, base_url = resolve_model_provider(
|
|
"@custom:lan-box.local-11434:ministral-3:latest"
|
|
)
|
|
assert model == "ministral-3:latest"
|
|
assert provider == "ollama"
|
|
assert base_url == "http://lan-box.local:11434/v1"
|
|
finally:
|
|
cfg_mod.cfg["model"] = old
|
|
|
|
|
|
def test_endpoint_custom_colon_slug_matching_ollama_base_url_uses_ollama_provider():
|
|
import api.config as cfg_mod
|
|
|
|
old = dict(cfg_mod.cfg.get("model", {}))
|
|
cfg_mod.cfg["model"] = {
|
|
"provider": "ollama",
|
|
"default": "llama3.2",
|
|
"base_url": "http://ollama.internal:11434/v1",
|
|
}
|
|
try:
|
|
model, provider, base_url = resolve_model_provider(
|
|
"@custom:ollama.internal:11434:llama3.2"
|
|
)
|
|
assert model == "llama3.2"
|
|
assert provider == "ollama"
|
|
assert base_url == "http://ollama.internal:11434/v1"
|
|
finally:
|
|
cfg_mod.cfg["model"] = old
|