feat: able to query test log

* feat: support hunyuan-embedding

* chore: improve implementation

---------

Co-authored-by: LUO Feng <luofeng@flowpp.com>
Co-authored-by: JustSong <quanpengsong@gmail.com>

.github/workflows/ci.yml

@@ -12,8 +12,6 @@ name: CI
 # would trigger our jobs twice on pull requests (once from "push" event and once
 # from "pull_request->synchronize")
 on:
-  pull_request:
-    types: [opened, reopened, synchronize]
   push:
     branches:
       - 'main'

README.md

@@ -175,6 +175,10 @@ sudo service nginx restart
 
 初始账号用户名为 `root`，密码为 `123456`。
 
+### 通过宝塔面板进行一键部署
+1. 安装宝塔面板9.2.0及以上版本，前往 [宝塔面板](https://www.bt.cn/new/download.html?r=dk_oneapi) 官网，选择正式版的脚本下载安装；
+2. 安装后登录宝塔面板，在左侧菜单栏中点击 `Docker`，首次进入会提示安装 `Docker` 服务，点击立即安装，按提示完成安装；
+3. 安装完成后在应用商店中搜索 `One-API`，点击安装，配置域名等基本信息即可完成安装；
 
 ### 基于 Docker Compose 进行部署
 
@@ -218,7 +222,7 @@ docker-compose ps
 3. 所有从服务器必须设置 `NODE_TYPE` 为 `slave`，不设置则默认为主服务器。
 4. 设置 `SYNC_FREQUENCY` 后服务器将定期从数据库同步配置，在使用远程数据库的情况下，推荐设置该项并启用 Redis，无论主从。
 5. 从服务器可以选择设置 `FRONTEND_BASE_URL`，以重定向页面请求到主服务器。
-6. 从服务器上**分别**装好 Redis，设置好 `REDIS_CONN_STRING`，这样可以做到在缓存未过期的情况下数据库零访问，可以减少延迟。
+6. 从服务器上**分别**装好 Redis，设置好 `REDIS_CONN_STRING`，这样可以做到在缓存未过期的情况下数据库零访问，可以减少延迟（Redis 集群或者哨兵模式的支持请参考环境变量说明）。
 7. 如果主服务器访问数据库延迟也比较高，则也需要启用 Redis，并设置 `SYNC_FREQUENCY`，以定期从数据库同步配置。
 
 环境变量的具体使用方法详见[此处](#环境变量)。
@@ -347,6 +351,11 @@ graph LR
 1. `REDIS_CONN_STRING`：设置之后将使用 Redis 作为缓存使用。
    + 例子：`REDIS_CONN_STRING=redis://default:redispw@localhost:49153`
    + 如果数据库访问延迟很低，没有必要启用 Redis，启用后反而会出现数据滞后的问题。
+   + 如果需要使用哨兵或者集群模式：
+     + 则需要把该环境变量设置为节点列表，例如：`localhost:49153,localhost:49154,localhost:49155`。
+     + 除此之外还需要设置以下环境变量：
+       + `REDIS_PASSWORD`：Redis 集群或者哨兵模式下的密码设置。
+       + `REDIS_MASTER_NAME`：Redis 哨兵模式下主节点的名称。
 2. `SESSION_SECRET`：设置之后将使用固定的会话密钥，这样系统重新启动后已登录用户的 cookie 将依旧有效。
    + 例子：`SESSION_SECRET=random_string`
 3. `SQL_DSN`：设置之后将使用指定数据库而非 SQLite，请使用 MySQL 或 PostgreSQL。
@@ -401,6 +410,7 @@ graph LR
 27. `INITIAL_ROOT_TOKEN`：如果设置了该值，则在系统首次启动时会自动创建一个值为该环境变量值的 root 用户令牌。
 28. `INITIAL_ROOT_ACCESS_TOKEN`：如果设置了该值，则在系统首次启动时会自动创建一个值为该环境变量的 root 用户创建系统管理令牌。
 29. `ENFORCE_INCLUDE_USAGE`：是否强制在 stream 模型下返回 usage，默认不开启，可选值为 `true` 和 `false`。
+30. `TEST_PROMPT`：测试模型时的用户 prompt，默认为 `Print your model name exactly and do not output without any other text.`。
 
 ### 命令行参数
 1. `--port <port_number>`: 指定服务器监听的端口号，默认为 `3000`。

common/config/config.go

@@ -1,13 +1,14 @@
 package config
 
 import (
-	"github.com/songquanpeng/one-api/common/env"
 	"os"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/songquanpeng/one-api/common/env"
+
 	"github.com/google/uuid"
 )
 
@@ -162,3 +163,4 @@ var UserContentRequestProxy = env.String("USER_CONTENT_REQUEST_PROXY", "")
 var UserContentRequestTimeout = env.Int("USER_CONTENT_REQUEST_TIMEOUT", 30)
 
 var EnforceIncludeUsage = env.Bool("ENFORCE_INCLUDE_USAGE", false)
+var TestPrompt = env.String("TEST_PROMPT", "Print your model name exactly and do not output without any other text.")

common/helper/helper.go

@@ -1,9 +1,8 @@
 package helper
 
 import (
+	"context"
 	"fmt"
-	"github.com/gin-gonic/gin"
-	"github.com/songquanpeng/one-api/common/random"
 	"html/template"
 	"log"
 	"net"
@@ -11,6 +10,10 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+
+	"github.com/gin-gonic/gin"
+
+	"github.com/songquanpeng/one-api/common/random"
 )
 
 func OpenBrowser(url string) {
@@ -106,6 +109,18 @@ func GenRequestID() string {
 	return GetTimeString() + random.GetRandomNumberString(8)
 }
 
+func SetRequestID(ctx context.Context, id string) context.Context {
+	return context.WithValue(ctx, RequestIdKey, id)
+}
+
+func GetRequestID(ctx context.Context) string {
+	rawRequestId := ctx.Value(RequestIdKey)
+	if rawRequestId == nil {
+		return ""
+	}
+	return rawRequestId.(string)
+}
+
 func GetResponseID(c *gin.Context) string {
 	logID := c.GetString(RequestIdKey)
 	return fmt.Sprintf("chatcmpl-%s", logID)

common/helper/time.go

@@ -13,3 +13,8 @@ func GetTimeString() string {
 	now := time.Now()
 	return fmt.Sprintf("%s%d", now.Format("20060102150405"), now.UnixNano()%1e9)
 }
+
+// CalcElapsedTime return the elapsed time in milliseconds (ms)
+func CalcElapsedTime(start time.Time) int64 {
+	return time.Now().Sub(start).Milliseconds()
+}

common/logger/logger.go

@@ -7,19 +7,25 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"runtime"
+	"strings"
 	"sync"
 	"time"
 
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/helper"
 )
 
+type loggerLevel string
+
 const (
-	loggerDEBUG = "DEBUG"
+	loggerDEBUG loggerLevel = "DEBUG"
-	loggerINFO  = "INFO"
+	loggerINFO  loggerLevel = "INFO"
-	loggerWarn  = "WARN"
+	loggerWarn  loggerLevel = "WARN"
-	loggerError = "ERR"
+	loggerError loggerLevel = "ERROR"
+	loggerFatal loggerLevel = "FATAL"
 )
 
 var setupLogOnce sync.Once
@@ -44,27 +50,26 @@ func SetupLogger() {
 }
 
 func SysLog(s string) {
-	t := time.Now()
+	logHelper(nil, loggerINFO, s)
-	_, _ = fmt.Fprintf(gin.DefaultWriter, "[SYS] %v | %s \n", t.Format("2006/01/02 - 15:04:05"), s)
 }
 
 func SysLogf(format string, a ...any) {
-	SysLog(fmt.Sprintf(format, a...))
+	logHelper(nil, loggerINFO, fmt.Sprintf(format, a...))
 }
 
 func SysError(s string) {
-	t := time.Now()
+	logHelper(nil, loggerError, s)
-	_, _ = fmt.Fprintf(gin.DefaultErrorWriter, "[SYS] %v | %s \n", t.Format("2006/01/02 - 15:04:05"), s)
 }
 
 func SysErrorf(format string, a ...any) {
-	SysError(fmt.Sprintf(format, a...))
+	logHelper(nil, loggerError, fmt.Sprintf(format, a...))
 }
 
 func Debug(ctx context.Context, msg string) {
-	if config.DebugEnabled {
+	if !config.DebugEnabled {
-		logHelper(ctx, loggerDEBUG, msg)
+		return
 	}
+	logHelper(ctx, loggerDEBUG, msg)
 }
 
 func Info(ctx context.Context, msg string) {
@@ -80,37 +85,65 @@ func Error(ctx context.Context, msg string) {
 }
 
 func Debugf(ctx context.Context, format string, a ...any) {
-	Debug(ctx, fmt.Sprintf(format, a...))
+	logHelper(ctx, loggerDEBUG, fmt.Sprintf(format, a...))
 }
 
 func Infof(ctx context.Context, format string, a ...any) {
-	Info(ctx, fmt.Sprintf(format, a...))
+	logHelper(ctx, loggerINFO, fmt.Sprintf(format, a...))
 }
 
 func Warnf(ctx context.Context, format string, a ...any) {
-	Warn(ctx, fmt.Sprintf(format, a...))
+	logHelper(ctx, loggerWarn, fmt.Sprintf(format, a...))
 }
 
 func Errorf(ctx context.Context, format string, a ...any) {
-	Error(ctx, fmt.Sprintf(format, a...))
+	logHelper(ctx, loggerError, fmt.Sprintf(format, a...))
 }
 
-func logHelper(ctx context.Context, level string, msg string) {
+func FatalLog(s string) {
+	logHelper(nil, loggerFatal, s)
+}
+
+func FatalLogf(format string, a ...any) {
+	logHelper(nil, loggerFatal, fmt.Sprintf(format, a...))
+}
+
+func logHelper(ctx context.Context, level loggerLevel, msg string) {
 	writer := gin.DefaultErrorWriter
 	if level == loggerINFO {
 		writer = gin.DefaultWriter
 	}
-	id := ctx.Value(helper.RequestIdKey)
+	var requestId string
-	if id == nil {
+	if ctx != nil {
-		id = helper.GenRequestID()
+		rawRequestId := helper.GetRequestID(ctx)
+		if rawRequestId != "" {
+			requestId = fmt.Sprintf(" | %s", rawRequestId)
+		}
 	}
+	lineInfo, funcName := getLineInfo()
 	now := time.Now()
-	_, _ = fmt.Fprintf(writer, "[%s] %v | %s | %s \n", level, now.Format("2006/01/02 - 15:04:05"), id, msg)
+	_, _ = fmt.Fprintf(writer, "[%s] %v%s%s %s%s \n", level, now.Format("2006/01/02 - 15:04:05"), requestId, lineInfo, funcName, msg)
 	SetupLogger()
+	if level == loggerFatal {
+		os.Exit(1)
+	}
 }
 
-func FatalLog(v ...any) {
+func getLineInfo() (string, string) {
-	t := time.Now()
+	funcName := "[unknown] "
-	_, _ = fmt.Fprintf(gin.DefaultErrorWriter, "[FATAL] %v | %v \n", t.Format("2006/01/02 - 15:04:05"), v)
+	pc, file, line, ok := runtime.Caller(3)
-	os.Exit(1)
+	if ok {
+		if fn := runtime.FuncForPC(pc); fn != nil {
+			parts := strings.Split(fn.Name(), ".")
+			funcName = "[" + parts[len(parts)-1] + "] "
+		}
+	} else {
+		file = "unknown"
+		line = 0
+	}
+	parts := strings.Split(file, "one-api/")
+	if len(parts) > 1 {
+		file = parts[1]
+	}
+	return fmt.Sprintf(" | %s:%d", file, line), funcName
 }

common/redis.go

@@ -2,13 +2,15 @@ package common
 
 import (
 	"context"
+	"os"
+	"strings"
+	"time"
+
 	"github.com/go-redis/redis/v8"
 	"github.com/songquanpeng/one-api/common/logger"
-	"os"
-	"time"
 )
 
-var RDB *redis.Client
+var RDB redis.Cmdable
 var RedisEnabled = true
 
 // InitRedisClient This function is called after init()
@@ -23,13 +25,23 @@ func InitRedisClient() (err error) {
 		logger.SysLog("SYNC_FREQUENCY not set, Redis is disabled")
 		return nil
 	}
-	logger.SysLog("Redis is enabled")
+	redisConnString := os.Getenv("REDIS_CONN_STRING")
-	opt, err := redis.ParseURL(os.Getenv("REDIS_CONN_STRING"))
+	if os.Getenv("REDIS_MASTER_NAME") == "" {
-	if err != nil {
+		logger.SysLog("Redis is enabled")
-		logger.FatalLog("failed to parse Redis connection string: " + err.Error())
+		opt, err := redis.ParseURL(redisConnString)
+		if err != nil {
+			logger.FatalLog("failed to parse Redis connection string: " + err.Error())
+		}
+		RDB = redis.NewClient(opt)
+	} else {
+		// cluster mode
+		logger.SysLog("Redis cluster mode enabled")
+		RDB = redis.NewUniversalClient(&redis.UniversalOptions{
+			Addrs:      strings.Split(redisConnString, ","),
+			Password:   os.Getenv("REDIS_PASSWORD"),
+			MasterName: os.Getenv("REDIS_MASTER_NAME"),
+		})
 	}
-	RDB = redis.NewClient(opt)
-
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 

controller/auth/github.go

@@ -5,16 +5,18 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
+	"strconv"
+	"time"
+
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/common/random"
 	"github.com/songquanpeng/one-api/controller"
 	"github.com/songquanpeng/one-api/model"
-	"net/http"
-	"strconv"
-	"time"
 )
 
 type GitHubOAuthResponse struct {
@@ -81,6 +83,7 @@ func getGitHubUserInfoByCode(code string) (*GitHubUser, error) {
 }
 
 func GitHubOAuth(c *gin.Context) {
+	ctx := c.Request.Context()
 	session := sessions.Default(c)
 	state := c.Query("state")
 	if state == "" || session.Get("oauth_state") == nil || state != session.Get("oauth_state").(string) {
@@ -136,7 +139,7 @@ func GitHubOAuth(c *gin.Context) {
 			user.Role = model.RoleCommonUser
 			user.Status = model.UserStatusEnabled
 
-			if err := user.Insert(0); err != nil {
+			if err := user.Insert(ctx, 0); err != nil {
 				c.JSON(http.StatusOK, gin.H{
 					"success": false,
 					"message": err.Error(),

controller/auth/lark.go

@@ -5,15 +5,17 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
+	"strconv"
+	"time"
+
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/controller"
 	"github.com/songquanpeng/one-api/model"
-	"net/http"
-	"strconv"
-	"time"
 )
 
 type LarkOAuthResponse struct {
@@ -79,6 +81,7 @@ func getLarkUserInfoByCode(code string) (*LarkUser, error) {
 }
 
 func LarkOAuth(c *gin.Context) {
+	ctx := c.Request.Context()
 	session := sessions.Default(c)
 	state := c.Query("state")
 	if state == "" || session.Get("oauth_state") == nil || state != session.Get("oauth_state").(string) {
@@ -125,7 +128,7 @@ func LarkOAuth(c *gin.Context) {
 			user.Role = model.RoleCommonUser
 			user.Status = model.UserStatusEnabled
 
-			if err := user.Insert(0); err != nil {
+			if err := user.Insert(ctx, 0); err != nil {
 				c.JSON(http.StatusOK, gin.H{
 					"success": false,
 					"message": err.Error(),

controller/auth/oidc.go

@@ -5,15 +5,17 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
+	"strconv"
+	"time"
+
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/controller"
 	"github.com/songquanpeng/one-api/model"
-	"net/http"
-	"strconv"
-	"time"
 )
 
 type OidcResponse struct {
@@ -87,6 +89,7 @@ func getOidcUserInfoByCode(code string) (*OidcUser, error) {
 }
 
 func OidcAuth(c *gin.Context) {
+	ctx := c.Request.Context()
 	session := sessions.Default(c)
 	state := c.Query("state")
 	if state == "" || session.Get("oauth_state") == nil || state != session.Get("oauth_state").(string) {
@@ -142,7 +145,7 @@ func OidcAuth(c *gin.Context) {
 			} else {
 				user.DisplayName = "OIDC User"
 			}
-			err := user.Insert(0)
+			err := user.Insert(ctx, 0)
 			if err != nil {
 				c.JSON(http.StatusOK, gin.H{
 					"success": false,

controller/auth/wechat.go

@@ -4,14 +4,16 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
+	"strconv"
+	"time"
+
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/ctxkey"
 	"github.com/songquanpeng/one-api/controller"
 	"github.com/songquanpeng/one-api/model"
-	"net/http"
-	"strconv"
-	"time"
 )
 
 type wechatLoginResponse struct {
@@ -52,6 +54,7 @@ func getWeChatIdByCode(code string) (string, error) {
 }
 
 func WeChatAuth(c *gin.Context) {
+	ctx := c.Request.Context()
 	if !config.WeChatAuthEnabled {
 		c.JSON(http.StatusOK, gin.H{
 			"message": "管理员未开启通过微信登录以及注册",
@@ -87,7 +90,7 @@ func WeChatAuth(c *gin.Context) {
 			user.Role = model.RoleCommonUser
 			user.Status = model.UserStatusEnabled
 
-			if err := user.Insert(0); err != nil {
+			if err := user.Insert(ctx, 0); err != nil {
 				c.JSON(http.StatusOK, gin.H{
 					"success": false,
 					"message": err.Error(),

controller/channel-billing.go

@@ -4,16 +4,17 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+	"net/http"
+	"strconv"
+	"time"
+
 	"github.com/songquanpeng/one-api/common/client"
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/model"
 	"github.com/songquanpeng/one-api/monitor"
 	"github.com/songquanpeng/one-api/relay/channeltype"
-	"io"
-	"net/http"
-	"strconv"
-	"time"
 
 	"github.com/gin-gonic/gin"
 )
@@ -101,6 +102,16 @@ type SiliconFlowUsageResponse struct {
 	} `json:"data"`
 }
 
+type DeepSeekUsageResponse struct {
+	IsAvailable  bool `json:"is_available"`
+	BalanceInfos []struct {
+		Currency        string `json:"currency"`
+		TotalBalance    string `json:"total_balance"`
+		GrantedBalance  string `json:"granted_balance"`
+		ToppedUpBalance string `json:"topped_up_balance"`
+	} `json:"balance_infos"`
+}
+
 // GetAuthHeader get auth header
 func GetAuthHeader(token string) http.Header {
 	h := http.Header{}
@@ -237,7 +248,36 @@ func updateChannelSiliconFlowBalance(channel *model.Channel) (float64, error) {
 	if response.Code != 20000 {
 		return 0, fmt.Errorf("code: %d, message: %s", response.Code, response.Message)
 	}
-	balance, err := strconv.ParseFloat(response.Data.Balance, 64)
+	balance, err := strconv.ParseFloat(response.Data.TotalBalance, 64)
+	if err != nil {
+		return 0, err
+	}
+	channel.UpdateBalance(balance)
+	return balance, nil
+}
+
+func updateChannelDeepSeekBalance(channel *model.Channel) (float64, error) {
+	url := "https://api.deepseek.com/user/balance"
+	body, err := GetResponseBody("GET", url, channel, GetAuthHeader(channel.Key))
+	if err != nil {
+		return 0, err
+	}
+	response := DeepSeekUsageResponse{}
+	err = json.Unmarshal(body, &response)
+	if err != nil {
+		return 0, err
+	}
+	index := -1
+	for i, balanceInfo := range response.BalanceInfos {
+		if balanceInfo.Currency == "CNY" {
+			index = i
+			break
+		}
+	}
+	if index == -1 {
+		return 0, errors.New("currency CNY not found")
+	}
+	balance, err := strconv.ParseFloat(response.BalanceInfos[index].TotalBalance, 64)
 	if err != nil {
 		return 0, err
 	}
@@ -271,6 +311,8 @@ func updateChannelBalance(channel *model.Channel) (float64, error) {
 		return updateChannelAIGC2DBalance(channel)
 	case channeltype.SiliconFlow:
 		return updateChannelSiliconFlowBalance(channel)
+	case channeltype.DeepSeek:
+		return updateChannelDeepSeekBalance(channel)
 	default:
 		return 0, errors.New("尚未实现")
 	}

controller/channel-test.go

@@ -2,6 +2,7 @@ package controller
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -15,14 +16,17 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/ctxkey"
+	"github.com/songquanpeng/one-api/common/helper"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/common/message"
 	"github.com/songquanpeng/one-api/middleware"
 	"github.com/songquanpeng/one-api/model"
 	"github.com/songquanpeng/one-api/monitor"
-	relay "github.com/songquanpeng/one-api/relay"
+	"github.com/songquanpeng/one-api/relay"
+	"github.com/songquanpeng/one-api/relay/adaptor/openai"
 	"github.com/songquanpeng/one-api/relay/channeltype"
 	"github.com/songquanpeng/one-api/relay/controller"
 	"github.com/songquanpeng/one-api/relay/meta"
@@ -35,18 +39,34 @@ func buildTestRequest(model string) *relaymodel.GeneralOpenAIRequest {
 		model = "gpt-3.5-turbo"
 	}
 	testRequest := &relaymodel.GeneralOpenAIRequest{
-		MaxTokens: 2,
+		Model: model,
-		Model:     model,
 	}
 	testMessage := relaymodel.Message{
 		Role:    "user",
-		Content: "hi",
+		Content: config.TestPrompt,
 	}
 	testRequest.Messages = append(testRequest.Messages, testMessage)
 	return testRequest
 }
 
-func testChannel(channel *model.Channel, request *relaymodel.GeneralOpenAIRequest) (err error, openaiErr *relaymodel.Error) {
+func parseTestResponse(resp string) (*openai.TextResponse, string, error) {
+	var response openai.TextResponse
+	err := json.Unmarshal([]byte(resp), &response)
+	if err != nil {
+		return nil, "", err
+	}
+	if len(response.Choices) == 0 {
+		return nil, "", errors.New("response has no choices")
+	}
+	stringContent, ok := response.Choices[0].Content.(string)
+	if !ok {
+		return nil, "", errors.New("response content is not string")
+	}
+	return &response, stringContent, nil
+}
+
+func testChannel(ctx context.Context, channel *model.Channel, request *relaymodel.GeneralOpenAIRequest) (responseMessage string, err error, openaiErr *relaymodel.Error) {
+	startTime := time.Now()
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
 	c.Request = &http.Request{
@@ -66,7 +86,7 @@ func testChannel(channel *model.Channel, request *relaymodel.GeneralOpenAIReques
 	apiType := channeltype.ToAPIType(channel.Type)
 	adaptor := relay.GetAdaptor(apiType)
 	if adaptor == nil {
-		return fmt.Errorf("invalid api type: %d, adaptor is nil", apiType), nil
+		return "", fmt.Errorf("invalid api type: %d, adaptor is nil", apiType), nil
 	}
 	adaptor.Init(meta)
 	modelName := request.Model
@@ -84,41 +104,69 @@ func testChannel(channel *model.Channel, request *relaymodel.GeneralOpenAIReques
 	request.Model = modelName
 	convertedRequest, err := adaptor.ConvertRequest(c, relaymode.ChatCompletions, request)
 	if err != nil {
-		return err, nil
+		return "", err, nil
 	}
 	jsonData, err := json.Marshal(convertedRequest)
 	if err != nil {
-		return err, nil
+		return "", err, nil
 	}
+	defer func() {
+		logContent := fmt.Sprintf("渠道 %s 测试成功，响应：%s", channel.Name, responseMessage)
+		if err != nil || openaiErr != nil {
+			errorMessage := ""
+			if err != nil {
+				errorMessage = err.Error()
+			} else {
+				errorMessage = openaiErr.Message
+			}
+			logContent = fmt.Sprintf("渠道 %s 测试失败，错误：%s", channel.Name, errorMessage)
+		}
+		go model.RecordTestLog(ctx, &model.Log{
+			ChannelId:   channel.Id,
+			ModelName:   modelName,
+			Content:     logContent,
+			ElapsedTime: helper.CalcElapsedTime(startTime),
+		})
+	}()
 	logger.SysLog(string(jsonData))
 	requestBody := bytes.NewBuffer(jsonData)
 	c.Request.Body = io.NopCloser(requestBody)
 	resp, err := adaptor.DoRequest(c, meta, requestBody)
 	if err != nil {
-		return err, nil
+		return "", err, nil
 	}
 	if resp != nil && resp.StatusCode != http.StatusOK {
 		err := controller.RelayErrorHandler(resp)
-		return fmt.Errorf("status code %d: %s", resp.StatusCode, err.Error.Message), &err.Error
+		errorMessage := err.Error.Message
+		if errorMessage != "" {
+			errorMessage = ", error message: " + errorMessage
+		}
+		return "", fmt.Errorf("http status code: %d%s", resp.StatusCode, errorMessage), &err.Error
 	}
 	usage, respErr := adaptor.DoResponse(c, resp, meta)
 	if respErr != nil {
-		return fmt.Errorf("%s", respErr.Error.Message), &respErr.Error
+		return "", fmt.Errorf("%s", respErr.Error.Message), &respErr.Error
 	}
 	if usage == nil {
-		return errors.New("usage is nil"), nil
+		return "", errors.New("usage is nil"), nil
+	}
+	rawResponse := w.Body.String()
+	_, responseMessage, err = parseTestResponse(rawResponse)
+	if err != nil {
+		return "", err, nil
 	}
 	result := w.Result()
 	// print result.Body
 	respBody, err := io.ReadAll(result.Body)
 	if err != nil {
-		return err, nil
+		return "", err, nil
 	}
 	logger.SysLog(fmt.Sprintf("testing channel #%d, response: \n%s", channel.Id, string(respBody)))
-	return nil, nil
+	return responseMessage, nil, nil
 }
 
 func TestChannel(c *gin.Context) {
+	ctx := c.Request.Context()
 	id, err := strconv.Atoi(c.Param("id"))
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{
@@ -135,10 +183,10 @@ func TestChannel(c *gin.Context) {
 		})
 		return
 	}
-	model := c.Query("model")
+	modelName := c.Query("model")
-	testRequest := buildTestRequest(model)
+	testRequest := buildTestRequest(modelName)
 	tik := time.Now()
-	err, _ = testChannel(channel, testRequest)
+	responseMessage, err, _ := testChannel(ctx, channel, testRequest)
 	tok := time.Now()
 	milliseconds := tok.Sub(tik).Milliseconds()
 	if err != nil {
@@ -148,18 +196,18 @@ func TestChannel(c *gin.Context) {
 	consumedTime := float64(milliseconds) / 1000.0
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{
-			"success": false,
+			"success":   false,
-			"message": err.Error(),
+			"message":   err.Error(),
-			"time":    consumedTime,
+			"time":      consumedTime,
-			"model":   model,
+			"modelName": modelName,
 		})
 		return
 	}
 	c.JSON(http.StatusOK, gin.H{
-		"success": true,
+		"success":   true,
-		"message": "",
+		"message":   responseMessage,
-		"time":    consumedTime,
+		"time":      consumedTime,
-		"model":   model,
+		"modelName": modelName,
 	})
 	return
 }
@@ -167,7 +215,7 @@ func TestChannel(c *gin.Context) {
 var testAllChannelsLock sync.Mutex
 var testAllChannelsRunning bool = false
 
-func testChannels(notify bool, scope string) error {
+func testChannels(ctx context.Context, notify bool, scope string) error {
 	if config.RootUserEmail == "" {
 		config.RootUserEmail = model.GetRootUserEmail()
 	}
@@ -191,7 +239,7 @@ func testChannels(notify bool, scope string) error {
 			isChannelEnabled := channel.Status == model.ChannelStatusEnabled
 			tik := time.Now()
 			testRequest := buildTestRequest("")
-			err, openaiErr := testChannel(channel, testRequest)
+			_, err, openaiErr := testChannel(ctx, channel, testRequest)
 			tok := time.Now()
 			milliseconds := tok.Sub(tik).Milliseconds()
 			if isChannelEnabled && milliseconds > disableThreshold {
@@ -225,11 +273,12 @@ func testChannels(notify bool, scope string) error {
 }
 
 func TestChannels(c *gin.Context) {
+	ctx := c.Request.Context()
 	scope := c.Query("scope")
 	if scope == "" {
 		scope = "all"
 	}
-	err := testChannels(true, scope)
+	err := testChannels(ctx, true, scope)
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,
@@ -245,10 +294,11 @@ func TestChannels(c *gin.Context) {
 }
 
 func AutomaticallyTestChannels(frequency int) {
+	ctx := context.Background()
 	for {
 		time.Sleep(time.Duration(frequency) * time.Minute)
 		logger.SysLog("testing all channels")
-		_ = testChannels(false, "all")
+		_ = testChannels(ctx, false, "all")
 		logger.SysLog("channel test finished")
 	}
 }

controller/user.go

@@ -109,6 +109,7 @@ func Logout(c *gin.Context) {
 }
 
 func Register(c *gin.Context) {
+	ctx := c.Request.Context()
 	if !config.RegisterEnabled {
 		c.JSON(http.StatusOK, gin.H{
 			"message": "管理员关闭了新用户注册",
@@ -166,7 +167,7 @@ func Register(c *gin.Context) {
 	if config.EmailVerificationEnabled {
 		cleanUser.Email = user.Email
 	}
-	if err := cleanUser.Insert(inviterId); err != nil {
+	if err := cleanUser.Insert(ctx, inviterId); err != nil {
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,
 			"message": err.Error(),
@@ -362,6 +363,7 @@ func GetSelf(c *gin.Context) {
 }
 
 func UpdateUser(c *gin.Context) {
+	ctx := c.Request.Context()
 	var updatedUser model.User
 	err := json.NewDecoder(c.Request.Body).Decode(&updatedUser)
 	if err != nil || updatedUser.Id == 0 {
@@ -416,7 +418,7 @@ func UpdateUser(c *gin.Context) {
 		return
 	}
 	if originUser.Quota != updatedUser.Quota {
-		model.RecordLog(originUser.Id, model.LogTypeManage, fmt.Sprintf("管理员将用户额度从 %s修改为 %s", common.LogQuota(originUser.Quota), common.LogQuota(updatedUser.Quota)))
+		model.RecordLog(ctx, originUser.Id, model.LogTypeManage, fmt.Sprintf("管理员将用户额度从 %s修改为 %s", common.LogQuota(originUser.Quota), common.LogQuota(updatedUser.Quota)))
 	}
 	c.JSON(http.StatusOK, gin.H{
 		"success": true,
@@ -535,6 +537,7 @@ func DeleteSelf(c *gin.Context) {
 }
 
 func CreateUser(c *gin.Context) {
+	ctx := c.Request.Context()
 	var user model.User
 	err := json.NewDecoder(c.Request.Body).Decode(&user)
 	if err != nil || user.Username == "" || user.Password == "" {
@@ -568,7 +571,7 @@ func CreateUser(c *gin.Context) {
 		Password:    user.Password,
 		DisplayName: user.DisplayName,
 	}
-	if err := cleanUser.Insert(0); err != nil {
+	if err := cleanUser.Insert(ctx, 0); err != nil {
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,
 			"message": err.Error(),
@@ -747,6 +750,7 @@ type topUpRequest struct {
 }
 
 func TopUp(c *gin.Context) {
+	ctx := c.Request.Context()
 	req := topUpRequest{}
 	err := c.ShouldBindJSON(&req)
 	if err != nil {
@@ -757,7 +761,7 @@ func TopUp(c *gin.Context) {
 		return
 	}
 	id := c.GetInt("id")
-	quota, err := model.Redeem(req.Key, id)
+	quota, err := model.Redeem(ctx, req.Key, id)
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,
@@ -780,6 +784,7 @@ type adminTopUpRequest struct {
 }
 
 func AdminTopUp(c *gin.Context) {
+	ctx := c.Request.Context()
 	req := adminTopUpRequest{}
 	err := c.ShouldBindJSON(&req)
 	if err != nil {
@@ -800,7 +805,7 @@ func AdminTopUp(c *gin.Context) {
 	if req.Remark == "" {
 		req.Remark = fmt.Sprintf("通过 API 充值 %s", common.LogQuota(int64(req.Quota)))
 	}
-	model.RecordTopupLog(req.UserId, req.Remark, req.Quota)
+	model.RecordTopupLog(ctx, req.UserId, req.Remark, req.Quota)
 	c.JSON(http.StatusOK, gin.H{
 		"success": true,
 		"message": "",

middleware/distributor.go

@@ -2,13 +2,15 @@ package middleware
 
 import (
 	"fmt"
+	"net/http"
+	"strconv"
+
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common/ctxkey"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/model"
 	"github.com/songquanpeng/one-api/relay/channeltype"
-	"net/http"
-	"strconv"
 )
 
 type ModelRequest struct {
@@ -17,6 +19,7 @@ type ModelRequest struct {
 
 func Distribute() func(c *gin.Context) {
 	return func(c *gin.Context) {
+		ctx := c.Request.Context()
 		userId := c.GetInt(ctxkey.Id)
 		userGroup, _ := model.CacheGetUserGroup(userId)
 		c.Set(ctxkey.Group, userGroup)
@@ -52,6 +55,7 @@ func Distribute() func(c *gin.Context) {
 				return
 			}
 		}
+		logger.Debugf(ctx, "user id %d, user group: %s, request model: %s, using channel #%d", userId, userGroup, requestModel, channel.Id)
 		SetupContextForSelectedChannel(c, channel, requestModel)
 		c.Next()
 	}

middleware/request-id.go

@@ -1,8 +1,8 @@
 package middleware
 
 import (
-	"context"
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common/helper"
 )
 
@@ -10,7 +10,7 @@ func RequestId() func(c *gin.Context) {
 	return func(c *gin.Context) {
 		id := helper.GenRequestID()
 		c.Set(helper.RequestIdKey, id)
-		ctx := context.WithValue(c.Request.Context(), helper.RequestIdKey, id)
+		ctx := helper.SetRequestID(c.Request.Context(), id)
 		c.Request = c.Request.WithContext(ctx)
 		c.Header(helper.RequestIdKey, id)
 		c.Next()

model/log.go

@@ -4,26 +4,31 @@ import (
 	"context"
 	"fmt"
 
+	"gorm.io/gorm"
+
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/helper"
 	"github.com/songquanpeng/one-api/common/logger"
-	"gorm.io/gorm"
 )
 
 type Log struct {
-	Id               int    `json:"id"`
+	Id                int    `json:"id"`
-	UserId           int    `json:"user_id" gorm:"index"`
+	UserId            int    `json:"user_id" gorm:"index"`
-	CreatedAt        int64  `json:"created_at" gorm:"bigint;index:idx_created_at_type"`
+	CreatedAt         int64  `json:"created_at" gorm:"bigint;index:idx_created_at_type"`
-	Type             int    `json:"type" gorm:"index:idx_created_at_type"`
+	Type              int    `json:"type" gorm:"index:idx_created_at_type"`
-	Content          string `json:"content"`
+	Content           string `json:"content"`
-	Username         string `json:"username" gorm:"index:index_username_model_name,priority:2;default:''"`
+	Username          string `json:"username" gorm:"index:index_username_model_name,priority:2;default:''"`
-	TokenName        string `json:"token_name" gorm:"index;default:''"`
+	TokenName         string `json:"token_name" gorm:"index;default:''"`
-	ModelName        string `json:"model_name" gorm:"index;index:index_username_model_name,priority:1;default:''"`
+	ModelName         string `json:"model_name" gorm:"index;index:index_username_model_name,priority:1;default:''"`
-	Quota            int    `json:"quota" gorm:"default:0"`
+	Quota             int    `json:"quota" gorm:"default:0"`
-	PromptTokens     int    `json:"prompt_tokens" gorm:"default:0"`
+	PromptTokens      int    `json:"prompt_tokens" gorm:"default:0"`
-	CompletionTokens int    `json:"completion_tokens" gorm:"default:0"`
+	CompletionTokens  int    `json:"completion_tokens" gorm:"default:0"`
-	ChannelId        int    `json:"channel" gorm:"index"`
+	ChannelId         int    `json:"channel" gorm:"index"`
+	RequestId         string `json:"request_id" gorm:"default:''"`
+	ElapsedTime       int64  `json:"elapsed_time" gorm:"default:0"` // unit is ms
+	IsStream          bool   `json:"is_stream" gorm:"default:false"`
+	SystemPromptReset bool   `json:"system_prompt_reset" gorm:"default:false"`
 }
 
 const (
@@ -32,9 +37,21 @@ const (
 	LogTypeConsume
 	LogTypeManage
 	LogTypeSystem
+	LogTypeTest
 )
 
-func RecordLog(userId int, logType int, content string) {
+func recordLogHelper(ctx context.Context, log *Log) {
+	requestId := helper.GetRequestID(ctx)
+	log.RequestId = requestId
+	err := LOG_DB.Create(log).Error
+	if err != nil {
+		logger.Error(ctx, "failed to record log: "+err.Error())
+		return
+	}
+	logger.Infof(ctx, "record log: %+v", log)
+}
+
+func RecordLog(ctx context.Context, userId int, logType int, content string) {
 	if logType == LogTypeConsume && !config.LogConsumeEnabled {
 		return
 	}
@@ -45,13 +62,10 @@ func RecordLog(userId int, logType int, content string) {
 		Type:      logType,
 		Content:   content,
 	}
-	err := LOG_DB.Create(log).Error
+	recordLogHelper(ctx, log)
-	if err != nil {
-		logger.SysError("failed to record log: " + err.Error())
-	}
 }
 
-func RecordTopupLog(userId int, content string, quota int) {
+func RecordTopupLog(ctx context.Context, userId int, content string, quota int) {
 	log := &Log{
 		UserId:    userId,
 		Username:  GetUsernameById(userId),
@@ -60,34 +74,23 @@ func RecordTopupLog(userId int, content string, quota int) {
 		Content:   content,
 		Quota:     quota,
 	}
-	err := LOG_DB.Create(log).Error
+	recordLogHelper(ctx, log)
-	if err != nil {
-		logger.SysError("failed to record log: " + err.Error())
-	}
 }
 
-func RecordConsumeLog(ctx context.Context, userId int, channelId int, promptTokens int, completionTokens int, modelName string, tokenName string, quota int64, content string) {
+func RecordConsumeLog(ctx context.Context, log *Log) {
-	logger.Info(ctx, fmt.Sprintf("record consume log: userId=%d, channelId=%d, promptTokens=%d, completionTokens=%d, modelName=%s, tokenName=%s, quota=%d, content=%s", userId, channelId, promptTokens, completionTokens, modelName, tokenName, quota, content))
 	if !config.LogConsumeEnabled {
 		return
 	}
-	log := &Log{
+	log.Username = GetUsernameById(log.UserId)
-		UserId:           userId,
+	log.CreatedAt = helper.GetTimestamp()
-		Username:         GetUsernameById(userId),
+	log.Type = LogTypeConsume
-		CreatedAt:        helper.GetTimestamp(),
+	recordLogHelper(ctx, log)
-		Type:             LogTypeConsume,
+}
-		Content:          content,
+
-		PromptTokens:     promptTokens,
+func RecordTestLog(ctx context.Context, log *Log) {
-		CompletionTokens: completionTokens,
+	log.CreatedAt = helper.GetTimestamp()
-		TokenName:        tokenName,
+	log.Type = LogTypeTest
-		ModelName:        modelName,
+	recordLogHelper(ctx, log)
-		Quota:            int(quota),
-		ChannelId:        channelId,
-	}
-	err := LOG_DB.Create(log).Error
-	if err != nil {
-		logger.Error(ctx, "failed to record log: "+err.Error())
-	}
 }
 
 func GetAllLogs(logType int, startTimestamp int64, endTimestamp int64, modelName string, username string, tokenName string, startIdx int, num int, channel int) (logs []*Log, err error) {

model/redemption.go

@@ -1,11 +1,14 @@
 package model
 
 import (
+	"context"
 	"errors"
 	"fmt"
+
+	"gorm.io/gorm"
+
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/helper"
-	"gorm.io/gorm"
 )
 
 const (
@@ -48,7 +51,7 @@ func GetRedemptionById(id int) (*Redemption, error) {
 	return &redemption, err
 }
 
-func Redeem(key string, userId int) (quota int64, err error) {
+func Redeem(ctx context.Context, key string, userId int) (quota int64, err error) {
 	if key == "" {
 		return 0, errors.New("未提供兑换码")
 	}
@@ -82,7 +85,7 @@ func Redeem(key string, userId int) (quota int64, err error) {
 	if err != nil {
 		return 0, errors.New("兑换失败，" + err.Error())
 	}
-	RecordLog(userId, LogTypeTopup, fmt.Sprintf("通过兑换码充值 %s", common.LogQuota(redemption.Quota)))
+	RecordLog(ctx, userId, LogTypeTopup, fmt.Sprintf("通过兑换码充值 %s", common.LogQuota(redemption.Quota)))
 	return redemption.Quota, nil
 }
 

model/user.go

@@ -1,16 +1,19 @@
 package model
 
 import (
+	"context"
 	"errors"
 	"fmt"
+	"strings"
+
+	"gorm.io/gorm"
+
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/blacklist"
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/helper"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/common/random"
-	"gorm.io/gorm"
-	"strings"
 )
 
 const (
@@ -114,7 +117,7 @@ func DeleteUserById(id int) (err error) {
 	return user.Delete()
 }
 
-func (user *User) Insert(inviterId int) error {
+func (user *User) Insert(ctx context.Context, inviterId int) error {
 	var err error
 	if user.Password != "" {
 		user.Password, err = common.Password2Hash(user.Password)
@@ -130,16 +133,16 @@ func (user *User) Insert(inviterId int) error {
 		return result.Error
 	}
 	if config.QuotaForNewUser > 0 {
-		RecordLog(user.Id, LogTypeSystem, fmt.Sprintf("新用户注册赠送 %s", common.LogQuota(config.QuotaForNewUser)))
+		RecordLog(ctx, user.Id, LogTypeSystem, fmt.Sprintf("新用户注册赠送 %s", common.LogQuota(config.QuotaForNewUser)))
 	}
 	if inviterId != 0 {
 		if config.QuotaForInvitee > 0 {
 			_ = IncreaseUserQuota(user.Id, config.QuotaForInvitee)
-			RecordLog(user.Id, LogTypeSystem, fmt.Sprintf("使用邀请码赠送 %s", common.LogQuota(config.QuotaForInvitee)))
+			RecordLog(ctx, user.Id, LogTypeSystem, fmt.Sprintf("使用邀请码赠送 %s", common.LogQuota(config.QuotaForInvitee)))
 		}
 		if config.QuotaForInviter > 0 {
 			_ = IncreaseUserQuota(inviterId, config.QuotaForInviter)
-			RecordLog(inviterId, LogTypeSystem, fmt.Sprintf("邀请用户赠送 %s", common.LogQuota(config.QuotaForInviter)))
+			RecordLog(ctx, inviterId, LogTypeSystem, fmt.Sprintf("邀请用户赠送 %s", common.LogQuota(config.QuotaForInviter)))
 		}
 	}
 	// create default token

relay/adaptor/anthropic/constants.go

@@ -9,5 +9,4 @@ var ModelList = []string{
 	"claude-3-5-sonnet-20240620",
 	"claude-3-5-sonnet-20241022",
 	"claude-3-5-sonnet-latest",
-	"claude-3-5-haiku-20241022",
 }

relay/adaptor/gemini/adaptor.go

@@ -7,7 +7,6 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/helper"
 	channelhelper "github.com/songquanpeng/one-api/relay/adaptor"
 	"github.com/songquanpeng/one-api/relay/adaptor/openai"
@@ -24,8 +23,11 @@ func (a *Adaptor) Init(meta *meta.Meta) {
 }
 
 func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
-	defaultVersion := config.GeminiVersion
+	var defaultVersion string
-	if meta.ActualModelName == "gemini-2.0-flash-exp" {
+	switch meta.ActualModelName {
+	case "gemini-2.0-flash-exp",
+		"gemini-2.0-flash-thinking-exp",
+		"gemini-2.0-flash-thinking-exp-01-21":
 		defaultVersion = "v1beta"
 	}
 

relay/adaptor/gemini/constants.go

@@ -7,5 +7,5 @@ var ModelList = []string{
 	"gemini-1.5-flash", "gemini-1.5-pro",
 	"text-embedding-004", "aqa",
 	"gemini-2.0-flash-exp",
-	"gemini-2.0-flash-thinking-exp",
+	"gemini-2.0-flash-thinking-exp", "gemini-2.0-flash-thinking-exp-01-21",
 }

relay/adaptor/openai/constants.go

@@ -9,6 +9,7 @@ var ModelList = []string{
 	"gpt-4-turbo-preview", "gpt-4-turbo", "gpt-4-turbo-2024-04-09",
 	"gpt-4o", "gpt-4o-2024-05-13",
 	"gpt-4o-2024-08-06",
+	"gpt-4o-2024-11-20",
 	"chatgpt-4o-latest",
 	"gpt-4o-mini", "gpt-4o-mini-2024-07-18",
 	"gpt-4-vision-preview",

relay/adaptor/tencent/adaptor.go

@@ -2,16 +2,19 @@ package tencent
 
 import (
 	"errors"
+	"io"
+	"net/http"
+	"strconv"
+	"strings"
+
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common/helper"
 	"github.com/songquanpeng/one-api/relay/adaptor"
 	"github.com/songquanpeng/one-api/relay/adaptor/openai"
 	"github.com/songquanpeng/one-api/relay/meta"
 	"github.com/songquanpeng/one-api/relay/model"
-	"io"
+	"github.com/songquanpeng/one-api/relay/relaymode"
-	"net/http"
-	"strconv"
-	"strings"
 )
 
 // https://cloud.tencent.com/document/api/1729/101837
@@ -52,10 +55,18 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
 	if err != nil {
 		return nil, err
 	}
-	tencentRequest := ConvertRequest(*request)
+	var convertedRequest any
+	switch relayMode {
+	case relaymode.Embeddings:
+		a.Action = "GetEmbedding"
+		convertedRequest = ConvertEmbeddingRequest(*request)
+	default:
+		a.Action = "ChatCompletions"
+		convertedRequest = ConvertRequest(*request)
+	}
 	// we have to calculate the sign here
-	a.Sign = GetSign(*tencentRequest, a, secretId, secretKey)
+	a.Sign = GetSign(convertedRequest, a, secretId, secretKey)
-	return tencentRequest, nil
+	return convertedRequest, nil
 }
 
 func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
@@ -75,7 +86,12 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *meta.Met
 		err, responseText = StreamHandler(c, resp)
 		usage = openai.ResponseText2Usage(responseText, meta.ActualModelName, meta.PromptTokens)
 	} else {
-		err, usage = Handler(c, resp)
+		switch meta.Mode {
+		case relaymode.Embeddings:
+			err, usage = EmbeddingHandler(c, resp)
+		default:
+			err, usage = Handler(c, resp)
+		}
 	}
 	return
 }

relay/adaptor/tencent/constants.go

@@ -6,4 +6,5 @@ var ModelList = []string{
 	"hunyuan-standard-256K",
 	"hunyuan-pro",
 	"hunyuan-vision",
+	"hunyuan-embedding",
 }

relay/adaptor/tencent/main.go

@@ -8,7 +8,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/songquanpeng/one-api/common/render"
 	"io"
 	"net/http"
 	"strconv"
@@ -16,11 +15,14 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/conv"
+	"github.com/songquanpeng/one-api/common/ctxkey"
 	"github.com/songquanpeng/one-api/common/helper"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/common/random"
+	"github.com/songquanpeng/one-api/common/render"
 	"github.com/songquanpeng/one-api/relay/adaptor/openai"
 	"github.com/songquanpeng/one-api/relay/constant"
 	"github.com/songquanpeng/one-api/relay/model"
@@ -44,8 +46,68 @@ func ConvertRequest(request model.GeneralOpenAIRequest) *ChatRequest {
 	}
 }
 
+func ConvertEmbeddingRequest(request model.GeneralOpenAIRequest) *EmbeddingRequest {
+	return &EmbeddingRequest{
+		InputList: request.ParseInput(),
+	}
+}
+
+func EmbeddingHandler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusCode, *model.Usage) {
+	var tencentResponseP EmbeddingResponseP
+	err := json.NewDecoder(resp.Body).Decode(&tencentResponseP)
+	if err != nil {
+		return openai.ErrorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil
+	}
+
+	err = resp.Body.Close()
+	if err != nil {
+		return openai.ErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
+	}
+
+	tencentResponse := tencentResponseP.Response
+	if tencentResponse.Error.Code != "" {
+		return &model.ErrorWithStatusCode{
+			Error: model.Error{
+				Message: tencentResponse.Error.Message,
+				Code:    tencentResponse.Error.Code,
+			},
+			StatusCode: resp.StatusCode,
+		}, nil
+	}
+	requestModel := c.GetString(ctxkey.RequestModel)
+	fullTextResponse := embeddingResponseTencent2OpenAI(&tencentResponse)
+	fullTextResponse.Model = requestModel
+	jsonResponse, err := json.Marshal(fullTextResponse)
+	if err != nil {
+		return openai.ErrorWrapper(err, "marshal_response_body_failed", http.StatusInternalServerError), nil
+	}
+	c.Writer.Header().Set("Content-Type", "application/json")
+	c.Writer.WriteHeader(resp.StatusCode)
+	_, err = c.Writer.Write(jsonResponse)
+	return nil, &fullTextResponse.Usage
+}
+
+func embeddingResponseTencent2OpenAI(response *EmbeddingResponse) *openai.EmbeddingResponse {
+	openAIEmbeddingResponse := openai.EmbeddingResponse{
+		Object: "list",
+		Data:   make([]openai.EmbeddingResponseItem, 0, len(response.Data)),
+		Model:  "hunyuan-embedding",
+		Usage:  model.Usage{TotalTokens: response.EmbeddingUsage.TotalTokens},
+	}
+
+	for _, item := range response.Data {
+		openAIEmbeddingResponse.Data = append(openAIEmbeddingResponse.Data, openai.EmbeddingResponseItem{
+			Object:    item.Object,
+			Index:     item.Index,
+			Embedding: item.Embedding,
+		})
+	}
+	return &openAIEmbeddingResponse
+}
+
 func responseTencent2OpenAI(response *ChatResponse) *openai.TextResponse {
 	fullTextResponse := openai.TextResponse{
+		Id:      response.ReqID,
 		Object:  "chat.completion",
 		Created: helper.GetTimestamp(),
 		Usage: model.Usage{
@@ -148,7 +210,7 @@ func Handler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusCode, *
 		return openai.ErrorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil
 	}
 	TencentResponse = responseP.Response
-	if TencentResponse.Error.Code != 0 {
+	if TencentResponse.Error.Code != "" {
 		return &model.ErrorWithStatusCode{
 			Error: model.Error{
 				Message: TencentResponse.Error.Message,
@@ -195,7 +257,7 @@ func hmacSha256(s, key string) string {
 	return string(hashed.Sum(nil))
 }
 
-func GetSign(req ChatRequest, adaptor *Adaptor, secId, secKey string) string {
+func GetSign(req any, adaptor *Adaptor, secId, secKey string) string {
 	// build canonical request string
 	host := "hunyuan.tencentcloudapi.com"
 	httpRequestMethod := "POST"

relay/adaptor/tencent/model.go

@@ -35,16 +35,16 @@ type ChatRequest struct {
 	// 1. 影响输出文本的多样性，取值越大，生成文本的多样性越强。
 	// 2. 取值区间为 [0.0, 1.0]，未传值时使用各模型推荐值。
 	// 3. 非必要不建议使用，不合理的取值会影响效果。
-	TopP *float64 `json:"TopP"`
+	TopP *float64 `json:"TopP,omitempty"`
 	// 说明：
 	// 1. 较高的数值会使输出更加随机，而较低的数值会使其更加集中和确定。
 	// 2. 取值区间为 [0.0, 2.0]，未传值时使用各模型推荐值。
 	// 3. 非必要不建议使用，不合理的取值会影响效果。
-	Temperature *float64 `json:"Temperature"`
+	Temperature *float64 `json:"Temperature,omitempty"`
 }
 
 type Error struct {
-	Code    int    `json:"Code"`
+	Code    string `json:"Code"`
 	Message string `json:"Message"`
 }
 
@@ -61,15 +61,41 @@ type ResponseChoices struct {
 }
 
 type ChatResponse struct {
-	Choices []ResponseChoices `json:"Choices,omitempty"` // 结果
+	Choices []ResponseChoices `json:"Choices,omitempty"`   // 结果
-	Created int64             `json:"Created,omitempty"` // unix 时间戳的字符串
+	Created int64             `json:"Created,omitempty"`   // unix 时间戳的字符串
-	Id      string            `json:"Id,omitempty"`      // 会话 id
+	Id      string            `json:"Id,omitempty"`        // 会话 id
-	Usage   Usage             `json:"Usage,omitempty"`   // token 数量
+	Usage   Usage             `json:"Usage,omitempty"`     // token 数量
-	Error   Error             `json:"Error,omitempty"`   // 错误信息 注意：此字段可能返回 null，表示取不到有效值
+	Error   Error             `json:"Error,omitempty"`     // 错误信息 注意：此字段可能返回 null，表示取不到有效值
-	Note    string            `json:"Note,omitempty"`    // 注释
+	Note    string            `json:"Note,omitempty"`      // 注释
-	ReqID   string            `json:"Req_id,omitempty"`  // 唯一请求 Id，每次请求都会返回。用于反馈接口入参
+	ReqID   string            `json:"RequestId,omitempty"` // 唯一请求 Id，每次请求都会返回。用于反馈接口入参
 }
 
 type ChatResponseP struct {
 	Response ChatResponse `json:"Response,omitempty"`
 }
+
+type EmbeddingRequest struct {
+	InputList []string `json:"InputList"`
+}
+
+type EmbeddingData struct {
+	Embedding []float64 `json:"Embedding"`
+	Index     int       `json:"Index"`
+	Object    string    `json:"Object"`
+}
+
+type EmbeddingUsage struct {
+	PromptTokens int `json:"PromptTokens"`
+	TotalTokens  int `json:"TotalTokens"`
+}
+
+type EmbeddingResponse struct {
+	Data           []EmbeddingData `json:"Data"`
+	EmbeddingUsage EmbeddingUsage  `json:"Usage,omitempty"`
+	RequestId      string          `json:"RequestId,omitempty"`
+	Error          Error           `json:"Error,omitempty"`
+}
+
+type EmbeddingResponseP struct {
+	Response EmbeddingResponse `json:"Response,omitempty"`
+}

relay/adaptor/vertexai/gemini/adapter.go

@@ -18,7 +18,8 @@ var ModelList = []string{
 	"gemini-pro", "gemini-pro-vision",
 	"gemini-1.5-pro-001", "gemini-1.5-flash-001",
 	"gemini-1.5-pro-002", "gemini-1.5-flash-002",
-	"gemini-2.0-flash-exp", "gemini-2.0-flash-thinking-exp",
+	"gemini-2.0-flash-exp",
+	"gemini-2.0-flash-thinking-exp", "gemini-2.0-flash-thinking-exp-01-21",
 }
 
 type Adaptor struct {

relay/billing/billing.go

@@ -3,6 +3,7 @@ package billing
 import (
 	"context"
 	"fmt"
+
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/model"
 )
@@ -31,8 +32,17 @@ func PostConsumeQuota(ctx context.Context, tokenId int, quotaDelta int64, totalQ
 	}
 	// totalQuota is total quota consumed
 	if totalQuota != 0 {
-		logContent := fmt.Sprintf("模型倍率 %.2f，分组倍率 %.2f", modelRatio, groupRatio)
+		logContent := fmt.Sprintf("倍率：%.2f × %.2f", modelRatio, groupRatio)
-		model.RecordConsumeLog(ctx, userId, channelId, int(totalQuota), 0, modelName, tokenName, totalQuota, logContent)
+		model.RecordConsumeLog(ctx, &model.Log{
+			UserId:           userId,
+			ChannelId:        channelId,
+			PromptTokens:     int(totalQuota),
+			CompletionTokens: 0,
+			ModelName:        modelName,
+			TokenName:        tokenName,
+			Quota:            int(totalQuota),
+			Content:          logContent,
+		})
 		model.UpdateUserUsedQuotaAndRequestCount(userId, totalQuota)
 		model.UpdateChannelUsedQuota(channelId, totalQuota)
 	}

relay/billing/ratio/model.go

@@ -9,9 +9,10 @@ import (
 )
 
 const (
-	USD2RMB = 7
+	USD2RMB   = 7
-	USD     = 500 // $0.002 = 1 -> $1 = 500
+	USD       = 500 // $0.002 = 1 -> $1 = 500
-	RMB     = USD / USD2RMB
+	MILLI_USD = 1.0 / 1000 * USD
+	RMB       = USD / USD2RMB
 )
 
 // ModelRatio
@@ -37,6 +38,7 @@ var ModelRatio = map[string]float64{
 	"chatgpt-4o-latest":       2.5,   // $0.005 / 1K tokens
 	"gpt-4o-2024-05-13":       2.5,   // $0.005 / 1K tokens
 	"gpt-4o-2024-08-06":       1.25,  // $0.0025 / 1K tokens
+	"gpt-4o-2024-11-20":       1.25,  // $0.0025 / 1K tokens
 	"gpt-4o-mini":             0.075, // $0.00015 / 1K tokens
 	"gpt-4o-mini-2024-07-18":  0.075, // $0.00015 / 1K tokens
 	"gpt-4-vision-preview":    5,     // $0.01 / 1K tokens
@@ -108,15 +110,16 @@ var ModelRatio = map[string]float64{
 	"bge-large-en":       0.002 * RMB,
 	"tao-8k":             0.002 * RMB,
 	// https://ai.google.dev/pricing
-	"gemini-pro":                    1, // $0.00025 / 1k characters -> $0.001 / 1k tokens
+	"gemini-pro":                          1, // $0.00025 / 1k characters -> $0.001 / 1k tokens
-	"gemini-1.0-pro":                1,
+	"gemini-1.0-pro":                      1,
-	"gemini-1.5-pro":                1,
+	"gemini-1.5-pro":                      1,
-	"gemini-1.5-pro-001":            1,
+	"gemini-1.5-pro-001":                  1,
-	"gemini-1.5-flash":              1,
+	"gemini-1.5-flash":                    1,
-	"gemini-1.5-flash-001":          1,
+	"gemini-1.5-flash-001":                1,
-	"gemini-2.0-flash-exp":          1,
+	"gemini-2.0-flash-exp":                1,
-	"gemini-2.0-flash-thinking-exp": 1,
+	"gemini-2.0-flash-thinking-exp":       1,
-	"aqa":                           1,
+	"gemini-2.0-flash-thinking-exp-01-21": 1,
+	"aqa":                                 1,
 	// https://open.bigmodel.cn/pricing
 	"glm-4":         0.1 * RMB,
 	"glm-4v":        0.1 * RMB,
@@ -278,8 +281,8 @@ var ModelRatio = map[string]float64{
 	"command-r":             0.5 / 1000 * USD,
 	"command-r-plus":        3.0 / 1000 * USD,
 	// https://platform.deepseek.com/api-docs/pricing/
-	"deepseek-chat":  1.0 / 1000 * RMB,
+	"deepseek-chat":     0.14 * MILLI_USD,
-	"deepseek-coder": 1.0 / 1000 * RMB,
+	"deepseek-reasoner": 0.55 * MILLI_USD,
 	// https://www.deepl.com/pro?cta=header-prices
 	"deepl-zh": 25.0 / 1000 * USD,
 	"deepl-en": 25.0 / 1000 * USD,
@@ -336,6 +339,11 @@ var CompletionRatio = map[string]float64{
 	// aws llama3
 	"llama3-8b-8192(33)":  0.0006 / 0.0003,
 	"llama3-70b-8192(33)": 0.0035 / 0.00265,
+	// whisper
+	"whisper-1": 0, // only count input tokens
+	// deepseek
+	"deepseek-chat":     0.28 / 0.14,
+	"deepseek-reasoner": 2.19 / 0.55,
 }
 
 var (
@@ -453,11 +461,13 @@ func GetCompletionRatio(name string, channelType int) float64 {
 		return 4.0 / 3.0
 	}
 	if strings.HasPrefix(name, "gpt-4") {
-		if strings.HasPrefix(name, "gpt-4o-mini") || name == "gpt-4o-2024-08-06" {
+		if strings.HasPrefix(name, "gpt-4o") {
+			if name == "gpt-4o-2024-05-13" {
+				return 3
+			}
 			return 4
 		}
 		if strings.HasPrefix(name, "gpt-4-turbo") ||
-			strings.HasPrefix(name, "gpt-4o") ||
 			strings.HasSuffix(name, "preview") {
 			return 3
 		}

relay/controller/audio.go

@@ -110,16 +110,9 @@ func RelayAudioHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
 	}()
 
 	// map model name
-	modelMapping := c.GetString(ctxkey.ModelMapping)
+	modelMapping := c.GetStringMapString(ctxkey.ModelMapping)
-	if modelMapping != "" {
+	if modelMapping != nil && modelMapping[audioModel] != "" {
-		modelMap := make(map[string]string)
+		audioModel = modelMapping[audioModel]
-		err := json.Unmarshal([]byte(modelMapping), &modelMap)
-		if err != nil {
-			return openai.ErrorWrapper(err, "unmarshal_model_mapping_failed", http.StatusInternalServerError)
-		}
-		if modelMap[audioModel] != "" {
-			audioModel = modelMap[audioModel]
-		}
 	}
 
 	baseURL := channeltype.ChannelBaseURLs[channelType]

relay/controller/helper.go

@@ -4,12 +4,15 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/songquanpeng/one-api/relay/constant/role"
 	"math"
 	"net/http"
 	"strings"
 
+	"github.com/songquanpeng/one-api/common/helper"
+	"github.com/songquanpeng/one-api/relay/constant/role"
+
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/logger"
@@ -119,12 +122,20 @@ func postConsumeQuota(ctx context.Context, usage *relaymodel.Usage, meta *meta.M
 	if err != nil {
 		logger.Error(ctx, "error update user quota cache: "+err.Error())
 	}
-	var extraLog string
+	logContent := fmt.Sprintf("倍率：%.2f × %.2f × %.2f", modelRatio, groupRatio, completionRatio)
-	if systemPromptReset {
+	model.RecordConsumeLog(ctx, &model.Log{
-		extraLog = " （注意系统提示词已被重置）"
+		UserId:            meta.UserId,
-	}
+		ChannelId:         meta.ChannelId,
-	logContent := fmt.Sprintf("模型倍率 %.2f，分组倍率 %.2f，补全倍率 %.2f%s", modelRatio, groupRatio, completionRatio, extraLog)
+		PromptTokens:      promptTokens,
-	model.RecordConsumeLog(ctx, meta.UserId, meta.ChannelId, promptTokens, completionTokens, textRequest.Model, meta.TokenName, quota, logContent)
+		CompletionTokens:  completionTokens,
+		ModelName:         textRequest.Model,
+		TokenName:         meta.TokenName,
+		Quota:             int(quota),
+		Content:           logContent,
+		IsStream:          meta.IsStream,
+		ElapsedTime:       helper.CalcElapsedTime(meta.StartTime),
+		SystemPromptReset: systemPromptReset,
+	})
 	model.UpdateUserUsedQuotaAndRequestCount(meta.UserId, quota)
 	model.UpdateChannelUsedQuota(meta.ChannelId, quota)
 }

relay/controller/image.go

@@ -10,6 +10,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/ctxkey"
 	"github.com/songquanpeng/one-api/common/logger"
@@ -209,8 +210,17 @@ func RelayImageHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
 		}
 		if quota != 0 {
 			tokenName := c.GetString(ctxkey.TokenName)
-			logContent := fmt.Sprintf("模型倍率 %.2f，分组倍率 %.2f", modelRatio, groupRatio)
+			logContent := fmt.Sprintf("倍率：%.2f × %.2f", modelRatio, groupRatio)
-			model.RecordConsumeLog(ctx, meta.UserId, meta.ChannelId, 0, 0, imageRequest.Model, tokenName, quota, logContent)
+			model.RecordConsumeLog(ctx, &model.Log{
+				UserId:           meta.UserId,
+				ChannelId:        meta.ChannelId,
+				PromptTokens:     0,
+				CompletionTokens: 0,
+				ModelName:        imageRequest.Model,
+				TokenName:        tokenName,
+				Quota:            int(quota),
+				Content:          logContent,
+			})
 			model.UpdateUserUsedQuotaAndRequestCount(meta.UserId, quota)
 			channelId := c.GetInt(ctxkey.ChannelId)
 			model.UpdateChannelUsedQuota(channelId, quota)

relay/controller/text.go

@@ -4,11 +4,12 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/songquanpeng/one-api/common/config"
 	"io"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+
+	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/relay"
 	"github.com/songquanpeng/one-api/relay/adaptor"

relay/meta/relay_meta.go

@@ -1,12 +1,15 @@
 package meta
 
 import (
+	"strings"
+	"time"
+
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common/ctxkey"
 	"github.com/songquanpeng/one-api/model"
 	"github.com/songquanpeng/one-api/relay/channeltype"
 	"github.com/songquanpeng/one-api/relay/relaymode"
-	"strings"
 )
 
 type Meta struct {
@@ -31,6 +34,7 @@ type Meta struct {
 	RequestURLPath  string
 	PromptTokens    int // only for DoResponse
 	SystemPrompt    string
+	StartTime       time.Time
 }
 
 func GetByContext(c *gin.Context) *Meta {
@@ -48,6 +52,7 @@ func GetByContext(c *gin.Context) *Meta {
 		APIKey:          strings.TrimPrefix(c.Request.Header.Get("Authorization"), "Bearer "),
 		RequestURLPath:  c.Request.URL.String(),
 		SystemPrompt:    c.GetString(ctxkey.SystemPrompt),
+		StartTime:       time.Now(),
 	}
 	cfg, ok := c.Get(ctxkey.Config)
 	if ok {

web/berry/src/utils/common.js

@@ -1,247 +1,260 @@
-import { enqueueSnackbar } from 'notistack';
+import {enqueueSnackbar} from 'notistack';
-import { snackbarConstants } from 'constants/SnackbarConstants';
+import {snackbarConstants} from 'constants/SnackbarConstants';
-import { API } from './api';
+import {API} from './api';
 
 export function getSystemName() {
-  let system_name = localStorage.getItem('system_name');
+    let system_name = localStorage.getItem('system_name');
-  if (!system_name) return 'One API';
+    if (!system_name) return 'One API';
-  return system_name;
+    return system_name;
 }
 
 export function isMobile() {
-  return window.innerWidth <= 600;
+    return window.innerWidth <= 600;
 }
 
 // eslint-disable-next-line
-export function SnackbarHTMLContent({ htmlContent }) {
+export function SnackbarHTMLContent({htmlContent}) {
-  return <div dangerouslySetInnerHTML={{ __html: htmlContent }} />;
+    return <div dangerouslySetInnerHTML={{__html: htmlContent}}/>;
 }
 
 export function getSnackbarOptions(variant) {
-  let options = snackbarConstants.Common[variant];
+    let options = snackbarConstants.Common[variant];
-  if (isMobile()) {
+    if (isMobile()) {
-    // 合并 options 和 snackbarConstants.Mobile
+        // 合并 options 和 snackbarConstants.Mobile
-    options = { ...options, ...snackbarConstants.Mobile };
+        options = {...options, ...snackbarConstants.Mobile};
-  }
+    }
-  return options;
+    return options;
 }
 
 export function showError(error) {
-  if (error.message) {
+    if (error.message) {
-    if (error.name === 'AxiosError') {
+        if (error.name === 'AxiosError') {
-      switch (error.response.status) {
+            switch (error.response.status) {
-        case 429:
+                case 429:
-          enqueueSnackbar('错误：请求次数过多，请稍后再试！', getSnackbarOptions('ERROR'));
+                    enqueueSnackbar('错误：请求次数过多，请稍后再试！', getSnackbarOptions('ERROR'));
-          break;
+                    break;
-        case 500:
+                case 500:
-          enqueueSnackbar('错误：服务器内部错误，请联系管理员！', getSnackbarOptions('ERROR'));
+                    enqueueSnackbar('错误：服务器内部错误，请联系管理员！', getSnackbarOptions('ERROR'));
-          break;
+                    break;
-        case 405:
+                case 405:
-          enqueueSnackbar('本站仅作演示之用，无服务端！', getSnackbarOptions('INFO'));
+                    enqueueSnackbar('本站仅作演示之用，无服务端！', getSnackbarOptions('INFO'));
-          break;
+                    break;
-        default:
+                default:
-          enqueueSnackbar('错误：' + error.message, getSnackbarOptions('ERROR'));
+                    enqueueSnackbar('错误：' + error.message, getSnackbarOptions('ERROR'));
-      }
+            }
-      return;
+            return;
+        }
+    } else {
+        enqueueSnackbar('错误：' + error, getSnackbarOptions('ERROR'));
     }
-  } else {
-    enqueueSnackbar('错误：' + error, getSnackbarOptions('ERROR'));
-  }
 }
 
 export function showNotice(message, isHTML = false) {
-  if (isHTML) {
+    if (isHTML) {
-    enqueueSnackbar(<SnackbarHTMLContent htmlContent={message} />, getSnackbarOptions('NOTICE'));
+        enqueueSnackbar(<SnackbarHTMLContent htmlContent={message}/>, getSnackbarOptions('NOTICE'));
-  } else {
+    } else {
-    enqueueSnackbar(message, getSnackbarOptions('NOTICE'));
+        enqueueSnackbar(message, getSnackbarOptions('NOTICE'));
-  }
+    }
 }
 
 export function showWarning(message) {
-  enqueueSnackbar(message, getSnackbarOptions('WARNING'));
+    enqueueSnackbar(message, getSnackbarOptions('WARNING'));
 }
 
 export function showSuccess(message) {
-  enqueueSnackbar(message, getSnackbarOptions('SUCCESS'));
+    enqueueSnackbar(message, getSnackbarOptions('SUCCESS'));
 }
 
 export function showInfo(message) {
-  enqueueSnackbar(message, getSnackbarOptions('INFO'));
+    enqueueSnackbar(message, getSnackbarOptions('INFO'));
 }
 
 export async function getOAuthState() {
-  const res = await API.get('/api/oauth/state');
+    const res = await API.get('/api/oauth/state');
-  const { success, message, data } = res.data;
+    const {success, message, data} = res.data;
-  if (success) {
+    if (success) {
-    return data;
+        return data;
-  } else {
+    } else {
-    showError(message);
+        showError(message);
-    return '';
+        return '';
-  }
+    }
 }
 
 export async function onGitHubOAuthClicked(github_client_id, openInNewTab = false) {
-  const state = await getOAuthState();
+    const state = await getOAuthState();
-  if (!state) return;
+    if (!state) return;
-  let url = `https://github.com/login/oauth/authorize?client_id=${github_client_id}&state=${state}&scope=user:email`;
+    let url = `https://github.com/login/oauth/authorize?client_id=${github_client_id}&state=${state}&scope=user:email`;
-  if (openInNewTab) {
+    if (openInNewTab) {
-    window.open(url);
+        window.open(url);
-  } else {
+    } else {
-    window.location.href = url;
+        window.location.href = url;
-  }
+    }
 }
 
 export async function onLarkOAuthClicked(lark_client_id) {
-  const state = await getOAuthState();
+    const state = await getOAuthState();
-  if (!state) return;
+    if (!state) return;
-  let redirect_uri = `${window.location.origin}/oauth/lark`;
+    let redirect_uri = `${window.location.origin}/oauth/lark`;
-  window.open(`https://accounts.feishu.cn/open-apis/authen/v1/authorize?redirect_uri=${redirect_uri}&client_id=${lark_client_id}&state=${state}`);
+    window.open(`https://accounts.feishu.cn/open-apis/authen/v1/authorize?redirect_uri=${redirect_uri}&client_id=${lark_client_id}&state=${state}`);
 }
 
 export async function onOidcClicked(auth_url, client_id, openInNewTab = false) {
-  const state = await getOAuthState();
+    const state = await getOAuthState();
-  if (!state) return;
+    if (!state) return;
-  const redirect_uri = `${window.location.origin}/oauth/oidc`;
+    const redirect_uri = `${window.location.origin}/oauth/oidc`;
-  const response_type = "code";
+    const response_type = "code";
-  const scope = "openid profile email";
+    const scope = "openid profile email";
-  const url = `${auth_url}?client_id=${client_id}&redirect_uri=${redirect_uri}&response_type=${response_type}&scope=${scope}&state=${state}`;
+    const url = `${auth_url}?client_id=${client_id}&redirect_uri=${redirect_uri}&response_type=${response_type}&scope=${scope}&state=${state}`;
-  if (openInNewTab) {
+    if (openInNewTab) {
-    window.open(url);
+        window.open(url);
-  } else
+    } else {
-  {
+        window.location.href = url;
-    window.location.href = url;
+    }
-  }
 }
 
 export function isAdmin() {
-  let user = localStorage.getItem('user');
+    let user = localStorage.getItem('user');
-  if (!user) return false;
+    if (!user) return false;
-  user = JSON.parse(user);
+    user = JSON.parse(user);
-  return user.role >= 10;
+    return user.role >= 10;
 }
 
 export function timestamp2string(timestamp) {
-  let date = new Date(timestamp * 1000);
+    let date = new Date(timestamp * 1000);
-  let year = date.getFullYear().toString();
+    let year = date.getFullYear().toString();
-  let month = (date.getMonth() + 1).toString();
+    let month = (date.getMonth() + 1).toString();
-  let day = date.getDate().toString();
+    let day = date.getDate().toString();
-  let hour = date.getHours().toString();
+    let hour = date.getHours().toString();
-  let minute = date.getMinutes().toString();
+    let minute = date.getMinutes().toString();
-  let second = date.getSeconds().toString();
+    let second = date.getSeconds().toString();
-  if (month.length === 1) {
+    if (month.length === 1) {
-    month = '0' + month;
+        month = '0' + month;
-  }
+    }
-  if (day.length === 1) {
+    if (day.length === 1) {
-    day = '0' + day;
+        day = '0' + day;
-  }
+    }
-  if (hour.length === 1) {
+    if (hour.length === 1) {
-    hour = '0' + hour;
+        hour = '0' + hour;
-  }
+    }
-  if (minute.length === 1) {
+    if (minute.length === 1) {
-    minute = '0' + minute;
+        minute = '0' + minute;
-  }
+    }
-  if (second.length === 1) {
+    if (second.length === 1) {
-    second = '0' + second;
+        second = '0' + second;
-  }
+    }
-  return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
+    return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
 }
 
 export function calculateQuota(quota, digits = 2) {
-  let quotaPerUnit = localStorage.getItem('quota_per_unit');
+    let quotaPerUnit = localStorage.getItem('quota_per_unit');
-  quotaPerUnit = parseFloat(quotaPerUnit);
+    quotaPerUnit = parseFloat(quotaPerUnit);
 
-  return (quota / quotaPerUnit).toFixed(digits);
+    return (quota / quotaPerUnit).toFixed(digits);
 }
 
 export function renderQuota(quota, digits = 2) {
-  let displayInCurrency = localStorage.getItem('display_in_currency');
+    let displayInCurrency = localStorage.getItem('display_in_currency');
-  displayInCurrency = displayInCurrency === 'true';
+    displayInCurrency = displayInCurrency === 'true';
-  if (displayInCurrency) {
+    if (displayInCurrency) {
-    return '$' + calculateQuota(quota, digits);
+        return '$' + calculateQuota(quota, digits);
-  }
+    }
-  return renderNumber(quota);
+    return renderNumber(quota);
 }
 
 export const verifyJSON = (str) => {
-  try {
+    try {
-    JSON.parse(str);
+        JSON.parse(str);
-  } catch (e) {
+    } catch (e) {
-    return false;
+        return false;
-  }
+    }
-  return true;
+    return true;
 };
 
 export function renderNumber(num) {
-  if (num >= 1000000000) {
+    if (num >= 1000000000) {
-    return (num / 1000000000).toFixed(1) + 'B';
+        return (num / 1000000000).toFixed(1) + 'B';
-  } else if (num >= 1000000) {
+    } else if (num >= 1000000) {
-    return (num / 1000000).toFixed(1) + 'M';
+        return (num / 1000000).toFixed(1) + 'M';
-  } else if (num >= 10000) {
+    } else if (num >= 10000) {
-    return (num / 1000).toFixed(1) + 'k';
+        return (num / 1000).toFixed(1) + 'k';
-  } else {
+    } else {
-    return num;
+        return num;
-  }
+    }
 }
 
 export function renderQuotaWithPrompt(quota, digits) {
-  let displayInCurrency = localStorage.getItem('display_in_currency');
+    let displayInCurrency = localStorage.getItem('display_in_currency');
-  displayInCurrency = displayInCurrency === 'true';
+    displayInCurrency = displayInCurrency === 'true';
-  if (displayInCurrency) {
+    if (displayInCurrency) {
-    return `（等价金额：${renderQuota(quota, digits)}）`;
+        return `（等价金额：${renderQuota(quota, digits)}）`;
-  }
+    }
-  return '';
+    return '';
 }
 
 export function downloadTextAsFile(text, filename) {
-  let blob = new Blob([text], { type: 'text/plain;charset=utf-8' });
+    let blob = new Blob([text], {type: 'text/plain;charset=utf-8'});
-  let url = URL.createObjectURL(blob);
+    let url = URL.createObjectURL(blob);
-  let a = document.createElement('a');
+    let a = document.createElement('a');
-  a.href = url;
+    a.href = url;
-  a.download = filename;
+    a.download = filename;
-  a.click();
+    a.click();
 }
 
 export function removeTrailingSlash(url) {
-  if (url.endsWith('/')) {
+    if (url.endsWith('/')) {
-    return url.slice(0, -1);
+        return url.slice(0, -1);
-  } else {
+    } else {
-    return url;
+        return url;
-  }
+    }
 }
 
 let channelModels = undefined;
+
 export async function loadChannelModels() {
-  const res = await API.get('/api/models');
+    const res = await API.get('/api/models');
-  const { success, data } = res.data;
+    const {success, data} = res.data;
-  if (!success) {
+    if (!success) {
-    return;
+        return;
-  }
+    }
-  channelModels = data;
+    channelModels = data;
-  localStorage.setItem('channel_models', JSON.stringify(data));
+    localStorage.setItem('channel_models', JSON.stringify(data));
 }
 
 export function getChannelModels(type) {
-  if (channelModels !== undefined && type in channelModels) {
+    if (channelModels !== undefined && type in channelModels) {
-    return channelModels[type];
+        return channelModels[type];
-  }
+    }
-  let models = localStorage.getItem('channel_models');
+    let models = localStorage.getItem('channel_models');
-  if (!models) {
+    if (!models) {
+        return [];
+    }
+    channelModels = JSON.parse(models);
+    if (type in channelModels) {
+        return channelModels[type];
+    }
     return [];
-  }
-  channelModels = JSON.parse(models);
-  if (type in channelModels) {
-    return channelModels[type];
-  }
-  return [];
 }
 
 export function copy(text, name = '') {
-  try {
+    if (navigator.clipboard && navigator.clipboard.writeText) {
-    navigator.clipboard.writeText(text);
+        navigator.clipboard.writeText(text).then(() => {
-  } catch (error) {
+            showNotice(`复制${name}成功！`, true);
-    text = `复制${name}失败，请手动复制：<br /><br />${text}`;
+        }, () => {
-    enqueueSnackbar(<SnackbarHTMLContent htmlContent={text} />, getSnackbarOptions('COPY'));
+            text = `复制${name}失败，请手动复制：<br /><br />${text}`;
-    return;
+            enqueueSnackbar(<SnackbarHTMLContent htmlContent={text}/>, getSnackbarOptions('COPY'));
-  }
+        });
-  showSuccess(`复制${name}成功！`);
+    } else {
+        const textArea = document.createElement("textarea");
+        textArea.value = text;
+        document.body.appendChild(textArea);
+        textArea.select();
+        try {
+            document.execCommand('copy');
+            showNotice(`复制${name}成功！`, true);
+        } catch (err) {
+            text = `复制${name}失败，请手动复制：<br /><br />${text}`;
+            enqueueSnackbar(<SnackbarHTMLContent htmlContent={text}/>, getSnackbarOptions('COPY'));
+        }
+        document.body.removeChild(textArea);
+    }
 }

web/berry/src/views/Channel/component/TableRow.js

@@ -268,6 +268,8 @@ function renderBalance(type, balance) {
       return <span>¥{balance.toFixed(2)}</span>;
     case 13: // AIGC2D
       return <span>{renderNumber(balance)}</span>;
+    case 36: // DeepSeek
+      return <span>¥{balance.toFixed(2)}</span>;
     case 44: // SiliconFlow
       return <span>¥{balance.toFixed(2)}</span>;
     default:

web/default/src/components/ChannelsTable.js

@@ -1,5 +1,15 @@
 import React, { useEffect, useState } from 'react';
-import { Button, Dropdown, Form, Input, Label, Message, Pagination, Popup, Table } from 'semantic-ui-react';
+import {
+  Button,
+  Dropdown,
+  Form,
+  Input,
+  Label,
+  Message,
+  Pagination,
+  Popup,
+  Table,
+} from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
 import {
   API,
@@ -9,31 +19,31 @@ import {
   showError,
   showInfo,
   showSuccess,
-  timestamp2string
+  timestamp2string,
 } from '../helpers';
 
 import { CHANNEL_OPTIONS, ITEMS_PER_PAGE } from '../constants';
 import { renderGroup, renderNumber } from '../helpers/render';
 
 function renderTimestamp(timestamp) {
-  return (
+  return <>{timestamp2string(timestamp)}</>;
-    <>
-      {timestamp2string(timestamp)}
-    </>
-  );
 }
 
 let type2label = undefined;
 
 function renderType(type) {
   if (!type2label) {
-    type2label = new Map;
+    type2label = new Map();
     for (let i = 0; i < CHANNEL_OPTIONS.length; i++) {
       type2label[CHANNEL_OPTIONS[i].value] = CHANNEL_OPTIONS[i];
     }
     type2label[0] = { value: 0, text: '未知类型', color: 'grey' };
   }
-  return <Label basic color={type2label[type]?.color}>{type2label[type] ? type2label[type].text : type}</Label>;
+  return (
+    <Label basic color={type2label[type]?.color}>
+      {type2label[type] ? type2label[type].text : type}
+    </Label>
+  );
 }
 
 function renderBalance(type, balance) {
@@ -52,6 +62,8 @@ function renderBalance(type, balance) {
       return <span>¥{balance.toFixed(2)}</span>;
     case 13: // AIGC2D
       return <span>{renderNumber(balance)}</span>;
+    case 36: // DeepSeek
+      return <span>¥{balance.toFixed(2)}</span>;
     case 44: // SiliconFlow
       return <span>¥{balance.toFixed(2)}</span>;
     default:
@@ -60,10 +72,10 @@ function renderBalance(type, balance) {
 }
 
 function isShowDetail() {
-  return localStorage.getItem("show_detail") === "true";
+  return localStorage.getItem('show_detail') === 'true';
 }
 
-const promptID = "detail"
+const promptID = 'detail';
 
 const ChannelsTable = () => {
   const [channels, setChannels] = useState([]);
@@ -79,33 +91,37 @@ const ChannelsTable = () => {
     const res = await API.get(`/api/channel/?p=${startIdx}`);
     const { success, message, data } = res.data;
     if (success) {
-        let localChannels = data.map((channel) => {
+      let localChannels = data.map((channel) => {
-            if (channel.models === '') {
+        if (channel.models === '') {
-                channel.models = [];
+          channel.models = [];
-                channel.test_model = "";
+          channel.test_model = '';
-            } else {
-                channel.models = channel.models.split(',');
-                if (channel.models.length > 0) {
-                    channel.test_model = channel.models[0];
-                }
-                channel.model_options = channel.models.map((model) => {
-                    return {
-                        key: model,
-                        text: model,
-                        value: model,
-                    }
-                })
-                console.log('channel', channel)
-            }
-            return channel;
-        });
-        if (startIdx === 0) {
-            setChannels(localChannels);
         } else {
-            let newChannels = [...channels];
+          channel.models = channel.models.split(',');
-            newChannels.splice(startIdx * ITEMS_PER_PAGE, data.length, ...localChannels);
+          if (channel.models.length > 0) {
-            setChannels(newChannels);
+            channel.test_model = channel.models[0];
+          }
+          channel.model_options = channel.models.map((model) => {
+            return {
+              key: model,
+              text: model,
+              value: model,
+            };
+          });
+          console.log('channel', channel);
         }
+        return channel;
+      });
+      if (startIdx === 0) {
+        setChannels(localChannels);
+      } else {
+        let newChannels = [...channels];
+        newChannels.splice(
+          startIdx * ITEMS_PER_PAGE,
+          data.length,
+          ...localChannels
+        );
+        setChannels(newChannels);
+      }
     } else {
       showError(message);
     }
@@ -129,8 +145,8 @@ const ChannelsTable = () => {
 
   const toggleShowDetail = () => {
     setShowDetail(!showDetail);
-    localStorage.setItem("show_detail", (!showDetail).toString());
+    localStorage.setItem('show_detail', (!showDetail).toString());
-  }
+  };
 
   useEffect(() => {
     loadChannels(0)
@@ -194,13 +210,19 @@ const ChannelsTable = () => {
   const renderStatus = (status) => {
     switch (status) {
       case 1:
-        return <Label basic color='green'>已启用</Label>;
+        return (
+          <Label basic color='green'>
+            已启用
+          </Label>
+        );
       case 2:
         return (
           <Popup
-            trigger={<Label basic color='red'>
+            trigger={
-              已禁用
+              <Label basic color='red'>
-            </Label>}
+                已禁用
+              </Label>
+            }
             content='本渠道被手动禁用'
             basic
           />
@@ -208,9 +230,11 @@ const ChannelsTable = () => {
       case 3:
         return (
           <Popup
-            trigger={<Label basic color='yellow'>
+            trigger={
-              已禁用
+              <Label basic color='yellow'>
-            </Label>}
+                已禁用
+              </Label>
+            }
             content='本渠道被程序自动禁用'
             basic
           />
@@ -228,15 +252,35 @@ const ChannelsTable = () => {
     let time = responseTime / 1000;
     time = time.toFixed(2) + ' 秒';
     if (responseTime === 0) {
-      return <Label basic color='grey'>未测试</Label>;
+      return (
+        <Label basic color='grey'>
+          未测试
+        </Label>
+      );
     } else if (responseTime <= 1000) {
-      return <Label basic color='green'>{time}</Label>;
+      return (
+        <Label basic color='green'>
+          {time}
+        </Label>
+      );
     } else if (responseTime <= 3000) {
-      return <Label basic color='olive'>{time}</Label>;
+      return (
+        <Label basic color='olive'>
+          {time}
+        </Label>
+      );
     } else if (responseTime <= 5000) {
-      return <Label basic color='yellow'>{time}</Label>;
+      return (
+        <Label basic color='yellow'>
+          {time}
+        </Label>
+      );
     } else {
-      return <Label basic color='red'>{time}</Label>;
+      return (
+        <Label basic color='red'>
+          {time}
+        </Label>
+      );
     }
   };
 
@@ -275,7 +319,11 @@ const ChannelsTable = () => {
       newChannels[realIdx].response_time = time * 1000;
       newChannels[realIdx].test_time = Date.now() / 1000;
       setChannels(newChannels);
-      showInfo(`渠道 ${name} 测试成功，模型 ${model}，耗时 ${time.toFixed(2)} 秒。`);
+      showInfo(
+        `渠道 ${name} 测试成功，模型 ${model}，耗时 ${time.toFixed(
+          2
+        )} 秒，模型输出：${message}`
+      );
     } else {
       showError(message);
     }
@@ -358,7 +406,6 @@ const ChannelsTable = () => {
     setLoading(false);
   };
 
-
   return (
     <>
       <Form onSubmit={searchChannels}>
@@ -372,20 +419,22 @@ const ChannelsTable = () => {
           onChange={handleKeywordChange}
         />
       </Form>
-      {
+      {showPrompt && (
-        showPrompt && (
+        <Message
-          <Message onDismiss={() => {
+          onDismiss={() => {
             setShowPrompt(false);
             setPromptShown(promptID);
-          }}>
+          }}
-            OpenAI 渠道已经不再支持通过 key 获取余额，因此余额显示为 0。对于支持的渠道类型，请点击余额进行刷新。
+        >
-            <br/>
+          OpenAI 渠道已经不再支持通过 key 获取余额，因此余额显示为
-            渠道测试仅支持 chat 模型，优先使用 gpt-3.5-turbo，如果该模型不可用则使用你所配置的模型列表中的第一个模型。
+          0。对于支持的渠道类型，请点击余额进行刷新。
-            <br/>
+          <br />
-            点击下方详情按钮可以显示余额以及设置额外的测试模型。
+          渠道测试仅支持 chat 模型，优先使用
-          </Message>
+          gpt-3.5-turbo，如果该模型不可用则使用你所配置的模型列表中的第一个模型。
-        )
+          <br />
-      }
+          点击下方详情按钮可以显示余额以及设置额外的测试模型。
+        </Message>
+      )}
       <Table basic compact size='small'>
         <Table.Header>
           <Table.Row>
@@ -476,7 +525,11 @@ const ChannelsTable = () => {
                   <Table.Cell>{renderStatus(channel.status)}</Table.Cell>
                   <Table.Cell>
                     <Popup
-                      content={channel.test_time ? renderTimestamp(channel.test_time) : '未测试'}
+                      content={
+                        channel.test_time
+                          ? renderTimestamp(channel.test_time)
+                          : '未测试'
+                      }
                       key={channel.id}
                       trigger={renderResponseTime(channel.response_time)}
                       basic
@@ -484,27 +537,38 @@ const ChannelsTable = () => {
                   </Table.Cell>
                   <Table.Cell hidden={!showDetail}>
                     <Popup
-                      trigger={<span onClick={() => {
+                      trigger={
-                        updateChannelBalance(channel.id, channel.name, idx);
+                        <span
-                      }} style={{ cursor: 'pointer' }}>
+                          onClick={() => {
-                      {renderBalance(channel.type, channel.balance)}
+                            updateChannelBalance(channel.id, channel.name, idx);
-                    </span>}
+                          }}
+                          style={{ cursor: 'pointer' }}
+                        >
+                          {renderBalance(channel.type, channel.balance)}
+                        </span>
+                      }
                       content='点击更新'
                       basic
                     />
                   </Table.Cell>
                   <Table.Cell>
                     <Popup
-                      trigger={<Input type='number' defaultValue={channel.priority} onBlur={(event) => {
+                      trigger={
-                        manageChannel(
+                        <Input
-                          channel.id,
+                          type='number'
-                          'priority',
+                          defaultValue={channel.priority}
-                          idx,
+                          onBlur={(event) => {
-                          event.target.value
+                            manageChannel(
-                        );
+                              channel.id,
-                      }}>
+                              'priority',
-                        <input style={{ maxWidth: '60px' }} />
+                              idx,
-                      </Input>}
+                              event.target.value
+                            );
+                          }}
+                        >
+                          <input style={{ maxWidth: '60px' }} />
+                        </Input>
+                      }
                       content='渠道选择优先级，越高越优先'
                       basic
                     />
@@ -526,7 +590,12 @@ const ChannelsTable = () => {
                         size={'small'}
                         positive
                         onClick={() => {
-                          testChannel(channel.id, channel.name, idx, channel.test_model);
+                          testChannel(
+                            channel.id,
+                            channel.name,
+                            idx,
+                            channel.test_model
+                          );
                         }}
                       >
                         测试
@@ -588,14 +657,31 @@ const ChannelsTable = () => {
 
         <Table.Footer>
           <Table.Row>
-            <Table.HeaderCell colSpan={showDetail ? "10" : "8"}>
+            <Table.HeaderCell colSpan={showDetail ? '10' : '8'}>
-              <Button size='small' as={Link} to='/channel/add' loading={loading}>
+              <Button
+                size='small'
+                as={Link}
+                to='/channel/add'
+                loading={loading}
+              >
                 添加新的渠道
               </Button>
-              <Button size='small' loading={loading} onClick={()=>{testChannels("all")}}>
+              <Button
+                size='small'
+                loading={loading}
+                onClick={() => {
+                  testChannels('all');
+                }}
+              >
                 测试所有渠道
               </Button>
-              <Button size='small' loading={loading} onClick={()=>{testChannels("disabled")}}>
+              <Button
+                size='small'
+                loading={loading}
+                onClick={() => {
+                  testChannels('disabled');
+                }}
+              >
                 测试禁用渠道
               </Button>
               {/*<Button size='small' onClick={updateAllChannelsBalance}*/}
@@ -610,7 +696,12 @@ const ChannelsTable = () => {
                 flowing
                 hoverable
               >
-                <Button size='small' loading={loading} negative onClick={deleteAllDisabledChannels}>
+                <Button
+                  size='small'
+                  loading={loading}
+                  negative
+                  onClick={deleteAllDisabledChannels}
+                >
                   确认删除
                 </Button>
               </Popup>
@@ -625,8 +716,12 @@ const ChannelsTable = () => {
                   (channels.length % ITEMS_PER_PAGE === 0 ? 1 : 0)
                 }
               />
-              <Button size='small' onClick={refresh} loading={loading}>刷新</Button>
+              <Button size='small' onClick={refresh} loading={loading}>
-              <Button size='small' onClick={toggleShowDetail}>{showDetail ? "隐藏详情" : "详情"}</Button>
+                刷新
+              </Button>
+              <Button size='small' onClick={toggleShowDetail}>
+                {showDetail ? '隐藏详情' : '详情'}
+              </Button>
             </Table.HeaderCell>
           </Table.Row>
         </Table.Footer>

web/default/src/components/LogsTable.js

@@ -1,21 +1,48 @@
 import React, { useEffect, useState } from 'react';
-import { Button, Form, Header, Label, Pagination, Segment, Select, Table } from 'semantic-ui-react';
+import {
-import { API, isAdmin, showError, timestamp2string } from '../helpers';
+  Button,
+  Form,
+  Header,
+  Label,
+  Pagination,
+  Segment,
+  Select,
+  Table,
+} from 'semantic-ui-react';
+import {
+  API,
+  copy,
+  isAdmin,
+  showError,
+  showSuccess,
+  showWarning,
+  timestamp2string,
+} from '../helpers';
 
 import { ITEMS_PER_PAGE } from '../constants';
-import { renderQuota } from '../helpers/render';
+import { renderColorLabel, renderQuota } from '../helpers/render';
+import { Link } from 'react-router-dom';
 
-function renderTimestamp(timestamp) {
+function renderTimestamp(timestamp, request_id) {
   return (
-    <>
+    <code
+      onClick={async () => {
+        if (await copy(request_id)) {
+          showSuccess(`已复制请求 ID：${request_id}`);
+        } else {
+          showWarning(`请求 ID 复制失败：${request_id}`);
+        }
+      }}
+      style={{ cursor: 'pointer' }}
+    >
       {timestamp2string(timestamp)}
-    </>
+    </code>
   );
 }
 
 const MODE_OPTIONS = [
   { key: 'all', text: '全部用户', value: 'all' },
-  { key: 'self', text: '当前用户', value: 'self' }
+  { key: 'self', text: '当前用户', value: 'self' },
 ];
 
 const LOG_OPTIONS = [
@@ -23,24 +50,92 @@ const LOG_OPTIONS = [
   { key: '1', text: '充值', value: 1 },
   { key: '2', text: '消费', value: 2 },
   { key: '3', text: '管理', value: 3 },
-  { key: '4', text: '系统', value: 4 }
+  { key: '4', text: '系统', value: 4 },
+  { key: '5', text: '测试', value: 5 },
 ];
 
 function renderType(type) {
   switch (type) {
     case 1:
-      return <Label basic color='green'> 充值 </Label>;
+      return (
+        <Label basic color='green'>
+          充值
+        </Label>
+      );
     case 2:
-      return <Label basic color='olive'> 消费 </Label>;
+      return (
+        <Label basic color='olive'>
+          消费
+        </Label>
+      );
     case 3:
-      return <Label basic color='orange'> 管理 </Label>;
+      return (
+        <Label basic color='orange'>
+          管理
+        </Label>
+      );
     case 4:
-      return <Label basic color='purple'> 系统 </Label>;
+      return (
+        <Label basic color='purple'>
+          系统
+        </Label>
+      );
+    case 5:
+      return (
+        <Label basic color='violet'>
+          测试
+        </Label>
+      );
     default:
-      return <Label basic color='black'> 未知 </Label>;
+      return (
+        <Label basic color='black'>
+          未知
+        </Label>
+      );
   }
 }
 
+function getColorByElapsedTime(elapsedTime) {
+  if (elapsedTime === undefined || 0) return 'black';
+  if (elapsedTime < 1000) return 'green';
+  if (elapsedTime < 3000) return 'olive';
+  if (elapsedTime < 5000) return 'yellow';
+  if (elapsedTime < 10000) return 'orange';
+  return 'red';
+}
+
+function renderDetail(log) {
+  return (
+    <>
+      {log.content}
+      <br />
+      {log.elapsed_time && (
+        <Label
+          basic
+          size={'mini'}
+          color={getColorByElapsedTime(log.elapsed_time)}
+        >
+          {log.elapsed_time} ms
+        </Label>
+      )}
+      {log.is_stream && (
+        <>
+          <Label size={'mini'} color='pink'>
+            Stream
+          </Label>
+        </>
+      )}
+      {log.system_prompt_reset && (
+        <>
+          <Label basic size={'mini'} color='red'>
+            System Prompt Reset
+          </Label>
+        </>
+      )}
+    </>
+  );
+}
+
 const LogsTable = () => {
   const [logs, setLogs] = useState([]);
   const [showStat, setShowStat] = useState(false);
@@ -57,13 +152,20 @@ const LogsTable = () => {
     model_name: '',
     start_timestamp: timestamp2string(0),
     end_timestamp: timestamp2string(now.getTime() / 1000 + 3600),
-    channel: ''
+    channel: '',
   });
-  const { username, token_name, model_name, start_timestamp, end_timestamp, channel } = inputs;
+  const {
+    username,
+    token_name,
+    model_name,
+    start_timestamp,
+    end_timestamp,
+    channel,
+  } = inputs;
 
   const [stat, setStat] = useState({
     quota: 0,
-    token: 0
+    token: 0,
   });
 
   const handleInputChange = (e, { name, value }) => {
@@ -73,7 +175,9 @@ const LogsTable = () => {
   const getLogSelfStat = async () => {
     let localStartTimestamp = Date.parse(start_timestamp) / 1000;
     let localEndTimestamp = Date.parse(end_timestamp) / 1000;
-    let res = await API.get(`/api/log/self/stat?type=${logType}&token_name=${token_name}&model_name=${model_name}&start_timestamp=${localStartTimestamp}&end_timestamp=${localEndTimestamp}`);
+    let res = await API.get(
+      `/api/log/self/stat?type=${logType}&token_name=${token_name}&model_name=${model_name}&start_timestamp=${localStartTimestamp}&end_timestamp=${localEndTimestamp}`
+    );
     const { success, message, data } = res.data;
     if (success) {
       setStat(data);
@@ -85,7 +189,9 @@ const LogsTable = () => {
   const getLogStat = async () => {
     let localStartTimestamp = Date.parse(start_timestamp) / 1000;
     let localEndTimestamp = Date.parse(end_timestamp) / 1000;
-    let res = await API.get(`/api/log/stat?type=${logType}&username=${username}&token_name=${token_name}&model_name=${model_name}&start_timestamp=${localStartTimestamp}&end_timestamp=${localEndTimestamp}&channel=${channel}`);
+    let res = await API.get(
+      `/api/log/stat?type=${logType}&username=${username}&token_name=${token_name}&model_name=${model_name}&start_timestamp=${localStartTimestamp}&end_timestamp=${localEndTimestamp}&channel=${channel}`
+    );
     const { success, message, data } = res.data;
     if (success) {
       setStat(data);
@@ -105,6 +211,10 @@ const LogsTable = () => {
     setShowStat(!showStat);
   };
 
+  const showUserTokenQuota = () => {
+    return logType !== 5;
+  };
+
   const loadLogs = async (startIdx) => {
     let url = '';
     let localStartTimestamp = Date.parse(start_timestamp) / 1000;
@@ -201,37 +311,82 @@ const LogsTable = () => {
         <Header as='h3'>
           使用明细（总消耗额度：
           {showStat && renderQuota(stat.quota)}
-          {!showStat && <span onClick={handleEyeClick} style={{ cursor: 'pointer', color: 'gray' }}>点击查看</span>}
+          {!showStat && (
+            <span
+              onClick={handleEyeClick}
+              style={{ cursor: 'pointer', color: 'gray' }}
+            >
+              点击查看
+            </span>
+          )}
           ）
         </Header>
         <Form>
           <Form.Group>
-            <Form.Input fluid label={'令牌名称'} width={3} value={token_name}
+            <Form.Input
-                        placeholder={'可选值'} name='token_name' onChange={handleInputChange} />
+              fluid
-            <Form.Input fluid label='模型名称' width={3} value={model_name} placeholder='可选值'
+              label={'令牌名称'}
-                        name='model_name'
+              width={3}
-                        onChange={handleInputChange} />
+              value={token_name}
-            <Form.Input fluid label='起始时间' width={4} value={start_timestamp} type='datetime-local'
+              placeholder={'可选值'}
-                        name='start_timestamp'
+              name='token_name'
-                        onChange={handleInputChange} />
+              onChange={handleInputChange}
-            <Form.Input fluid label='结束时间' width={4} value={end_timestamp} type='datetime-local'
+            />
-                        name='end_timestamp'
+            <Form.Input
-                        onChange={handleInputChange} />
+              fluid
-            <Form.Button fluid label='操作' width={2} onClick={refresh}>查询</Form.Button>
+              label='模型名称'
+              width={3}
+              value={model_name}
+              placeholder='可选值'
+              name='model_name'
+              onChange={handleInputChange}
+            />
+            <Form.Input
+              fluid
+              label='起始时间'
+              width={4}
+              value={start_timestamp}
+              type='datetime-local'
+              name='start_timestamp'
+              onChange={handleInputChange}
+            />
+            <Form.Input
+              fluid
+              label='结束时间'
+              width={4}
+              value={end_timestamp}
+              type='datetime-local'
+              name='end_timestamp'
+              onChange={handleInputChange}
+            />
+            <Form.Button fluid label='操作' width={2} onClick={refresh}>
+              查询
+            </Form.Button>
           </Form.Group>
-          {
+          {isAdminUser && (
-            isAdminUser && <>
+            <>
               <Form.Group>
-                <Form.Input fluid label={'渠道 ID'} width={3} value={channel}
+                <Form.Input
-                            placeholder='可选值' name='channel'
+                  fluid
-                            onChange={handleInputChange} />
+                  label={'渠道 ID'}
-                <Form.Input fluid label={'用户名称'} width={3} value={username}
+                  width={3}
-                            placeholder={'可选值'} name='username'
+                  value={channel}
-                            onChange={handleInputChange} />
+                  placeholder='可选值'
-
+                  name='channel'
+                  onChange={handleInputChange}
+                />
+                <Form.Input
+                  fluid
+                  label={'用户名称'}
+                  width={3}
+                  value={username}
+                  placeholder={'可选值'}
+                  name='username'
+                  onChange={handleInputChange}
+                />
               </Form.Group>
             </>
-          }
+          )}
         </Form>
         <Table basic compact size='small'>
           <Table.Header>
@@ -245,8 +400,8 @@ const LogsTable = () => {
               >
                 时间
               </Table.HeaderCell>
-              {
+              {isAdminUser && (
-                isAdminUser && <Table.HeaderCell
+                <Table.HeaderCell
                   style={{ cursor: 'pointer' }}
                   onClick={() => {
                     sortLog('channel');
@@ -255,27 +410,7 @@ const LogsTable = () => {
                 >
                   渠道
                 </Table.HeaderCell>
-              }
+              )}
-              {
-                isAdminUser && <Table.HeaderCell
-                  style={{ cursor: 'pointer' }}
-                  onClick={() => {
-                    sortLog('username');
-                  }}
-                  width={1}
-                >
-                  用户
-                </Table.HeaderCell>
-              }
-              <Table.HeaderCell
-                style={{ cursor: 'pointer' }}
-                onClick={() => {
-                  sortLog('token_name');
-                }}
-                width={1}
-              >
-                令牌
-              </Table.HeaderCell>
               <Table.HeaderCell
                 style={{ cursor: 'pointer' }}
                 onClick={() => {
@@ -294,33 +429,57 @@ const LogsTable = () => {
               >
                 模型
               </Table.HeaderCell>
-              <Table.HeaderCell
+              {showUserTokenQuota() && (
-                style={{ cursor: 'pointer' }}
+                <>
-                onClick={() => {
+                  {isAdminUser && (
-                  sortLog('prompt_tokens');
+                    <Table.HeaderCell
-                }}
+                      style={{ cursor: 'pointer' }}
-                width={1}
+                      onClick={() => {
-              >
+                        sortLog('username');
-                提示
+                      }}
-              </Table.HeaderCell>
+                      width={1}
-              <Table.HeaderCell
+                    >
-                style={{ cursor: 'pointer' }}
+                      用户
-                onClick={() => {
+                    </Table.HeaderCell>
-                  sortLog('completion_tokens');
+                  )}
-                }}
+                  <Table.HeaderCell
-                width={1}
+                    style={{ cursor: 'pointer' }}
-              >
+                    onClick={() => {
-                补全
+                      sortLog('token_name');
-              </Table.HeaderCell>
+                    }}
-              <Table.HeaderCell
+                    width={1}
-                style={{ cursor: 'pointer' }}
+                  >
-                onClick={() => {
+                    令牌
-                  sortLog('quota');
+                  </Table.HeaderCell>
-                }}
+                  <Table.HeaderCell
-                width={1}
+                    style={{ cursor: 'pointer' }}
-              >
+                    onClick={() => {
-                额度
+                      sortLog('prompt_tokens');
-              </Table.HeaderCell>
+                    }}
+                    width={1}
+                  >
+                    提示
+                  </Table.HeaderCell>
+                  <Table.HeaderCell
+                    style={{ cursor: 'pointer' }}
+                    onClick={() => {
+                      sortLog('completion_tokens');
+                    }}
+                    width={1}
+                  >
+                    补全
+                  </Table.HeaderCell>
+                  <Table.HeaderCell
+                    style={{ cursor: 'pointer' }}
+                    onClick={() => {
+                      sortLog('quota');
+                    }}
+                    width={1}
+                  >
+                    额度
+                  </Table.HeaderCell>
+                </>
+              )}
               <Table.HeaderCell
                 style={{ cursor: 'pointer' }}
                 onClick={() => {
@@ -343,24 +502,64 @@ const LogsTable = () => {
                 if (log.deleted) return <></>;
                 return (
                   <Table.Row key={log.id}>
-                    <Table.Cell>{renderTimestamp(log.created_at)}</Table.Cell>
+                    <Table.Cell>
-                    {
+                      {renderTimestamp(log.created_at, log.request_id)}
-                      isAdminUser && (
+                    </Table.Cell>
-                        <Table.Cell>{log.channel ? <Label basic>{log.channel}</Label> : ''}</Table.Cell>
+                    {isAdminUser && (
-                      )
+                      <Table.Cell>
-                    }
+                        {log.channel ? (
-                    {
+                          <Label
-                      isAdminUser && (
+                            basic
-                        <Table.Cell>{log.username ? <Label>{log.username}</Label> : ''}</Table.Cell>
+                            as={Link}
-                      )
+                            to={`/channel/edit/${log.channel}`}
-                    }
+                          >
-                    <Table.Cell>{log.token_name ? <Label basic>{log.token_name}</Label> : ''}</Table.Cell>
+                            {log.channel}
+                          </Label>
+                        ) : (
+                          ''
+                        )}
+                      </Table.Cell>
+                    )}
                     <Table.Cell>{renderType(log.type)}</Table.Cell>
-                    <Table.Cell>{log.model_name ? <Label basic>{log.model_name}</Label> : ''}</Table.Cell>
+                    <Table.Cell>
-                    <Table.Cell>{log.prompt_tokens ? log.prompt_tokens : ''}</Table.Cell>
+                      {log.model_name ? renderColorLabel(log.model_name) : ''}
-                    <Table.Cell>{log.completion_tokens ? log.completion_tokens : ''}</Table.Cell>
+                    </Table.Cell>
-                    <Table.Cell>{log.quota ? renderQuota(log.quota, 6) : ''}</Table.Cell>
+                    {showUserTokenQuota() && (
-                    <Table.Cell>{log.content}</Table.Cell>
+                      <>
+                        {isAdminUser && (
+                          <Table.Cell>
+                            {log.username ? (
+                              <Label
+                                basic
+                                as={Link}
+                                to={`/user/edit/${log.user_id}`}
+                              >
+                                {log.username}
+                              </Label>
+                            ) : (
+                              ''
+                            )}
+                          </Table.Cell>
+                        )}
+                        <Table.Cell>
+                          {log.token_name
+                            ? renderColorLabel(log.token_name)
+                            : ''}
+                        </Table.Cell>
+
+                        <Table.Cell>
+                          {log.prompt_tokens ? log.prompt_tokens : ''}
+                        </Table.Cell>
+                        <Table.Cell>
+                          {log.completion_tokens ? log.completion_tokens : ''}
+                        </Table.Cell>
+                        <Table.Cell>
+                          {log.quota ? renderQuota(log.quota, 6) : ''}
+                        </Table.Cell>
+                      </>
+                    )}
+
+                    <Table.Cell>{renderDetail(log)}</Table.Cell>
                   </Table.Row>
                 );
               })}
@@ -379,7 +578,9 @@ const LogsTable = () => {
                     setLogType(value);
                   }}
                 />
-                <Button size='small' onClick={refresh} loading={loading}>刷新</Button>
+                <Button size='small' onClick={refresh} loading={loading}>
+                  刷新
+                </Button>
                 <Pagination
                   floated='right'
                   activePage={activePage}

web/default/src/helpers/render.js

@@ -13,16 +13,18 @@ export function renderGroup(group) {
   }
   let groups = group.split(',');
   groups.sort();
-  return <>
+  return (
-    {groups.map((group) => {
+    <>
-      if (group === 'vip' || group === 'pro') {
+      {groups.map((group) => {
-        return <Label color='yellow'>{group}</Label>;
+        if (group === 'vip' || group === 'pro') {
-      } else if (group === 'svip' || group === 'premium') {
+          return <Label color='yellow'>{group}</Label>;
-        return <Label color='red'>{group}</Label>;
+        } else if (group === 'svip' || group === 'premium') {
-      }
+          return <Label color='red'>{group}</Label>;
-      return <Label>{group}</Label>;
+        }
-    })}
+        return <Label>{group}</Label>;
-  </>;
+      })}
+    </>
+  );
 }
 
 export function renderNumber(num) {
@@ -55,4 +57,33 @@ export function renderQuotaWithPrompt(quota, digits) {
     return `（等价金额：${renderQuota(quota, digits)}）`;
   }
   return '';
-}
+}
+
+const colors = [
+  'red',
+  'orange',
+  'yellow',
+  'olive',
+  'green',
+  'teal',
+  'blue',
+  'violet',
+  'purple',
+  'pink',
+  'brown',
+  'grey',
+  'black',
+];
+
+export function renderColorLabel(text) {
+  let hash = 0;
+  for (let i = 0; i < text.length; i++) {
+    hash = text.charCodeAt(i) + ((hash << 5) - hash);
+  }
+  let index = Math.abs(hash % colors.length);
+  return (
+    <Label basic color={colors[index]}>
+      {text}
+    </Label>
+  );
+}