fix(providers): honor a custom base_url over models_url in fetch_models
Follow-up to the salvaged CommandCode signature fix: accepting base_url but ignoring it left custom endpoints (user-configured model.base_url / COMMANDCODE_BASE_URL proxies) fetching the public catalog instead of the configured one. Reviewer dansigma flagged this on PR #88851. Class-wide fix, not a CommandCode patch: - providers/base.py: a caller base_url that DIFFERS from the profile's default now wins over models_url. Equality with the default means "not customised" (callers pass base_url unconditionally, defaulting to the profile's own URL) and keeps models_url as the endpoint, preserving the OpenRouter-style split-catalog behavior. - commandcode: _fetch_commandcode_models() takes the endpoint override; both profile overrides forward base_url. - Tests: base-class precedence (custom beats models_url, default does not), CommandCode redirect via live local HTTP server incl. claude-* filter, and default-echo hitting the canonical endpoint. All verified to fail against the pre-fix implementation (sabotage run).
This commit is contained in:
@@ -275,3 +275,93 @@ class TestCommandCodeFetchModelsPickerContract:
|
||||
anth = resolve_provider_full("commandcode-anthropic", {}, [])
|
||||
assert anth is not None and anth.id == "commandcode-anthropic"
|
||||
assert anth.transport == "anthropic_messages"
|
||||
|
||||
|
||||
# ── base_url endpoint override ───────────────────────────────────────────────
|
||||
|
||||
class TestCommandCodeBaseUrlOverride:
|
||||
"""A custom base_url must redirect the catalog fetch; the default must not.
|
||||
|
||||
The picker passes ``base_url`` unconditionally (profile default when the
|
||||
user configured nothing), so only a value differing from the default
|
||||
``_COMMANDCODE_BASE`` counts as a customised endpoint.
|
||||
"""
|
||||
|
||||
def _serve(self, models):
|
||||
import json
|
||||
from http.server import BaseHTTPRequestHandler, HTTPServer
|
||||
from threading import Thread
|
||||
|
||||
class H(BaseHTTPRequestHandler):
|
||||
def do_GET(self):
|
||||
body = json.dumps({"data": models}).encode()
|
||||
self.send_response(200)
|
||||
self.send_header("Content-Type", "application/json")
|
||||
self.end_headers()
|
||||
self.wfile.write(body)
|
||||
|
||||
def log_message(self, fmt, *args):
|
||||
pass
|
||||
|
||||
server = HTTPServer(("127.0.0.1", 0), H)
|
||||
Thread(target=server.serve_forever, daemon=True).start()
|
||||
return server, server.server_address[1]
|
||||
|
||||
def test_custom_base_url_redirects_fetch(self, commandcode_profile):
|
||||
server, port = self._serve([{"id": "proxied/model-x"}])
|
||||
try:
|
||||
result = commandcode_profile.fetch_models(
|
||||
api_key="k", base_url=f"http://127.0.0.1:{port}"
|
||||
)
|
||||
assert result == ["proxied/model-x"]
|
||||
finally:
|
||||
server.shutdown()
|
||||
|
||||
def test_custom_base_url_redirects_anthropic_fetch(
|
||||
self, commandcode_anthropic_profile
|
||||
):
|
||||
server, port = self._serve(
|
||||
[{"id": "claude-sonnet-4-6"}, {"id": "deepseek/deepseek-v4-pro"}]
|
||||
)
|
||||
try:
|
||||
result = commandcode_anthropic_profile.fetch_models(
|
||||
api_key="k", base_url=f"http://127.0.0.1:{port}"
|
||||
)
|
||||
assert result == ["claude-sonnet-4-6"] # claude-* filter still applies
|
||||
finally:
|
||||
server.shutdown()
|
||||
|
||||
def test_default_base_url_hits_default_endpoint(self, commandcode_profile):
|
||||
"""Echoing the profile default back must NOT count as an override."""
|
||||
import sys
|
||||
from unittest.mock import patch as mock_patch
|
||||
|
||||
# The bundled plugin module is registered at discovery time under
|
||||
# ``plugins.model_providers.commandcode`` — resolve via the profile's
|
||||
# own __module__ so the test doesn't depend on discovery mechanics.
|
||||
cc_mod = sys.modules[type(commandcode_profile).__module__]
|
||||
|
||||
captured = {}
|
||||
|
||||
class _FakeResp:
|
||||
def __enter__(self):
|
||||
return self
|
||||
|
||||
def __exit__(self, *a):
|
||||
return False
|
||||
|
||||
def read(self):
|
||||
return b'{"data": [{"id": "m1"}]}'
|
||||
|
||||
def fake_urlopen(req, timeout=0):
|
||||
captured["url"] = req.full_url
|
||||
return _FakeResp()
|
||||
|
||||
with mock_patch.object(
|
||||
cc_mod.urllib.request, "urlopen", side_effect=fake_urlopen
|
||||
):
|
||||
result = commandcode_profile.fetch_models(
|
||||
api_key="k", base_url=cc_mod._COMMANDCODE_BASE + "/"
|
||||
)
|
||||
assert result == ["m1"]
|
||||
assert captured["url"] == cc_mod._COMMANDCODE_MODELS_URL
|
||||
|
||||
Reference in New Issue
Block a user