mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-10-28 08:35:33 +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.
163 lines
6.6 KiB
Go
163 lines
6.6 KiB
Go
package controller
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/constant"
|
|
"github.com/QuantumNous/new-api/model"
|
|
"github.com/QuantumNous/new-api/service"
|
|
"github.com/QuantumNous/new-api/setting/operation_setting"
|
|
)
|
|
|
|
// RegisterScheduledSystemTasks wires the periodic channel test, upstream model
|
|
// update, and async task polling (Midjourney / Suno / video) jobs into the
|
|
// system task framework so a DB lease dedups execution across multiple master
|
|
// instances and each run is recorded as one task row. Call this before
|
|
// service.StartSystemTaskRunner.
|
|
func RegisterScheduledSystemTasks() {
|
|
service.RegisterSystemTaskHandler(channelTestHandler{})
|
|
service.RegisterSystemTaskHandler(modelUpdateHandler{})
|
|
service.RegisterSystemTaskHandler(midjourneyPollHandler{})
|
|
service.RegisterSystemTaskHandler(asyncTaskPollHandler{})
|
|
}
|
|
|
|
// channelTestHandler runs the scheduled "test all channels" job. Enablement and
|
|
// cadence still come from the monitor settings; only the execution path moved
|
|
// into the system task runner.
|
|
type channelTestHandler struct{}
|
|
|
|
func (channelTestHandler) Type() string { return model.SystemTaskTypeChannelTest }
|
|
|
|
func (channelTestHandler) Enabled() bool {
|
|
return operation_setting.GetMonitorSetting().AutoTestChannelEnabled
|
|
}
|
|
|
|
func (channelTestHandler) Interval() time.Duration {
|
|
minutes := operation_setting.GetMonitorSetting().AutoTestChannelMinutes
|
|
if minutes <= 0 {
|
|
minutes = 10
|
|
}
|
|
return time.Duration(minutes * float64(time.Minute))
|
|
}
|
|
|
|
func (channelTestHandler) NewPayload() any { return nil }
|
|
|
|
// channelTestTaskPayload controls one channel_test run. A nil/empty payload is a
|
|
// scheduled run, which uses the configured monitor ChannelTestMode and does not
|
|
// notify. A manual "test all channels" trigger sets Mode=scheduled_all and
|
|
// Notify=true to reproduce the legacy manual behavior (test every channel and
|
|
// notify root on completion).
|
|
type channelTestTaskPayload struct {
|
|
Mode string `json:"mode,omitempty"`
|
|
Notify bool `json:"notify,omitempty"`
|
|
}
|
|
|
|
func (channelTestHandler) Run(ctx context.Context, task *model.SystemTask, runnerID string) {
|
|
payload := channelTestTaskPayload{}
|
|
if err := task.DecodePayload(&payload); err != nil {
|
|
finishSystemTaskHandler(task, runnerID, model.SystemTaskStatusFailed, nil, err)
|
|
return
|
|
}
|
|
summary, err := runChannelTestTask(ctx, payload.Mode, payload.Notify, service.NewSystemTaskProgressReporter(task, runnerID))
|
|
if err != nil {
|
|
finishSystemTaskHandler(task, runnerID, model.SystemTaskStatusFailed, nil, err)
|
|
return
|
|
}
|
|
finishSystemTaskHandler(task, runnerID, model.SystemTaskStatusSucceeded, summary, nil)
|
|
}
|
|
|
|
// modelUpdateHandler runs the scheduled upstream model update detection job.
|
|
type modelUpdateHandler struct{}
|
|
|
|
func (modelUpdateHandler) Type() string { return model.SystemTaskTypeModelUpdate }
|
|
|
|
func (modelUpdateHandler) Enabled() bool {
|
|
return common.GetEnvOrDefaultBool("CHANNEL_UPSTREAM_MODEL_UPDATE_TASK_ENABLED", true)
|
|
}
|
|
|
|
func (modelUpdateHandler) Interval() time.Duration {
|
|
intervalMinutes := common.GetEnvOrDefault(
|
|
"CHANNEL_UPSTREAM_MODEL_UPDATE_TASK_INTERVAL_MINUTES",
|
|
channelUpstreamModelUpdateTaskDefaultIntervalMinutes,
|
|
)
|
|
if intervalMinutes < 1 {
|
|
intervalMinutes = channelUpstreamModelUpdateTaskDefaultIntervalMinutes
|
|
}
|
|
return time.Duration(intervalMinutes) * time.Minute
|
|
}
|
|
|
|
func (modelUpdateHandler) NewPayload() any { return nil }
|
|
|
|
// modelUpdateTaskPayload controls one model_update run. A scheduled run
|
|
// (Manual=false) respects the per-channel minimum check interval and may
|
|
// auto-apply detected models when a channel has auto-sync enabled. A manual
|
|
// "detect all" trigger sets Manual=true to reproduce the legacy detect-all
|
|
// semantics: force a re-check regardless of the interval and never auto-apply,
|
|
// so the admin reviews and applies changes explicitly.
|
|
type modelUpdateTaskPayload struct {
|
|
Manual bool `json:"manual,omitempty"`
|
|
}
|
|
|
|
func (modelUpdateHandler) Run(ctx context.Context, task *model.SystemTask, runnerID string) {
|
|
payload := modelUpdateTaskPayload{}
|
|
if err := task.DecodePayload(&payload); err != nil {
|
|
finishSystemTaskHandler(task, runnerID, model.SystemTaskStatusFailed, nil, err)
|
|
return
|
|
}
|
|
summary := runChannelUpstreamModelUpdateTaskOnce(ctx, payload.Manual, !payload.Manual, service.NewSystemTaskProgressReporter(task, runnerID))
|
|
finishSystemTaskHandler(task, runnerID, model.SystemTaskStatusSucceeded, summary, nil)
|
|
}
|
|
|
|
// midjourneyPollHandler runs one Midjourney polling pass per scheduled run.
|
|
// Enabled() folds the "are there unfinished tasks?" check into enablement so the
|
|
// scheduler creates no row when the system is idle; only when at least one
|
|
// Midjourney task is in progress does a row get scheduled.
|
|
type midjourneyPollHandler struct{}
|
|
|
|
func (midjourneyPollHandler) Type() string { return model.SystemTaskTypeMidjourneyPoll }
|
|
|
|
func (midjourneyPollHandler) Enabled() bool {
|
|
return constant.UpdateTask && model.HasUnfinishedMidjourneyTasks()
|
|
}
|
|
|
|
func (midjourneyPollHandler) Interval() time.Duration { return 15 * time.Second }
|
|
|
|
func (midjourneyPollHandler) NewPayload() any { return nil }
|
|
|
|
func (midjourneyPollHandler) Run(ctx context.Context, task *model.SystemTask, runnerID string) {
|
|
summary := runMidjourneyTaskUpdateOnce(ctx, service.NewSystemTaskProgressReporter(task, runnerID))
|
|
finishSystemTaskHandler(task, runnerID, model.SystemTaskStatusSucceeded, summary, nil)
|
|
}
|
|
|
|
// asyncTaskPollHandler runs one async-task (Suno/video) polling pass per
|
|
// scheduled run. Like midjourneyPollHandler, Enabled() folds in the unfinished
|
|
// task existence check so an idle system schedules no rows.
|
|
type asyncTaskPollHandler struct{}
|
|
|
|
func (asyncTaskPollHandler) Type() string { return model.SystemTaskTypeAsyncTaskPoll }
|
|
|
|
func (asyncTaskPollHandler) Enabled() bool {
|
|
return constant.UpdateTask && model.HasUnfinishedSyncTasks()
|
|
}
|
|
|
|
func (asyncTaskPollHandler) Interval() time.Duration { return 15 * time.Second }
|
|
|
|
func (asyncTaskPollHandler) NewPayload() any { return nil }
|
|
|
|
func (asyncTaskPollHandler) Run(ctx context.Context, task *model.SystemTask, runnerID string) {
|
|
summary := service.RunTaskPollingOnce(ctx, service.NewSystemTaskProgressReporter(task, runnerID))
|
|
finishSystemTaskHandler(task, runnerID, model.SystemTaskStatusSucceeded, summary, nil)
|
|
}
|
|
|
|
func finishSystemTaskHandler(task *model.SystemTask, runnerID string, status model.SystemTaskStatus, result any, runErr error) {
|
|
errorMessage := ""
|
|
if runErr != nil {
|
|
errorMessage = runErr.Error()
|
|
}
|
|
if err := model.FinishSystemTask(task.TaskID, runnerID, status, result, errorMessage); err != nil {
|
|
common.SysLog(common.LogText("system task %s failed to persist result: %v", task.TaskID, err))
|
|
}
|
|
}
|