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.
330 lines
9.8 KiB
Go
330 lines
9.8 KiB
Go
package controller
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/dto"
|
|
"github.com/QuantumNous/new-api/logger"
|
|
"github.com/QuantumNous/new-api/model"
|
|
"github.com/QuantumNous/new-api/service"
|
|
"github.com/QuantumNous/new-api/setting"
|
|
"github.com/QuantumNous/new-api/setting/system_setting"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
// midjourneyPollSummary is the result recorded on a midjourney_poll system task
|
|
// row, summarizing one polling pass.
|
|
type midjourneyPollSummary struct {
|
|
UnfinishedTasks int `json:"unfinished_tasks"`
|
|
ChannelsScanned int `json:"channels_scanned"`
|
|
NullTasksFailed int `json:"null_tasks_failed"`
|
|
}
|
|
|
|
// runMidjourneyTaskUpdateOnce performs one Midjourney polling pass synchronously.
|
|
// It honors ctx cancellation (the system-task runner cancels it when the lease
|
|
// is lost) and, when report is non-nil, reports progress as (processedChannels,
|
|
// totalChannels) so the system task surfaces a percentage.
|
|
func runMidjourneyTaskUpdateOnce(ctx context.Context, report func(processed, total int)) midjourneyPollSummary {
|
|
summary := midjourneyPollSummary{}
|
|
if ctx == nil {
|
|
ctx = context.Background()
|
|
}
|
|
|
|
tasks := model.GetAllUnFinishTasks()
|
|
if len(tasks) == 0 {
|
|
return summary
|
|
}
|
|
summary.UnfinishedTasks = len(tasks)
|
|
|
|
logger.LogInfo(ctx, common.LogText("unfinished tasks found: %v", len(tasks)))
|
|
taskChannelM := make(map[int][]string)
|
|
taskM := make(map[string]*model.Midjourney)
|
|
nullTaskIds := make([]int, 0)
|
|
for _, task := range tasks {
|
|
if task.MjId == "" {
|
|
// 统计失败的未完成任务
|
|
nullTaskIds = append(nullTaskIds, task.Id)
|
|
continue
|
|
}
|
|
taskM[task.MjId] = task
|
|
taskChannelM[task.ChannelId] = append(taskChannelM[task.ChannelId], task.MjId)
|
|
}
|
|
if len(nullTaskIds) > 0 {
|
|
summary.NullTasksFailed = len(nullTaskIds)
|
|
err := model.MjBulkUpdateByTaskIds(nullTaskIds, map[string]any{
|
|
"status": "FAILURE",
|
|
"progress": "100%",
|
|
})
|
|
if err != nil {
|
|
logger.LogError(ctx, common.LogText("Fix null mj_id task error: %v", err))
|
|
} else {
|
|
logger.LogInfo(ctx, common.LogText("Fix null mj_id task success: %v", nullTaskIds))
|
|
}
|
|
}
|
|
if len(taskChannelM) == 0 {
|
|
return summary
|
|
}
|
|
|
|
totalChannels := len(taskChannelM)
|
|
processedChannels := 0
|
|
for channelId, taskIds := range taskChannelM {
|
|
if ctx != nil && ctx.Err() != nil {
|
|
break
|
|
}
|
|
if report != nil {
|
|
report(processedChannels, totalChannels)
|
|
}
|
|
processedChannels++
|
|
summary.ChannelsScanned++
|
|
logger.LogInfo(ctx, common.LogText("channel #%d has %d unfinished tasks", channelId, len(taskIds)))
|
|
if len(taskIds) == 0 {
|
|
continue
|
|
}
|
|
midjourneyChannel, err := model.CacheGetChannel(channelId)
|
|
if err != nil {
|
|
logger.LogError(ctx, common.LogText("CacheGetChannel: %v", err))
|
|
err := model.MjBulkUpdate(taskIds, map[string]any{
|
|
"fail_reason": "Failed to get the channel information. Please contact the administrator",
|
|
"status": "FAILURE",
|
|
"progress": "100%",
|
|
})
|
|
if err != nil {
|
|
logger.LogInfo(ctx, common.LogText("UpdateMidjourneyTask error: %v", err))
|
|
}
|
|
continue
|
|
}
|
|
requestUrl := fmt.Sprintf("%s/mj/task/list-by-condition", *midjourneyChannel.BaseURL)
|
|
|
|
body, err := common.Marshal(map[string]any{
|
|
"ids": taskIds,
|
|
})
|
|
if err != nil {
|
|
logger.LogError(ctx, common.LogText("Get Task marshal body error: %v", err))
|
|
continue
|
|
}
|
|
timeout := time.Second * 15
|
|
requestCtx, cancel := context.WithTimeout(ctx, timeout)
|
|
req, err := http.NewRequestWithContext(requestCtx, "POST", requestUrl, bytes.NewBuffer(body))
|
|
if err != nil {
|
|
cancel()
|
|
logger.LogError(ctx, common.LogText("Get Task error: %v", err))
|
|
continue
|
|
}
|
|
req.Header.Set("Content-Type", "application/json")
|
|
req.Header.Set("mj-api-secret", midjourneyChannel.Key)
|
|
resp, err := service.GetHttpClient().Do(req)
|
|
if err != nil {
|
|
logger.LogError(ctx, common.LogText("Get Task Do req error: %v", err))
|
|
cancel()
|
|
continue
|
|
}
|
|
if resp.StatusCode != http.StatusOK {
|
|
logger.LogError(ctx, common.LogText("Get Task status code: %d", resp.StatusCode))
|
|
resp.Body.Close()
|
|
cancel()
|
|
continue
|
|
}
|
|
responseBody, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
logger.LogError(ctx, common.LogText("Get Mjp Task parse body error: %v", err))
|
|
resp.Body.Close()
|
|
cancel()
|
|
continue
|
|
}
|
|
var responseItems []dto.MidjourneyDto
|
|
err = common.Unmarshal(responseBody, &responseItems)
|
|
if err != nil {
|
|
logger.LogError(ctx, common.LogText("Get Mjp Task parse body error2: %v, body: %s", err, string(responseBody)))
|
|
resp.Body.Close()
|
|
cancel()
|
|
continue
|
|
}
|
|
resp.Body.Close()
|
|
req.Body.Close()
|
|
cancel()
|
|
|
|
for _, responseItem := range responseItems {
|
|
task := taskM[responseItem.MjId]
|
|
if task == nil {
|
|
logger.LogWarn(ctx, common.LogText("Midjourney task response ignored: unknown mj_id=%s", responseItem.MjId))
|
|
continue
|
|
}
|
|
|
|
useTime := (time.Now().UnixNano() / int64(time.Millisecond)) - task.SubmitTime
|
|
// 如果时间超过一小时,且进度不是100%,则认为任务失败
|
|
if useTime > 3600000 && task.Progress != "100%" {
|
|
responseItem.FailReason = "Upstream task timed out (over 1 hour)"
|
|
responseItem.Status = "FAILURE"
|
|
}
|
|
if !checkMjTaskNeedUpdate(task, responseItem) {
|
|
continue
|
|
}
|
|
preStatus := task.Status
|
|
task.Code = 1
|
|
task.Progress = responseItem.Progress
|
|
task.PromptEn = responseItem.PromptEn
|
|
task.State = responseItem.State
|
|
task.SubmitTime = responseItem.SubmitTime
|
|
task.StartTime = responseItem.StartTime
|
|
task.FinishTime = responseItem.FinishTime
|
|
task.ImageUrl = responseItem.ImageUrl
|
|
task.Status = responseItem.Status
|
|
task.FailReason = responseItem.FailReason
|
|
if responseItem.Properties != nil {
|
|
propertiesStr, _ := common.Marshal(responseItem.Properties)
|
|
task.Properties = string(propertiesStr)
|
|
}
|
|
if responseItem.Buttons != nil {
|
|
buttonStr, _ := common.Marshal(responseItem.Buttons)
|
|
task.Buttons = string(buttonStr)
|
|
}
|
|
// 映射 VideoUrl
|
|
task.VideoUrl = responseItem.VideoUrl
|
|
|
|
// 映射 VideoUrls - 将数组序列化为 JSON 字符串
|
|
if responseItem.VideoUrls != nil && len(responseItem.VideoUrls) > 0 {
|
|
videoUrlsStr, err := common.Marshal(responseItem.VideoUrls)
|
|
if err != nil {
|
|
logger.LogError(ctx, common.LogText("failed to serialize VideoUrls: %v", err))
|
|
task.VideoUrls = "[]" // 失败时设置为空数组
|
|
} else {
|
|
task.VideoUrls = string(videoUrlsStr)
|
|
}
|
|
} else {
|
|
task.VideoUrls = "" // 空值时清空字段
|
|
}
|
|
|
|
shouldReturnQuota := false
|
|
if (task.Progress != "100%" && responseItem.FailReason != "") || (task.Progress == "100%" && task.Status == "FAILURE") {
|
|
logger.LogInfo(ctx, common.LogText("%s failed: %s", task.MjId, task.FailReason))
|
|
task.Progress = "100%"
|
|
if task.Quota != 0 {
|
|
shouldReturnQuota = true
|
|
}
|
|
}
|
|
won, err := task.UpdateWithStatus(preStatus)
|
|
if err != nil {
|
|
logger.LogError(ctx, common.LogText("UpdateMidjourneyTask task error: %s", err.Error()))
|
|
} else if won && shouldReturnQuota {
|
|
service.RefundMidjourneyQuota(ctx, task, "Composition failed")
|
|
}
|
|
}
|
|
}
|
|
if report != nil && (ctx == nil || ctx.Err() == nil) {
|
|
report(totalChannels, totalChannels)
|
|
}
|
|
return summary
|
|
}
|
|
|
|
func checkMjTaskNeedUpdate(oldTask *model.Midjourney, newTask dto.MidjourneyDto) bool {
|
|
if oldTask.Code != 1 {
|
|
return true
|
|
}
|
|
if oldTask.Progress != newTask.Progress {
|
|
return true
|
|
}
|
|
if oldTask.PromptEn != newTask.PromptEn {
|
|
return true
|
|
}
|
|
if oldTask.State != newTask.State {
|
|
return true
|
|
}
|
|
if oldTask.SubmitTime != newTask.SubmitTime {
|
|
return true
|
|
}
|
|
if oldTask.StartTime != newTask.StartTime {
|
|
return true
|
|
}
|
|
if oldTask.FinishTime != newTask.FinishTime {
|
|
return true
|
|
}
|
|
if oldTask.ImageUrl != newTask.ImageUrl {
|
|
return true
|
|
}
|
|
if oldTask.Status != newTask.Status {
|
|
return true
|
|
}
|
|
if oldTask.FailReason != newTask.FailReason {
|
|
return true
|
|
}
|
|
if oldTask.FinishTime != newTask.FinishTime {
|
|
return true
|
|
}
|
|
if oldTask.Progress != "100%" && newTask.FailReason != "" {
|
|
return true
|
|
}
|
|
// 检查 VideoUrl 是否需要更新
|
|
if oldTask.VideoUrl != newTask.VideoUrl {
|
|
return true
|
|
}
|
|
// 检查 VideoUrls 是否需要更新
|
|
if newTask.VideoUrls != nil && len(newTask.VideoUrls) > 0 {
|
|
newVideoUrlsStr, _ := common.Marshal(newTask.VideoUrls)
|
|
if oldTask.VideoUrls != string(newVideoUrlsStr) {
|
|
return true
|
|
}
|
|
} else if oldTask.VideoUrls != "" {
|
|
// 如果新数据没有 VideoUrls 但旧数据有,需要更新(清空)
|
|
return true
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
func GetAllMidjourney(c *gin.Context) {
|
|
pageInfo := common.GetPageQuery(c)
|
|
|
|
// 解析其他查询参数
|
|
queryParams := model.TaskQueryParams{
|
|
ChannelID: c.Query("channel_id"),
|
|
MjID: c.Query("mj_id"),
|
|
StartTimestamp: c.Query("start_timestamp"),
|
|
EndTimestamp: c.Query("end_timestamp"),
|
|
}
|
|
|
|
items := model.GetAllTasks(pageInfo.GetStartIdx(), pageInfo.GetPageSize(), queryParams)
|
|
total := model.CountAllTasks(queryParams)
|
|
|
|
if setting.MjForwardUrlEnabled {
|
|
for i, midjourney := range items {
|
|
midjourney.ImageUrl = system_setting.ServerAddress + "/mj/image/" + midjourney.MjId
|
|
items[i] = midjourney
|
|
}
|
|
}
|
|
pageInfo.SetTotal(int(total))
|
|
pageInfo.SetItems(items)
|
|
common.ApiSuccess(c, pageInfo)
|
|
}
|
|
|
|
func GetUserMidjourney(c *gin.Context) {
|
|
pageInfo := common.GetPageQuery(c)
|
|
|
|
userId := c.GetInt("id")
|
|
|
|
queryParams := model.TaskQueryParams{
|
|
MjID: c.Query("mj_id"),
|
|
StartTimestamp: c.Query("start_timestamp"),
|
|
EndTimestamp: c.Query("end_timestamp"),
|
|
}
|
|
|
|
items := model.GetAllUserTask(userId, pageInfo.GetStartIdx(), pageInfo.GetPageSize(), queryParams)
|
|
total := model.CountAllUserTask(userId, queryParams)
|
|
|
|
if setting.MjForwardUrlEnabled {
|
|
for i, midjourney := range items {
|
|
midjourney.ImageUrl = system_setting.ServerAddress + "/mj/image/" + midjourney.MjId
|
|
items[i] = midjourney
|
|
}
|
|
}
|
|
pageInfo.SetTotal(int(total))
|
|
pageInfo.SetItems(items)
|
|
common.ApiSuccess(c, pageInfo)
|
|
}
|