mirror of
https://gh-proxy.org/https://github.com/klinsmaya/new-api.git
synced 2026-11-10 10:27:56 +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.
231 lines
6.7 KiB
Go
231 lines
6.7 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"math"
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
taskdto "github.com/QuantumNous/new-api/dto"
|
|
"github.com/QuantumNous/new-api/logger"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
)
|
|
|
|
func MidjourneyErrorWrapper(code int, desc string) *taskdto.MidjourneyResponse {
|
|
return &taskdto.MidjourneyResponse{
|
|
Code: code,
|
|
Description: desc,
|
|
}
|
|
}
|
|
|
|
func MidjourneyErrorWithStatusCodeWrapper(code int, desc string, statusCode int) *taskdto.MidjourneyResponseWithStatusCode {
|
|
return &taskdto.MidjourneyResponseWithStatusCode{
|
|
StatusCode: statusCode,
|
|
Response: *MidjourneyErrorWrapper(code, desc),
|
|
}
|
|
}
|
|
|
|
//// OpenAIErrorWrapper wraps an error into an OpenAIErrorWithStatusCode
|
|
//func OpenAIErrorWrapper(err error, code string, statusCode int) *dto.OpenAIErrorWithStatusCode {
|
|
// text := err.Error()
|
|
// lowerText := strings.ToLower(text)
|
|
// if !strings.HasPrefix(lowerText, "get file base64 from url") && !strings.HasPrefix(lowerText, "mime type is not supported") {
|
|
// if strings.Contains(lowerText, "post") || strings.Contains(lowerText, "dial") || strings.Contains(lowerText, "http") {
|
|
// common.SysLog(fmt.Sprintf("error: %s", text))
|
|
// text = "请求上游地址失败"
|
|
// }
|
|
// }
|
|
// openAIError := dto.OpenAIError{
|
|
// Message: text,
|
|
// Type: "new_api_error",
|
|
// Code: code,
|
|
// }
|
|
// return &dto.OpenAIErrorWithStatusCode{
|
|
// Error: openAIError,
|
|
// StatusCode: statusCode,
|
|
// }
|
|
//}
|
|
//
|
|
//func OpenAIErrorWrapperLocal(err error, code string, statusCode int) *dto.OpenAIErrorWithStatusCode {
|
|
// openaiErr := OpenAIErrorWrapper(err, code, statusCode)
|
|
// openaiErr.LocalError = true
|
|
// return openaiErr
|
|
//}
|
|
|
|
func ClaudeErrorWrapper(err error, code string, statusCode int) *dto.ClaudeErrorWithStatusCode {
|
|
text := err.Error()
|
|
lowerText := strings.ToLower(text)
|
|
if !strings.HasPrefix(lowerText, "get file base64 from url") {
|
|
if strings.Contains(lowerText, "post") || strings.Contains(lowerText, "dial") || strings.Contains(lowerText, "http") {
|
|
common.SysLog(common.LogText("error: %s", text))
|
|
text = "request to the upstream address failed"
|
|
}
|
|
}
|
|
claudeError := types.ClaudeError{
|
|
Message: text,
|
|
Type: "new_api_error",
|
|
}
|
|
return &dto.ClaudeErrorWithStatusCode{
|
|
Error: claudeError,
|
|
StatusCode: statusCode,
|
|
}
|
|
}
|
|
|
|
func ClaudeErrorWrapperLocal(err error, code string, statusCode int) *dto.ClaudeErrorWithStatusCode {
|
|
claudeErr := ClaudeErrorWrapper(err, code, statusCode)
|
|
claudeErr.LocalError = true
|
|
return claudeErr
|
|
}
|
|
|
|
func RelayErrorHandler(ctx context.Context, resp *http.Response, showBodyWhenFail bool) (newApiErr *types.NewAPIError) {
|
|
newApiErr = types.InitOpenAIError(types.ErrorCodeBadResponseStatusCode, resp.StatusCode)
|
|
|
|
responseBody, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return
|
|
}
|
|
CloseResponseBodyGracefully(resp)
|
|
var errResponse dto.GeneralErrorResponse
|
|
responseBodyText := string(responseBody)
|
|
responseBodyPreview := common.LocalLogPreview(responseBodyText)
|
|
buildErrWithBody := func(message string) error {
|
|
if message == "" {
|
|
return fmt.Errorf("bad response status code %d, body: %s", resp.StatusCode, responseBodyText)
|
|
}
|
|
return fmt.Errorf("bad response status code %d, message: %s, body: %s", resp.StatusCode, message, responseBodyText)
|
|
}
|
|
|
|
err = common.Unmarshal(responseBody, &errResponse)
|
|
if err != nil {
|
|
if showBodyWhenFail {
|
|
newApiErr.Err = buildErrWithBody("")
|
|
} else {
|
|
logger.LogError(ctx, common.LogText("bad response status code %d, body: %s", resp.StatusCode, responseBodyPreview))
|
|
newApiErr.Err = fmt.Errorf("bad response status code %d", resp.StatusCode)
|
|
}
|
|
return
|
|
}
|
|
|
|
if common.GetJsonType(errResponse.Error) == "object" {
|
|
// General format error (OpenAI, Anthropic, Gemini, etc.)
|
|
oaiError := errResponse.TryToOpenAIError()
|
|
if oaiError != nil {
|
|
newApiErr = types.WithOpenAIError(*oaiError, resp.StatusCode)
|
|
if showBodyWhenFail {
|
|
newApiErr.Err = buildErrWithBody(newApiErr.Error())
|
|
}
|
|
return
|
|
}
|
|
}
|
|
message := errResponse.ToMessage()
|
|
if message == "" {
|
|
// The body parsed as JSON but carried no usable error message; log the
|
|
// raw body so the upstream failure remains diagnosable.
|
|
logger.LogError(ctx, common.LogText("bad response status code %d with empty error message, body: %s", resp.StatusCode, responseBodyPreview))
|
|
}
|
|
newApiErr = types.NewOpenAIError(errors.New(message), types.ErrorCodeBadResponseStatusCode, resp.StatusCode)
|
|
if showBodyWhenFail {
|
|
newApiErr.Err = buildErrWithBody(newApiErr.Error())
|
|
}
|
|
return
|
|
}
|
|
|
|
func ResetStatusCode(newApiErr *types.NewAPIError, statusCodeMappingStr string) {
|
|
if newApiErr == nil {
|
|
return
|
|
}
|
|
if statusCodeMappingStr == "" || statusCodeMappingStr == "{}" {
|
|
return
|
|
}
|
|
statusCodeMapping := make(map[string]any)
|
|
err := common.Unmarshal([]byte(statusCodeMappingStr), &statusCodeMapping)
|
|
if err != nil {
|
|
return
|
|
}
|
|
if newApiErr.StatusCode == http.StatusOK {
|
|
return
|
|
}
|
|
codeStr := strconv.Itoa(newApiErr.StatusCode)
|
|
if value, ok := statusCodeMapping[codeStr]; ok {
|
|
intCode, ok := parseStatusCodeMappingValue(value)
|
|
if !ok {
|
|
return
|
|
}
|
|
newApiErr.StatusCode = intCode
|
|
}
|
|
}
|
|
|
|
func parseStatusCodeMappingValue(value any) (int, bool) {
|
|
switch v := value.(type) {
|
|
case string:
|
|
if v == "" {
|
|
return 0, false
|
|
}
|
|
statusCode, err := strconv.Atoi(v)
|
|
if err != nil {
|
|
return 0, false
|
|
}
|
|
return statusCode, true
|
|
case float64:
|
|
if v != math.Trunc(v) {
|
|
return 0, false
|
|
}
|
|
return int(v), true
|
|
case int:
|
|
return v, true
|
|
case json.Number:
|
|
statusCode, err := strconv.Atoi(v.String())
|
|
if err != nil {
|
|
return 0, false
|
|
}
|
|
return statusCode, true
|
|
default:
|
|
return 0, false
|
|
}
|
|
}
|
|
|
|
func TaskErrorWrapperLocal(err error, code string, statusCode int) *taskdto.TaskError {
|
|
openaiErr := TaskErrorWrapper(err, code, statusCode)
|
|
openaiErr.LocalError = true
|
|
return openaiErr
|
|
}
|
|
|
|
func TaskErrorWrapper(err error, code string, statusCode int) *taskdto.TaskError {
|
|
text := err.Error()
|
|
lowerText := strings.ToLower(text)
|
|
if strings.Contains(lowerText, "post") || strings.Contains(lowerText, "dial") || strings.Contains(lowerText, "http") {
|
|
common.SysLog(common.LogText("error: %s", text))
|
|
//text = "请求上游地址失败"
|
|
text = common.MaskSensitiveInfo(text)
|
|
}
|
|
//避免暴露内部错误
|
|
taskError := &taskdto.TaskError{
|
|
Code: code,
|
|
Message: text,
|
|
StatusCode: statusCode,
|
|
Error: err,
|
|
}
|
|
|
|
return taskError
|
|
}
|
|
|
|
// TaskErrorFromAPIError 将 PreConsumeBilling 返回的 NewAPIError 转换为 TaskError。
|
|
func TaskErrorFromAPIError(apiErr *types.NewAPIError) *taskdto.TaskError {
|
|
if apiErr == nil {
|
|
return nil
|
|
}
|
|
return &taskdto.TaskError{
|
|
Code: string(apiErr.GetErrorCode()),
|
|
Message: apiErr.Err.Error(),
|
|
StatusCode: apiErr.StatusCode,
|
|
Error: apiErr.Err,
|
|
}
|
|
}
|