mirror of
https://github.com/router-for-me/CLIProxyAPI.git
synced 2026-02-03 04:50:52 +08:00
This commit introduces several improvements to the AMP (Advanced Model Proxy) module: - **Model Mapping Logic:** The `FallbackHandler` now uses a more robust approach for model mapping. It includes the extraction and preservation of dynamic "thinking suffixes" (e.g., `(xhigh)`) during mapping, ensuring that these configurations are correctly applied to the mapped model. A new `resolveMappedModel` function centralizes this logic for cleaner code. - **ModelMapper Verification:** The `ModelMapper` in `model_mapping.go` now verifies that the target model of a mapping has available providers *after* normalizing it. This prevents mappings to non-existent or unresolvable models. - **Gemini Thinking Configuration Cleanup:** In `gemini_thinking.go`, unnecessary `generationConfig.thinkingConfig.include_thoughts` and `generationConfig.thinkingConfig.thinkingBudget` fields are now deleted from the request body when applying Gemini thinking levels. This prevents potential conflicts or redundant configurations. - **Testing:** A new test case `TestModelMapper_MapModel_TargetWithThinkingSuffix` has been added to `model_mapping_test.go` to specifically cover the preservation of thinking suffixes during model mapping.
206 lines
5.3 KiB
Go
206 lines
5.3 KiB
Go
package amp
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
|
|
"github.com/router-for-me/CLIProxyAPI/v6/internal/registry"
|
|
)
|
|
|
|
func TestNewModelMapper(t *testing.T) {
|
|
mappings := []config.AmpModelMapping{
|
|
{From: "claude-opus-4.5", To: "claude-sonnet-4"},
|
|
{From: "gpt-5", To: "gemini-2.5-pro"},
|
|
}
|
|
|
|
mapper := NewModelMapper(mappings)
|
|
if mapper == nil {
|
|
t.Fatal("Expected non-nil mapper")
|
|
}
|
|
|
|
result := mapper.GetMappings()
|
|
if len(result) != 2 {
|
|
t.Errorf("Expected 2 mappings, got %d", len(result))
|
|
}
|
|
}
|
|
|
|
func TestNewModelMapper_Empty(t *testing.T) {
|
|
mapper := NewModelMapper(nil)
|
|
if mapper == nil {
|
|
t.Fatal("Expected non-nil mapper")
|
|
}
|
|
|
|
result := mapper.GetMappings()
|
|
if len(result) != 0 {
|
|
t.Errorf("Expected 0 mappings, got %d", len(result))
|
|
}
|
|
}
|
|
|
|
func TestModelMapper_MapModel_NoProvider(t *testing.T) {
|
|
mappings := []config.AmpModelMapping{
|
|
{From: "claude-opus-4.5", To: "claude-sonnet-4"},
|
|
}
|
|
|
|
mapper := NewModelMapper(mappings)
|
|
|
|
// Without a registered provider for the target, mapping should return empty
|
|
result := mapper.MapModel("claude-opus-4.5")
|
|
if result != "" {
|
|
t.Errorf("Expected empty result when target has no provider, got %s", result)
|
|
}
|
|
}
|
|
|
|
func TestModelMapper_MapModel_WithProvider(t *testing.T) {
|
|
// Register a mock provider for the target model
|
|
reg := registry.GetGlobalRegistry()
|
|
reg.RegisterClient("test-client", "claude", []*registry.ModelInfo{
|
|
{ID: "claude-sonnet-4", OwnedBy: "anthropic", Type: "claude"},
|
|
})
|
|
defer reg.UnregisterClient("test-client")
|
|
|
|
mappings := []config.AmpModelMapping{
|
|
{From: "claude-opus-4.5", To: "claude-sonnet-4"},
|
|
}
|
|
|
|
mapper := NewModelMapper(mappings)
|
|
|
|
// With a registered provider, mapping should work
|
|
result := mapper.MapModel("claude-opus-4.5")
|
|
if result != "claude-sonnet-4" {
|
|
t.Errorf("Expected claude-sonnet-4, got %s", result)
|
|
}
|
|
}
|
|
|
|
func TestModelMapper_MapModel_TargetWithThinkingSuffix(t *testing.T) {
|
|
reg := registry.GetGlobalRegistry()
|
|
reg.RegisterClient("test-client-thinking", "codex", []*registry.ModelInfo{
|
|
{ID: "gpt-5.2", OwnedBy: "openai", Type: "codex"},
|
|
})
|
|
defer reg.UnregisterClient("test-client-thinking")
|
|
|
|
mappings := []config.AmpModelMapping{
|
|
{From: "gpt-5.2-alias", To: "gpt-5.2(xhigh)"},
|
|
}
|
|
|
|
mapper := NewModelMapper(mappings)
|
|
|
|
result := mapper.MapModel("gpt-5.2-alias")
|
|
if result != "gpt-5.2(xhigh)" {
|
|
t.Errorf("Expected gpt-5.2(xhigh), got %s", result)
|
|
}
|
|
}
|
|
|
|
func TestModelMapper_MapModel_CaseInsensitive(t *testing.T) {
|
|
reg := registry.GetGlobalRegistry()
|
|
reg.RegisterClient("test-client2", "claude", []*registry.ModelInfo{
|
|
{ID: "claude-sonnet-4", OwnedBy: "anthropic", Type: "claude"},
|
|
})
|
|
defer reg.UnregisterClient("test-client2")
|
|
|
|
mappings := []config.AmpModelMapping{
|
|
{From: "Claude-Opus-4.5", To: "claude-sonnet-4"},
|
|
}
|
|
|
|
mapper := NewModelMapper(mappings)
|
|
|
|
// Should match case-insensitively
|
|
result := mapper.MapModel("claude-opus-4.5")
|
|
if result != "claude-sonnet-4" {
|
|
t.Errorf("Expected claude-sonnet-4, got %s", result)
|
|
}
|
|
}
|
|
|
|
func TestModelMapper_MapModel_NotFound(t *testing.T) {
|
|
mappings := []config.AmpModelMapping{
|
|
{From: "claude-opus-4.5", To: "claude-sonnet-4"},
|
|
}
|
|
|
|
mapper := NewModelMapper(mappings)
|
|
|
|
// Unknown model should return empty
|
|
result := mapper.MapModel("unknown-model")
|
|
if result != "" {
|
|
t.Errorf("Expected empty for unknown model, got %s", result)
|
|
}
|
|
}
|
|
|
|
func TestModelMapper_MapModel_EmptyInput(t *testing.T) {
|
|
mappings := []config.AmpModelMapping{
|
|
{From: "claude-opus-4.5", To: "claude-sonnet-4"},
|
|
}
|
|
|
|
mapper := NewModelMapper(mappings)
|
|
|
|
result := mapper.MapModel("")
|
|
if result != "" {
|
|
t.Errorf("Expected empty for empty input, got %s", result)
|
|
}
|
|
}
|
|
|
|
func TestModelMapper_UpdateMappings(t *testing.T) {
|
|
mapper := NewModelMapper(nil)
|
|
|
|
// Initially empty
|
|
if len(mapper.GetMappings()) != 0 {
|
|
t.Error("Expected 0 initial mappings")
|
|
}
|
|
|
|
// Update with new mappings
|
|
mapper.UpdateMappings([]config.AmpModelMapping{
|
|
{From: "model-a", To: "model-b"},
|
|
{From: "model-c", To: "model-d"},
|
|
})
|
|
|
|
result := mapper.GetMappings()
|
|
if len(result) != 2 {
|
|
t.Errorf("Expected 2 mappings after update, got %d", len(result))
|
|
}
|
|
|
|
// Update again should replace, not append
|
|
mapper.UpdateMappings([]config.AmpModelMapping{
|
|
{From: "model-x", To: "model-y"},
|
|
})
|
|
|
|
result = mapper.GetMappings()
|
|
if len(result) != 1 {
|
|
t.Errorf("Expected 1 mapping after second update, got %d", len(result))
|
|
}
|
|
}
|
|
|
|
func TestModelMapper_UpdateMappings_SkipsInvalid(t *testing.T) {
|
|
mapper := NewModelMapper(nil)
|
|
|
|
mapper.UpdateMappings([]config.AmpModelMapping{
|
|
{From: "", To: "model-b"}, // Invalid: empty from
|
|
{From: "model-a", To: ""}, // Invalid: empty to
|
|
{From: " ", To: "model-b"}, // Invalid: whitespace from
|
|
{From: "model-c", To: "model-d"}, // Valid
|
|
})
|
|
|
|
result := mapper.GetMappings()
|
|
if len(result) != 1 {
|
|
t.Errorf("Expected 1 valid mapping, got %d", len(result))
|
|
}
|
|
}
|
|
|
|
func TestModelMapper_GetMappings_ReturnsCopy(t *testing.T) {
|
|
mappings := []config.AmpModelMapping{
|
|
{From: "model-a", To: "model-b"},
|
|
}
|
|
|
|
mapper := NewModelMapper(mappings)
|
|
|
|
// Get mappings and modify the returned map
|
|
result := mapper.GetMappings()
|
|
result["new-key"] = "new-value"
|
|
|
|
// Original should be unchanged
|
|
original := mapper.GetMappings()
|
|
if len(original) != 1 {
|
|
t.Errorf("Expected original to have 1 mapping, got %d", len(original))
|
|
}
|
|
if _, exists := original["new-key"]; exists {
|
|
t.Error("Original map was modified")
|
|
}
|
|
}
|