fix(models): validate MiniMax models against static catalog (#12611, #12460, #12399, #12547)

This commit is contained in:
Tranquil-Flow 2026-04-20 02:03:31 +00:00 committed by Teknium
parent a4ba0754ed
commit 35e7bf6b00
2 changed files with 175 additions and 0 deletions

View file

@ -2104,6 +2104,51 @@ def validate_requested_model(
), ),
} }
# MiniMax providers don't expose a /models endpoint — validate against
# the static catalog instead, similar to openai-codex.
if normalized in ("minimax", "minimax-cn"):
try:
catalog_models = provider_model_ids(normalized)
except Exception:
catalog_models = []
if catalog_models:
# Case-insensitive lookup (catalog uses mixed case like MiniMax-M2.7)
catalog_lower = {m.lower(): m for m in catalog_models}
if requested_for_lookup.lower() in catalog_lower:
return {
"accepted": True,
"persist": True,
"recognized": True,
"message": None,
}
# Auto-correct close matches (case-insensitive)
catalog_lower_list = list(catalog_lower.keys())
auto = get_close_matches(requested_for_lookup.lower(), catalog_lower_list, n=1, cutoff=0.9)
if auto:
corrected = catalog_lower[auto[0]]
return {
"accepted": True,
"persist": True,
"recognized": True,
"corrected_model": corrected,
"message": f"Auto-corrected `{requested}` → `{corrected}`",
}
suggestions = get_close_matches(requested_for_lookup.lower(), catalog_lower_list, n=3, cutoff=0.5)
suggestion_text = ""
if suggestions:
suggestion_text = "\n Similar models: " + ", ".join(f"`{catalog_lower[s]}`" for s in suggestions)
return {
"accepted": True,
"persist": True,
"recognized": False,
"message": (
f"Note: `{requested}` was not found in the MiniMax catalog."
f"{suggestion_text}"
"\n MiniMax does not expose a /models endpoint, so Hermes cannot verify the model name."
"\n The model may still work if it exists on the server."
),
}
# Probe the live API to check if the model actually exists # Probe the live API to check if the model actually exists
api_models = fetch_api_models(api_key, base_url) api_models = fetch_api_models(api_key, base_url)

View file

@ -0,0 +1,130 @@
"""Tests for MiniMax model validation via static catalog (issues #12611, #12460, #12399, #12547).
MiniMax and MiniMax-CN providers don't expose /v1/models, so validate_requested_model()
must validate against the static catalog instead of probing the live API.
"""
from unittest.mock import patch
import pytest
from hermes_cli.models import validate_requested_model
class TestMiniMaxModelValidation:
"""Test that validate_requested_model handles MiniMax providers correctly."""
@pytest.fixture(autouse=True)
def _isolate_minimax(self):
"""Ensure MiniMax catalog is used even if a live /v1/models endpoint exists."""
# Simulate fetch_api_models returning None (i.e., /v1/models is unreachable),
# proving that the catalog path is taken.
probe_payload = {
"models": None,
"probed_url": "https://api.minimax.io/v1/models",
"resolved_base_url": "https://api.minimax.io/v1",
"suggested_base_url": None,
"used_fallback": False,
}
with patch("hermes_cli.models.fetch_api_models", return_value=None), \
patch("hermes_cli.models.probe_api_models", return_value=probe_payload):
yield
# -------------------------------------------------------------------------
# Test 1: A known MiniMax model is accepted with recognized=True
# -------------------------------------------------------------------------
def test_valid_minimax_model_accepted(self):
result = validate_requested_model("MiniMax-M2.7", "minimax")
assert result["accepted"] is True
assert result["persist"] is True
assert result["recognized"] is True
assert result["message"] is None
# -------------------------------------------------------------------------
# Test 1b: Case-insensitive lookup matches catalog entries
# -------------------------------------------------------------------------
def test_valid_minimax_model_case_insensitive(self):
result = validate_requested_model("minimax-m2.7", "minimax")
assert result["accepted"] is True
assert result["persist"] is True
assert result["recognized"] is True
assert result["message"] is None
def test_valid_minimax_model_uppercase(self):
result = validate_requested_model("MINIMAX-M2.7", "minimax")
assert result["accepted"] is True
assert result["recognized"] is True
# -------------------------------------------------------------------------
# Test 2: A near-match model on minimax-cn triggers a suggestion (not auto-correct)
# -------------------------------------------------------------------------
def test_near_match_minimax_cn_suggests_similar(self):
# "MiniMax-M2.7-highspeed" is somewhat similar to "MiniMax-M2.7" (ratio ~0.71)
# but below the 0.9 auto-correct cutoff. It should be accepted with a
# recognized=False and a similar-models suggestion (ratio > 0.5).
result = validate_requested_model("MiniMax-M2.7-highspeed", "minimax-cn")
assert result["accepted"] is True
assert result["persist"] is True
assert result["recognized"] is False
# Should NOT auto-correct (ratio 0.71 < 0.9)
assert "corrected_model" not in result
# But should suggest similar models (ratio 0.71 > 0.5)
assert "MiniMax-M2.7" in result["message"]
# -------------------------------------------------------------------------
# Test 3: A completely unknown model is accepted (not rejected) with a warning
# -------------------------------------------------------------------------
def test_unknown_minimax_model_accepted_with_warning(self):
# "NotARealModel" has very low similarity to any MiniMax model (~0.16).
# It should still be accepted (not rejected), with recognized=False and
# a note that MiniMax doesn't expose /models.
result = validate_requested_model("NotARealModel", "minimax")
assert result["accepted"] is True
assert result["persist"] is True
assert result["recognized"] is False
assert "NotARealModel" in result["message"]
assert "not found in the MiniMax catalog" in result["message"]
assert "MiniMax does not expose a /models endpoint" in result["message"]
# -------------------------------------------------------------------------
# Test 4: Verify catalog path is used (probe_api_models returns None)
# -------------------------------------------------------------------------
def test_minimax_uses_catalog_not_api_probe(self):
"""Ensure that when fetch_api_models returns None, the catalog is still checked."""
# The _isolate_minimax fixture already patches fetch_api_models to return None.
# If we reach the catalog path, MiniMax-M2.5 should be found and recognized.
result = validate_requested_model("MiniMax-M2.5", "minimax")
assert result["accepted"] is True
assert result["recognized"] is True
assert result["message"] is None
class TestMiniMaxCatalogPathRequired:
"""Prove the catalog path is necessary: without it, MiniMax would fail.
These tests demonstrate that when fetch_api_models returns None (simulating
the real 404 from MiniMax /v1/models), the openai-codex-style catalog path
is the only way to avoid a "Could not reach the API" failure.
"""
def test_minimax_without_fix_would_reach_api_probe(self):
"""Without the catalog block, minimax falls through to fetch_api_models.
This test documents the before-fix behavior: when the MiniMax block
is absent, the code falls through to `api_models = fetch_api_models(...)`
which returns None (404), leading to rejection.
"""
probe_payload = {
"models": None,
"probed_url": "https://api.minimax.io/v1/models",
"resolved_base_url": "https://api.minimax.io/v1",
"suggested_base_url": None,
"used_fallback": False,
}
with patch("hermes_cli.models.fetch_api_models", return_value=None), \
patch("hermes_cli.models.probe_api_models", return_value=probe_payload):
# Before fix: this would return accepted=False because api_models is None
# After fix: returns accepted=True via catalog path
result = validate_requested_model("MiniMax-M2.7", "minimax")
# The fix makes this True; without the fix it would be False
assert result["accepted"] is True