mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-10-28 16:46:57 +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.
147 lines
3.7 KiB
Go
147 lines
3.7 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/constant"
|
|
"github.com/QuantumNous/new-api/logger"
|
|
"github.com/QuantumNous/new-api/model"
|
|
|
|
"github.com/bytedance/gopkg/util/gopool"
|
|
)
|
|
|
|
const (
|
|
codexCredentialRefreshTickInterval = 10 * time.Minute
|
|
codexCredentialRefreshThreshold = 24 * time.Hour
|
|
codexCredentialRefreshBatchSize = 200
|
|
codexCredentialRefreshTimeout = 15 * time.Second
|
|
)
|
|
|
|
var (
|
|
codexCredentialRefreshOnce sync.Once
|
|
codexCredentialRefreshRunning atomic.Bool
|
|
)
|
|
|
|
func shouldAutoRefreshCodexChannelStatus(status int) bool {
|
|
return status == common.ChannelStatusEnabled || status == common.ChannelStatusAutoDisabled
|
|
}
|
|
|
|
func StartCodexCredentialAutoRefreshTask() {
|
|
codexCredentialRefreshOnce.Do(func() {
|
|
if !common.IsMasterNode {
|
|
return
|
|
}
|
|
|
|
gopool.Go(func() {
|
|
logger.LogInfo(context.Background(), common.LogText("codex credential auto-refresh task started: tick=%s threshold=%s", codexCredentialRefreshTickInterval, codexCredentialRefreshThreshold))
|
|
|
|
ticker := time.NewTicker(codexCredentialRefreshTickInterval)
|
|
defer ticker.Stop()
|
|
|
|
runCodexCredentialAutoRefreshOnce()
|
|
for range ticker.C {
|
|
runCodexCredentialAutoRefreshOnce()
|
|
}
|
|
})
|
|
})
|
|
}
|
|
|
|
func runCodexCredentialAutoRefreshOnce() {
|
|
if !codexCredentialRefreshRunning.CompareAndSwap(false, true) {
|
|
return
|
|
}
|
|
defer codexCredentialRefreshRunning.Store(false)
|
|
|
|
ctx := context.Background()
|
|
now := time.Now()
|
|
|
|
var refreshed int
|
|
var scanned int
|
|
|
|
offset := 0
|
|
for {
|
|
var channels []*model.Channel
|
|
err := model.DB.
|
|
Select("id", "name", "key", "status", "channel_info").
|
|
Where("type = ? AND (status = ? OR status = ?)",
|
|
constant.ChannelTypeCodex,
|
|
common.ChannelStatusEnabled,
|
|
common.ChannelStatusAutoDisabled,
|
|
).
|
|
Order("id asc").
|
|
Limit(codexCredentialRefreshBatchSize).
|
|
Offset(offset).
|
|
Find(&channels).Error
|
|
if err != nil {
|
|
logger.LogError(ctx, common.LogText("codex credential auto-refresh: query channels failed: %v", err))
|
|
return
|
|
}
|
|
if len(channels) == 0 {
|
|
break
|
|
}
|
|
offset += codexCredentialRefreshBatchSize
|
|
|
|
for _, ch := range channels {
|
|
if ch == nil {
|
|
continue
|
|
}
|
|
scanned++
|
|
if ch.ChannelInfo.IsMultiKey {
|
|
continue
|
|
}
|
|
|
|
rawKey := strings.TrimSpace(ch.Key)
|
|
if rawKey == "" {
|
|
continue
|
|
}
|
|
|
|
oauthKey, err := parseCodexOAuthKey(rawKey)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
|
|
refreshToken := strings.TrimSpace(oauthKey.RefreshToken)
|
|
if refreshToken == "" {
|
|
continue
|
|
}
|
|
|
|
expiredAtRaw := strings.TrimSpace(oauthKey.Expired)
|
|
expiredAt, err := time.Parse(time.RFC3339, expiredAtRaw)
|
|
if err == nil && !expiredAt.IsZero() && expiredAt.Sub(now) > codexCredentialRefreshThreshold {
|
|
continue
|
|
}
|
|
|
|
refreshCtx, cancel := context.WithTimeout(ctx, codexCredentialRefreshTimeout)
|
|
newKey, _, err := RefreshCodexChannelCredential(refreshCtx, ch.Id, CodexCredentialRefreshOptions{ResetCaches: false})
|
|
cancel()
|
|
if err != nil {
|
|
logger.LogWarn(ctx, common.LogText("codex credential auto-refresh: channel_id=%d name=%s refresh failed: %v", ch.Id, ch.Name, err))
|
|
continue
|
|
}
|
|
|
|
refreshed++
|
|
logger.LogInfo(ctx, common.LogText("codex credential auto-refresh: channel_id=%d name=%s refreshed, expires_at=%s", ch.Id, ch.Name, newKey.Expired))
|
|
}
|
|
}
|
|
|
|
if refreshed > 0 {
|
|
func() {
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
logger.LogWarn(ctx, common.LogText("codex credential auto-refresh: InitChannelCache panic: %v", r))
|
|
}
|
|
}()
|
|
model.InitChannelCache()
|
|
}()
|
|
}
|
|
|
|
if common.DebugEnabled {
|
|
logger.LogDebug(ctx, "codex credential auto-refresh: scanned=%d refreshed=%d", scanned, refreshed)
|
|
}
|
|
}
|