mirror of
https://gh-proxy.org/https://github.com/klinsmaya/new-api.git
synced 2026-11-08 01:17:09 +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.
112 lines
3.8 KiB
Go
112 lines
3.8 KiB
Go
package relay
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"strings"
|
|
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
relayconstant "github.com/QuantumNous/new-api/relay/constant"
|
|
"github.com/QuantumNous/new-api/relay/helper"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
"github.com/QuantumNous/new-api/service"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func ResponsesHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *types.NewAPIError) {
|
|
var responsesReq *dto.OpenAIResponsesRequest
|
|
switch req := info.Request.(type) {
|
|
case *dto.OpenAIResponsesRequest:
|
|
responsesReq = req
|
|
case *dto.OpenAIResponsesCompactionRequest:
|
|
// Only fields documented for POST /v1/responses/compact are forwarded:
|
|
// model, input, instructions, previous_response_id, prompt_cache_key,
|
|
// prompt_cache_options, prompt_cache_retention, service_tier.
|
|
// Undocumented Codex-parity fields (tools, reasoning, text) are parsed
|
|
// for client compatibility but intentionally not sent upstream.
|
|
responsesReq = &dto.OpenAIResponsesRequest{
|
|
Model: req.Model,
|
|
Input: req.Input,
|
|
Instructions: req.Instructions,
|
|
PreviousResponseID: req.PreviousResponseID,
|
|
ParallelToolCalls: req.ParallelToolCalls,
|
|
ServiceTier: req.ServiceTier,
|
|
PromptCacheKey: req.PromptCacheKey,
|
|
PromptCacheOptions: req.PromptCacheOptions,
|
|
PromptCacheRetention: req.PromptCacheRetention,
|
|
}
|
|
default:
|
|
return types.NewErrorWithStatusCode(
|
|
fmt.Errorf("invalid request type, expected dto.OpenAIResponsesRequest or dto.OpenAIResponsesCompactionRequest, got %T", info.Request),
|
|
types.ErrorCodeInvalidRequest,
|
|
http.StatusBadRequest,
|
|
types.ErrOptionWithSkipRetry(),
|
|
)
|
|
}
|
|
|
|
adaptor, requestBody, closer, apiErr := PrepareResponsesRequest(c, info, responsesReq)
|
|
if apiErr != nil {
|
|
return apiErr
|
|
}
|
|
defer closer.Close()
|
|
|
|
var httpResp *http.Response
|
|
resp, err := adaptor.DoRequest(c, info, requestBody)
|
|
if err != nil {
|
|
return types.NewOpenAIError(err, types.ErrorCodeDoRequestFailed, http.StatusInternalServerError)
|
|
}
|
|
|
|
statusCodeMappingStr := c.GetString("status_code_mapping")
|
|
|
|
if resp != nil {
|
|
httpResp = resp.(*http.Response)
|
|
|
|
if httpResp.StatusCode != http.StatusOK {
|
|
newAPIError = service.RelayErrorHandler(c.Request.Context(), httpResp, false)
|
|
// reset status code 重置状态码
|
|
service.ResetStatusCode(newAPIError, statusCodeMappingStr)
|
|
return newAPIError
|
|
}
|
|
}
|
|
|
|
usage, newAPIError := adaptor.DoResponse(c, httpResp, info)
|
|
if newAPIError != nil {
|
|
// reset status code 重置状态码
|
|
service.ResetStatusCode(newAPIError, statusCodeMappingStr)
|
|
return newAPIError
|
|
}
|
|
|
|
usageDto := usage.(*dto.Usage)
|
|
if info.RelayMode == relayconstant.RelayModeResponsesCompact {
|
|
originModelName := info.OriginModelName
|
|
originPriceData := info.PriceData
|
|
|
|
_, err := helper.ModelPriceHelper(c, info, info.GetEstimatePromptTokens(), &types.TokenCountMeta{})
|
|
if err != nil {
|
|
info.OriginModelName = originModelName
|
|
info.PriceData = originPriceData
|
|
return types.NewError(err, types.ErrorCodeModelPriceError, types.ErrOptionWithSkipRetry(), types.ErrOptionWithStatusCode(http.StatusBadRequest))
|
|
}
|
|
service.PostTextConsumeQuota(c, info, usageDto, nil)
|
|
|
|
info.OriginModelName = originModelName
|
|
info.PriceData = originPriceData
|
|
return nil
|
|
}
|
|
|
|
ConsumeResponsesQuota(c, info, usageDto)
|
|
return nil
|
|
}
|
|
|
|
// ConsumeResponsesQuota applies the same settlement dispatch to HTTP and
|
|
// WebSocket Responses usage. Compact requests keep their separate repricing.
|
|
func ConsumeResponsesQuota(c *gin.Context, info *relaycommon.RelayInfo, usage *dto.Usage) {
|
|
if strings.HasPrefix(info.OriginModelName, "gpt-4o-audio") {
|
|
service.PostAudioConsumeQuota(c, info, usage, nil)
|
|
return
|
|
}
|
|
service.PostTextConsumeQuota(c, info, usage, nil)
|
|
}
|