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.
131 lines
3.4 KiB
Go
131 lines
3.4 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
"runtime"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/logger"
|
|
"github.com/QuantumNous/new-api/model"
|
|
|
|
"github.com/bytedance/gopkg/util/gopool"
|
|
)
|
|
|
|
const systemInstanceReportInterval = 30 * time.Second
|
|
|
|
var systemInstanceReporterOnce sync.Once
|
|
|
|
type SystemInstanceInfo struct {
|
|
SchemaVersion int `json:"schema_version"`
|
|
Node common.NodeIdentity `json:"node"`
|
|
Role SystemInstanceRoleInfo `json:"role"`
|
|
Runtime SystemInstanceRuntimeInfo `json:"runtime"`
|
|
Host SystemInstanceHostInfo `json:"host"`
|
|
Resources SystemInstanceResources `json:"resources"`
|
|
Extra map[string]any `json:"extra,omitempty"`
|
|
}
|
|
|
|
type SystemInstanceRoleInfo struct {
|
|
IsMaster bool `json:"is_master"`
|
|
}
|
|
|
|
type SystemInstanceRuntimeInfo struct {
|
|
Version string `json:"version"`
|
|
GOOS string `json:"goos"`
|
|
GOARCH string `json:"goarch"`
|
|
StartedAt int64 `json:"started_at"`
|
|
}
|
|
|
|
type SystemInstanceHostInfo struct {
|
|
Hostname string `json:"hostname"`
|
|
}
|
|
|
|
type SystemInstanceResources struct {
|
|
CPU SystemInstanceResourceUsage `json:"cpu"`
|
|
Memory SystemInstanceResourceUsage `json:"memory"`
|
|
Storage SystemInstanceStorageMetrics `json:"storage"`
|
|
}
|
|
|
|
type SystemInstanceResourceUsage struct {
|
|
UsagePercent float64 `json:"usage_percent"`
|
|
}
|
|
|
|
type SystemInstanceStorageMetrics struct {
|
|
TotalBytes uint64 `json:"total_bytes"`
|
|
UsedBytes uint64 `json:"used_bytes"`
|
|
FreeBytes uint64 `json:"free_bytes"`
|
|
UsedPercent float64 `json:"used_percent"`
|
|
}
|
|
|
|
func StartSystemInstanceReporter() {
|
|
systemInstanceReporterOnce.Do(func() {
|
|
gopool.Go(func() {
|
|
reportSystemInstanceWithLog()
|
|
|
|
ticker := time.NewTicker(systemInstanceReportInterval)
|
|
defer ticker.Stop()
|
|
for range ticker.C {
|
|
reportSystemInstanceWithLog()
|
|
}
|
|
})
|
|
})
|
|
}
|
|
|
|
func ReportCurrentSystemInstance() error {
|
|
identity := common.GetNodeIdentity()
|
|
hostname, hostnameErr := os.Hostname()
|
|
if strings.TrimSpace(identity.Name) == "" {
|
|
if hostnameErr != nil || strings.TrimSpace(hostname) == "" {
|
|
return fmt.Errorf("system instance node name is empty")
|
|
}
|
|
identity.Name = hostname
|
|
identity.Source = common.NodeNameSourceHostname
|
|
identity.ManuallyConfigured = false
|
|
identity.ShouldConfigureManually = true
|
|
}
|
|
systemStatus := common.GetSystemStatus()
|
|
diskInfo := common.GetDiskSpaceInfo()
|
|
info := SystemInstanceInfo{
|
|
SchemaVersion: 1,
|
|
Node: identity,
|
|
Role: SystemInstanceRoleInfo{
|
|
IsMaster: common.IsMasterNode,
|
|
},
|
|
Runtime: SystemInstanceRuntimeInfo{
|
|
Version: common.Version,
|
|
GOOS: runtime.GOOS,
|
|
GOARCH: runtime.GOARCH,
|
|
StartedAt: common.StartTime,
|
|
},
|
|
Host: SystemInstanceHostInfo{
|
|
Hostname: hostname,
|
|
},
|
|
Resources: SystemInstanceResources{
|
|
CPU: SystemInstanceResourceUsage{
|
|
UsagePercent: systemStatus.CPUUsage,
|
|
},
|
|
Memory: SystemInstanceResourceUsage{
|
|
UsagePercent: systemStatus.MemoryUsage,
|
|
},
|
|
Storage: SystemInstanceStorageMetrics{
|
|
TotalBytes: diskInfo.Total,
|
|
UsedBytes: diskInfo.Used,
|
|
FreeBytes: diskInfo.Free,
|
|
UsedPercent: diskInfo.UsedPercent,
|
|
},
|
|
},
|
|
}
|
|
return model.UpsertSystemInstance(identity.Name, info, common.StartTime, common.GetTimestamp())
|
|
}
|
|
|
|
func reportSystemInstanceWithLog() {
|
|
if err := ReportCurrentSystemInstance(); err != nil {
|
|
logger.LogWarn(context.Background(), common.LogText("system instance report failed: %v", err))
|
|
}
|
|
}
|