Skip to content

fix(models): bind provider detection to DNS labels #5961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
RaresKeY wants to merge 1 commit into
base: dev
Choose a base branch
from
+20 −6
Draft

fix(models): bind provider detection to DNS labels #5961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/model_capability_readers/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,17 +290,22 @@ def detect_vendor(base_url: Any = "", endpoint_kind: Any = "") -> str:
return kind_map[kind]

parsed = urlparse(compact_str(base_url))
host = (parsed.hostname or "").lower()
host = (parsed.hostname or "").lower().rstrip(".")
port = parsed.port
if host.endswith("openrouter.ai"):

def host_matches(domain: str) -> bool:
domain = domain.lower().rstrip(".")
return host == domain or host.endswith(f".{domain}")

if host_matches("openrouter.ai"):
return VENDOR_OPENROUTER
if host.endswith("openai.com"):
if host_matches("openai.com"):
return VENDOR_OPENAI
if host.endswith("anthropic.com"):
if host_matches("anthropic.com"):
return VENDOR_ANTHROPIC
if host.endswith("googleapis.com"):
if host_matches("googleapis.com"):
return VENDOR_GOOGLE
if host.endswith("ollama.com") or port == 11434:
if host_matches("ollama.com") or port == 11434:
return VENDOR_OLLAMA
if port == 1234:
return VENDOR_LMSTUDIO
Expand Down
9 changes: 9 additions & 0 deletions tests/test_model_capability_readers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ def test_detect_vendor_uses_endpoint_kind_then_host_and_common_local_ports():
assert detect_vendor("http://localhost:7000/v1") == VENDOR_GENERIC_OPENAI


def test_detect_vendor_requires_a_dns_label_boundary():
assert detect_vendor("https://api.openai.com./v1") == VENDOR_OPENAI
assert detect_vendor("https://notopenai.com/v1") == VENDOR_GENERIC_OPENAI
assert detect_vendor("https://fakeopenrouter.ai/v1") == VENDOR_GENERIC_OPENAI
assert detect_vendor("https://notgoogleapis.com/v1") == VENDOR_GENERIC_OPENAI
assert detect_vendor("https://evilanthropic.com/v1") == VENDOR_GENERIC_OPENAI
assert detect_vendor("https://fakeollama.com/v1") == VENDOR_GENERIC_OPENAI


def test_generic_openai_reader_keeps_basic_model_payload_unknown():
records = generic_openai.records_from_payload(
{
Expand Down