📝 Add docstrings to hotfix/analytic

Docstrings generation was requested by @wzxjohn. * https://github.com/QuantumNous/new-api/pull/2133#issuecomment-3484993715 The following files were modified: * `common/embed-file-system.go`
2026-04-03 23:10:48 +00:00 · 2025-11-04 09:56:24 +00:00
35 changed files with 83 additions and 583 deletions
--- a/README.md
+++ b/README.md
@@ -141,7 +141,6 @@ New API提供了丰富的功能，详细特性请参考[特性说明](https://do
 - `NOTIFICATION_LIMIT_DURATION_MINUTE`：邮件等通知限制持续时间，默认 `10`分钟
 - `NOTIFY_LIMIT_COUNT`：用户通知在指定持续时间内的最大数量，默认 `2`
 - `ERROR_LOG_ENABLED=true`: 是否记录并显示错误日志，默认`false`
- `TASK_PRICE_PATCH=sora-2-all,sora-2-pro-all`: 异步任务设置某些模型按次计费，多个模型用逗号分隔，例如`sora-2-all,sora-2-pro-all`，表示sora-2-all和sora-2-pro-all模型异步任务仅按次计费，不按秒等计费。

 ## 部署

--- a/common/constants.go
+++ b/common/constants.go
@@ -159,15 +159,14 @@ var (
 	GlobalWebRateLimitNum      int
 	GlobalWebRateLimitDuration int64

-	CriticalRateLimitEnable   bool
-	CriticalRateLimitNum            = 20
-	CriticalRateLimitDuration int64 = 20 * 60
-
 	UploadRateLimitNum            = 10
 	UploadRateLimitDuration int64 = 60

 	DownloadRateLimitNum            = 10
 	DownloadRateLimitDuration int64 = 60
+
+	CriticalRateLimitNum            = 20
+	CriticalRateLimitDuration int64 = 20 * 60
 )

 var RateLimitKeyExpirationDuration = 20 * time.Minute
--- a/common/embed-file-system.go
+++ b/common/embed-file-system.go
@@ -4,6 +4,7 @@ import (
 	"embed"
 	"io/fs"
 	"net/http"
+	"os"

 	"github.com/gin-contrib/static"
 )
@@ -14,7 +15,7 @@ type embedFileSystem struct {
 	http.FileSystem
 }

-func (e embedFileSystem) Exists(prefix string, path string) bool {
+func (e *embedFileSystem) Exists(prefix string, path string) bool {
 	_, err := e.Open(path)
 	if err != nil {
 		return false
@@ -22,12 +23,22 @@ func (e embedFileSystem) Exists(prefix string, path string) bool {
 	return true
 }

+func (e *embedFileSystem) Open(name string) (http.File, error) {
+	if name == "/" {
+		// This will make sure the index page goes to NoRouter handler,
+		// which will use the replaced index bytes with analytic codes.
+		return nil, os.ErrNotExist
+	}
+	return e.FileSystem.Open(name)
+}
+
+// requested subtree cannot be opened.
 func EmbedFolder(fsEmbed embed.FS, targetPath string) static.ServeFileSystem {
 	efs, err := fs.Sub(fsEmbed, targetPath)
 	if err != nil {
 		panic(err)
 	}
-	return embedFileSystem{
+	return &embedFileSystem{
 		FileSystem: http.FS(efs),
 	}
-}
+}
--- a/common/init.go
+++ b/common/init.go
@@ -99,9 +99,6 @@ func InitEnv() {
 	GlobalWebRateLimitNum = GetEnvOrDefault("GLOBAL_WEB_RATE_LIMIT", 60)
 	GlobalWebRateLimitDuration = int64(GetEnvOrDefault("GLOBAL_WEB_RATE_LIMIT_DURATION", 180))

-	CriticalRateLimitEnable = GetEnvOrDefaultBool("CRITICAL_RATE_LIMIT_ENABLE", true)
-	CriticalRateLimitNum = GetEnvOrDefault("CRITICAL_RATE_LIMIT", 20)
-	CriticalRateLimitDuration = int64(GetEnvOrDefault("CRITICAL_RATE_LIMIT_DURATION", 20*60))
 	initConstantEnv()
 }

--- a/controller/channel-test.go
+++ b/controller/channel-test.go
@@ -617,10 +617,6 @@ func TestAllChannels(c *gin.Context) {
 var autoTestChannelsOnce sync.Once

 func AutomaticallyTestChannels() {
-	// 只在Master节点定时测试渠道
-	if !common.IsMasterNode {
-		return
-	}
 	autoTestChannelsOnce.Do(func() {
 		for {
 			if !operation_setting.GetMonitorSetting().AutoTestChannelEnabled {
--- a/controller/channel.go
+++ b/controller/channel.go
@@ -649,15 +649,13 @@ func DeleteDisabledChannel(c *gin.Context) {
 }

 type ChannelTag struct {
-	Tag            string  `json:"tag"`
-	NewTag         *string `json:"new_tag"`
-	Priority       *int64  `json:"priority"`
-	Weight         *uint   `json:"weight"`
-	ModelMapping   *string `json:"model_mapping"`
-	Models         *string `json:"models"`
-	Groups         *string `json:"groups"`
-	ParamOverride  *string `json:"param_override"`
-	HeaderOverride *string `json:"header_override"`
+	Tag          string  `json:"tag"`
+	NewTag       *string `json:"new_tag"`
+	Priority     *int64  `json:"priority"`
+	Weight       *uint   `json:"weight"`
+	ModelMapping *string `json:"model_mapping"`
+	Models       *string `json:"models"`
+	Groups       *string `json:"groups"`
 }

 func DisableTagChannels(c *gin.Context) {
@@ -723,29 +721,7 @@ func EditTagChannels(c *gin.Context) {
 		})
 		return
 	}
-	if channelTag.ParamOverride != nil {
-		trimmed := strings.TrimSpace(*channelTag.ParamOverride)
-		if trimmed != "" && !json.Valid([]byte(trimmed)) {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": "参数覆盖必须是合法的 JSON 格式",
-			})
-			return
-		}
-		channelTag.ParamOverride = common.GetPointer[string](trimmed)
-	}
-	if channelTag.HeaderOverride != nil {
-		trimmed := strings.TrimSpace(*channelTag.HeaderOverride)
-		if trimmed != "" && !json.Valid([]byte(trimmed)) {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": "请求头覆盖必须是合法的 JSON 格式",
-			})
-			return
-		}
-		channelTag.HeaderOverride = common.GetPointer[string](trimmed)
-	}
-	err = model.EditChannelByTag(channelTag.Tag, channelTag.NewTag, channelTag.ModelMapping, channelTag.Models, channelTag.Groups, channelTag.Priority, channelTag.Weight, channelTag.ParamOverride, channelTag.HeaderOverride)
+	err = model.EditChannelByTag(channelTag.Tag, channelTag.NewTag, channelTag.ModelMapping, channelTag.Models, channelTag.Groups, channelTag.Priority, channelTag.Weight)
 	if err != nil {
 		common.ApiError(c, err)
 		return
--- a/dto/openai_request.go
+++ b/dto/openai_request.go
@@ -232,13 +232,10 @@ func (r *GeneralOpenAIRequest) GetSystemRoleName() string {
 	return "system"
 }

-const CustomType = "custom"
-
 type ToolCallRequest struct {
 	ID       string          `json:"id,omitempty"`
 	Type     string          `json:"type"`
-	Function FunctionRequest `json:"function,omitempty"`
-	Custom   json.RawMessage `json:"custom,omitempty"`
+	Function FunctionRequest `json:"function"`
 }

 type FunctionRequest struct {
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -67,10 +67,8 @@ func LogError(ctx context.Context, msg string) {
 }

 func LogDebug(ctx context.Context, msg string, args ...any) {
+	msg = fmt.Sprintf(msg, args...)
 	if common.DebugEnabled {
-		if len(args) > 0 {
-			msg = fmt.Sprintf(msg, args...)
-		}
 		logHelper(ctx, loggerDebug, msg)
 	}
 }
--- a/middleware/rate-limit.go
+++ b/middleware/rate-limit.go
@@ -102,10 +102,7 @@ func GlobalAPIRateLimit() func(c *gin.Context) {
 }

 func CriticalRateLimit() func(c *gin.Context) {
-	if common.CriticalRateLimitEnable {
-		return rateLimitFactory(common.CriticalRateLimitNum, common.CriticalRateLimitDuration, "CT")
-	}
-	return defNext
+	return rateLimitFactory(common.CriticalRateLimitNum, common.CriticalRateLimitDuration, "CT")
 }

 func DownloadRateLimit() func(c *gin.Context) {
--- a/model/channel.go
+++ b/model/channel.go
@@ -138,11 +138,9 @@ func (channel *Channel) GetNextEnabledKey() (string, int, *types.NewAPIError) {
 			enabledIdx = append(enabledIdx, i)
 		}
 	}
-	// If no specific status list or none enabled, return an explicit error so caller can
-	// properly handle a channel with no available keys (e.g. mark channel disabled).
-	// Returning the first key here caused requests to keep using an already-disabled key.
+	// If no specific status list or none enabled, fall back to first key
 	if len(enabledIdx) == 0 {
-		return "", 0, types.NewError(errors.New("no enabled keys"), types.ErrorCodeChannelNoAvailableKey)
+		return keys[0], 0, nil
 	}

 	switch channel.ChannelInfo.MultiKeyMode {
@@ -690,7 +688,7 @@ func DisableChannelByTag(tag string) error {
 	return err
 }

-func EditChannelByTag(tag string, newTag *string, modelMapping *string, models *string, group *string, priority *int64, weight *uint, paramOverride *string, headerOverride *string) error {
+func EditChannelByTag(tag string, newTag *string, modelMapping *string, models *string, group *string, priority *int64, weight *uint) error {
 	updateData := Channel{}
 	shouldReCreateAbilities := false
 	updatedTag := tag
@@ -716,12 +714,6 @@ func EditChannelByTag(tag string, newTag *string, modelMapping *string, models *
 	if weight != nil {
 		updateData.Weight = weight
 	}
-	if paramOverride != nil {
-		updateData.ParamOverride = paramOverride
-	}
-	if headerOverride != nil {
-		updateData.HeaderOverride = headerOverride
-	}

 	err := DB.Model(&Channel{}).Where("tag = ?", tag).Updates(updateData).Error
 	if err != nil {
--- a/relay/channel/claude/relay-claude.go
+++ b/relay/channel/claude/relay-claude.go
@@ -189,9 +189,7 @@ func RequestOpenAI2ClaudeMessage(c *gin.Context, textRequest dto.GeneralOpenAIRe
 		// https://docs.anthropic.com/en/docs/build-with-claude/extended-thinking#important-considerations-when-using-extended-thinking
 		claudeRequest.TopP = 0
 		claudeRequest.Temperature = common.GetPointer[float64](1.0)
-		if !model_setting.ShouldPreserveThinkingSuffix(textRequest.Model) {
-			claudeRequest.Model = strings.TrimSuffix(textRequest.Model, "-thinking")
-		}
+		claudeRequest.Model = strings.TrimSuffix(textRequest.Model, "-thinking")
 	}

 	if textRequest.ReasoningEffort != "" {
--- a/relay/channel/gemini/adaptor.go
+++ b/relay/channel/gemini/adaptor.go
@@ -127,8 +127,7 @@ func (a *Adaptor) Init(info *relaycommon.RelayInfo) {

 func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {

-	if model_setting.GetGeminiSettings().ThinkingAdapterEnabled &&
-		!model_setting.ShouldPreserveThinkingSuffix(info.OriginModelName) {
+	if model_setting.GetGeminiSettings().ThinkingAdapterEnabled {
 		// 新增逻辑：处理 -thinking-<budget> 格式
 		if strings.Contains(info.UpstreamModelName, "-thinking-") {
 			parts := strings.Split(info.UpstreamModelName, "-thinking-")
--- a/relay/channel/openai/adaptor.go
+++ b/relay/channel/openai/adaptor.go
@@ -27,7 +27,6 @@ import (
 	"github.com/QuantumNous/new-api/relay/common_handler"
 	relayconstant "github.com/QuantumNous/new-api/relay/constant"
 	"github.com/QuantumNous/new-api/service"
-	"github.com/QuantumNous/new-api/setting/model_setting"
 	"github.com/QuantumNous/new-api/types"

 	"github.com/gin-gonic/gin"
@@ -225,8 +224,7 @@ func (a *Adaptor) ConvertOpenAIRequest(c *gin.Context, info *relaycommon.RelayIn
 			request.Usage = json.RawMessage(`{"include":true}`)
 		}
 		// 适配 OpenRouter 的 thinking 后缀
-		if !model_setting.ShouldPreserveThinkingSuffix(info.OriginModelName) &&
-			strings.HasSuffix(info.UpstreamModelName, "-thinking") {
+		if strings.HasSuffix(info.UpstreamModelName, "-thinking") {
 			info.UpstreamModelName = strings.TrimSuffix(info.UpstreamModelName, "-thinking")
 			request.Model = info.UpstreamModelName
 			if len(request.Reasoning) == 0 {
--- a/relay/channel/task/ali/adaptor.go
+++ b/relay/channel/task/ali/adaptor.go
@@ -15,7 +15,6 @@ import (
 	"github.com/QuantumNous/new-api/relay/channel"
 	relaycommon "github.com/QuantumNous/new-api/relay/common"
 	"github.com/QuantumNous/new-api/service"
-	"github.com/samber/lo"

 	"github.com/gin-gonic/gin"
 	"github.com/pkg/errors"
@@ -156,51 +155,8 @@ func (a *TaskAdaptor) BuildRequestBody(c *gin.Context, info *relaycommon.RelayIn
 	return bytes.NewReader(bodyBytes), nil
 }

-var (
-	size480p = []string{
-		"832*480",
-		"480*832",
-		"624*624",
-	}
-	size720p = []string{
-		"1280*720",
-		"720*1280",
-		"960*960",
-		"1088*832",
-		"832*1088",
-	}
-	size1080p = []string{
-		"1920*1080",
-		"1080*1920",
-		"1440*1440",
-		"1632*1248",
-		"1248*1632",
-	}
-)
-
-func sizeToResolution(size string) (string, error) {
-	if lo.Contains(size480p, size) {
-		return "480P", nil
-	} else if lo.Contains(size720p, size) {
-		return "720P", nil
-	} else if lo.Contains(size1080p, size) {
-		return "1080P", nil
-	}
-	return "", fmt.Errorf("invalid size: %s", size)
-}
-
-func ProcessAliOtherRatios(aliReq *AliVideoRequest) (map[string]float64, error) {
-	otherRatios := make(map[string]float64)
-	aliRatios := map[string]map[string]float64{
-		"wan2.5-t2v-preview": {
-			"480P":  1,
-			"720P":  2,
-			"1080P": 1 / 0.3,
-		},
-		"wan2.2-t2v-plus": {
-			"480P":  1,
-			"1080P": 0.7 / 0.14,
-		},
+func (a *TaskAdaptor) convertToAliRequest(info *relaycommon.RelayInfo, req relaycommon.TaskSubmitReq) (*AliVideoRequest, error) {
+	otherRatios := map[string]map[string]float64{
 		"wan2.5-i2v-preview": {
 			"480P":  1,
 			"720P":  2,
@@ -224,30 +180,6 @@ func ProcessAliOtherRatios(aliReq *AliVideoRequest) (map[string]float64, error)
 			"720P": 0.9 / 0.5,
 		},
 	}
-	var resolution string
-
-	// size match
-	if aliReq.Parameters.Size != "" {
-		toResolution, err := sizeToResolution(aliReq.Parameters.Size)
-		if err != nil {
-			return nil, err
-		}
-		resolution = toResolution
-	} else {
-		resolution = strings.ToUpper(aliReq.Parameters.Resolution)
-		if !strings.HasSuffix(resolution, "P") {
-			resolution = resolution + "P"
-		}
-	}
-	if otherRatio, ok := aliRatios[aliReq.Model]; ok {
-		if ratio, ok := otherRatio[resolution]; ok {
-			otherRatios[fmt.Sprintf("resolution-%s", resolution)] = ratio
-		}
-	}
-	return otherRatios, nil
-}
-
-func (a *TaskAdaptor) convertToAliRequest(info *relaycommon.RelayInfo, req relaycommon.TaskSubmitReq) (*AliVideoRequest, error) {
 	aliReq := &AliVideoRequest{
 		Model: req.Model,
 		Input: AliVideoInput{
@@ -262,40 +194,22 @@ func (a *TaskAdaptor) convertToAliRequest(info *relaycommon.RelayInfo, req relay

 	// 处理分辨率映射
 	if req.Size != "" {
-		// text to video size must be contained *
-		if strings.Contains(req.Model, "t2v") && !strings.Contains(req.Size, "*") {
-			return nil, fmt.Errorf("invalid size: %s, example: %s", req.Size, "1920*1080")
-		}
-		if strings.Contains(req.Size, "*") {
-			aliReq.Parameters.Size = req.Size
-		} else {
-			resolution := strings.ToUpper(req.Size)
-			// 支持 480p, 720p, 1080p 或 480P, 720P, 1080P
-			if !strings.HasSuffix(resolution, "P") {
-				resolution = resolution + "P"
-			}
-			aliReq.Parameters.Resolution = resolution
+		resolution := strings.ToUpper(req.Size)
+		// 支持 480p, 720p, 1080p 或 480P, 720P, 1080P
+		if !strings.HasSuffix(resolution, "P") {
+			resolution = resolution + "P"
 		}
+		aliReq.Parameters.Resolution = resolution
 	} else {
 		// 根据模型设置默认分辨率
-		if strings.Contains(req.Model, "t2v") { // image to video
-			if strings.HasPrefix(req.Model, "wan2.5") {
-				aliReq.Parameters.Size = "1920*1080"
-			} else if strings.HasPrefix(req.Model, "wan2.2") {
-				aliReq.Parameters.Size = "1920*1080"
-			} else {
-				aliReq.Parameters.Size = "1280*720"
-			}
+		if strings.HasPrefix(req.Model, "wan2.5") {
+			aliReq.Parameters.Resolution = "1080P"
+		} else if strings.HasPrefix(req.Model, "wan2.2-i2v-flash") {
+			aliReq.Parameters.Resolution = "720P"
+		} else if strings.HasPrefix(req.Model, "wan2.2-i2v-plus") {
+			aliReq.Parameters.Resolution = "1080P"
 		} else {
-			if strings.HasPrefix(req.Model, "wan2.5") {
-				aliReq.Parameters.Resolution = "1080P"
-			} else if strings.HasPrefix(req.Model, "wan2.2-i2v-flash") {
-				aliReq.Parameters.Resolution = "720P"
-			} else if strings.HasPrefix(req.Model, "wan2.2-i2v-plus") {
-				aliReq.Parameters.Resolution = "1080P"
-			} else {
-				aliReq.Parameters.Resolution = "720P"
-			}
+			aliReq.Parameters.Resolution = "720P"
 		}
 	}

@@ -333,14 +247,14 @@ func (a *TaskAdaptor) convertToAliRequest(info *relaycommon.RelayInfo, req relay
 		"seconds": float64(aliReq.Parameters.Duration),
 	}

-	ratios, err := ProcessAliOtherRatios(aliReq)
-	if err != nil {
-		return nil, err
-	}
-	for s, f := range ratios {
-		info.PriceData.OtherRatios[s] = f
+	if otherRatio, ok := otherRatios[req.Model]; ok {
+		if ratio, ok := otherRatio[aliReq.Parameters.Resolution]; ok {
+			info.PriceData.OtherRatios[fmt.Sprintf("resolution-%s", aliReq.Parameters.Resolution)] = ratio
+		}
 	}

+	// println(fmt.Sprintf("other ratios: %v", info.PriceData.OtherRatios))
+
 	return aliReq, nil
 }

--- a/relay/channel/task/jimeng/adaptor.go
+++ b/relay/channel/task/jimeng/adaptor.go
@@ -406,15 +406,12 @@ func (a *TaskAdaptor) convertToRequestPayload(req *relaycommon.TaskSubmitReq) (*
 	// 即梦视频3.0 ReqKey转换
 	// https://www.volcengine.com/docs/85621/1792707
 	if strings.Contains(r.ReqKey, "jimeng_v30") {
-		if r.ReqKey == "jimeng_v30_pro" {
-			// 3.0 pro只有固定的jimeng_ti2v_v30_pro
-			r.ReqKey = "jimeng_ti2v_v30_pro"
-		} else if len(req.Images) > 1 {
+		if len(req.Images) > 1 {
 			// 多张图片：首尾帧生成
-			r.ReqKey = strings.TrimSuffix(strings.Replace(r.ReqKey, "jimeng_v30", "jimeng_i2v_first_tail_v30", 1), "p")
+			r.ReqKey = strings.Replace(r.ReqKey, "jimeng_v30", "jimeng_i2v_first_tail_v30", 1)
 		} else if len(req.Images) == 1 {
 			// 单张图片：图生视频
-			r.ReqKey = strings.TrimSuffix(strings.Replace(r.ReqKey, "jimeng_v30", "jimeng_i2v_first_v30", 1), "p")
+			r.ReqKey = strings.Replace(r.ReqKey, "jimeng_v30", "jimeng_i2v_first_v30", 1)
 		} else {
 			// 无图片：文生视频
 			r.ReqKey = strings.Replace(r.ReqKey, "jimeng_v30", "jimeng_t2v_v30", 1)
--- a/relay/channel/vertex/adaptor.go
+++ b/relay/channel/vertex/adaptor.go
@@ -168,8 +168,7 @@ func (a *Adaptor) getRequestUrl(info *relaycommon.RelayInfo, modelName, suffix s
 func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
 	suffix := ""
 	if a.RequestMode == RequestModeGemini {
-		if model_setting.GetGeminiSettings().ThinkingAdapterEnabled &&
-			!model_setting.ShouldPreserveThinkingSuffix(info.OriginModelName) {
+		if model_setting.GetGeminiSettings().ThinkingAdapterEnabled {
 			// 新增逻辑：处理 -thinking-<budget> 格式
 			if strings.Contains(info.UpstreamModelName, "-thinking-") {
 				parts := strings.Split(info.UpstreamModelName, "-thinking-")
--- a/relay/channel/volcengine/adaptor.go
+++ b/relay/channel/volcengine/adaptor.go
@@ -16,7 +16,6 @@ import (
 	"github.com/QuantumNous/new-api/relay/channel/openai"
 	relaycommon "github.com/QuantumNous/new-api/relay/common"
 	"github.com/QuantumNous/new-api/relay/constant"
-	"github.com/QuantumNous/new-api/setting/model_setting"
 	"github.com/QuantumNous/new-api/types"

 	"github.com/gin-gonic/gin"
@@ -292,9 +291,7 @@ func (a *Adaptor) ConvertOpenAIRequest(c *gin.Context, info *relaycommon.RelayIn
 		return nil, errors.New("request is nil")
 	}

-	if !model_setting.ShouldPreserveThinkingSuffix(info.OriginModelName) &&
-		strings.HasSuffix(info.UpstreamModelName, "-thinking") &&
-		strings.HasPrefix(info.UpstreamModelName, "deepseek") {
+	if strings.HasSuffix(info.UpstreamModelName, "-thinking") && strings.HasPrefix(info.UpstreamModelName, "deepseek") {
 		info.UpstreamModelName = strings.TrimSuffix(info.UpstreamModelName, "-thinking")
 		request.Model = info.UpstreamModelName
 		request.THINKING = json.RawMessage(`{"type": "enabled"}`)
--- a/relay/claude_handler.go
+++ b/relay/claude_handler.go
@@ -67,9 +67,7 @@ func ClaudeHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *typ
 			request.TopP = 0
 			request.Temperature = common.GetPointer[float64](1.0)
 		}
-		if !model_setting.ShouldPreserveThinkingSuffix(info.OriginModelName) {
-			request.Model = strings.TrimSuffix(request.Model, "-thinking")
-		}
+		request.Model = strings.TrimSuffix(request.Model, "-thinking")
 		info.UpstreamModelName = request.Model
 	}

--- a/setting/model_setting/global.go
+++ b/setting/model_setting/global.go
@@ -1,23 +1,16 @@
 package model_setting

 import (
-	"strings"
-
 	"github.com/QuantumNous/new-api/setting/config"
 )

 type GlobalSettings struct {
-	PassThroughRequestEnabled bool     `json:"pass_through_request_enabled"`
-	ThinkingModelBlacklist    []string `json:"thinking_model_blacklist"`
+	PassThroughRequestEnabled bool `json:"pass_through_request_enabled"`
 }

 // 默认配置
 var defaultOpenaiSettings = GlobalSettings{
 	PassThroughRequestEnabled: false,
-	ThinkingModelBlacklist: []string{
-		"moonshotai/kimi-k2-thinking",
-		"kimi-k2-thinking",
-	},
 }

 // 全局实例
@@ -31,18 +24,3 @@ func init() {
 func GetGlobalSettings() *GlobalSettings {
 	return &globalSettings
 }
-
-// ShouldPreserveThinkingSuffix 判断模型是否配置为保留 thinking/-nothinking 后缀
-func ShouldPreserveThinkingSuffix(modelName string) bool {
-	target := strings.TrimSpace(modelName)
-	if target == "" {
-		return false
-	}
-
-	for _, entry := range globalSettings.ThinkingModelBlacklist {
-		if strings.TrimSpace(entry) == target {
-			return true
-		}
-	}
-	return false
-}
--- a/web/src/components/settings/ModelSetting.jsx
+++ b/web/src/components/settings/ModelSetting.jsx
@@ -37,7 +37,6 @@ const ModelSetting = () => {
    'claude.default_max_tokens': '',
    'claude.thinking_adapter_budget_tokens_percentage': 0.8,
    'global.pass_through_request_enabled': false,
-    'global.thinking_model_blacklist': '[]',
    'general_setting.ping_interval_enabled': false,
    'general_setting.ping_interval_seconds': 60,
    'gemini.thinking_adapter_enabled': false,
@@ -57,8 +56,7 @@ const ModelSetting = () => {
          item.key === 'gemini.version_settings' ||
          item.key === 'claude.model_headers_settings' ||
          item.key === 'claude.default_max_tokens' ||
-          item.key === 'gemini.supported_imagine_models' ||
-          item.key === 'global.thinking_model_blacklist'
+          item.key === 'gemini.supported_imagine_models'
        ) {
          if (item.value !== '') {
            item.value = JSON.stringify(JSON.parse(item.value), null, 2);
--- a/web/src/components/table/channels/modals/EditTagModal.jsx
+++ b/web/src/components/table/channels/modals/EditTagModal.jsx
@@ -45,7 +45,6 @@ import {
  IconBookmark,
  IconUser,
  IconCode,
-  IconSetting,
 } from '@douyinfe/semi-icons';
 import { getChannelModels } from '../../../../helpers';
 import { useTranslation } from 'react-i18next';
@@ -70,8 +69,6 @@ const EditTagModal = (props) => {
    model_mapping: null,
    groups: [],
    models: [],
-    param_override: null,
-    header_override: null,
  };
  const [inputs, setInputs] = useState(originInputs);
  const formApiRef = useRef(null);
@@ -193,48 +190,12 @@ const EditTagModal = (props) => {
    if (formVals.models && formVals.models.length > 0) {
      data.models = formVals.models.join(',');
    }
-    if (
-      formVals.param_override !== undefined &&
-      formVals.param_override !== null
-    ) {
-      if (typeof formVals.param_override !== 'string') {
-        showInfo('参数覆盖必须是合法的 JSON 格式！');
-        setLoading(false);
-        return;
-      }
-      const trimmedParamOverride = formVals.param_override.trim();
-      if (trimmedParamOverride !== '' && !verifyJSON(trimmedParamOverride)) {
-        showInfo('参数覆盖必须是合法的 JSON 格式！');
-        setLoading(false);
-        return;
-      }
-      data.param_override = trimmedParamOverride;
-    }
-    if (
-      formVals.header_override !== undefined &&
-      formVals.header_override !== null
-    ) {
-      if (typeof formVals.header_override !== 'string') {
-        showInfo('请求头覆盖必须是合法的 JSON 格式！');
-        setLoading(false);
-        return;
-      }
-      const trimmedHeaderOverride = formVals.header_override.trim();
-      if (trimmedHeaderOverride !== '' && !verifyJSON(trimmedHeaderOverride)) {
-        showInfo('请求头覆盖必须是合法的 JSON 格式！');
-        setLoading(false);
-        return;
-      }
-      data.header_override = trimmedHeaderOverride;
-    }
    data.new_tag = formVals.new_tag;
    if (
      data.model_mapping === undefined &&
      data.groups === undefined &&
      data.models === undefined &&
-      data.new_tag === undefined &&
-      data.param_override === undefined &&
-      data.header_override === undefined
+      data.new_tag === undefined
    ) {
      showWarning('没有任何修改！');
      setLoading(false);
@@ -530,157 +491,6 @@ const EditTagModal = (props) => {
                </div>
              </Card>

-              <Card className='!rounded-2xl shadow-sm border-0 mb-6'>
-                {/* Header: Advanced Settings */}
-                <div className='flex items-center mb-2'>
-                  <Avatar size='small' color='orange' className='mr-2 shadow-md'>
-                    <IconSetting size={16} />
-                  </Avatar>
-                  <div>
-                    <Text className='text-lg font-medium'>{t('高级设置')}</Text>
-                    <div className='text-xs text-gray-600'>
-                      {t('渠道的高级配置选项')}
-                    </div>
-                  </div>
-                </div>
-
-                <div className='space-y-4'>
-                  <Form.TextArea
-                    field='param_override'
-                    label={t('参数覆盖')}
-                    placeholder={
-                      t(
-                        '此项可选，用于覆盖请求参数。不支持覆盖 stream 参数',
-                      ) +
-                      '\n' +
-                      t('旧格式（直接覆盖）：') +
-                      '\n{\n  "temperature": 0,\n  "max_tokens": 1000\n}' +
-                      '\n\n' +
-                      t('新格式（支持条件判断与json自定义）：') +
-                      '\n{\n  "operations": [\n    {\n      "path": "temperature",\n      "mode": "set",\n      "value": 0.7,\n      "conditions": [\n        {\n          "path": "model",\n          "mode": "prefix",\n          "value": "gpt"\n        }\n      ]\n    }\n  ]\n}'
-                    }
-                    autosize
-                    showClear
-                    onChange={(value) =>
-                      handleInputChange('param_override', value)
-                    }
-                    extraText={
-                      <div className='flex gap-2 flex-wrap'>
-                        <Text
-                          className='!text-semi-color-primary cursor-pointer'
-                          onClick={() =>
-                            handleInputChange(
-                              'param_override',
-                              JSON.stringify({ temperature: 0 }, null, 2),
-                            )
-                          }
-                        >
-                          {t('旧格式模板')}
-                        </Text>
-                        <Text
-                          className='!text-semi-color-primary cursor-pointer'
-                          onClick={() =>
-                            handleInputChange(
-                              'param_override',
-                              JSON.stringify(
-                                {
-                                  operations: [
-                                    {
-                                      path: 'temperature',
-                                      mode: 'set',
-                                      value: 0.7,
-                                      conditions: [
-                                        {
-                                          path: 'model',
-                                          mode: 'prefix',
-                                          value: 'gpt',
-                                        },
-                                      ],
-                                      logic: 'AND',
-                                    },
-                                  ],
-                                },
-                                null,
-                                2,
-                              ),
-                            )
-                          }
-                        >
-                          {t('新格式模板')}
-                        </Text>
-                        <Text
-                          className='!text-semi-color-primary cursor-pointer'
-                          onClick={() =>
-                            handleInputChange('param_override', null)
-                          }
-                        >
-                          {t('不更改')}
-                        </Text>
-                      </div>
-                    }
-                  />
-
-                  <Form.TextArea
-                    field='header_override'
-                    label={t('请求头覆盖')}
-                    placeholder={
-                      t('此项可选，用于覆盖请求头参数') +
-                      '\n' +
-                      t('格式示例：') +
-                      '\n{\n  "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36 Edg/139.0.0.0",\n  "Authorization": "Bearer {api_key}"\n}'
-                    }
-                    autosize
-                    showClear
-                    onChange={(value) =>
-                      handleInputChange('header_override', value)
-                    }
-                    extraText={
-                      <div className='flex flex-col gap-1'>
-                        <div className='flex gap-2 flex-wrap items-center'>
-                          <Text
-                            className='!text-semi-color-primary cursor-pointer'
-                            onClick={() =>
-                              handleInputChange(
-                                'header_override',
-                                JSON.stringify(
-                                  {
-                                    'User-Agent':
-                                      'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36 Edg/139.0.0.0',
-                                    Authorization: 'Bearer {api_key}',
-                                  },
-                                  null,
-                                  2,
-                                ),
-                              )
-                            }
-                          >
-                            {t('填入模板')}
-                          </Text>
-                          <Text
-                            className='!text-semi-color-primary cursor-pointer'
-                            onClick={() =>
-                              handleInputChange('header_override', null)
-                            }
-                          >
-                            {t('不更改')}
-                          </Text>
-                        </div>
-                        <div>
-                          <Text type='tertiary' size='small'>
-                            {t('支持变量：')}
-                          </Text>
-                          <div className='text-xs text-tertiary ml-2'>
-                            <div>
-                              {t('渠道密钥')}: {'{api_key}'}
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    }
-                  />
-                </div>
-              </Card>
-
              <Card className='!rounded-2xl shadow-sm border-0'>
                {/* Header: Group Settings */}
                <div className='flex items-center mb-2'>
--- a/web/src/components/table/model-pricing/filter/PricingTags.jsx
+++ b/web/src/components/table/model-pricing/filter/PricingTags.jsx
@@ -44,7 +44,7 @@ const PricingTags = ({
    (allModels.length > 0 ? allModels : models).forEach((model) => {
      if (model.tags) {
        model.tags
-          .split(/[,;|]+/) // 逗号、分号或竖线（保留空格，允许多词标签如 "open weights"）
+          .split(/[,;|\s]+/) // 逗号、分号、竖线或空白字符
          .map((tag) => tag.trim())
          .filter(Boolean)
          .forEach((tag) => tagSet.add(tag.toLowerCase()));
@@ -64,7 +64,7 @@ const PricingTags = ({
        if (!model.tags) return false;
        return model.tags
          .toLowerCase()
-          .split(/[,;|]+/)
+          .split(/[,;|\s]+/)
          .map((tg) => tg.trim())
          .includes(tagLower);
      }).length;
--- a/web/src/components/table/tokens/modals/EditTokenModal.jsx
+++ b/web/src/components/table/tokens/modals/EditTokenModal.jsx
@@ -66,9 +66,9 @@ const EditTokenModal = (props) => {

  const getInitValues = () => ({
    name: '',
-    remain_quota: 0,
+    remain_quota: 500000,
    expired_time: -1,
-    unlimited_quota: true,
+    unlimited_quota: false,
    model_limits_enabled: false,
    model_limits: [],
    allow_ips: '',
--- a/web/src/helpers/base64.js
+++ b/web/src/helpers/base64.js
@@ -1,56 +0,0 @@
-/*
-Copyright (C) 2025 QuantumNous
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-For commercial licensing, please contact support@quantumnous.com
-*/
-
-const toBinaryString = (text) => {
-  if (typeof TextEncoder !== 'undefined') {
-    const bytes = new TextEncoder().encode(text);
-    let binary = '';
-
-    bytes.forEach((byte) => {
-      binary += String.fromCharCode(byte);
-    });
-
-    return binary;
-  }
-
-  return encodeURIComponent(text).replace(/%([0-9A-F]{2})/g, (_, hex) =>
-    String.fromCharCode(parseInt(hex, 16)),
-  );
-};
-
-export const encodeToBase64 = (value) => {
-  const input = value == null ? '' : String(value);
-
-  if (typeof window === 'undefined') {
-    if (typeof Buffer !== 'undefined') {
-      return Buffer.from(input, 'utf-8').toString('base64');
-    }
-    if (
-      typeof globalThis !== 'undefined' &&
-      typeof globalThis.btoa === 'function'
-    ) {
-      return globalThis.btoa(toBinaryString(input));
-    }
-    throw new Error(
-      'Base64 encoding is unavailable in the current environment',
-    );
-  }
-
-  return window.btoa(toBinaryString(input));
-};
--- a/web/src/helpers/index.js
+++ b/web/src/helpers/index.js
@@ -20,7 +20,6 @@ For commercial licensing, please contact support@quantumnous.com
 export * from './history';
 export * from './auth';
 export * from './utils';
-export * from './base64';
 export * from './api';
 export * from './render';
 export * from './log';
--- a/web/src/hooks/model-pricing/useModelPricingData.jsx
+++ b/web/src/hooks/model-pricing/useModelPricingData.jsx
@@ -128,7 +128,7 @@ export const useModelPricingData = () => {
        if (!model.tags) return false;
        const tagsArr = model.tags
          .toLowerCase()
-          .split(/[,;|]+/)
+          .split(/[,;|\s]+/)
          .map((tag) => tag.trim())
          .filter(Boolean);
        return tagsArr.includes(tagLower);
--- a/web/src/hooks/model-pricing/usePricingFilterCounts.js
+++ b/web/src/hooks/model-pricing/usePricingFilterCounts.js
@@ -23,7 +23,7 @@ import { useMemo } from 'react';
 const normalizeTags = (tags = '') =>
  tags
    .toLowerCase()
-    .split(/[,;|]+/)
+    .split(/[,;|\s]+/)
    .map((t) => t.trim())
    .filter(Boolean);

--- a/web/src/hooks/tokens/useTokensData.jsx
+++ b/web/src/hooks/tokens/useTokensData.jsx
@@ -20,13 +20,7 @@ For commercial licensing, please contact support@quantumnous.com
 import { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Modal } from '@douyinfe/semi-ui';
-import {
-  API,
-  copy,
-  showError,
-  showSuccess,
-  encodeToBase64,
-} from '../../helpers';
+import { API, copy, showError, showSuccess } from '../../helpers';
 import { ITEMS_PER_PAGE } from '../../constants';
 import { useTableCompactMode } from '../common/useTableCompactMode';

@@ -142,7 +136,7 @@ export const useTokensData = (openFluentNotification) => {
        apiKey: 'sk-' + record.key,
      };
      let encodedConfig = encodeURIComponent(
-        encodeToBase64(JSON.stringify(cherryConfig)),
+        btoa(JSON.stringify(cherryConfig)),
      );
      url = url.replaceAll('{cherryConfig}', encodedConfig);
    } else {
--- a/web/src/i18n/locales/en.json
+++ b/web/src/i18n/locales/en.json
@@ -561,9 +561,6 @@
    "启用绘图功能": "Enable drawing function",
    "启用请求体透传功能": "Enable request body pass-through functionality",
    "启用请求透传": "Enable request pass-through",
-    "禁用思考处理的模型列表": "Models skipping thinking handling",
-    "列出的模型将不会自动添加或移除-thinking/-nothinking 后缀": "Models in this list will not automatically add or remove the -thinking/-nothinking suffix.",
-    "请输入JSON数组，如 [\"model-a\",\"model-b\"]": "Enter a JSON array, e.g. [\"model-a\",\"model-b\"]",
    "启用额度消费日志记录": "Enable quota consumption logging",
    "启用验证": "Enable Authentication",
    "周": "week",
--- a/web/src/i18n/locales/fr.json
+++ b/web/src/i18n/locales/fr.json
@@ -564,9 +564,6 @@
    "启用绘图功能": "Activer la fonction de dessin",
    "启用请求体透传功能": "Activer la fonctionnalité de transmission du corps de la requête",
    "启用请求透传": "Activer la transmission de la requête",
-    "禁用思考处理的模型列表": "Liste noire des modèles pour le traitement thinking",
-    "列出的模型将不会自动添加或移除-thinking/-nothinking 后缀": "Les modèles listés ici n'ajouteront ni ne retireront automatiquement le suffixe -thinking/-nothinking.",
-    "请输入JSON数组，如 [\"model-a\",\"model-b\"]": "Saisissez un tableau JSON, par ex. [\"model-a\",\"model-b\"]",
    "启用额度消费日志记录": "Activer la journalisation de la consommation de quota",
    "启用验证": "Activer l'authentification",
    "周": "semaine",
--- a/web/src/i18n/locales/ja.json
+++ b/web/src/i18n/locales/ja.json
@@ -561,9 +561,6 @@
    "启用绘图功能": "画像生成機能を有効にする",
    "启用请求体透传功能": "リクエストボディのパススルー機能を有効にします。",
    "启用请求透传": "リクエストパススルーを有効にする",
-    "禁用思考处理的模型列表": "Thinking処理を無効化するモデル一覧",
-    "列出的模型将不会自动添加或移除-thinking/-nothinking 后缀": "ここに含まれるモデルでは-thinking/-nothinkingサフィックスを自動的に追加・削除しません。",
-    "请输入JSON数组，如 [\"model-a\",\"model-b\"]": "JSON配列を入力してください（例：[\"model-a\",\"model-b\"]）",
    "启用额度消费日志记录": "クォータ消費のログ記録を有効にする",
    "启用验证": "認証を有効にする",
    "周": "週",
--- a/web/src/i18n/locales/ru.json
+++ b/web/src/i18n/locales/ru.json
@@ -567,9 +567,6 @@
    "启用绘图功能": "Включить функцию рисования",
    "启用请求体透传功能": "Включить функцию прозрачной передачи тела запроса",
    "启用请求透传": "Включить прозрачную передачу запросов",
-    "禁用思考处理的模型列表": "Список моделей без обработки thinking",
-    "列出的模型将不会自动添加或移除-thinking/-nothinking 后缀": "Для этих моделей суффиксы -thinking/-nothinking не будут добавляться или удаляться автоматически.",
-    "请输入JSON数组，如 [\"model-a\",\"model-b\"]": "Введите JSON-массив, например [\"model-a\",\"model-b\"]",
    "启用额度消费日志记录": "Включить журналирование потребления квоты",
    "启用验证": "Включить проверку",
    "周": "Неделя",
--- a/web/src/i18n/locales/zh.json
+++ b/web/src/i18n/locales/zh.json
@@ -558,9 +558,6 @@
    "启用绘图功能": "启用绘图功能",
    "启用请求体透传功能": "启用请求体透传功能",
    "启用请求透传": "启用请求透传",
-    "禁用思考处理的模型列表": "禁用思考处理的模型列表",
-    "列出的模型将不会自动添加或移除-thinking/-nothinking 后缀": "列出的模型将不会自动添加或移除-thinking/-nothinking 后缀",
-    "请输入JSON数组，如 [\"model-a\",\"model-b\"]": "请输入JSON数组，如 [\"model-a\",\"model-b\"]",
    "启用额度消费日志记录": "启用额度消费日志记录",
    "启用验证": "启用验证",
    "周": "周",
--- a/web/src/pages/Playground/index.jsx
+++ b/web/src/pages/Playground/index.jsx
@@ -47,7 +47,6 @@ import {
  createLoadingAssistantMessage,
  getTextContent,
  buildApiPayload,
-  encodeToBase64,
 } from '../../helpers';

 // Components
@@ -73,7 +72,7 @@ const generateAvatarDataUrl = (username) => {
      <text x="50%" y="50%" dominant-baseline="central" text-anchor="middle" font-size="16" fill="#ffffff" font-family="sans-serif">${firstLetter}</text>
    </svg>
  `;
-  return `data:image/svg+xml;base64,${encodeToBase64(svg)}`;
+  return `data:image/svg+xml;base64,${btoa(svg)}`;
 };

 const Playground = () => {
--- a/web/src/pages/Setting/Model/SettingGlobalModel.jsx
+++ b/web/src/pages/Setting/Model/SettingGlobalModel.jsx
@@ -29,44 +29,23 @@ import {
 } from '../../../helpers';
 import { useTranslation } from 'react-i18next';

-const thinkingExample = JSON.stringify(
-  ['moonshotai/kimi-k2-thinking', 'kimi-k2-thinking'],
-  null,
-  2,
-);
-
-const defaultGlobalSettingInputs = {
-  'global.pass_through_request_enabled': false,
-  'global.thinking_model_blacklist': '[]',
-  'general_setting.ping_interval_enabled': false,
-  'general_setting.ping_interval_seconds': 60,
-};
-
 export default function SettingGlobalModel(props) {
  const { t } = useTranslation();

  const [loading, setLoading] = useState(false);
-  const [inputs, setInputs] = useState(defaultGlobalSettingInputs);
+  const [inputs, setInputs] = useState({
+    'global.pass_through_request_enabled': false,
+    'general_setting.ping_interval_enabled': false,
+    'general_setting.ping_interval_seconds': 60,
+  });
  const refForm = useRef();
-  const [inputsRow, setInputsRow] = useState(defaultGlobalSettingInputs);
-
-  const normalizeValueBeforeSave = (key, value) => {
-    if (key === 'global.thinking_model_blacklist') {
-      const text = typeof value === 'string' ? value.trim() : '';
-      return text === '' ? '[]' : value;
-    }
-    return value;
-  };
+  const [inputsRow, setInputsRow] = useState(inputs);

  function onSubmit() {
    const updateArray = compareObjects(inputs, inputsRow);
    if (!updateArray.length) return showWarning(t('你似乎并没有修改什么'));
    const requestQueue = updateArray.map((item) => {
-      const normalizedValue = normalizeValueBeforeSave(
-        item.key,
-        inputs[item.key],
-      );
-      let value = String(normalizedValue);
+      let value = String(inputs[item.key]);

      return API.put('/api/option/', {
        key: item.key,
@@ -95,30 +74,14 @@ export default function SettingGlobalModel(props) {

  useEffect(() => {
    const currentInputs = {};
-    for (const key of Object.keys(defaultGlobalSettingInputs)) {
-      if (props.options[key] !== undefined) {
-        let value = props.options[key];
-        if (key === 'global.thinking_model_blacklist') {
-          try {
-            value =
-              value && String(value).trim() !== ''
-                ? JSON.stringify(JSON.parse(value), null, 2)
-                : defaultGlobalSettingInputs[key];
-          } catch (error) {
-            value = defaultGlobalSettingInputs[key];
-          }
-        }
-        currentInputs[key] = value;
-      } else {
-        currentInputs[key] = defaultGlobalSettingInputs[key];
+    for (let key in props.options) {
+      if (Object.keys(inputs).includes(key)) {
+        currentInputs[key] = props.options[key];
      }
    }
-
    setInputs(currentInputs);
    setInputsRow(structuredClone(currentInputs));
-    if (refForm.current) {
-      refForm.current.setValues(currentInputs);
-    }
+    refForm.current.setValues(currentInputs);
  }, [props.options]);

  return (
@@ -147,38 +110,6 @@ export default function SettingGlobalModel(props) {
                />
              </Col>
            </Row>
-            <Row>
-              <Col span={24}>
-                <Form.TextArea
-                  label={t('禁用思考处理的模型列表')}
-                  field={'global.thinking_model_blacklist'}
-                  placeholder={
-                    t('例如：') +
-                    '\n' +
-                    thinkingExample
-                  }
-                  rows={4}
-                  rules={[
-                    {
-                      validator: (rule, value) => {
-                        if (!value || value.trim() === '') return true;
-                        return verifyJSON(value);
-                      },
-                      message: t('不是合法的 JSON 字符串'),
-                    },
-                  ]}
-                  extraText={t(
-                    '列出的模型将不会自动添加或移除-thinking/-nothinking 后缀',
-                  )}
-                  onChange={(value) =>
-                    setInputs({
-                      ...inputs,
-                      'global.thinking_model_blacklist': value,
-                    })
-                  }
-                />
-              </Col>
-            </Row>

            <Form.Section text={t('连接保活设置')}>
              <Row style={{ marginTop: 10 }}>