mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-10-28 08:35:33 +08:00
Calcium-Ion
128089fa7d
* 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.
202 lines
8.3 KiB
Go
202 lines
8.3 KiB
Go
package model
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func seedSubscriptionResetPlan(t *testing.T, plan *SubscriptionPlan) {
|
|
t.Helper()
|
|
require.NoError(t, DB.Create(plan).Error)
|
|
}
|
|
|
|
func seedSubscriptionResetSub(t *testing.T, sub *UserSubscription) {
|
|
t.Helper()
|
|
require.NoError(t, DB.Create(sub).Error)
|
|
}
|
|
|
|
func getSubscriptionResetSub(t *testing.T, id int) UserSubscription {
|
|
t.Helper()
|
|
var sub UserSubscription
|
|
require.NoError(t, DB.Where("id = ?", id).First(&sub).Error)
|
|
return sub
|
|
}
|
|
|
|
func TestAdminResetUserSubscriptionsByPlanResetsAllActiveMatchesAndAdvancesTime(t *testing.T) {
|
|
truncateTables(t)
|
|
|
|
now := GetDBTimestamp()
|
|
plan := &SubscriptionPlan{
|
|
Id: 9101,
|
|
Title: "Pro",
|
|
PriceAmount: 10,
|
|
DurationUnit: SubscriptionDurationMonth,
|
|
DurationValue: 1,
|
|
TotalAmount: 1000,
|
|
QuotaResetPeriod: SubscriptionResetDaily,
|
|
}
|
|
otherPlan := &SubscriptionPlan{
|
|
Id: 9102,
|
|
Title: "Basic",
|
|
PriceAmount: 1,
|
|
DurationUnit: SubscriptionDurationMonth,
|
|
DurationValue: 1,
|
|
TotalAmount: 100,
|
|
QuotaResetPeriod: SubscriptionResetDaily,
|
|
}
|
|
seedSubscriptionResetPlan(t, plan)
|
|
seedSubscriptionResetPlan(t, otherPlan)
|
|
|
|
activeEnd := now + 30*24*3600
|
|
expiredEnd := now - 1
|
|
seedSubscriptionResetSub(t, &UserSubscription{Id: 9201, UserId: 101, PlanId: plan.Id, AmountTotal: 1000, AmountUsed: 300, StartTime: now - 3600, EndTime: activeEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now + 120})
|
|
seedSubscriptionResetSub(t, &UserSubscription{Id: 9202, UserId: 101, PlanId: plan.Id, AmountTotal: 1000, AmountUsed: 500, StartTime: now - 3600, EndTime: activeEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now + 120})
|
|
seedSubscriptionResetSub(t, &UserSubscription{Id: 9203, UserId: 101, PlanId: otherPlan.Id, AmountTotal: 100, AmountUsed: 60, StartTime: now - 3600, EndTime: activeEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now + 120})
|
|
seedSubscriptionResetSub(t, &UserSubscription{Id: 9204, UserId: 101, PlanId: plan.Id, AmountTotal: 1000, AmountUsed: 700, StartTime: now - 7200, EndTime: expiredEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now - 10})
|
|
seedSubscriptionResetSub(t, &UserSubscription{Id: 9205, UserId: 102, PlanId: plan.Id, AmountTotal: 1000, AmountUsed: 800, StartTime: now - 3600, EndTime: activeEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now + 120})
|
|
seedSubscriptionResetSub(t, &UserSubscription{Id: 9206, UserId: 101, PlanId: plan.Id, AmountTotal: 1000, AmountUsed: 900, StartTime: now - 3600, EndTime: activeEnd, Status: "cancelled", LastResetTime: now - 3600, NextResetTime: now + 120})
|
|
|
|
beforeReset := GetDBTimestamp()
|
|
result, err := AdminResetUserSubscriptionsByPlan(101, plan.Id, true)
|
|
afterReset := GetDBTimestamp()
|
|
|
|
require.NoError(t, err)
|
|
require.NotNil(t, result)
|
|
assert.Equal(t, plan.Id, result.PlanId)
|
|
assert.Equal(t, 2, result.MatchedCount)
|
|
assert.Equal(t, 2, result.ResetCount)
|
|
assert.Equal(t, 1, result.UserCount)
|
|
assert.Equal(t, []int{101}, result.AffectedUserIds)
|
|
assert.True(t, result.AdvanceResetTime)
|
|
|
|
for _, id := range []int{9201, 9202} {
|
|
sub := getSubscriptionResetSub(t, id)
|
|
assert.Zero(t, sub.AmountUsed)
|
|
assert.GreaterOrEqual(t, sub.LastResetTime, beforeReset)
|
|
assert.LessOrEqual(t, sub.LastResetTime, afterReset)
|
|
assert.Equal(t, calcNextResetTime(time.Unix(sub.LastResetTime, 0), plan, sub.EndTime), sub.NextResetTime)
|
|
}
|
|
assert.EqualValues(t, 60, getSubscriptionResetSub(t, 9203).AmountUsed)
|
|
assert.EqualValues(t, 700, getSubscriptionResetSub(t, 9204).AmountUsed)
|
|
assert.EqualValues(t, 800, getSubscriptionResetSub(t, 9205).AmountUsed)
|
|
assert.EqualValues(t, 900, getSubscriptionResetSub(t, 9206).AmountUsed)
|
|
}
|
|
|
|
func TestAdminResetUserSubscriptionsByPlanKeepsResetTimes(t *testing.T) {
|
|
truncateTables(t)
|
|
|
|
now := GetDBTimestamp()
|
|
plan := &SubscriptionPlan{
|
|
Id: 9301,
|
|
Title: "Team",
|
|
PriceAmount: 20,
|
|
DurationUnit: SubscriptionDurationMonth,
|
|
DurationValue: 1,
|
|
TotalAmount: 2000,
|
|
QuotaResetPeriod: SubscriptionResetMonthly,
|
|
}
|
|
seedSubscriptionResetPlan(t, plan)
|
|
|
|
lastReset := now - 86400
|
|
nextReset := now + 86400
|
|
seedSubscriptionResetSub(t, &UserSubscription{Id: 9302, UserId: 201, PlanId: plan.Id, AmountTotal: 2000, AmountUsed: 1200, StartTime: now - 172800, EndTime: now + 30*24*3600, Status: "active", LastResetTime: lastReset, NextResetTime: nextReset})
|
|
|
|
result, err := AdminResetUserSubscriptionsByPlan(201, plan.Id, false)
|
|
|
|
require.NoError(t, err)
|
|
assert.False(t, result.AdvanceResetTime)
|
|
sub := getSubscriptionResetSub(t, 9302)
|
|
assert.Zero(t, sub.AmountUsed)
|
|
assert.Equal(t, lastReset, sub.LastResetTime)
|
|
assert.Equal(t, nextReset, sub.NextResetTime)
|
|
}
|
|
|
|
func TestAdminResetUserSubscriptionsByPlanNoActiveMatchReturnsError(t *testing.T) {
|
|
truncateTables(t)
|
|
|
|
now := GetDBTimestamp()
|
|
plan := &SubscriptionPlan{
|
|
Id: 9401,
|
|
Title: "Expired",
|
|
PriceAmount: 10,
|
|
DurationUnit: SubscriptionDurationMonth,
|
|
DurationValue: 1,
|
|
TotalAmount: 1000,
|
|
}
|
|
seedSubscriptionResetPlan(t, plan)
|
|
seedSubscriptionResetSub(t, &UserSubscription{Id: 9402, UserId: 301, PlanId: plan.Id, AmountTotal: 1000, AmountUsed: 500, StartTime: now - 7200, EndTime: now - 1, Status: "active"})
|
|
|
|
result, err := AdminResetUserSubscriptionsByPlan(301, plan.Id, true)
|
|
|
|
require.Error(t, err)
|
|
assert.Nil(t, result)
|
|
assert.True(t, strings.Contains(err.Error(), "This user has no active subscription to this plan"))
|
|
}
|
|
|
|
func TestAdminResetPlanSubscriptionsResetsAllActiveUsers(t *testing.T) {
|
|
truncateTables(t)
|
|
|
|
now := GetDBTimestamp()
|
|
plan := &SubscriptionPlan{
|
|
Id: 9501,
|
|
Title: "Business",
|
|
PriceAmount: 30,
|
|
DurationUnit: SubscriptionDurationMonth,
|
|
DurationValue: 1,
|
|
TotalAmount: 3000,
|
|
QuotaResetPeriod: SubscriptionResetNever,
|
|
}
|
|
seedSubscriptionResetPlan(t, plan)
|
|
|
|
activeEnd := now + 30*24*3600
|
|
seedSubscriptionResetSub(t, &UserSubscription{Id: 9502, UserId: 401, PlanId: plan.Id, AmountTotal: 3000, AmountUsed: 1000, StartTime: now - 3600, EndTime: activeEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now + 10})
|
|
seedSubscriptionResetSub(t, &UserSubscription{Id: 9503, UserId: 401, PlanId: plan.Id, AmountTotal: 3000, AmountUsed: 1100, StartTime: now - 3500, EndTime: activeEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now + 10})
|
|
seedSubscriptionResetSub(t, &UserSubscription{Id: 9504, UserId: 402, PlanId: plan.Id, AmountTotal: 3000, AmountUsed: 1200, StartTime: now - 3400, EndTime: activeEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now + 10})
|
|
seedSubscriptionResetSub(t, &UserSubscription{Id: 9505, UserId: 403, PlanId: plan.Id, AmountTotal: 3000, AmountUsed: 1300, StartTime: now - 7200, EndTime: now - 1, Status: "active", LastResetTime: now - 3600, NextResetTime: now - 10})
|
|
seedSubscriptionResetSub(t, &UserSubscription{Id: 9506, UserId: 404, PlanId: plan.Id, AmountTotal: 3000, AmountUsed: 1400, StartTime: now - 3600, EndTime: activeEnd, Status: "cancelled", LastResetTime: now - 3600, NextResetTime: now + 10})
|
|
|
|
result, err := AdminResetPlanSubscriptions(plan.Id, true)
|
|
|
|
require.NoError(t, err)
|
|
require.NotNil(t, result)
|
|
assert.Equal(t, 3, result.MatchedCount)
|
|
assert.Equal(t, 3, result.ResetCount)
|
|
assert.Equal(t, 2, result.UserCount)
|
|
assert.Equal(t, []int{401, 402}, result.AffectedUserIds)
|
|
for _, id := range []int{9502, 9503, 9504} {
|
|
sub := getSubscriptionResetSub(t, id)
|
|
assert.Zero(t, sub.AmountUsed)
|
|
assert.Zero(t, sub.LastResetTime)
|
|
assert.Zero(t, sub.NextResetTime)
|
|
}
|
|
assert.EqualValues(t, 1300, getSubscriptionResetSub(t, 9505).AmountUsed)
|
|
assert.EqualValues(t, 1400, getSubscriptionResetSub(t, 9506).AmountUsed)
|
|
}
|
|
|
|
func TestAdminResetPlanSubscriptionsNoMatchSucceeds(t *testing.T) {
|
|
truncateTables(t)
|
|
|
|
plan := &SubscriptionPlan{
|
|
Id: 9601,
|
|
Title: "Empty",
|
|
PriceAmount: 10,
|
|
DurationUnit: SubscriptionDurationMonth,
|
|
DurationValue: 1,
|
|
TotalAmount: 1000,
|
|
}
|
|
seedSubscriptionResetPlan(t, plan)
|
|
|
|
result, err := AdminResetPlanSubscriptions(plan.Id, true)
|
|
|
|
require.NoError(t, err)
|
|
require.NotNil(t, result)
|
|
assert.Zero(t, result.MatchedCount)
|
|
assert.Zero(t, result.ResetCount)
|
|
assert.Zero(t, result.UserCount)
|
|
assert.Empty(t, result.AffectedUserIds)
|
|
}
|