Hua/nanobot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: prefer explicit provider prefix over keyword match to fix Codex routing

Browse Source
This commit is contained in:
Re-bin
2026-02-19 17:39:44 +00:00
parent d78368bb2f
commit b11f0ce6a9
2 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
nanobot/config/schema.py
View File

@@ -291,30 +291,21 @@ class Config(BaseSettings):
model_prefix = model_lower.split("/", 1)[0] if "/" in model_lower else ""
normalized_prefix = model_prefix.replace("-", "_")
def _matches_model_prefix(spec_name: str) -> bool:
if not model_prefix:
return False
return normalized_prefix == spec_name
def _kw_matches(kw: str) -> bool:
kw = kw.lower()
return kw in model_lower or kw.replace("-", "_") in model_normalized
def _keyword_matches(keyword: str) -> bool:
keyword_lower = keyword.lower()
return (
keyword_lower in model_lower
or keyword_lower.replace("-", "_") in model_normalized
)
# Explicit provider prefix in model name wins over generic keyword matches.
# This prevents `github-copilot/...codex` from being treated as OpenAI Codex.
# Explicit provider prefix wins — prevents `github-copilot/...codex` matching openai_codex.
for spec in PROVIDERS:
p = getattr(self.providers, spec.name, None)
if p and _matches_model_prefix(spec.name):
if p and model_prefix and normalized_prefix == spec.name:
if spec.is_oauth or p.api_key:
return p, spec.name
# Match by keyword (order follows PROVIDERS registry)
for spec in PROVIDERS:
p = getattr(self.providers, spec.name, None)
if p and any(_keyword_matches(kw) for kw in spec.keywords):
if p and any(_kw_matches(kw) for kw in spec.keywords):
if spec.is_oauth or p.api_key:
return p, spec.name

16
nanobot/providers/registry.py
View File

@@ -387,21 +387,15 @@ def find_by_model(model: str) -> ProviderSpec | None:
model_normalized = model_lower.replace("-", "_")
model_prefix = model_lower.split("/", 1)[0] if "/" in model_lower else ""
normalized_prefix = model_prefix.replace("-", "_")
std_specs = [s for s in PROVIDERS if not s.is_gateway and not s.is_local]
# Prefer explicit provider prefix in model name.
for spec in PROVIDERS:
if spec.is_gateway or spec.is_local:
continue
# Prefer explicit provider prefix — prevents `github-copilot/...codex` matching openai_codex.
for spec in std_specs:
if model_prefix and normalized_prefix == spec.name:
return spec
for spec in PROVIDERS:
if spec.is_gateway or spec.is_local:
continue
if any(
kw in model_lower or kw.replace("-", "_") in model_normalized
for kw in spec.keywords
):
for spec in std_specs:
if any(kw in model_lower or kw.replace("-", "_") in model_normalized for kw in spec.keywords):
return spec
return None