* test(relayconvert): add golden snapshot matrix and relaykit boundary guard Phase 0 of the relaykit extraction plan: pin byte-level output of every registered (from,to) request/response/stream conversion route, and forbid kit-bound packages from growing host-only imports. * wip(relayconvert): drop gin.Context from converter signatures; add convmeta draft Phase 1 in progress: relayconvert now takes context.Context; host media resolver adapts gin.Context back at the service boundary. * refactor(relayconvert): decouple converters from RelayInfo, gin, and settings Phase 1 of the relaykit extraction plan: - converters now depend on convmeta.Meta (implemented by RelayInfo) instead of *relaycommon.RelayInfo; ClaudeConvertInfo and the format guesser move to convmeta with aliases left behind - host settings reach converters via a convmeta.Options snapshot built in RelayInfo.ConvOptions; no more model_setting/reasoning global reads inside the conversion layer - effort-suffix helpers move to service/relayconvert/reasoning (old package forwards); chat-to-responses upgrade policy moves to service (host routing logic, not conversion) - golden conversion matrix unchanged * test(relayconvert): tighten boundary — kit packages now free of gin/setting imports * refactor(dto): drop gin and logger dependencies Phase 2 (part 1): dto.Request.IsStream now takes *http.Request instead of *gin.Context (Gemini's impl reads query/path off the std request); dto's three logger calls become common.SysError. Boundary test allowlist is now empty — kit-bound packages import no gin/setting/logger/model. * refactor(kit): extract dependency-free kitutil; dto/types/relayconvert stop importing common Phase 2 of the relaykit extraction plan: - new service/relayconvert/kitutil holds the pure helpers the kit needs (JSON wrappers, pointer/string/uuid/timestamp utils, MaskSensitiveInfo, pluggable LogInfo/LogError hooks, Debug flag) - dto, types, and all relayconvert packages now use kitutil; their only remaining internal deps are dto/types/constant - common keeps every original symbol (MaskSensitiveInfo delegates to kitutil) so host code is untouched; main.go routes kit logging into common.SysLog/SysError and mirrors DebugEnabled - golden conversion matrix unchanged * refactor(kit): move EndpointType/FinishReason to types; OpenRouter dialect via Options Kit packages (dto/types/relayconvert/reasonmap) no longer import constant: - EndpointType and finish-reason values live in types; constant re-exports - the OpenRouter special-case in claude->openai request conversion reads Options.OpenRouterDialect, set by the host from the channel type; InitChannelMeta invalidates the cached snapshot on channel switch * refactor: extract relaykit submodule (dto/types/relayconvert/reasonmap) Phase 3 of the relaykit extraction plan: - new go module github.com/QuantumNous/new-api/relaykit containing dto (minus task family), types, relayconvert (with convmeta/kitutil/reasoning), and reasonmap; host consumes it via require + replace, go.work for dev - task-family dto (task/suno/midjourney/video) stays in the host dto package; dual-consumer host files alias it as taskdto - relaykit builds and tests standalone (GOWORK=off): no host imports, no gin, no DB, no settings - golden conversion matrix unchanged * build(docker): copy relaykit/go.mod before go mod download The local-replace submodule's go.mod must exist inside the build context for the main module graph to resolve. * fix: address relaykit extraction regressions * fix: address relaykit review regressions * docs: document Meta nil receiver contract * fix(relaykit): fail OpenAI→Claude conversion without max_tokens; reject negative default_max_tokens The Claude Messages API requires max_tokens (omitting it is a 400 "Field required"), but with a nil Options.Claude.DefaultMaxTokens hook the converters silently emitted a request the upstream is guaranteed to reject. Both OpenAI Chat and Responses → Claude conversions now return sharedclaude.ErrMissingMaxTokens when no path (client value, default hook, thinking-adapter floor) supplied one. Unreachable in the host, which always configures the hook. Host side, claude.default_max_tokens now rejects negative values at the option API before persisting — they would wrap into huge unsigned values during conversion. Zero stays allowed: the current API treats max_tokens: 0 as cache pre-warming. * fix: make Gemini safety settings read path race-free
380 lines
10 KiB
Go
380 lines
10 KiB
Go
package controller
|
||
|
||
import (
|
||
"fmt"
|
||
"net/http"
|
||
"strconv"
|
||
"strings"
|
||
|
||
"github.com/QuantumNous/new-api/common"
|
||
"github.com/QuantumNous/new-api/i18n"
|
||
"github.com/QuantumNous/new-api/model"
|
||
"github.com/QuantumNous/new-api/setting"
|
||
"github.com/QuantumNous/new-api/setting/console_setting"
|
||
"github.com/QuantumNous/new-api/setting/model_setting"
|
||
"github.com/QuantumNous/new-api/setting/operation_setting"
|
||
"github.com/QuantumNous/new-api/setting/ratio_setting"
|
||
"github.com/QuantumNous/new-api/setting/system_setting"
|
||
|
||
"github.com/gin-gonic/gin"
|
||
)
|
||
|
||
var completionRatioMetaOptionKeys = []string{
|
||
"ModelPrice",
|
||
"ModelRatio",
|
||
"CompletionRatio",
|
||
"CacheRatio",
|
||
"CreateCacheRatio",
|
||
"ImageRatio",
|
||
"AudioRatio",
|
||
"AudioCompletionRatio",
|
||
}
|
||
|
||
func isPaymentComplianceOptionKey(key string) bool {
|
||
return strings.HasPrefix(key, "payment_setting.compliance_")
|
||
}
|
||
|
||
func isPositiveOptionValue(value string) bool {
|
||
intValue, err := strconv.Atoi(strings.TrimSpace(value))
|
||
if err == nil {
|
||
return intValue > 0
|
||
}
|
||
floatValue, err := strconv.ParseFloat(strings.TrimSpace(value), 64)
|
||
return err == nil && floatValue > 0
|
||
}
|
||
|
||
func collectModelNamesFromOptionValue(raw string, modelNames map[string]struct{}) {
|
||
if strings.TrimSpace(raw) == "" {
|
||
return
|
||
}
|
||
|
||
var parsed map[string]any
|
||
if err := common.UnmarshalJsonStr(raw, &parsed); err != nil {
|
||
return
|
||
}
|
||
|
||
for modelName := range parsed {
|
||
modelNames[modelName] = struct{}{}
|
||
}
|
||
}
|
||
|
||
func buildCompletionRatioMetaValue(optionValues map[string]string) string {
|
||
modelNames := make(map[string]struct{})
|
||
for _, key := range completionRatioMetaOptionKeys {
|
||
collectModelNamesFromOptionValue(optionValues[key], modelNames)
|
||
}
|
||
|
||
meta := make(map[string]ratio_setting.CompletionRatioInfo, len(modelNames))
|
||
for modelName := range modelNames {
|
||
meta[modelName] = ratio_setting.GetCompletionRatioInfo(modelName)
|
||
}
|
||
|
||
jsonBytes, err := common.Marshal(meta)
|
||
if err != nil {
|
||
return "{}"
|
||
}
|
||
return string(jsonBytes)
|
||
}
|
||
|
||
func GetOptions(c *gin.Context) {
|
||
var options []*model.Option
|
||
optionValues := make(map[string]string)
|
||
common.OptionMapRWMutex.Lock()
|
||
for k, v := range common.OptionMap {
|
||
if k == "theme.frontend" {
|
||
continue
|
||
}
|
||
value := common.Interface2String(v)
|
||
isSensitiveKey := strings.HasSuffix(k, "Token") ||
|
||
strings.HasSuffix(k, "Secret") ||
|
||
strings.HasSuffix(k, "Key") ||
|
||
strings.HasSuffix(k, "secret") ||
|
||
strings.HasSuffix(k, "api_key")
|
||
if isSensitiveKey {
|
||
continue
|
||
}
|
||
options = append(options, &model.Option{
|
||
Key: k,
|
||
Value: value,
|
||
})
|
||
for _, optionKey := range completionRatioMetaOptionKeys {
|
||
if optionKey == k {
|
||
optionValues[k] = value
|
||
break
|
||
}
|
||
}
|
||
}
|
||
common.OptionMapRWMutex.Unlock()
|
||
options = append(options, &model.Option{
|
||
Key: "CompletionRatioMeta",
|
||
Value: buildCompletionRatioMetaValue(optionValues),
|
||
})
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": true,
|
||
"message": "",
|
||
"data": options,
|
||
})
|
||
}
|
||
|
||
type OptionUpdateRequest struct {
|
||
Key string `json:"key"`
|
||
Value any `json:"value"`
|
||
}
|
||
|
||
func UpdateOption(c *gin.Context) {
|
||
var option OptionUpdateRequest
|
||
err := common.DecodeJson(c.Request.Body, &option)
|
||
if err != nil {
|
||
c.JSON(http.StatusBadRequest, gin.H{
|
||
"success": false,
|
||
"message": "无效的参数",
|
||
})
|
||
return
|
||
}
|
||
switch option.Value.(type) {
|
||
case bool:
|
||
option.Value = common.Interface2String(option.Value.(bool))
|
||
case float64:
|
||
option.Value = common.Interface2String(option.Value.(float64))
|
||
case int:
|
||
option.Value = common.Interface2String(option.Value.(int))
|
||
default:
|
||
option.Value = fmt.Sprintf("%v", option.Value)
|
||
}
|
||
switch option.Key {
|
||
case "QuotaForInviter", "QuotaForInvitee":
|
||
if isPositiveOptionValue(option.Value.(string)) && !operation_setting.IsPaymentComplianceConfirmed() {
|
||
common.ApiErrorI18n(c, i18n.MsgPaymentComplianceRequired)
|
||
return
|
||
}
|
||
default:
|
||
if isPaymentComplianceOptionKey(option.Key) {
|
||
common.ApiErrorMsg(c, "合规确认字段不允许通过通用设置接口修改")
|
||
return
|
||
}
|
||
}
|
||
switch option.Key {
|
||
case "GitHubOAuthEnabled":
|
||
if option.Value == "true" && common.GitHubClientId == "" {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": "无法启用 GitHub OAuth,请先填入 GitHub Client Id 以及 GitHub Client Secret!",
|
||
})
|
||
return
|
||
}
|
||
case "discord.enabled":
|
||
if option.Value == "true" && system_setting.GetDiscordSettings().ClientId == "" {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": "无法启用 Discord OAuth,请先填入 Discord Client Id 以及 Discord Client Secret!",
|
||
})
|
||
return
|
||
}
|
||
case "oidc.enabled":
|
||
if option.Value == "true" && system_setting.GetOIDCSettings().ClientId == "" {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": "无法启用 OIDC 登录,请先填入 OIDC Client Id 以及 OIDC Client Secret!",
|
||
})
|
||
return
|
||
}
|
||
case "LinuxDOOAuthEnabled":
|
||
if option.Value == "true" && common.LinuxDOClientId == "" {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": "无法启用 LinuxDO OAuth,请先填入 LinuxDO Client Id 以及 LinuxDO Client Secret!",
|
||
})
|
||
return
|
||
}
|
||
case "EmailDomainRestrictionEnabled":
|
||
if option.Value == "true" && len(common.EmailDomainWhitelist) == 0 {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": "无法启用邮箱域名限制,请先填入限制的邮箱域名!",
|
||
})
|
||
return
|
||
}
|
||
case "WeChatAuthEnabled":
|
||
if option.Value == "true" && common.WeChatServerAddress == "" {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": "无法启用微信登录,请先填入微信登录相关配置信息!",
|
||
})
|
||
return
|
||
}
|
||
case "TurnstileCheckEnabled":
|
||
if option.Value == "true" && common.TurnstileSiteKey == "" {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": "无法启用 Turnstile 校验,请先填入 Turnstile 校验相关配置信息!",
|
||
})
|
||
|
||
return
|
||
}
|
||
case "TelegramOAuthEnabled":
|
||
if option.Value == "true" && common.TelegramBotToken == "" {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": "无法启用 Telegram OAuth,请先填入 Telegram Bot Token!",
|
||
})
|
||
return
|
||
}
|
||
case "theme.frontend":
|
||
if option.Value != "default" {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": "Classic 前端已移除,主题只能设置为 default",
|
||
})
|
||
return
|
||
}
|
||
case "GroupRatio":
|
||
err = ratio_setting.CheckGroupRatio(option.Value.(string))
|
||
if err != nil {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": err.Error(),
|
||
})
|
||
return
|
||
}
|
||
case "gemini.safety_settings":
|
||
err = model_setting.ValidateGeminiSafetySettings(option.Value.(string))
|
||
if err != nil {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": err.Error(),
|
||
})
|
||
return
|
||
}
|
||
case "claude.default_max_tokens":
|
||
err = model_setting.ValidateClaudeDefaultMaxTokens(option.Value.(string))
|
||
if err != nil {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": err.Error(),
|
||
})
|
||
return
|
||
}
|
||
case operation_setting.ToolPriceOptionKey:
|
||
err = operation_setting.ValidateToolPricesJSON(option.Value.(string))
|
||
if err != nil {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": err.Error(),
|
||
})
|
||
return
|
||
}
|
||
case "ImageRatio":
|
||
err = ratio_setting.UpdateImageRatioByJSONString(option.Value.(string))
|
||
if err != nil {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": "图片倍率设置失败: " + err.Error(),
|
||
})
|
||
return
|
||
}
|
||
case "AudioRatio":
|
||
err = ratio_setting.UpdateAudioRatioByJSONString(option.Value.(string))
|
||
if err != nil {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": "音频倍率设置失败: " + err.Error(),
|
||
})
|
||
return
|
||
}
|
||
case "AudioCompletionRatio":
|
||
err = ratio_setting.UpdateAudioCompletionRatioByJSONString(option.Value.(string))
|
||
if err != nil {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": "音频补全倍率设置失败: " + err.Error(),
|
||
})
|
||
return
|
||
}
|
||
case "CreateCacheRatio":
|
||
err = ratio_setting.UpdateCreateCacheRatioByJSONString(option.Value.(string))
|
||
if err != nil {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": "缓存创建倍率设置失败: " + err.Error(),
|
||
})
|
||
return
|
||
}
|
||
case "ModelRequestRateLimitGroup":
|
||
err = setting.CheckModelRequestRateLimitGroup(option.Value.(string))
|
||
if err != nil {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": err.Error(),
|
||
})
|
||
return
|
||
}
|
||
case "AutomaticDisableStatusCodes":
|
||
_, err = operation_setting.ParseHTTPStatusCodeRanges(option.Value.(string))
|
||
if err != nil {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": err.Error(),
|
||
})
|
||
return
|
||
}
|
||
case "AutomaticRetryStatusCodes":
|
||
_, err = operation_setting.ParseHTTPStatusCodeRanges(option.Value.(string))
|
||
if err != nil {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": err.Error(),
|
||
})
|
||
return
|
||
}
|
||
case "console_setting.api_info":
|
||
err = console_setting.ValidateConsoleSettings(option.Value.(string), "ApiInfo")
|
||
if err != nil {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": err.Error(),
|
||
})
|
||
return
|
||
}
|
||
case "console_setting.announcements":
|
||
err = console_setting.ValidateConsoleSettings(option.Value.(string), "Announcements")
|
||
if err != nil {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": err.Error(),
|
||
})
|
||
return
|
||
}
|
||
case "console_setting.faq":
|
||
err = console_setting.ValidateConsoleSettings(option.Value.(string), "FAQ")
|
||
if err != nil {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": err.Error(),
|
||
})
|
||
return
|
||
}
|
||
case "console_setting.uptime_kuma_groups":
|
||
err = console_setting.ValidateConsoleSettings(option.Value.(string), "UptimeKumaGroups")
|
||
if err != nil {
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": false,
|
||
"message": err.Error(),
|
||
})
|
||
return
|
||
}
|
||
}
|
||
err = model.UpdateOption(option.Key, option.Value.(string))
|
||
if err != nil {
|
||
common.ApiError(c, err)
|
||
return
|
||
}
|
||
// 出于安全考虑只记录被修改的配置项名称,不记录配置值(可能含密钥等敏感信息)。
|
||
recordManageAudit(c, "option.update", map[string]interface{}{
|
||
"key": option.Key,
|
||
})
|
||
c.JSON(http.StatusOK, gin.H{
|
||
"success": true,
|
||
"message": "",
|
||
})
|
||
}
|