i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-02 01:10:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 简化模型权限检查，移除 resolved_model_name 参数

Browse Source 
- 从 check_model_allowed 和 check_model_allowed_with_mappings 移除 resolved_model_name 参数
- 优化匹配逻辑：先精确匹配 model_name，再检查 candidate_models 交集，最后进行映射匹配
- 更新 CacheAwareScheduler 中的相关调用，传入 provider_model_names 作为 candidate_models
- 同步更新测试用例
This commit is contained in:
fawney19
2026-01-23 00:57:47 +08:00
parent 7ef0488419
commit 08a3148ab3
6 changed files with 40 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/services/test_model_availability.py
View File

@@ -447,7 +447,6 @@ class TestModelMappingsIntegration:
is_allowed, matched = check_model_allowed_with_mappings(
model_name="claude-haiku-4-5-20251001", # GlobalModel.name
allowed_models=["claude-3-5-haiku-20251001"], # Key.allowed_models
resolved_model_name="claude-haiku-4-5-20251001", # Model.provider_model_name
model_mappings=["claude-3-5-haiku-.*"], # GlobalModel.config.model_mappings
)
@@ -461,7 +460,6 @@ class TestModelMappingsIntegration:
is_allowed, matched = check_model_allowed_with_mappings(
model_name="claude-haiku-4-5-20251001",
allowed_models=["claude-haiku-4-5-20251001"], # 精确匹配
resolved_model_name="claude-haiku-4-5-20251001",
model_mappings=["claude-3-5-haiku-.*"],
)
@@ -475,7 +473,6 @@ class TestModelMappingsIntegration:
is_allowed, matched = check_model_allowed_with_mappings(
model_name="claude-haiku-4-5-20251001",
allowed_models=["gpt-4o"], # 与映射模式不匹配
resolved_model_name="claude-haiku-4-5-20251001",
model_mappings=["claude-3-5-haiku-.*"],
)
@@ -489,7 +486,6 @@ class TestModelMappingsIntegration:
is_allowed, matched = check_model_allowed_with_mappings(
model_name="target-model",
allowed_models=["b-model-1", "a-model-1"],
resolved_model_name="target-model",
model_mappings=[".*-model-1"], # 匹配两个
)