fix(auxiliary): preserve main provider base url (#45587)
This commit is contained in:
parent
62b4618e9a
commit
4b646bc21e
2 changed files with 30 additions and 1 deletions
|
|
@ -3190,7 +3190,7 @@ def _resolve_auto(main_runtime: Optional[Dict[str, Any]] = None) -> Tuple[Option
|
||||||
if (main_provider and main_model
|
if (main_provider and main_model
|
||||||
and main_provider not in {"auto", ""}):
|
and main_provider not in {"auto", ""}):
|
||||||
resolved_provider = main_provider
|
resolved_provider = main_provider
|
||||||
explicit_base_url = None
|
explicit_base_url = runtime_base_url or None
|
||||||
explicit_api_key = None
|
explicit_api_key = None
|
||||||
if runtime_base_url and (main_provider == "custom" or main_provider.startswith("custom:")):
|
if runtime_base_url and (main_provider == "custom" or main_provider.startswith("custom:")):
|
||||||
resolved_provider = "custom"
|
resolved_provider = "custom"
|
||||||
|
|
|
||||||
|
|
@ -161,6 +161,35 @@ class TestResolveAutoMainFirst:
|
||||||
assert mock_resolve.call_args.args[0] == "anthropic"
|
assert mock_resolve.call_args.args[0] == "anthropic"
|
||||||
assert mock_resolve.call_args.args[1] == "runtime-model"
|
assert mock_resolve.call_args.args[1] == "runtime-model"
|
||||||
|
|
||||||
|
def test_runtime_base_url_passed_for_named_api_key_provider(self):
|
||||||
|
"""Named API-key providers inherit the live session endpoint for aux work."""
|
||||||
|
token_plan_url = "https://token-plan-sgp.xiaomimimo.com/v1"
|
||||||
|
with patch(
|
||||||
|
"agent.auxiliary_client._read_main_provider",
|
||||||
|
return_value="openrouter",
|
||||||
|
), patch(
|
||||||
|
"agent.auxiliary_client._read_main_model", return_value="config-model",
|
||||||
|
), patch(
|
||||||
|
"agent.auxiliary_client.resolve_provider_client"
|
||||||
|
) as mock_resolve:
|
||||||
|
mock_resolve.return_value = (MagicMock(), "mimo-v2.5-pro")
|
||||||
|
|
||||||
|
from agent.auxiliary_client import _resolve_auto
|
||||||
|
|
||||||
|
_resolve_auto(main_runtime={
|
||||||
|
"provider": "xiaomi",
|
||||||
|
"model": "mimo-v2.5-pro",
|
||||||
|
"base_url": token_plan_url,
|
||||||
|
"api_key": "tp-test-key",
|
||||||
|
"api_mode": "chat_completions",
|
||||||
|
})
|
||||||
|
|
||||||
|
assert mock_resolve.call_args.args[0] == "xiaomi"
|
||||||
|
assert mock_resolve.call_args.args[1] == "mimo-v2.5-pro"
|
||||||
|
assert mock_resolve.call_args.kwargs["explicit_base_url"] == token_plan_url
|
||||||
|
assert mock_resolve.call_args.kwargs["explicit_api_key"] == "tp-test-key"
|
||||||
|
assert mock_resolve.call_args.kwargs["api_mode"] == "chat_completions"
|
||||||
|
|
||||||
|
|
||||||
# ── Vision — resolve_vision_provider_client ─────────────────────────────────
|
# ── Vision — resolve_vision_provider_client ─────────────────────────────────
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue