Skip to content

fix: prefer exact model registry IDs over aliases #22

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

Open
kbentonferguson wants to merge 1 commit into
base: main
Choose a base branch
from
+49 −12
Open

fix: prefer exact model registry IDs over aliases #22

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
30 changes: 18 additions & 12 deletions puppetmaster/model_registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,19 +1165,25 @@ def resolve_model_pin(
if not needle:
return None

eligible = [
spec
for spec in enabled_specs(registry)
if adapter is None or spec.adapter == adapter
]
exact_ids = [spec for spec in eligible if spec.id == needle]

token = _normalize_model_token(needle.split("/")[-1])
candidates: list[ModelSpec] = []
for spec in enabled_specs(registry):
if adapter is not None and spec.adapter != adapter:
continue
if spec.id == needle or spec.adapter_model_name == needle:
candidates.append(spec)
continue
if token and (
_normalize_model_token(spec.adapter_model_name) == token
or _normalize_model_token(spec.id.split("/")[-1]) == token
):
candidates.append(spec)
candidates: list[ModelSpec] = list(exact_ids)
if not candidates:
for spec in eligible:
if spec.adapter_model_name == needle:
candidates.append(spec)
continue
if token and (
_normalize_model_token(spec.adapter_model_name) == token
or _normalize_model_token(spec.id.split("/")[-1]) == token
):
candidates.append(spec)

if not candidates:
return None
Expand Down
31 changes: 31 additions & 0 deletions tests/test_puppetmaster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15153,6 +15153,37 @@ def test_resolve_accepts_registry_id_and_adapter_name(self) -> None:
self.assertEqual(pin.registry_id, "cursor/grok-4-5")
self.assertEqual(pin.adapter_model_name, "grok-4.5")

def test_resolve_exact_registry_id_wins_over_ambiguous_model_alias(self) -> None:
from puppetmaster.model_registry import ModelSpec, resolve_model_pin

registry = [
ModelSpec(
id="agentic/gpt-5.6-sol",
adapter="agentic",
adapter_model_name="gpt-5.6-sol",
enabled=True,
payload_defaults={"provider": "openai-api"},
),
ModelSpec(
id="agentic/openai-codex/gpt-5.6-sol",
adapter="agentic",
adapter_model_name="gpt-5.6-sol",
enabled=True,
payload_defaults={"provider": "openai-codex"},
),
]

pin = resolve_model_pin(
"agentic/gpt-5.6-sol",
registry,
adapter="agentic",
)

self.assertIsNotNone(pin)
assert pin is not None
self.assertEqual(pin.registry_id, "agentic/gpt-5.6-sol")
self.assertEqual(pin.spec.payload_defaults["provider"], "openai-api")

def test_resolve_rejects_ambiguous_pin(self) -> None:
from puppetmaster.model_registry import AmbiguousModelPinError, ModelSpec, resolve_model_pin

Expand Down