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.
149 lines
4.4 KiB
Go
149 lines
4.4 KiB
Go
package controller
|
|
|
|
import (
|
|
"net/http"
|
|
"strconv"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/i18n"
|
|
"github.com/QuantumNous/new-api/model"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func GetAllLogs(c *gin.Context) {
|
|
pageInfo := common.GetPageQuery(c)
|
|
logType, _ := strconv.Atoi(c.Query("type"))
|
|
startTimestamp, _ := strconv.ParseInt(c.Query("start_timestamp"), 10, 64)
|
|
endTimestamp, _ := strconv.ParseInt(c.Query("end_timestamp"), 10, 64)
|
|
username := c.Query("username")
|
|
tokenName := c.Query("token_name")
|
|
modelName := c.Query("model_name")
|
|
channel, _ := strconv.Atoi(c.Query("channel"))
|
|
group := c.Query("group")
|
|
requestId := c.Query("request_id")
|
|
upstreamRequestId := c.Query("upstream_request_id")
|
|
logs, total, err := model.GetAllLogs(logType, startTimestamp, endTimestamp, modelName, username, tokenName, pageInfo.GetStartIdx(), pageInfo.GetPageSize(), channel, group, requestId, upstreamRequestId)
|
|
if err != nil {
|
|
common.ApiError(c, err)
|
|
return
|
|
}
|
|
if c.GetInt("role") < common.RoleRootUser {
|
|
model.FormatAdminLogs(logs)
|
|
} else {
|
|
model.FormatRootLogs(logs)
|
|
}
|
|
pageInfo.SetTotal(int(total))
|
|
pageInfo.SetItems(logs)
|
|
common.ApiSuccess(c, pageInfo)
|
|
return
|
|
}
|
|
|
|
func GetUserLogs(c *gin.Context) {
|
|
pageInfo := common.GetPageQuery(c)
|
|
userId := c.GetInt("id")
|
|
logType, _ := strconv.Atoi(c.Query("type"))
|
|
startTimestamp, _ := strconv.ParseInt(c.Query("start_timestamp"), 10, 64)
|
|
endTimestamp, _ := strconv.ParseInt(c.Query("end_timestamp"), 10, 64)
|
|
tokenName := c.Query("token_name")
|
|
modelName := c.Query("model_name")
|
|
group := c.Query("group")
|
|
requestId := c.Query("request_id")
|
|
upstreamRequestId := c.Query("upstream_request_id")
|
|
logs, total, err := model.GetUserLogs(userId, logType, startTimestamp, endTimestamp, modelName, tokenName, pageInfo.GetStartIdx(), pageInfo.GetPageSize(), group, requestId, upstreamRequestId)
|
|
if err != nil {
|
|
common.ApiError(c, err)
|
|
return
|
|
}
|
|
pageInfo.SetTotal(int(total))
|
|
pageInfo.SetItems(logs)
|
|
common.ApiSuccess(c, pageInfo)
|
|
return
|
|
}
|
|
|
|
// Deprecated: SearchAllLogs 已废弃,前端未使用该接口。
|
|
func SearchAllLogs(c *gin.Context) {
|
|
common.ApiErrorT(c, "This API is deprecated")
|
|
}
|
|
|
|
// Deprecated: SearchUserLogs 已废弃,前端未使用该接口。
|
|
func SearchUserLogs(c *gin.Context) {
|
|
common.ApiErrorT(c, "This API is deprecated")
|
|
}
|
|
|
|
func GetLogByKey(c *gin.Context) {
|
|
tokenId := c.GetInt("token_id")
|
|
if tokenId == 0 {
|
|
common.ApiErrorI18n(c, i18n.MsgTokenInvalid)
|
|
return
|
|
}
|
|
logs, err := model.GetLogByTokenId(tokenId)
|
|
if err != nil {
|
|
c.JSON(200, gin.H{
|
|
"success": false,
|
|
"message": err.Error(),
|
|
})
|
|
return
|
|
}
|
|
c.JSON(200, gin.H{
|
|
"success": true,
|
|
"message": "",
|
|
"data": logs,
|
|
})
|
|
}
|
|
|
|
func GetLogsStat(c *gin.Context) {
|
|
logType, _ := strconv.Atoi(c.Query("type"))
|
|
startTimestamp, _ := strconv.ParseInt(c.Query("start_timestamp"), 10, 64)
|
|
endTimestamp, _ := strconv.ParseInt(c.Query("end_timestamp"), 10, 64)
|
|
tokenName := c.Query("token_name")
|
|
username := c.Query("username")
|
|
modelName := c.Query("model_name")
|
|
channel, _ := strconv.Atoi(c.Query("channel"))
|
|
group := c.Query("group")
|
|
stat, err := model.SumUsedQuota(logType, startTimestamp, endTimestamp, modelName, username, tokenName, channel, group)
|
|
if err != nil {
|
|
common.ApiError(c, err)
|
|
return
|
|
}
|
|
//tokenNum := model.SumUsedToken(logType, startTimestamp, endTimestamp, modelName, username, "")
|
|
c.JSON(http.StatusOK, gin.H{
|
|
"success": true,
|
|
"message": "",
|
|
"data": gin.H{
|
|
"quota": stat.Quota,
|
|
"rpm": stat.Rpm,
|
|
"tpm": stat.Tpm,
|
|
},
|
|
})
|
|
return
|
|
}
|
|
|
|
func GetLogsSelfStat(c *gin.Context) {
|
|
username := c.GetString("username")
|
|
logType, _ := strconv.Atoi(c.Query("type"))
|
|
startTimestamp, _ := strconv.ParseInt(c.Query("start_timestamp"), 10, 64)
|
|
endTimestamp, _ := strconv.ParseInt(c.Query("end_timestamp"), 10, 64)
|
|
tokenName := c.Query("token_name")
|
|
modelName := c.Query("model_name")
|
|
channel, _ := strconv.Atoi(c.Query("channel"))
|
|
group := c.Query("group")
|
|
quotaNum, err := model.SumUsedQuota(logType, startTimestamp, endTimestamp, modelName, username, tokenName, channel, group)
|
|
if err != nil {
|
|
common.ApiError(c, err)
|
|
return
|
|
}
|
|
//tokenNum := model.SumUsedToken(logType, startTimestamp, endTimestamp, modelName, username, tokenName)
|
|
c.JSON(200, gin.H{
|
|
"success": true,
|
|
"message": "",
|
|
"data": gin.H{
|
|
"quota": quotaNum.Quota,
|
|
"rpm": quotaNum.Rpm,
|
|
"tpm": quotaNum.Tpm,
|
|
//"token": tokenNum,
|
|
},
|
|
})
|
|
return
|
|
}
|