feat: sync deployed v1.0.0-rc.38-custom.42

Sync production source including routing, billing, Astra detection and public uptime. Update custom build instructions and license packaging.

model/channel_settings_test.go

@@ -1,12 +1,21 @@
 package model
 
 import (
+	"fmt"
+	"os"
+	"path/filepath"
 	"testing"
 
+	"github.com/QuantumNous/new-api/common"
 	"github.com/QuantumNous/new-api/constant"
+	filterdto "github.com/QuantumNous/new-api/dto"
 	"github.com/QuantumNous/new-api/relaykit/dto"
+	"github.com/glebarez/sqlite"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"gorm.io/driver/mysql"
+	"gorm.io/driver/postgres"
+	"gorm.io/gorm"
 )
 
 func TestChannelValidateSettingsRejectsInvalidHTTPTransport(t *testing.T) {
@@ -41,6 +50,25 @@ func TestChannelValidateSettingsRejectsInvalidHTTPTransport(t *testing.T) {
 	}
 }
 
+func TestChannelGetSettingDefaultsAstraGuardOn(t *testing.T) {
+	channel := &Channel{}
+
+	assert.True(t, channel.GetSetting().AstraModelGuardEnabled())
+
+	channel.Setting = common.GetPointer(`{"proxy":""}`)
+	assert.True(t, channel.GetSetting().AstraModelGuardEnabled())
+
+	channel.Setting = common.GetPointer(`{"responses_astra_model_guard":false}`)
+	setting := channel.GetSetting()
+	assert.False(t, setting.AstraModelGuardEnabled())
+
+	setting.Proxy = "http://127.0.0.1:8080"
+	channel.SetSetting(setting)
+	reloaded := channel.GetSetting()
+	assert.False(t, reloaded.AstraModelGuardEnabled())
+	assert.Contains(t, *channel.Setting, `"responses_astra_model_guard":false`)
+}
+
 func TestAdvancedCustomChannelRequiresModelListRouteOnlyWhenUpdateChecksEnabled(t *testing.T) {
 	inferenceRoute := dto.AdvancedCustomRoute{
 		IncomingPath: "/v1/chat/completions",
@@ -98,3 +126,91 @@ func TestAdvancedCustomChannelRequiresModelListRouteOnlyWhenUpdateChecksEnabled(
 		})
 	}
 }
+
+func TestInferencePresetSettingsAndDatabaseRoundTrip(t *testing.T) {
+	for _, dialect := range []string{"sqlite", "mysql", "postgres"} {
+		t.Run(dialect, func(t *testing.T) {
+			var driver gorm.Dialector
+			switch dialect {
+			case "sqlite":
+				driver = sqlite.Open(filepath.Join(t.TempDir(), "presets.db"))
+			case "mysql":
+				dsn := os.Getenv("TEST_MYSQL_DSN")
+				if dsn == "" {
+					t.Skip("TEST_MYSQL_DSN is not configured")
+				}
+				driver = mysql.Open(dsn)
+			case "postgres":
+				dsn := os.Getenv("TEST_POSTGRES_DSN")
+				if dsn == "" {
+					t.Skip("TEST_POSTGRES_DSN is not configured")
+				}
+				driver = postgres.Open(dsn)
+			}
+			db, err := gorm.Open(driver, &gorm.Config{})
+			require.NoError(t, err)
+			sqlDB, err := db.DB()
+			require.NoError(t, err)
+			t.Cleanup(func() { require.NoError(t, sqlDB.Close()) })
+			table := db.Table("inference_preset_channels").Session(&gorm.Session{})
+			require.NoError(t, table.AutoMigrate(&Channel{}))
+			t.Cleanup(func() { require.NoError(t, db.Migrator().DropTable("inference_preset_channels")) })
+			var version string
+			if dialect == "sqlite" {
+				require.NoError(t, db.Raw("select sqlite_version()").Scan(&version).Error)
+			} else {
+				require.NoError(t, db.Raw("select version()").Scan(&version).Error)
+			}
+			t.Logf("%s version: %s", dialect, version)
+			for _, channelType := range []int{constant.ChannelTypeVLLM, constant.ChannelTypeSGLang} {
+				t.Run(fmt.Sprint(channelType), func(t *testing.T) {
+					channel := &Channel{Type: channelType, Key: "EMPTY", Name: "inference", Status: common.ChannelStatusEnabled}
+					require.NoError(t, channel.ValidateSettings())
+					require.NotNil(t, channel.GetOtherSettings().AdvancedCustom)
+					require.NoError(t, table.Create(channel).Error)
+					for range 2 {
+						var loaded Channel
+						require.NoError(t, table.First(&loaded, channel.Id).Error)
+						assert.Equal(t, channelType, loaded.Type)
+						assert.Empty(t, loaded.OtherSettings)
+						defaults := loaded.GetOtherSettings().AdvancedCustom
+						require.NotNil(t, defaults)
+						assert.True(t, defaults.SupportsPath("/v1/messages"))
+						assert.Empty(t, loaded.OtherSettings, "reading defaults must not rewrite saved settings")
+						defaults.Routes[0].UpstreamPath = "/changed-locally"
+						assert.Equal(t, "/v1/chat/completions", loaded.GetOtherSettings().AdvancedCustom.Routes[0].UpstreamPath)
+					}
+					settings := dto.ChannelOtherSettings{AdvancedCustom: &dto.AdvancedCustomConfig{Routes: []dto.AdvancedCustomRoute{{IncomingPath: "/v1/chat/completions", UpstreamPath: "/custom/chat", Models: []string{"allowed"}, Auth: &dto.AdvancedCustomRouteAuth{Type: "none"}}}}}
+					channel.SetOtherSettings(settings)
+					require.NoError(t, channel.ValidateSettings())
+					require.NoError(t, table.Save(channel).Error)
+					for range 2 {
+						var loaded Channel
+						require.NoError(t, table.First(&loaded, channel.Id).Error)
+						actual := loaded.GetOtherSettings().AdvancedCustom
+						require.Equal(t, common.GetAdvancedCustomPreset(channelType), actual, "named channels must ignore editable advanced_custom overrides")
+						assert.Equal(t, channel.OtherSettings, loaded.OtherSettings)
+						for _, tc := range []struct {
+							path, model string
+							allowed     bool
+						}{
+							{"/v1/chat/completions", "allowed", true},
+							{"/v1/chat/completions", "other", true},
+							{"/v1/messages", "allowed", true},
+							{"/v1/images/generations", "allowed", false},
+						} {
+							ok, _ := ChannelSatisfiesFilters(&loaded, tc.model, []filterdto.ChannelFilter{{Kind: filterdto.FilterRequestPath, RequestPath: tc.path}})
+							assert.Equal(t, tc.allowed, ok)
+						}
+						endpoints := getPricingEndpointTypesForAbility(AbilityWithChannel{ChannelType: channelType, Ability: Ability{Model: "allowed", ChannelId: loaded.Id}}, map[int]*dto.AdvancedCustomConfig{loaded.Id: actual})
+						expectedEndpoints := []constant.EndpointType{constant.EndpointTypeOpenAI, constant.EndpointTypeOpenAIResponse, constant.EndpointTypeAnthropic, constant.EndpointTypeEmbeddings}
+						if channelType == constant.ChannelTypeSGLang {
+							expectedEndpoints = append(expectedEndpoints, constant.EndpointTypeJinaRerank)
+						}
+						assert.ElementsMatch(t, expectedEndpoints, endpoints)
+					}
+				})
+			}
+		})
+	}
+}