Repository navigation
feat: CNY localization, channel UX fixes, and JSON editor improvements #4832
+1,935
−337
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,8 @@ | ||
| # Frontend Development - Backend + Frontend in Docker | ||
| # | ||
| # Usage: | ||
| # docker compose -f docker-compose.dev.yml up -d | ||
| # Open http://localhost:5173 (Rsbuild dev server, API auto-proxied to :3000) | ||
| # | ||
| # Rebuild backend after Go code changes: | ||
| # docker compose -f docker-compose.dev.yml up -d --build new-api | ||
|
|
@@ -39,15 +38,33 @@ services: | |
| networks: | ||
| - dev-network | ||
|
|
||
| frontend: | ||
| image: oven/bun:1 | ||
| container_name: new-api-frontend | ||
| restart: unless-stopped | ||
| working_dir: /app | ||
| ports: | ||
| - "5173:3000" | ||
| volumes: | ||
| - ./web/default:/app | ||
| - frontend_node_modules:/app/node_modules | ||
| environment: | ||
| - VITE_REACT_APP_SERVER_URL=http://new-api-dev:3000 | ||
| command: sh -c "bun install && bun run dev --host 0.0.0.0" | ||
| depends_on: | ||
| - new-api | ||
| networks: | ||
| - dev-network | ||
|
|
||
| redis: | ||
| image: redis:latest | ||
| container_name: new-api-dev-redis | ||
| restart: unless-stopped | ||
| networks: | ||
| - dev-network | ||
|
|
||
| postgres: | ||
| image: postgres:15 | ||
| container_name: new-api-dev-pg | ||
| restart: unless-stopped | ||
| environment: | ||
|
|
@@ -67,6 +84,7 @@ services: | |
| volumes: | ||
| dev_data: | ||
| dev_pg_data: | ||
| frontend_node_modules: | ||
|
|
||
| networks: | ||
| dev-network: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -118,15 +118,14 @@ func logHelper(ctx context.Context, level string, msg string) { | |
| } | ||
|
|
||
| func LogQuota(quota int) string { | ||
| // 计价基准为人民币，直接除以 QuotaPerUnit 即为 CNY | ||
| q := float64(quota) | ||
| switch operation_setting.GetQuotaDisplayType() { | ||
| case operation_setting.QuotaDisplayTypeCNY: | ||
| cny := q / common.QuotaPerUnit | ||
| return fmt.Sprintf("¥%.6f 额度", cny) | ||
| case operation_setting.QuotaDisplayTypeCustom: | ||
| base := q / common.QuotaPerUnit | ||
| rate := operation_setting.GetGeneralSetting().CustomCurrencyExchangeRate | ||
| symbol := operation_setting.GetGeneralSetting().CustomCurrencySymbol | ||
| if symbol == "" { | ||
|
|
@@ -135,24 +134,24 @@ func LogQuota(quota int) string { | |
| if rate <= 0 { | ||
| rate = 1 | ||
| } | ||
| v := base * rate | ||
| return fmt.Sprintf("%s%.6f 额度", symbol, v) | ||
| case operation_setting.QuotaDisplayTypeTokens: | ||
| return fmt.Sprintf("%d 点额度", quota) | ||
| default: // USD | ||
| usd := q / common.QuotaPerUnit / operation_setting.USDExchangeRate | ||
| return fmt.Sprintf("＄%.6f 额度", usd) | ||
| } | ||
|
Comment on lines
141
to
144
Contributor
There was a problem hiding this comment. Validate USDExchangeRate before division. Line 142 (and line 168 in 🛡️ Proposed fix to add validation default: // USD
+ exchangeRate := operation_setting.USDExchangeRate
+ if exchangeRate <= 0 {
+ exchangeRate = 1.0
+ }
- usd := q / common.QuotaPerUnit / operation_setting.USDExchangeRate
+ usd := q / common.QuotaPerUnit / exchangeRate
return fmt.Sprintf("＄%.6f 额度", usd)
}Apply a similar fix to 🤖 Prompt for AI Agents |
||
| } | ||
|
|
||
| func FormatQuota(quota int) string { | ||
| q := float64(quota) | ||
| switch operation_setting.GetQuotaDisplayType() { | ||
| case operation_setting.QuotaDisplayTypeCNY: | ||
| cny := q / common.QuotaPerUnit | ||
| return fmt.Sprintf("¥%.6f", cny) | ||
| case operation_setting.QuotaDisplayTypeCustom: | ||
| base := q / common.QuotaPerUnit | ||
| rate := operation_setting.GetGeneralSetting().CustomCurrencyExchangeRate | ||
| symbol := operation_setting.GetGeneralSetting().CustomCurrencySymbol | ||
| if symbol == "" { | ||
|
|
@@ -161,12 +160,13 @@ func FormatQuota(quota int) string { | |
| if rate <= 0 { | ||
| rate = 1 | ||
| } | ||
| v := base * rate | ||
| return fmt.Sprintf("%s%.6f", symbol, v) | ||
| case operation_setting.QuotaDisplayTypeTokens: | ||
| return fmt.Sprintf("%d", quota) | ||
| default: // USD | ||
| usd := q / common.QuotaPerUnit / operation_setting.USDExchangeRate | ||
| return fmt.Sprintf("＄%.6f", usd) | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -246,8 +246,27 @@ func RecordConsumeLog(c *gin.Context, userId int, params RecordConsumeLogParams) | |
| logger.LogError(c, "failed to record log: "+err.Error()) | ||
| } | ||
| if common.DataExportEnabled { | ||
| // Extract cache token counts from the Other map before spawning goroutine | ||
| cacheTokens := 0 | ||
| cacheCreationTokens := 0 | ||
| if v, ok := params.Other["cache_tokens"]; ok { | ||
| switch n := v.(type) { | ||
| case int: | ||
| cacheTokens = n | ||
| case float64: | ||
| cacheTokens = int(n) | ||
| } | ||
| } | ||
| if v, ok := params.Other["cache_creation_tokens"]; ok { | ||
| switch n := v.(type) { | ||
| case int: | ||
| cacheCreationTokens = n | ||
| case float64: | ||
| cacheCreationTokens = int(n) | ||
| } | ||
| } | ||
| gopool.Go(func() { | ||
| LogQuotaData(userId, username, params.ModelName, params.Quota, common.GetTimestamp(), params.PromptTokens+params.CompletionTokens, cacheTokens, cacheCreationTokens, params.PromptTokens, params.CompletionTokens) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,14 +11,18 @@ import ( | |
|
|
||
| // QuotaData 柱状图数据 | ||
| type QuotaData struct { | ||
| Id int `json:"id"` | ||
| UserID int `json:"user_id" gorm:"index"` | ||
| Username string `json:"username" gorm:"index:idx_qdt_model_user_name,priority:2;size:64;default:''"` | ||
| ModelName string `json:"model_name" gorm:"index:idx_qdt_model_user_name,priority:1;size:64;default:''"` | ||
| CreatedAt int64 `json:"created_at" gorm:"bigint;index:idx_qdt_created_at,priority:2"` | ||
| TokenUsed int `json:"token_used" gorm:"default:0"` | ||
| Count int `json:"count" gorm:"default:0"` | ||
| Quota int `json:"quota" gorm:"default:0"` | ||
| CacheTokens int `json:"cache_tokens" gorm:"default:0"` // tokens read from cache (prompt cache hits) | ||
| CacheCreationTokens int `json:"cache_creation_tokens" gorm:"default:0"` // tokens written to cache | ||
| PromptTokens int `json:"prompt_tokens" gorm:"default:0"` // total input tokens | ||
| CompletionTokens int `json:"completion_tokens" gorm:"default:0"` // total output tokens | ||
| } | ||
|
|
||
| func UpdateQuotaData() { | ||
|
|
@@ -34,34 +38,42 @@ func UpdateQuotaData() { | |
| var CacheQuotaData = make(map[string]*QuotaData) | ||
| var CacheQuotaDataLock = sync.Mutex{} | ||
|
|
||
| func logQuotaDataCache(userId int, username string, modelName string, quota int, createdAt int64, tokenUsed int, cacheTokens int, cacheCreationTokens int, promptTokens int, completionTokens int) { | ||
| key := fmt.Sprintf("%d-%s-%s-%d", userId, username, modelName, createdAt) | ||
| quotaData, ok := CacheQuotaData[key] | ||
| if ok { | ||
| quotaData.Count += 1 | ||
| quotaData.Quota += quota | ||
| quotaData.TokenUsed += tokenUsed | ||
| quotaData.CacheTokens += cacheTokens | ||
| quotaData.CacheCreationTokens += cacheCreationTokens | ||
| quotaData.PromptTokens += promptTokens | ||
| quotaData.CompletionTokens += completionTokens | ||
| } else { | ||
| quotaData = &QuotaData{ | ||
| UserID: userId, | ||
| Username: username, | ||
| ModelName: modelName, | ||
| CreatedAt: createdAt, | ||
| Count: 1, | ||
| Quota: quota, | ||
| TokenUsed: tokenUsed, | ||
| CacheTokens: cacheTokens, | ||
| CacheCreationTokens: cacheCreationTokens, | ||
| PromptTokens: promptTokens, | ||
| CompletionTokens: completionTokens, | ||
| } | ||
| } | ||
| CacheQuotaData[key] = quotaData | ||
| } | ||
|
|
||
| func LogQuotaData(userId int, username string, modelName string, quota int, createdAt int64, tokenUsed int, cacheTokens int, cacheCreationTokens int, promptTokens int, completionTokens int) { | ||
| // 只精确到小时 | ||
| createdAt = createdAt - (createdAt % 3600) | ||
|
|
||
| CacheQuotaDataLock.Lock() | ||
| defer CacheQuotaDataLock.Unlock() | ||
| logQuotaDataCache(userId, username, modelName, quota, createdAt, tokenUsed, cacheTokens, cacheCreationTokens, promptTokens, completionTokens) | ||
| } | ||
|
|
||
| func SaveQuotaDataCache() { | ||
|
|
@@ -80,7 +92,7 @@ func SaveQuotaDataCache() { | |
| //quotaDataDB.Count += quotaData.Count | ||
| //quotaDataDB.Quota += quotaData.Quota | ||
| //DB.Table("quota_data").Save(quotaDataDB) | ||
| increaseQuotaData(quotaData.UserID, quotaData.Username, quotaData.ModelName, quotaData.Count, quotaData.Quota, quotaData.CreatedAt, quotaData.TokenUsed, quotaData.CacheTokens, quotaData.CacheCreationTokens, quotaData.PromptTokens, quotaData.CompletionTokens) | ||
| } else { | ||
| DB.Table("quota_data").Create(quotaData) | ||
| } | ||
|
|
@@ -89,12 +101,16 @@ func SaveQuotaDataCache() { | |
| common.SysLog(fmt.Sprintf("保存数据看板数据成功，共保存%d条数据", size)) | ||
| } | ||
|
|
||
| func increaseQuotaData(userId int, username string, modelName string, count int, quota int, createdAt int64, tokenUsed int, cacheTokens int, cacheCreationTokens int, promptTokens int, completionTokens int) { | ||
| err := DB.Table("quota_data").Where("user_id = ? and username = ? and model_name = ? and created_at = ?", | ||
| userId, username, modelName, createdAt).Updates(map[string]interface{}{ | ||
| "count": gorm.Expr("count + ?", count), | ||
| "quota": gorm.Expr("quota + ?", quota), | ||
| "token_used": gorm.Expr("token_used + ?", tokenUsed), | ||
| "cache_tokens": gorm.Expr("cache_tokens + ?", cacheTokens), | ||
| "cache_creation_tokens": gorm.Expr("cache_creation_tokens + ?", cacheCreationTokens), | ||
| "prompt_tokens": gorm.Expr("prompt_tokens + ?", promptTokens), | ||
| "completion_tokens": gorm.Expr("completion_tokens + ?", completionTokens), | ||
| }).Error | ||
| if err != nil { | ||
| common.SysLog(fmt.Sprintf("increaseQuotaData error: %s", err)) | ||
|
|
@@ -118,7 +134,7 @@ func GetQuotaDataByUserId(userId int, startTime int64, endTime int64) (quotaData | |
| func GetQuotaDataGroupByUser(startTime int64, endTime int64) (quotaData []*QuotaData, err error) { | ||
| var quotaDatas []*QuotaData | ||
| err = DB.Table("quota_data"). | ||
| Select("username, created_at, sum(count) as count, sum(quota) as quota, sum(token_used) as token_used, sum(cache_tokens) as cache_tokens, sum(cache_creation_tokens) as cache_creation_tokens, sum(prompt_tokens) as prompt_tokens, sum(completion_tokens) as completion_tokens"). | ||
| Where("created_at >= ? and created_at <= ?", startTime, endTime). | ||
| Group("username, created_at"). | ||
| Find("aDatas).Error | ||
|
|
@@ -133,6 +149,6 @@ func GetAllQuotaDates(startTime int64, endTime int64, username string) (quotaDat | |
| // 从quota_data表中查询数据 | ||
| // only select model_name, sum(count) as count, sum(quota) as quota, model_name, created_at from quota_data group by model_name, created_at; | ||
| //err = DB.Table("quota_data").Where("created_at >= ? and created_at <= ?", startTime, endTime).Find("aDatas).Error | ||
| err = DB.Table("quota_data").Select("model_name, sum(count) as count, sum(quota) as quota, sum(token_used) as token_used, sum(cache_tokens) as cache_tokens, sum(cache_creation_tokens) as cache_creation_tokens, sum(prompt_tokens) as prompt_tokens, sum(completion_tokens) as completion_tokens, created_at").Where("created_at >= ? and created_at <= ?", startTime, endTime).Group("model_name, created_at").Find("aDatas).Error | ||
| return quotaDatas, err | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,7 +27,7 @@ var generalSetting = GeneralSetting{ | |
| DocsLink: "https://docs.newapi.pro", | ||
| PingIntervalEnabled: false, | ||
| PingIntervalSeconds: 60, | ||
| QuotaDisplayType: QuotaDisplayTypeCNY, | ||
| CustomCurrencySymbol: "¤", | ||
| CustomCurrencyExchangeRate: 1.0, | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,20 +8,16 @@ import ( | |
| "github.com/QuantumNous/new-api/types" | ||
| ) | ||
|
|
||
| // 计价基准：人民币 (CNY) | ||
| const ( | ||
| USD2RMB = 7.3 // 暂定 1 USD = 7.3 RMB | ||
| RMB = 500 // ¥0.002 = 1 -> ¥1 = 500（基准货币） | ||
| USD = RMB * USD2RMB // $1 = 3650（由汇率换算，仅供参考） | ||
| ) | ||
|
|
||
| // modelRatio — 以人民币为基准 | ||
| // 1 === ¥0.002 / 1K tokens === ¥2 / 1M tokens | ||
| // 1 === $0.000274 / 1K tokens（按 7.3 汇率换算） | ||
|
|
||
| var defaultModelRatio = map[string]float64{ | ||
| //"midjourney": 50, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🌐 Web query:
What is the latest stable version of Go (golang)?💡 Result:
Latest stable version of Go (as of today, 2026-05-19): Go 1.26.3 [1]. This is shown on the official Go download page under “Stable versions”, listing “go1.26.3” as the latest stable release [1].
Citations:
Pin the Go version instead of using
latest.Using
golang:latestbreaks build reproducibility and can cause unexpected failures when a new Go version is released. While this solves the immediate problem of an unavailable tag (golang:1.26.1-alpinedoesn't exist), the proper fix is to use a valid pinned version.📌 Suggested fix
Use a recent pinned version (Go 1.26.3 is the current stable):
or with the full Debian image:
🤖 Prompt for AI Agents