mirror of
https://gh-proxy.org/https://github.com/klinsmaya/new-api.git
synced 2026-11-09 01:47:07 +08:00
* feat(i18n): translate web console messages in the frontend and AI-client errors in the backend
Chinese text was hard-coded in API messages, stored log content, emails and
server logs, so it reached users of every interface language.
Text is now translated where its reader is:
- Web console APIs return the English source text as message_key with
message_params, and the web console translates it in all seven languages.
message keeps the English text for other API callers.
- Errors returned to AI clients, emails and notifications are translated by
the backend (en, zh-CN, zh-TW) in the language saved on the account, then
the language of the request's Accept-Language header.
- A reader who states no language still gets the original Chinese text of the
messages that were Chinese before, word for word. Gateways that use another
new-api as their upstream match that text, for example to disable a channel
whose account ran out of quota.
- Usage, top-up and system log content is stored as content_parts (key and
params) and rendered in the viewer's language. Task fail reasons and refund
reasons written by the gateway are English keys. Rows written earlier are
shown as before.
- Server logs are English.
Also:
- The saved interface language zhTW, and zh-HK, zh-MO and zh-Hant, now select
Traditional Chinese in the backend instead of Simplified Chinese.
- The built-in group descriptions are translated; descriptions an
administrator saved are shown as written.
- .agents/rules/i18n.md records the conventions. Tests in i18n/ fail on a
non-English string literal, on a web console message without translations
and on a locale key without a constant.
* feat(i18n): print server logs in Chinese when LOG_LANGUAGE asks for it
Server log lines are English by default. With LOG_LANGUAGE=zh-CN, the lines
that were Chinese before print their original Chinese text.
common.LogText formats a log line from its English format, which is also the
key of its Chinese text in common/log_text.zh-CN.json. A line without an entry
prints in English. go vet checks the arguments of every call, and
TestServerLogTexts checks that each entry still matches a call and has the
same verbs as its key.
* docs: list LOG_LANGUAGE in the docker compose example
* feat(i18n): translate every server log line and add DEFAULT_LANGUAGE
Every line the gateway prints goes through common.LogText. With
DEFAULT_LANGUAGE=zh-CN, the lines that have a Chinese text in
common/log_text.zh-CN.json print it and the others print English.
DEFAULT_LANGUAGE replaces LOG_LANGUAGE. It also sets the language of
backend messages, emails and notifications for a reader who states no
language: en, zh-CN or zh-TW, English when unset. The list of messages
that stayed Chinese for such readers is removed.
Review fixes:
- Channel test logs store the token name "Model test"; the console shows
it in the interface language.
- Task fail reasons written by the gateway are fixed sentences the console
translates. The HTTP status and the upstream detail go to the server log
when a polled task is failed.
- The auto-disable reason of a slow channel is written in DEFAULT_LANGUAGE.
Also:
- Drop the repository-scanning lint tests, the i18n rules file and its
read gate. AGENTS.md keeps the conventions in four lines.
- Payment error toasts keep their previous text and only add the
translated message key.
- Remove guards and helpers that no caller needs.
* fix(i18n): address review on language lookup, notices and error responses
- Relay requests no longer load the user a second time to find the
language: the settings TokenAuth put into the request are used as they
are, also when they hold no language.
- Upstream model update notices are rendered in each recipient's saved
language, DEFAULT_LANGUAGE when none.
- /api/usage/token and /api/log/token answer with backend-translated
messages again, with the keys and status codes used before this PR.
Their callers are scripts, not the web console.
- Webhook notifications fill {{value}} placeholders like the other
senders. Running the rendered text through Sprintf appended
%!(EXTRA ...) and broke %2F in links.
- RootUserLanguage reads the setting of the root user it already loaded.
- zh_TW and zh_HK are read as Traditional Chinese.
- Add common.ApiErrorStatus for error responses under another HTTP status
and use it where those responses were built by hand.
- Remove middleware.GetLanguage, which had no callers.
187 lines
5.0 KiB
Go
187 lines
5.0 KiB
Go
package model_setting
|
|
|
|
import (
|
|
"regexp"
|
|
"slices"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/setting/config"
|
|
)
|
|
|
|
type ChatCompletionsToResponsesPolicy struct {
|
|
Enabled bool `json:"enabled"`
|
|
AllChannels bool `json:"all_channels"`
|
|
ChannelIDs []int `json:"channel_ids,omitempty"`
|
|
ChannelTypes []int `json:"channel_types,omitempty"`
|
|
ModelPatterns []string `json:"model_patterns,omitempty"`
|
|
}
|
|
|
|
func (p ChatCompletionsToResponsesPolicy) IsChannelEnabled(channelID int, channelType int) bool {
|
|
if !p.Enabled {
|
|
return false
|
|
}
|
|
if p.AllChannels {
|
|
return true
|
|
}
|
|
|
|
if channelID > 0 && len(p.ChannelIDs) > 0 && slices.Contains(p.ChannelIDs, channelID) {
|
|
return true
|
|
}
|
|
if channelType > 0 && len(p.ChannelTypes) > 0 && slices.Contains(p.ChannelTypes, channelType) {
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
type GlobalSettings struct {
|
|
PassThroughRequestEnabled bool `json:"pass_through_request_enabled"`
|
|
ThinkingModelBlacklist []string `json:"thinking_model_blacklist"`
|
|
// EffortTailModelIDs lists real model IDs that sit inside the GPT/o-series
|
|
// family whitelist but whose names already end in an effort word.
|
|
EffortTailModelIDs []string `json:"effort_tail_model_ids"`
|
|
ChatCompletionsToResponsesPolicy ChatCompletionsToResponsesPolicy `json:"chat_completions_to_responses_policy"`
|
|
}
|
|
|
|
// 默认配置
|
|
var defaultOpenaiSettings = GlobalSettings{
|
|
PassThroughRequestEnabled: false,
|
|
ThinkingModelBlacklist: []string{
|
|
"moonshotai/kimi-k2-thinking",
|
|
"kimi-k2-thinking",
|
|
},
|
|
EffortTailModelIDs: []string{
|
|
"gpt-5.1-codex-max",
|
|
"qwen-image-edit-max",
|
|
"qwen-max",
|
|
"stable-diffusion-3-medium",
|
|
"yi-medium",
|
|
},
|
|
ChatCompletionsToResponsesPolicy: ChatCompletionsToResponsesPolicy{
|
|
Enabled: false,
|
|
AllChannels: true,
|
|
},
|
|
}
|
|
|
|
// 全局实例
|
|
var globalSettings = defaultOpenaiSettings
|
|
|
|
func init() {
|
|
// 注册到全局配置管理器
|
|
config.GlobalConfig.Register("global", &globalSettings)
|
|
}
|
|
|
|
func GetGlobalSettings() *GlobalSettings {
|
|
return &globalSettings
|
|
}
|
|
|
|
const thinkingBlacklistRegexPrefix = "re:"
|
|
|
|
type thinkingBlacklistCompiled struct {
|
|
source string
|
|
exact []string
|
|
regexes []*regexp.Regexp
|
|
}
|
|
|
|
var (
|
|
thinkingBlacklistMu sync.RWMutex
|
|
thinkingBlacklistCache thinkingBlacklistCompiled
|
|
)
|
|
|
|
func thinkingBlacklistSourceKey(entries []string) string {
|
|
return strings.Join(entries, "\x00")
|
|
}
|
|
|
|
func compiledThinkingBlacklist() ([]string, []*regexp.Regexp) {
|
|
entries := globalSettings.ThinkingModelBlacklist
|
|
key := thinkingBlacklistSourceKey(entries)
|
|
|
|
thinkingBlacklistMu.RLock()
|
|
if thinkingBlacklistCache.source == key {
|
|
exact, regexes := thinkingBlacklistCache.exact, thinkingBlacklistCache.regexes
|
|
thinkingBlacklistMu.RUnlock()
|
|
return exact, regexes
|
|
}
|
|
thinkingBlacklistMu.RUnlock()
|
|
|
|
thinkingBlacklistMu.Lock()
|
|
defer thinkingBlacklistMu.Unlock()
|
|
if thinkingBlacklistCache.source == key {
|
|
return thinkingBlacklistCache.exact, thinkingBlacklistCache.regexes
|
|
}
|
|
|
|
exact := make([]string, 0, len(entries))
|
|
var regexes []*regexp.Regexp
|
|
for _, entry := range entries {
|
|
entry = strings.TrimSpace(entry)
|
|
if entry == "" {
|
|
continue
|
|
}
|
|
if after, ok := strings.CutPrefix(entry, thinkingBlacklistRegexPrefix); ok {
|
|
pattern := after
|
|
if pattern == "" {
|
|
common.SysError(common.LogText("invalid thinking_model_blacklist regex %q: pattern is empty", entry))
|
|
continue
|
|
}
|
|
re, err := regexp.Compile(pattern)
|
|
if err != nil {
|
|
common.SysError(common.LogText("invalid thinking_model_blacklist regex %q: %v", entry, err))
|
|
continue
|
|
}
|
|
regexes = append(regexes, re)
|
|
continue
|
|
}
|
|
exact = append(exact, entry)
|
|
}
|
|
thinkingBlacklistCache = thinkingBlacklistCompiled{source: key, exact: exact, regexes: regexes}
|
|
return exact, regexes
|
|
}
|
|
|
|
// ShouldPreserveThinkingSuffix reports whether the full model name is exempt
|
|
// from host thinking-suffix and @-modifier parsing. Exact blacklist entries
|
|
// match the complete name; entries prefixed with re: are Go regular expressions
|
|
// matched with MatchString against the same full name.
|
|
func ShouldPreserveThinkingSuffix(modelName string) bool {
|
|
target := strings.TrimSpace(modelName)
|
|
if target == "" {
|
|
return false
|
|
}
|
|
|
|
exact, regexes := compiledThinkingBlacklist()
|
|
if slices.Contains(exact, target) {
|
|
return true
|
|
}
|
|
for _, re := range regexes {
|
|
if re.MatchString(target) {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// ShouldPreserveEffortTail reports whether modelName is a real model ID whose
|
|
// name already ends in an effort word. Entries match the complete name and the
|
|
// de-namespaced bare name.
|
|
func ShouldPreserveEffortTail(modelName string) bool {
|
|
target := strings.TrimSpace(modelName)
|
|
if target == "" {
|
|
return false
|
|
}
|
|
bare := target
|
|
if slash := strings.LastIndex(target, "/"); slash >= 0 {
|
|
bare = target[slash+1:]
|
|
}
|
|
|
|
for _, entry := range globalSettings.EffortTailModelIDs {
|
|
entry = strings.TrimSpace(entry)
|
|
if entry == "" {
|
|
continue
|
|
}
|
|
if entry == target || entry == bare {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|