Fix Google model restriction parameter order regression (#62)

- Fixed swapped parameters in restriction_service.is_allowed() calls
- Parameter order should be (provider_type, model_name, original_name)
- Regression introduced in merge commit 39c50a1, breaking Gemini model access
- Added comments to prevent future parameter order confusion
- Resolves Gemini model is not allowed by restriction policy errors

🤖 Generated with Claude Code

Co-authored-by: Ming <ming@mail.ooo>
Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Ming
2025-06-16 23:12:16 +08:00
committed by GitHub
parent 70b64adff3
commit f55f2b0a0f

View File

@@ -73,7 +73,9 @@ class GeminiModelProvider(ModelProvider):
from utils.model_restrictions import get_restriction_service from utils.model_restrictions import get_restriction_service
restriction_service = get_restriction_service() restriction_service = get_restriction_service()
if not restriction_service.is_allowed(ProviderType.GOOGLE, model_name, resolved_name): # IMPORTANT: Parameter order is (provider_type, model_name, original_name)
# resolved_name is the canonical model name, model_name is the user input
if not restriction_service.is_allowed(ProviderType.GOOGLE, resolved_name, model_name):
raise ValueError(f"Gemini model '{resolved_name}' is not allowed by restriction policy.") raise ValueError(f"Gemini model '{resolved_name}' is not allowed by restriction policy.")
config = self.SUPPORTED_MODELS[resolved_name] config = self.SUPPORTED_MODELS[resolved_name]
@@ -255,7 +257,9 @@ class GeminiModelProvider(ModelProvider):
from utils.model_restrictions import get_restriction_service from utils.model_restrictions import get_restriction_service
restriction_service = get_restriction_service() restriction_service = get_restriction_service()
if not restriction_service.is_allowed(ProviderType.GOOGLE, model_name, resolved_name): # IMPORTANT: Parameter order is (provider_type, model_name, original_name)
# resolved_name is the canonical model name, model_name is the user input
if not restriction_service.is_allowed(ProviderType.GOOGLE, resolved_name, model_name):
logger.debug(f"Gemini model '{model_name}' -> '{resolved_name}' blocked by restrictions") logger.debug(f"Gemini model '{model_name}' -> '{resolved_name}' blocked by restrictions")
return False return False