mirror of
https://gh-proxy.org/https://github.com/klinsmaya/new-api.git
synced 2026-11-09 09:57:06 +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.
166 lines
6.3 KiB
Go
166 lines
6.3 KiB
Go
package system_setting
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"net"
|
|
"net/url"
|
|
"regexp"
|
|
"strings"
|
|
"unicode"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
)
|
|
|
|
const (
|
|
TaskArtifactStoreModeUpstream = "upstream"
|
|
TaskArtifactStoreModeS3 = "s3"
|
|
|
|
DefaultTaskArtifactStorePresignTTLSeconds = 900
|
|
MaxTaskArtifactStorePresignTTLSeconds = 7 * 24 * 60 * 60
|
|
)
|
|
|
|
const (
|
|
TaskArtifactStoreModeEnv = "TASK_ARTIFACT_STORE_MODE"
|
|
TaskArtifactStoreS3EndpointEnv = "TASK_ARTIFACT_STORE_S3_ENDPOINT"
|
|
TaskArtifactStoreS3BucketEnv = "TASK_ARTIFACT_STORE_S3_BUCKET"
|
|
TaskArtifactStoreS3RegionEnv = "TASK_ARTIFACT_STORE_S3_REGION"
|
|
TaskArtifactStoreS3AccessKeyEnv = "TASK_ARTIFACT_STORE_S3_ACCESS_KEY"
|
|
TaskArtifactStoreS3SecretKeyEnv = "TASK_ARTIFACT_STORE_S3_SECRET_KEY"
|
|
TaskArtifactStoreS3PrefixEnv = "TASK_ARTIFACT_STORE_S3_PREFIX"
|
|
TaskArtifactStoreS3PresignTTLEnv = "TASK_ARTIFACT_STORE_S3_PRESIGN_TTL"
|
|
)
|
|
|
|
var (
|
|
taskArtifactStoreBucketPattern = regexp.MustCompile(`^[a-z0-9][a-z0-9.-]{1,61}[a-z0-9]$`)
|
|
taskArtifactStoreRegionPattern = regexp.MustCompile(`^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$`)
|
|
)
|
|
|
|
// TaskArtifactStoreConfig reserves the configuration contract for a future S3
|
|
// implementation. The current release always falls back to upstream proxying.
|
|
type TaskArtifactStoreConfig struct {
|
|
Mode string
|
|
S3Endpoint string
|
|
S3Bucket string
|
|
S3Region string
|
|
S3AccessKey string
|
|
S3SecretKey string
|
|
S3Prefix string
|
|
S3PresignTTLSeconds int
|
|
}
|
|
|
|
// LoadTaskArtifactStoreConfig reads and validates startup-only configuration.
|
|
// S3 mode is deliberately disabled until a storage implementation is shipped.
|
|
func LoadTaskArtifactStoreConfig() TaskArtifactStoreConfig {
|
|
config := TaskArtifactStoreConfig{
|
|
Mode: common.GetEnvOrDefaultString(TaskArtifactStoreModeEnv, TaskArtifactStoreModeUpstream),
|
|
S3Endpoint: common.GetEnvOrDefaultString(TaskArtifactStoreS3EndpointEnv, ""),
|
|
S3Bucket: common.GetEnvOrDefaultString(TaskArtifactStoreS3BucketEnv, ""),
|
|
S3Region: common.GetEnvOrDefaultString(TaskArtifactStoreS3RegionEnv, ""),
|
|
S3AccessKey: common.GetEnvOrDefaultString(TaskArtifactStoreS3AccessKeyEnv, ""),
|
|
S3SecretKey: common.GetEnvOrDefaultString(TaskArtifactStoreS3SecretKeyEnv, ""),
|
|
S3Prefix: common.GetEnvOrDefaultString(TaskArtifactStoreS3PrefixEnv, ""),
|
|
S3PresignTTLSeconds: common.GetEnvOrDefault(TaskArtifactStoreS3PresignTTLEnv, DefaultTaskArtifactStorePresignTTLSeconds),
|
|
}
|
|
if err := ValidateTaskArtifactStoreConfig(config); err != nil {
|
|
common.SysError(common.LogText("invalid task artifact store configuration: %s; using upstream mode", err.Error()))
|
|
config.Mode = TaskArtifactStoreModeUpstream
|
|
return config
|
|
}
|
|
if config.Mode == TaskArtifactStoreModeS3 {
|
|
common.SysError(common.LogText("task artifact S3 storage is not implemented; using upstream mode"))
|
|
config.Mode = TaskArtifactStoreModeUpstream
|
|
}
|
|
return config
|
|
}
|
|
|
|
// ValidateTaskArtifactStoreConfig performs syntax checks only. It never
|
|
// resolves hosts, contacts an endpoint, or verifies credentials.
|
|
func ValidateTaskArtifactStoreConfig(config TaskArtifactStoreConfig) error {
|
|
if config.Mode != TaskArtifactStoreModeUpstream && config.Mode != TaskArtifactStoreModeS3 {
|
|
return fmt.Errorf("unsupported mode %q", config.Mode)
|
|
}
|
|
if config.S3PresignTTLSeconds <= 0 || config.S3PresignTTLSeconds > MaxTaskArtifactStorePresignTTLSeconds {
|
|
return fmt.Errorf("S3 presign TTL must be between 1 and %d seconds", MaxTaskArtifactStorePresignTTLSeconds)
|
|
}
|
|
|
|
requireS3Fields := config.Mode == TaskArtifactStoreModeS3
|
|
if requireS3Fields && config.S3Endpoint == "" {
|
|
return errors.New("S3 endpoint is required")
|
|
}
|
|
if config.S3Endpoint != "" {
|
|
if config.S3Endpoint != strings.TrimSpace(config.S3Endpoint) {
|
|
return errors.New("S3 endpoint must not contain surrounding whitespace")
|
|
}
|
|
endpoint, err := url.Parse(config.S3Endpoint)
|
|
if err != nil || endpoint == nil || endpoint.Host == "" || endpoint.User != nil || endpoint.Opaque != "" {
|
|
return errors.New("S3 endpoint must be an absolute URL without userinfo")
|
|
}
|
|
if endpoint.Scheme != "http" && endpoint.Scheme != "https" {
|
|
return errors.New("S3 endpoint must use http or https")
|
|
}
|
|
if endpoint.RawQuery != "" || endpoint.ForceQuery || endpoint.Fragment != "" {
|
|
return errors.New("S3 endpoint must not contain a query or fragment")
|
|
}
|
|
}
|
|
|
|
if requireS3Fields && config.S3Bucket == "" {
|
|
return errors.New("S3 bucket is required")
|
|
}
|
|
if config.S3Bucket != "" {
|
|
if !taskArtifactStoreBucketPattern.MatchString(config.S3Bucket) ||
|
|
strings.Contains(config.S3Bucket, "..") || net.ParseIP(config.S3Bucket) != nil {
|
|
return errors.New("S3 bucket syntax is invalid")
|
|
}
|
|
}
|
|
|
|
if requireS3Fields && config.S3Region == "" {
|
|
return errors.New("S3 region is required")
|
|
}
|
|
if config.S3Region != "" && !taskArtifactStoreRegionPattern.MatchString(config.S3Region) {
|
|
return errors.New("S3 region syntax is invalid")
|
|
}
|
|
if err := validateTaskArtifactStoreCredential("access key", config.S3AccessKey, 256, requireS3Fields); err != nil {
|
|
return err
|
|
}
|
|
if err := validateTaskArtifactStoreCredential("secret key", config.S3SecretKey, 1024, requireS3Fields); err != nil {
|
|
return err
|
|
}
|
|
|
|
if config.S3Prefix != "" {
|
|
if config.S3Prefix != strings.TrimSpace(config.S3Prefix) || len(config.S3Prefix) > 512 ||
|
|
strings.HasPrefix(config.S3Prefix, "/") || strings.Contains(config.S3Prefix, "\\") {
|
|
return errors.New("S3 prefix syntax is invalid")
|
|
}
|
|
for part := range strings.SplitSeq(config.S3Prefix, "/") {
|
|
if part == "." || part == ".." {
|
|
return errors.New("S3 prefix must not contain dot segments")
|
|
}
|
|
}
|
|
for _, character := range config.S3Prefix {
|
|
if unicode.IsControl(character) {
|
|
return errors.New("S3 prefix must not contain control characters")
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func validateTaskArtifactStoreCredential(name, value string, maxLength int, required bool) error {
|
|
if required && value == "" {
|
|
return fmt.Errorf("S3 %s is required", name)
|
|
}
|
|
if value == "" {
|
|
return nil
|
|
}
|
|
if value != strings.TrimSpace(value) || len(value) > maxLength {
|
|
return fmt.Errorf("S3 %s syntax is invalid", name)
|
|
}
|
|
for _, character := range value {
|
|
if unicode.IsControl(character) {
|
|
return fmt.Errorf("S3 %s syntax is invalid", name)
|
|
}
|
|
}
|
|
return nil
|
|
}
|