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.
166 lines
4.6 KiB
Go
166 lines
4.6 KiB
Go
package controller
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/constant"
|
|
"github.com/QuantumNous/new-api/model"
|
|
"github.com/QuantumNous/new-api/relay/channel/codex"
|
|
"github.com/QuantumNous/new-api/service"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func GetCodexChannelUsage(c *gin.Context) {
|
|
fetchCodexChannelWhamData(
|
|
c,
|
|
service.FetchCodexWhamUsage,
|
|
common.LogText("failed to fetch codex usage"),
|
|
"Failed to fetch usage. Please try again later",
|
|
)
|
|
}
|
|
|
|
func GetCodexChannelRateLimitResetCredits(c *gin.Context) {
|
|
fetchCodexChannelWhamData(
|
|
c,
|
|
service.FetchCodexWhamRateLimitResetCredits,
|
|
common.LogText("failed to fetch codex reset credits"),
|
|
"Failed to fetch reset credit details. Please try again later",
|
|
)
|
|
}
|
|
|
|
func ResetCodexChannelUsage(c *gin.Context) {
|
|
fetchCodexChannelWhamData(
|
|
c,
|
|
service.ConsumeCodexWhamRateLimitResetCredit,
|
|
common.LogText("failed to reset codex usage"),
|
|
"Failed to reset usage. Please try again later",
|
|
)
|
|
}
|
|
|
|
type codexWhamFetchFunc func(
|
|
ctx context.Context,
|
|
client *http.Client,
|
|
baseURL string,
|
|
accessToken string,
|
|
accountID string,
|
|
) (statusCode int, body []byte, err error)
|
|
|
|
func fetchCodexChannelWhamData(
|
|
c *gin.Context,
|
|
fetch codexWhamFetchFunc,
|
|
logPrefix string,
|
|
userMessage string,
|
|
) {
|
|
channelId, err := strconv.Atoi(c.Param("id"))
|
|
if err != nil {
|
|
common.ApiError(c, fmt.Errorf("invalid channel id: %w", err))
|
|
return
|
|
}
|
|
|
|
ch, err := model.GetChannelById(channelId, true)
|
|
if err != nil {
|
|
common.ApiError(c, err)
|
|
return
|
|
}
|
|
if ch == nil {
|
|
c.JSON(http.StatusOK, gin.H{"success": false, "message": "channel not found"})
|
|
return
|
|
}
|
|
if ch.Type != constant.ChannelTypeCodex {
|
|
c.JSON(http.StatusOK, gin.H{"success": false, "message": "channel type is not Codex"})
|
|
return
|
|
}
|
|
if ch.ChannelInfo.IsMultiKey {
|
|
c.JSON(http.StatusOK, gin.H{"success": false, "message": "multi-key channel is not supported"})
|
|
return
|
|
}
|
|
|
|
oauthKey, err := codex.ParseOAuthKey(strings.TrimSpace(ch.Key))
|
|
if err != nil {
|
|
common.SysError(common.LogText("failed to parse oauth key: %s", err.Error()))
|
|
common.ApiErrorT(c, "Failed to parse credentials. Please check the channel configuration")
|
|
return
|
|
}
|
|
accessToken := strings.TrimSpace(oauthKey.AccessToken)
|
|
accountID := strings.TrimSpace(oauthKey.AccountID)
|
|
if accessToken == "" {
|
|
c.JSON(http.StatusOK, gin.H{"success": false, "message": "codex channel: access_token is required"})
|
|
return
|
|
}
|
|
if accountID == "" {
|
|
c.JSON(http.StatusOK, gin.H{"success": false, "message": "codex channel: account_id is required"})
|
|
return
|
|
}
|
|
|
|
client, err := service.GetHttpClientWithProxy(ch.GetSetting().Proxy)
|
|
if err != nil {
|
|
common.ApiError(c, err)
|
|
return
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(c.Request.Context(), 15*time.Second)
|
|
defer cancel()
|
|
|
|
statusCode, body, err := fetch(ctx, client, ch.GetBaseURL(), accessToken, accountID)
|
|
if err != nil {
|
|
common.SysError(logPrefix + ": " + err.Error())
|
|
common.ApiErrorT(c, userMessage)
|
|
return
|
|
}
|
|
|
|
if (statusCode == http.StatusUnauthorized || statusCode == http.StatusForbidden) && strings.TrimSpace(oauthKey.RefreshToken) != "" {
|
|
refreshCtx, refreshCancel := context.WithTimeout(c.Request.Context(), 10*time.Second)
|
|
defer refreshCancel()
|
|
|
|
res, refreshErr := service.RefreshCodexOAuthTokenWithProxy(refreshCtx, oauthKey.RefreshToken, ch.GetSetting().Proxy)
|
|
if refreshErr == nil {
|
|
oauthKey.AccessToken = res.AccessToken
|
|
oauthKey.RefreshToken = res.RefreshToken
|
|
oauthKey.LastRefresh = time.Now().Format(time.RFC3339)
|
|
oauthKey.Expired = res.ExpiresAt.Format(time.RFC3339)
|
|
if strings.TrimSpace(oauthKey.Type) == "" {
|
|
oauthKey.Type = "codex"
|
|
}
|
|
|
|
encoded, encErr := common.Marshal(oauthKey)
|
|
if encErr == nil {
|
|
_ = model.DB.Model(&model.Channel{}).Where("id = ?", ch.Id).Update("key", string(encoded)).Error
|
|
model.InitChannelCache()
|
|
}
|
|
|
|
ctx2, cancel2 := context.WithTimeout(c.Request.Context(), 15*time.Second)
|
|
defer cancel2()
|
|
statusCode, body, err = fetch(ctx2, client, ch.GetBaseURL(), oauthKey.AccessToken, accountID)
|
|
if err != nil {
|
|
common.SysError(common.LogText("%s after refresh: %s", logPrefix, err.Error()))
|
|
common.ApiErrorT(c, userMessage)
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
var payload any
|
|
if common.Unmarshal(body, &payload) != nil {
|
|
payload = string(body)
|
|
}
|
|
|
|
ok := statusCode >= 200 && statusCode < 300
|
|
resp := gin.H{
|
|
"success": ok,
|
|
"message": "",
|
|
"upstream_status": statusCode,
|
|
"data": payload,
|
|
}
|
|
if !ok {
|
|
resp["message"] = fmt.Sprintf("upstream status: %d", statusCode)
|
|
}
|
|
c.JSON(http.StatusOK, resp)
|
|
}
|