Ecosystem/ai-gateway
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into patch/images-edits

Browse Source
This commit is contained in:
Laisky.Cai 2024-05-28 11:11:03 +08:00 committed by GitHub
commit dd73f5b6b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
35 changed files with 637 additions and 513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -87,6 +87,7 @@ _✨ 通过标准的 OpenAI API 格式访问所有的大模型，开箱即用
+ [x] [DeepSeek](https://www.deepseek.com/) + [x] [DeepSeek](https://www.deepseek.com/)
+ [x] [Cloudflare Workers AI](https://developers.cloudflare.com/workers-ai/) + [x] [Cloudflare Workers AI](https://developers.cloudflare.com/workers-ai/)
+ [x] [DeepL](https://www.deepl.com/) + [x] [DeepL](https://www.deepl.com/)
+ [x] [together.ai](https://www.together.ai/)
2. 支持配置镜像以及众多[第三方代理服务](https://iamazing.cn/page/openai-api-third-party-services)。 2. 支持配置镜像以及众多[第三方代理服务](https://iamazing.cn/page/openai-api-third-party-services)。
3. 支持通过**负载均衡**的方式访问多个渠道。 3. 支持通过**负载均衡**的方式访问多个渠道。
4. 支持 **stream 模式**，可以通过流式传输实现打字机效果。 4. 支持 **stream 模式**，可以通过流式传输实现打字机效果。

22
controller/relay.go
View File

@ -4,6 +4,9 @@ import (
"bytes" "bytes"
"context" "context"
"fmt" "fmt"
"io"
"net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common" "github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/config" "github.com/songquanpeng/one-api/common/config"
@ -16,8 +19,6 @@ import (
"github.com/songquanpeng/one-api/relay/controller" "github.com/songquanpeng/one-api/relay/controller"
"github.com/songquanpeng/one-api/relay/model" "github.com/songquanpeng/one-api/relay/model"
"github.com/songquanpeng/one-api/relay/relaymode" "github.com/songquanpeng/one-api/relay/relaymode"
"io"
"net/http"
) )
// https://platform.openai.com/docs/api-reference/chat // https://platform.openai.com/docs/api-reference/chat
@ -44,6 +45,7 @@ func Relay(c *gin.Context) {
ctx := c.Request.Context() ctx := c.Request.Context()
relayMode := relaymode.GetByPath(c.Request.URL.Path) relayMode := relaymode.GetByPath(c.Request.URL.Path)
channelId := c.GetInt(ctxkey.ChannelId) channelId := c.GetInt(ctxkey.ChannelId)
userId := c.GetInt("id")
bizErr := relayHelper(c, relayMode) bizErr := relayHelper(c, relayMode)
if bizErr == nil { if bizErr == nil {
monitor.Emit(channelId, true) monitor.Emit(channelId, true)
@ -53,9 +55,10 @@ func Relay(c *gin.Context) {
channelName := c.GetString(ctxkey.ChannelName) channelName := c.GetString(ctxkey.ChannelName)
group := c.GetString(ctxkey.Group) group := c.GetString(ctxkey.Group)
originalModel := c.GetString(ctxkey.OriginalModel) originalModel := c.GetString(ctxkey.OriginalModel)
// bizErr is shared, should not run this function in goroutine to avoid race
processChannelRelayError(ctx, channelId, channelName, bizErr) // BUG: bizErr is shared, should not run this function in goroutine to avoid race
requestId := c.GetString(ctxkey.RequestId) go processChannelRelayError(ctx, userId, channelId, channelName, bizErr)
requestId := c.GetString(helper.RequestIdKey)
retryTimes := config.RetryTimes retryTimes := config.RetryTimes
if !shouldRetry(c, bizErr.StatusCode) { if !shouldRetry(c, bizErr.StatusCode) {
logger.Errorf(ctx, "relay error happen, status code is %d, won't retry in this case", bizErr.StatusCode) logger.Errorf(ctx, "relay error happen, status code is %d, won't retry in this case", bizErr.StatusCode)
@ -81,8 +84,9 @@ func Relay(c *gin.Context) {
channelId := c.GetInt(ctxkey.ChannelId) channelId := c.GetInt(ctxkey.ChannelId)
lastFailedChannelId = channelId lastFailedChannelId = channelId
channelName := c.GetString(ctxkey.ChannelName) channelName := c.GetString(ctxkey.ChannelName)
// bizErr is shared, should not run this function in goroutine to avoid race
processChannelRelayError(ctx, channelId, channelName, bizErr) // BUG: bizErr is shared, should not run this function in goroutine to avoid race
go processChannelRelayError(ctx, userId, channelId, channelName, bizErr)
} }
if bizErr != nil { if bizErr != nil {
@ -115,8 +119,8 @@ func shouldRetry(c *gin.Context, statusCode int) bool {
return true return true
} }
func processChannelRelayError(ctx context.Context, channelId int, channelName string, err *model.ErrorWithStatusCode) { func processChannelRelayError(ctx context.Context, userId int, channelId int, channelName string, err *model.ErrorWithStatusCode) {
logger.Errorf(ctx, "relay error (channel #%d): %s", channelId, err.Message) logger.Errorf(ctx, "relay error (channel id %d, user id: %d): %s", channelId, userId, err.Message)
// https://platform.openai.com/docs/guides/error-codes/api-errors // https://platform.openai.com/docs/guides/error-codes/api-errors
if monitor.ShouldDisableChannel(&err.Error, err.StatusCode) { if monitor.ShouldDisableChannel(&err.Error, err.StatusCode) {
monitor.DisableChannel(channelId, channelName, err.Message) monitor.DisableChannel(channelId, channelName, err.Message)

25
controller/user.go
View File

@ -6,6 +6,8 @@ import (
"github.com/songquanpeng/one-api/common" "github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/config" "github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/ctxkey" "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/random"
"github.com/songquanpeng/one-api/model" "github.com/songquanpeng/one-api/model"
"net/http" "net/http"
@ -109,6 +111,7 @@ func Logout(c *gin.Context) {
} }
func Register(c *gin.Context) { func Register(c *gin.Context) {
ctx := c.Request.Context()
if !config.RegisterEnabled { if !config.RegisterEnabled {
c.JSON(http.StatusOK, gin.H{ c.JSON(http.StatusOK, gin.H{
"message": "管理员关闭了新用户注册", "message": "管理员关闭了新用户注册",
@ -173,6 +176,28 @@ func Register(c *gin.Context) {
}) })
return return
} }
go func() {
err := user.ValidateAndFill()
if err != nil {
logger.Errorf(ctx, "user.ValidateAndFill failed: %w", err)
return
}
cleanToken := model.Token{
UserId: user.Id,
Name: "default",
Key: random.GenerateKey(),
CreatedTime: helper.GetTimestamp(),
AccessedTime: helper.GetTimestamp(),
ExpiredTime: -1,
RemainQuota: -1,
UnlimitedQuota: true,
}
err = cleanToken.Insert()
if err != nil {
logger.Errorf(ctx, "cleanToken.Insert failed: %w", err)
return
}
}()
c.JSON(http.StatusOK, gin.H{ c.JSON(http.StatusOK, gin.H{
"success": true, "success": true,
"message": "", "message": "",

48
go.mod
View File

@ -4,42 +4,42 @@ module github.com/songquanpeng/one-api
go 1.20 go 1.20
require ( require (
github.com/aws/aws-sdk-go-v2 v1.26.1 github.com/aws/aws-sdk-go-v2 v1.27.0
github.com/aws/aws-sdk-go-v2/credentials v1.17.11 github.com/aws/aws-sdk-go-v2/credentials v1.17.15
github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.7.4 github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.8.3
github.com/gin-contrib/cors v1.7.1 github.com/gin-contrib/cors v1.7.2
github.com/gin-contrib/gzip v1.0.0 github.com/gin-contrib/gzip v1.0.1
github.com/gin-contrib/sessions v1.0.0 github.com/gin-contrib/sessions v1.0.1
github.com/gin-contrib/static v1.1.1 github.com/gin-contrib/static v1.1.2
github.com/gin-gonic/gin v1.9.1 github.com/gin-gonic/gin v1.10.0
github.com/go-playground/validator/v10 v10.19.0 github.com/go-playground/validator/v10 v10.20.0
github.com/go-redis/redis/v8 v8.11.5 github.com/go-redis/redis/v8 v8.11.5
github.com/golang-jwt/jwt v3.2.2+incompatible github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/google/uuid v1.6.0 github.com/google/uuid v1.6.0
github.com/gorilla/websocket v1.5.1 github.com/gorilla/websocket v1.5.1
github.com/jinzhu/copier v0.4.0 github.com/jinzhu/copier v0.4.0
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/pkoukk/tiktoken-go v0.1.6 github.com/pkoukk/tiktoken-go v0.1.7
github.com/smartystreets/goconvey v1.8.1 github.com/smartystreets/goconvey v1.8.1
github.com/stretchr/testify v1.9.0 github.com/stretchr/testify v1.9.0
golang.org/x/crypto v0.22.0 golang.org/x/crypto v0.23.0
golang.org/x/image v0.15.0 golang.org/x/image v0.16.0
gorm.io/driver/mysql v1.5.6 gorm.io/driver/mysql v1.5.6
gorm.io/driver/postgres v1.5.7 gorm.io/driver/postgres v1.5.7
gorm.io/driver/sqlite v1.5.5 gorm.io/driver/sqlite v1.5.5
gorm.io/gorm v1.25.9 gorm.io/gorm v1.25.10
) )
require ( require (
filippo.io/edwards25519 v1.1.0 // indirect filippo.io/edwards25519 v1.1.0 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.7 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.7 // indirect
github.com/aws/smithy-go v1.20.2 // indirect github.com/aws/smithy-go v1.20.2 // indirect
github.com/bytedance/sonic v1.11.5 // indirect github.com/bytedance/sonic v1.11.6 // indirect
github.com/bytedance/sonic/loader v0.1.1 // indirect github.com/bytedance/sonic/loader v0.1.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cloudwego/base64x v0.1.3 // indirect github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect github.com/cloudwego/iasm v0.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@ -50,7 +50,7 @@ require (
github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-sql-driver/mysql v1.8.1 // indirect github.com/go-sql-driver/mysql v1.8.1 // indirect
github.com/goccy/go-json v0.10.2 // indirect github.com/goccy/go-json v0.10.3 // indirect
github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/gopherjs/gopherjs v1.17.2 // indirect
github.com/gorilla/context v1.1.2 // indirect github.com/gorilla/context v1.1.2 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect github.com/gorilla/securecookie v1.1.2 // indirect
@ -70,16 +70,16 @@ require (
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.2.1 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/smarty/assertions v1.15.0 // indirect github.com/smarty/assertions v1.15.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect github.com/ugorji/go/codec v1.2.12 // indirect
golang.org/x/arch v0.7.0 // indirect golang.org/x/arch v0.8.0 // indirect
golang.org/x/net v0.24.0 // indirect golang.org/x/net v0.25.0 // indirect
golang.org/x/sync v0.7.0 // indirect golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.19.0 // indirect golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.14.0 // indirect golang.org/x/text v0.15.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect
) )

48
go.sum
View File

@ -2,20 +2,32 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA= github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA=
github.com/aws/aws-sdk-go-v2 v1.26.1/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= github.com/aws/aws-sdk-go-v2 v1.26.1/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM=
github.com/aws/aws-sdk-go-v2 v1.27.0 h1:7bZWKoXhzI+mMR/HjdMx8ZCC5+6fY0lS5tr0bbgiLlo=
github.com/aws/aws-sdk-go-v2 v1.27.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 h1:x6xsQXGSmW6frevwDA+vi/wqhp1ct18mVXYN08/93to= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 h1:x6xsQXGSmW6frevwDA+vi/wqhp1ct18mVXYN08/93to=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2/go.mod h1:lPprDr1e6cJdyYeGXnRaJoP4Md+cDBvi2eOj00BlGmg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2/go.mod h1:lPprDr1e6cJdyYeGXnRaJoP4Md+cDBvi2eOj00BlGmg=
github.com/aws/aws-sdk-go-v2/credentials v1.17.11 h1:YuIB1dJNf1Re822rriUOTxopaHHvIq0l/pX3fwO+Tzs= github.com/aws/aws-sdk-go-v2/credentials v1.17.11 h1:YuIB1dJNf1Re822rriUOTxopaHHvIq0l/pX3fwO+Tzs=
github.com/aws/aws-sdk-go-v2/credentials v1.17.11/go.mod h1:AQtFPsDH9bI2O+71anW6EKL+NcD7LG3dpKGMV4SShgo= github.com/aws/aws-sdk-go-v2/credentials v1.17.11/go.mod h1:AQtFPsDH9bI2O+71anW6EKL+NcD7LG3dpKGMV4SShgo=
github.com/aws/aws-sdk-go-v2/credentials v1.17.15 h1:YDexlvDRCA8ems2T5IP1xkMtOZ1uLJOCJdTr0igs5zo=
github.com/aws/aws-sdk-go-v2/credentials v1.17.15/go.mod h1:vxHggqW6hFNaeNC0WyXS3VdyjcV0a4KMUY4dKJ96buU=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 h1:aw39xVGeRWlWx9EzGVnhOR4yOjQDHPQ6o6NmBlscyQg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 h1:aw39xVGeRWlWx9EzGVnhOR4yOjQDHPQ6o6NmBlscyQg=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5/go.mod h1:FSaRudD0dXiMPK2UjknVwwTYyZMRsHv3TtkabsZih5I= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5/go.mod h1:FSaRudD0dXiMPK2UjknVwwTYyZMRsHv3TtkabsZih5I=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.7 h1:lf/8VTF2cM+N4SLzaYJERKEWAXq8MOMpZfU6wEPWsPk=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.7/go.mod h1:4SjkU7QiqK2M9oozyMzfZ/23LmUY+h3oFqhdeP5OMiI=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 h1:PG1F3OD1szkuQPzDw3CIQsRIrtTlUC3lP84taWzHlq0= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 h1:PG1F3OD1szkuQPzDw3CIQsRIrtTlUC3lP84taWzHlq0=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5/go.mod h1:jU1li6RFryMz+so64PpKtudI+QzbKoIEivqdf6LNpOc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5/go.mod h1:jU1li6RFryMz+so64PpKtudI+QzbKoIEivqdf6LNpOc=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.7 h1:4OYVp0705xu8yjdyoWix0r9wPIRXnIzzOoUpQVHIJ/g=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.7/go.mod h1:vd7ESTEvI76T2Na050gODNmNU7+OyKrIKroYTu4ABiI=
github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.7.4 h1:JgHnonzbnA3pbqj76wYsSZIZZQYBxkmMEjvL6GHy8XU= github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.7.4 h1:JgHnonzbnA3pbqj76wYsSZIZZQYBxkmMEjvL6GHy8XU=
github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.7.4/go.mod h1:nZspkhg+9p8iApLFoyAqfyuMP0F38acy2Hm3r5r95Cg= github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.7.4/go.mod h1:nZspkhg+9p8iApLFoyAqfyuMP0F38acy2Hm3r5r95Cg=
github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.8.3 h1:Fihjyd6DeNjcawBEGLH9dkIEUi6AdhucDKPE9nJ4QiY=
github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.8.3/go.mod h1:opvUj3ismqSCxYc+m4WIjPL0ewZGtvp0ess7cKvBPOQ=
github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q= github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q=
github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
github.com/bytedance/sonic v1.11.5 h1:G00FYjjqll5iQ1PYXynbg/hyzqBqavH8Mo9/oTopd9k= github.com/bytedance/sonic v1.11.5 h1:G00FYjjqll5iQ1PYXynbg/hyzqBqavH8Mo9/oTopd9k=
github.com/bytedance/sonic v1.11.5/go.mod h1:X2PC2giUdj/Cv2lliWFLk6c/DUQok5rViJSemeB0wDw= github.com/bytedance/sonic v1.11.5/go.mod h1:X2PC2giUdj/Cv2lliWFLk6c/DUQok5rViJSemeB0wDw=
github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
github.com/bytedance/sonic/loader v0.1.0/go.mod h1:UmRT+IRTGKz/DAkzcEGzyVqQFJ7H9BqwBO3pm9H/+HY= github.com/bytedance/sonic/loader v0.1.0/go.mod h1:UmRT+IRTGKz/DAkzcEGzyVqQFJ7H9BqwBO3pm9H/+HY=
github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
@ -23,6 +35,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cloudwego/base64x v0.1.3 h1:b5J/l8xolB7dyDTTmhJP2oTs5LdrjyrUFuNxdfq5hAg= github.com/cloudwego/base64x v0.1.3 h1:b5J/l8xolB7dyDTTmhJP2oTs5LdrjyrUFuNxdfq5hAg=
github.com/cloudwego/base64x v0.1.3/go.mod h1:1+1K5BUHIQzyapgpF7LwvOGAEDicKtt1umPV+aN8pi8= github.com/cloudwego/base64x v0.1.3/go.mod h1:1+1K5BUHIQzyapgpF7LwvOGAEDicKtt1umPV+aN8pi8=
github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@ -39,16 +53,26 @@ github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uq
github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
github.com/gin-contrib/cors v1.7.1 h1:s9SIppU/rk8enVvkzwiC2VK3UZ/0NNGsWfUKvV55rqs= github.com/gin-contrib/cors v1.7.1 h1:s9SIppU/rk8enVvkzwiC2VK3UZ/0NNGsWfUKvV55rqs=
github.com/gin-contrib/cors v1.7.1/go.mod h1:n/Zj7B4xyrgk/cX1WCX2dkzFfaNm/xJb6oIUk7WTtps= github.com/gin-contrib/cors v1.7.1/go.mod h1:n/Zj7B4xyrgk/cX1WCX2dkzFfaNm/xJb6oIUk7WTtps=
github.com/gin-contrib/cors v1.7.2 h1:oLDHxdg8W/XDoN/8zamqk/Drgt4oVZDvaV0YmvVICQw=
github.com/gin-contrib/cors v1.7.2/go.mod h1:SUJVARKgQ40dmrzgXEVxj2m7Ig1v1qIboQkPDTQ9t2E=
github.com/gin-contrib/gzip v1.0.0 h1:UKN586Po/92IDX6ie5CWLgMI81obiIp5nSP85T3wlTk= github.com/gin-contrib/gzip v1.0.0 h1:UKN586Po/92IDX6ie5CWLgMI81obiIp5nSP85T3wlTk=
github.com/gin-contrib/gzip v1.0.0/go.mod h1:CtG7tQrPB3vIBo6Gat9FVUsis+1emjvQqd66ME5TdnE= github.com/gin-contrib/gzip v1.0.0/go.mod h1:CtG7tQrPB3vIBo6Gat9FVUsis+1emjvQqd66ME5TdnE=
github.com/gin-contrib/gzip v1.0.1 h1:HQ8ENHODeLY7a4g1Au/46Z92bdGFl74OhxcZble9WJE=
github.com/gin-contrib/gzip v1.0.1/go.mod h1:njt428fdUNRvjuJf16tZMYZ2Yl+WQB53X5wmhDwXvC4=
github.com/gin-contrib/sessions v1.0.0 h1:r5GLta4Oy5xo9rAwMHx8B4wLpeRGHMdz9NafzJAdP8Y= github.com/gin-contrib/sessions v1.0.0 h1:r5GLta4Oy5xo9rAwMHx8B4wLpeRGHMdz9NafzJAdP8Y=
github.com/gin-contrib/sessions v1.0.0/go.mod h1:DN0f4bvpqMQElDdi+gNGScrP2QEI04IErRyMFyorUOI= github.com/gin-contrib/sessions v1.0.0/go.mod h1:DN0f4bvpqMQElDdi+gNGScrP2QEI04IErRyMFyorUOI=
github.com/gin-contrib/sessions v1.0.1 h1:3hsJyNs7v7N8OtelFmYXFrulAf6zSR7nW/putcPEHxI=
github.com/gin-contrib/sessions v1.0.1/go.mod h1:ouxSFM24/OgIud5MJYQJLpy6AwxQ5EYO9yLhbtObGkM=
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
github.com/gin-contrib/static v1.1.1 h1:XEvBd4DDLG1HBlyPBQU1XO8NlTpw6mgdqcPteetYA5k= github.com/gin-contrib/static v1.1.1 h1:XEvBd4DDLG1HBlyPBQU1XO8NlTpw6mgdqcPteetYA5k=
github.com/gin-contrib/static v1.1.1/go.mod h1:yRGmar7+JYvbMLRPIi4H5TVVSBwULfT9vetnVD0IO74= github.com/gin-contrib/static v1.1.1/go.mod h1:yRGmar7+JYvbMLRPIi4H5TVVSBwULfT9vetnVD0IO74=
github.com/gin-contrib/static v1.1.2 h1:c3kT4bFkUJn2aoRU3s6XnMjJT8J6nNWJkR0NglqmlZ4=
github.com/gin-contrib/static v1.1.2/go.mod h1:Fw90ozjHCmZBWbgrsqrDvO28YbhKEKzKp8GixhR4yLw=
github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
@ -56,6 +80,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4= github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4=
github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8=
github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
@ -63,6 +89,8 @@ github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpv
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
@ -121,10 +149,14 @@ github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtosvtEhg= github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtosvtEhg=
github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkoukk/tiktoken-go v0.1.6 h1:JF0TlJzhTbrI30wCvFuiw6FzP2+/bR+FIxUdgEAcUsw= github.com/pkoukk/tiktoken-go v0.1.6 h1:JF0TlJzhTbrI30wCvFuiw6FzP2+/bR+FIxUdgEAcUsw=
github.com/pkoukk/tiktoken-go v0.1.6/go.mod h1:9NiV+i9mJKGj1rYOT+njbv+ZwA/zJxYdewGl6qVatpg= github.com/pkoukk/tiktoken-go v0.1.6/go.mod h1:9NiV+i9mJKGj1rYOT+njbv+ZwA/zJxYdewGl6qVatpg=
github.com/pkoukk/tiktoken-go v0.1.7 h1:qOBHXX4PHtvIvmOtyg1EeKlwFRiMKAcoMp4Q+bLQDmw=
github.com/pkoukk/tiktoken-go v0.1.7/go.mod h1:9NiV+i9mJKGj1rYOT+njbv+ZwA/zJxYdewGl6qVatpg=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
@ -151,23 +183,37 @@ github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZ
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc= golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8= golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
golang.org/x/image v0.16.0 h1:9kloLAKhUufZhA12l5fwnx2NZW39/we1UhBesW433jw=
golang.org/x/image v0.16.0/go.mod h1:ugSZItdV4nOxyqp56HmXwH0Ry0nBCpjnZdpDaIHdoPs=
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
@ -184,5 +230,7 @@ gorm.io/driver/sqlite v1.5.5/go.mod h1:6NgQ7sQWAIFsPrJJl1lSNSu2TABh0ZZ/zm5fosATa
gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
gorm.io/gorm v1.25.9 h1:wct0gxZIELDk8+ZqF/MVnHLkA1rvYlBWUMv2EdsK1g8= gorm.io/gorm v1.25.9 h1:wct0gxZIELDk8+ZqF/MVnHLkA1rvYlBWUMv2EdsK1g8=
gorm.io/gorm v1.25.9/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= gorm.io/gorm v1.25.9/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
gorm.io/gorm v1.25.10 h1:dQpO+33KalOA+aFYGlK+EfxcI5MbO7EP2yYygwh9h+s=
gorm.io/gorm v1.25.10/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

8
relay/adaptor/minimax/constants.go
View File

@ -1,7 +1,11 @@
package minimax package minimax
// https://www.minimaxi.com/document/guides/chat-model/V2?id=65e0736ab2845de20908e2dd
var ModelList = []string{ var ModelList = []string{
"abab5.5s-chat", "abab6.5-chat",
"abab5.5-chat", "abab6.5s-chat",
"abab6-chat", "abab6-chat",
"abab5.5-chat",
"abab5.5s-chat",
} }

6
relay/adaptor/openai/adaptor.go
View File

@ -86,9 +86,13 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *meta.Met
if meta.IsStream { if meta.IsStream {
var responseText string var responseText string
err, responseText, usage = StreamHandler(c, resp, meta.Mode) err, responseText, usage = StreamHandler(c, resp, meta.Mode)
if usage == nil { if usage == nil || usage.TotalTokens == 0 {
usage = ResponseText2Usage(responseText, meta.ActualModelName, meta.PromptTokens) usage = ResponseText2Usage(responseText, meta.ActualModelName, meta.PromptTokens)
} }
if usage.TotalTokens != 0 && usage.PromptTokens == 0 { // some channels don't return prompt tokens & completion tokens
usage.PromptTokens = meta.PromptTokens
usage.CompletionTokens = usage.TotalTokens - meta.PromptTokens
}
} else { } else {
switch meta.Mode { switch meta.Mode {
case relaymode.ImagesGenerations: case relaymode.ImagesGenerations:

4
relay/adaptor/openai/compatible.go
View File

@ -10,6 +10,7 @@ import (
"github.com/songquanpeng/one-api/relay/adaptor/mistral" "github.com/songquanpeng/one-api/relay/adaptor/mistral"
"github.com/songquanpeng/one-api/relay/adaptor/moonshot" "github.com/songquanpeng/one-api/relay/adaptor/moonshot"
"github.com/songquanpeng/one-api/relay/adaptor/stepfun" "github.com/songquanpeng/one-api/relay/adaptor/stepfun"
"github.com/songquanpeng/one-api/relay/adaptor/togetherai"
"github.com/songquanpeng/one-api/relay/channeltype" "github.com/songquanpeng/one-api/relay/channeltype"
) )
@ -24,6 +25,7 @@ var CompatibleChannels = []int{
channeltype.LingYiWanWu, channeltype.LingYiWanWu,
channeltype.StepFun, channeltype.StepFun,
channeltype.DeepSeek, channeltype.DeepSeek,
channeltype.TogetherAI,
} }
func GetCompatibleChannelMeta(channelType int) (string, []string) { func GetCompatibleChannelMeta(channelType int) (string, []string) {
@ -48,6 +50,8 @@ func GetCompatibleChannelMeta(channelType int) (string, []string) {
return "stepfun", stepfun.ModelList return "stepfun", stepfun.ModelList
case channeltype.DeepSeek: case channeltype.DeepSeek:
return "deepseek", deepseek.ModelList return "deepseek", deepseek.ModelList
case channeltype.TogetherAI:
return "together.ai", togetherai.ModelList
default: default:
return "openai", ModelList return "openai", ModelList
} }

1
relay/adaptor/openai/constants.go
View File

@ -7,6 +7,7 @@ var ModelList = []string{
"gpt-4", "gpt-4-0314", "gpt-4-0613", "gpt-4-1106-preview", "gpt-4-0125-preview", "gpt-4", "gpt-4-0314", "gpt-4-0613", "gpt-4-1106-preview", "gpt-4-0125-preview",
"gpt-4-32k", "gpt-4-32k-0314", "gpt-4-32k-0613", "gpt-4-32k", "gpt-4-32k-0314", "gpt-4-32k-0613",
"gpt-4-turbo-preview", "gpt-4-turbo", "gpt-4-turbo-2024-04-09", "gpt-4-turbo-preview", "gpt-4-turbo", "gpt-4-turbo-2024-04-09",
"gpt-4o", "gpt-4o-2024-05-13",
"gpt-4-vision-preview", "gpt-4-vision-preview",
"text-embedding-ada-002", "text-embedding-3-small", "text-embedding-3-large", "text-embedding-ada-002", "text-embedding-3-small", "text-embedding-3-large",
"text-curie-001", "text-babbage-001", "text-ada-001", "text-davinci-002", "text-davinci-003", "text-curie-001", "text-babbage-001", "text-ada-001", "text-davinci-002", "text-davinci-003",

6
relay/adaptor/openai/token.go
View File

@ -24,6 +24,10 @@ func InitTokenEncoders() {
logger.FatalLog(fmt.Sprintf("failed to get gpt-3.5-turbo token encoder: %s", err.Error())) logger.FatalLog(fmt.Sprintf("failed to get gpt-3.5-turbo token encoder: %s", err.Error()))
} }
defaultTokenEncoder = gpt35TokenEncoder defaultTokenEncoder = gpt35TokenEncoder
gpt4oTokenEncoder, err := tiktoken.EncodingForModel("gpt-4o")
if err != nil {
logger.FatalLog(fmt.Sprintf("failed to get gpt-4o token encoder: %s", err.Error()))
}
gpt4TokenEncoder, err := tiktoken.EncodingForModel("gpt-4") gpt4TokenEncoder, err := tiktoken.EncodingForModel("gpt-4")
if err != nil { if err != nil {
logger.FatalLog(fmt.Sprintf("failed to get gpt-4 token encoder: %s", err.Error())) logger.FatalLog(fmt.Sprintf("failed to get gpt-4 token encoder: %s", err.Error()))
@ -31,6 +35,8 @@ func InitTokenEncoders() {
for model := range billingratio.ModelRatio { for model := range billingratio.ModelRatio {
if strings.HasPrefix(model, "gpt-3.5") { if strings.HasPrefix(model, "gpt-3.5") {
tokenEncoderMap[model] = gpt35TokenEncoder tokenEncoderMap[model] = gpt35TokenEncoder
} else if strings.HasPrefix(model, "gpt-4o") {
tokenEncoderMap[model] = gpt4oTokenEncoder
} else if strings.HasPrefix(model, "gpt-4") { } else if strings.HasPrefix(model, "gpt-4") {
tokenEncoderMap[model] = gpt4TokenEncoder tokenEncoderMap[model] = gpt4TokenEncoder
} else { } else {

10
relay/adaptor/togetherai/constants.go Normal file
View File

@ -0,0 +1,10 @@
package togetherai
// https://docs.together.ai/docs/inference-models
var ModelList = []string{
"meta-llama/Llama-3-70b-chat-hf",
"deepseek-ai/deepseek-coder-33b-instruct",
"mistralai/Mixtral-8x22B-Instruct-v0.1",
"Qwen/Qwen1.5-72B-Chat",
}

5
relay/billing/ratio/image.go
View File

@ -49,3 +49,8 @@ var ImagePromptLengthLimitations = map[string]int{
"wanx-v1": 4000, "wanx-v1": 4000,
"cogview-3": 833, "cogview-3": 833,
} }
var ImageOriginModelName = map[string]string{
"ali-stable-diffusion-xl": "stable-diffusion-xl",
"ali-stable-diffusion-v1.5": "stable-diffusion-v1.5",
}

10
relay/billing/ratio/model.go
View File

@ -32,6 +32,8 @@ var ModelRatio = map[string]float64{
"gpt-4-turbo-preview": 5, // $0.01 / 1K tokens "gpt-4-turbo-preview": 5, // $0.01 / 1K tokens
"gpt-4-turbo": 5, // $0.01 / 1K tokens "gpt-4-turbo": 5, // $0.01 / 1K tokens
"gpt-4-turbo-2024-04-09": 5, // $0.01 / 1K tokens "gpt-4-turbo-2024-04-09": 5, // $0.01 / 1K tokens
"gpt-4o": 2.5, // $0.005 / 1K tokens
"gpt-4o-2024-05-13": 2.5, // $0.005 / 1K tokens
"gpt-4-vision-preview": 5, // $0.01 / 1K tokens "gpt-4-vision-preview": 5, // $0.01 / 1K tokens
"gpt-3.5-turbo": 0.25, // $0.0005 / 1K tokens "gpt-3.5-turbo": 0.25, // $0.0005 / 1K tokens
"gpt-3.5-turbo-0301": 0.75, "gpt-3.5-turbo-0301": 0.75,
@ -138,6 +140,8 @@ var ModelRatio = map[string]float64{
"Baichuan2-Turbo-192k": 0.016 * RMB, "Baichuan2-Turbo-192k": 0.016 * RMB,
"Baichuan2-53B": 0.02 * RMB, "Baichuan2-53B": 0.02 * RMB,
// https://api.minimax.chat/document/price // https://api.minimax.chat/document/price
"abab6.5-chat": 0.03 * RMB,
"abab6.5s-chat": 0.01 * RMB,
"abab6-chat": 0.1 * RMB, "abab6-chat": 0.1 * RMB,
"abab5.5-chat": 0.015 * RMB, "abab5.5-chat": 0.015 * RMB,
"abab5.5s-chat": 0.005 * RMB, "abab5.5s-chat": 0.005 * RMB,
@ -169,7 +173,7 @@ var ModelRatio = map[string]float64{
"command-light": 0.5, "command-light": 0.5,
"command-light-nightly": 0.5, "command-light-nightly": 0.5,
"command-r": 0.5 / 1000 * USD, "command-r": 0.5 / 1000 * USD,
"command-r-plus ": 3.0 / 1000 * USD, "command-r-plus": 3.0 / 1000 * USD,
// https://platform.deepseek.com/api-docs/pricing/ // https://platform.deepseek.com/api-docs/pricing/
"deepseek-chat": 1.0 / 1000 * RMB, "deepseek-chat": 1.0 / 1000 * RMB,
"deepseek-coder": 1.0 / 1000 * RMB, "deepseek-coder": 1.0 / 1000 * RMB,
@ -278,7 +282,9 @@ func GetCompletionRatio(name string) float64 {
return 4.0 / 3.0 return 4.0 / 3.0
} }
if strings.HasPrefix(name, "gpt-4") { if strings.HasPrefix(name, "gpt-4") {
if strings.HasPrefix(name, "gpt-4-turbo") || strings.HasSuffix(name, "preview") { if strings.HasPrefix(name, "gpt-4-turbo") ||
strings.HasPrefix(name, "gpt-4o") ||
strings.HasSuffix(name, "preview") {
return 3 return 3
} }
return 2 return 2

1
relay/channeltype/define.go
View File

@ -40,6 +40,7 @@ const (
DeepSeek DeepSeek
Cloudflare Cloudflare
DeepL DeepL
TogetherAI
Dummy Dummy
) )

1
relay/channeltype/url.go
View File

@ -40,6 +40,7 @@ var ChannelBaseURLs = []string{
"https://api.deepseek.com", // 36 "https://api.deepseek.com", // 36
"https://api.cloudflare.com", // 37 "https://api.cloudflare.com", // 37
"https://api-free.deepl.com", // 38 "https://api-free.deepl.com", // 38
"https://api.together.xyz", // 39
} }
func init() { func init() {

10
relay/controller/error.go
View File

@ -53,6 +53,16 @@ func (e GeneralErrorResponse) ToMessage() string {
} }
func RelayErrorHandler(resp *http.Response) (ErrorWithStatusCode *model.ErrorWithStatusCode) { func RelayErrorHandler(resp *http.Response) (ErrorWithStatusCode *model.ErrorWithStatusCode) {
if resp == nil {
return &model.ErrorWithStatusCode{
StatusCode: 500,
Error: model.Error{
Message: "resp is nil",
Type: "upstream_error",
Code: "bad_response",
},
}
}
ErrorWithStatusCode = &model.ErrorWithStatusCode{ ErrorWithStatusCode = &model.ErrorWithStatusCode{
StatusCode: resp.StatusCode, StatusCode: resp.StatusCode,
Error: model.Error{ Error: model.Error{

3
relay/controller/helper.go
View File

@ -208,6 +208,9 @@ func getMappedModelName(modelName string, mapping map[string]string) (string, bo
func isErrorHappened(meta *meta.Meta, resp *http.Response) bool { func isErrorHappened(meta *meta.Meta, resp *http.Response) bool {
if resp == nil { if resp == nil {
if meta.ChannelType == channeltype.AwsClaude {
return false
}
return true return true
} }
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {

7
relay/controller/image.go
View File

@ -57,6 +57,11 @@ func RelayImageHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
return openai.ErrorWrapper(err, "get_image_cost_ratio_failed", http.StatusInternalServerError) return openai.ErrorWrapper(err, "get_image_cost_ratio_failed", http.StatusInternalServerError)
} }
imageModel := imageRequest.Model
// Convert the original image model
imageRequest.Model, _ = getMappedModelName(imageRequest.Model, billingratio.ImageOriginModelName)
c.Set("response_format", imageRequest.ResponseFormat)
var requestBody io.Reader var requestBody io.Reader
if strings.ToLower(c.GetString(ctxkey.ContentType)) == "application/json" && if strings.ToLower(c.GetString(ctxkey.ContentType)) == "application/json" &&
isModelMapped || meta.ChannelType == channeltype.Azure { // make Azure channel request body isModelMapped || meta.ChannelType == channeltype.Azure { // make Azure channel request body
@ -92,7 +97,7 @@ func RelayImageHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
requestBody = bytes.NewBuffer(jsonStr) requestBody = bytes.NewBuffer(jsonStr)
} }
modelRatio := billingratio.GetModelRatio(imageRequest.Model) modelRatio := billingratio.GetModelRatio(imageModel)
groupRatio := billingratio.GetGroupRatio(meta.Group) groupRatio := billingratio.GetGroupRatio(meta.Group)
ratio := modelRatio * groupRatio ratio := modelRatio * groupRatio
userQuota, err := model.CacheGetUserQuota(ctx, meta.UserId) userQuota, err := model.CacheGetUserQuota(ctx, meta.UserId)

2
web/air/public/index.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="zh-CN">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="logo.png" /> <link rel="icon" href="logo.png" />

4
web/berry/package.json
View File

@ -15,7 +15,7 @@
"@mui/utils": "^5.8.6", "@mui/utils": "^5.8.6",
"@mui/x-date-pickers": "^6.18.5", "@mui/x-date-pickers": "^6.18.5",
"@tabler/icons-react": "^2.44.0", "@tabler/icons-react": "^2.44.0",
"apexcharts": "^3.35.3", "apexcharts": "3.35.3",
"axios": "^0.27.2", "axios": "^0.27.2",
"dayjs": "^1.11.10", "dayjs": "^1.11.10",
"formik": "^2.2.9", "formik": "^2.2.9",
@ -26,7 +26,7 @@
"notistack": "^3.0.1", "notistack": "^3.0.1",
"prop-types": "^15.8.1", "prop-types": "^15.8.1",
"react": "^18.2.0", "react": "^18.2.0",
"react-apexcharts": "^1.4.0", "react-apexcharts": "1.4.0",
"react-device-detect": "^2.2.2", "react-device-detect": "^2.2.2",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-perfect-scrollbar": "^1.5.8", "react-perfect-scrollbar": "^1.5.8",

2
web/berry/public/index.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="zh-CN">
<head> <head>
<title>One API</title> <title>One API</title>
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="/favicon.ico" />

36
web/berry/src/constants/ChannelConstants.js
View File

@ -11,12 +11,18 @@ export const CHANNEL_OPTIONS = {
value: 14, value: 14,
color: 'primary' color: 'primary'
}, },
// 33: { 33: {
// key: 33, key: 33,
// text: 'AWS Claude', text: 'AWS Claude',
// value: 33, value: 33,
// color: 'primary' color: 'primary'
// }, },
37: {
key: 37,
text: 'Cloudflare',
value: 37,
color: 'success'
},
3: { 3: {
key: 3, key: 3,
text: 'Azure OpenAI', text: 'Azure OpenAI',
@ -119,12 +125,12 @@ export const CHANNEL_OPTIONS = {
value: 32, value: 32,
color: 'primary' color: 'primary'
}, },
// 34: { 34: {
// key: 34, key: 34,
// text: 'Coze', text: 'Coze',
// value: 34, value: 34,
// color: 'primary' color: 'primary'
// }, },
35: { 35: {
key: 35, key: 35,
text: 'Cohere', text: 'Cohere',
@ -143,6 +149,12 @@ export const CHANNEL_OPTIONS = {
value: 38, value: 38,
color: 'primary' color: 'primary'
}, },
39: {
key: 39,
text: 'together.ai',
value: 39,
color: 'primary'
},
8: { 8: {
key: 8, key: 8,
text: '自定义渠道', text: '自定义渠道',

42
web/berry/src/constants/SnackbarConstants.js
View File

@ -1,24 +1,56 @@
import { closeSnackbar } from 'notistack';
import { IconX } from '@tabler/icons-react';
import { IconButton } from '@mui/material';
const action = (snackbarId) => (
<>
<IconButton
onClick={() => {
closeSnackbar(snackbarId);
}}
>
<IconX stroke={1.5} size="1.25rem" />
</IconButton>
</>
);
export const snackbarConstants = { export const snackbarConstants = {
Common: { Common: {
ERROR: { ERROR: {
variant: 'error', variant: 'error',
autoHideDuration: 5000 autoHideDuration: 5000,
preventDuplicate: true,
action
}, },
WARNING: { WARNING: {
variant: 'warning', variant: 'warning',
autoHideDuration: 10000 autoHideDuration: 10000,
preventDuplicate: true,
action
}, },
SUCCESS: { SUCCESS: {
variant: 'success', variant: 'success',
autoHideDuration: 1500 autoHideDuration: 1500,
preventDuplicate: true,
action
}, },
INFO: { INFO: {
variant: 'info', variant: 'info',
autoHideDuration: 3000 autoHideDuration: 3000,
preventDuplicate: true,
action
}, },
NOTICE: { NOTICE: {
variant: 'info', variant: 'info',
autoHideDuration: 7000 autoHideDuration: 20000,
preventDuplicate: true,
action
},
COPY: {
variant: 'copy',
persist: true,
preventDuplicate: true,
allowDownload: true,
action
} }
}, },
Mobile: { Mobile: {

37
web/berry/src/utils/common.js
View File

@ -193,3 +193,40 @@ export function removeTrailingSlash(url) {
return url; return url;
} }
} }
let channelModels = undefined;
export async function loadChannelModels() {
const res = await API.get('/api/models');
const { success, data } = res.data;
if (!success) {
return;
}
channelModels = data;
localStorage.setItem('channel_models', JSON.stringify(data));
}
export function getChannelModels(type) {
if (channelModels !== undefined && type in channelModels) {
return channelModels[type];
}
let models = localStorage.getItem('channel_models');
if (!models) {
return [];
}
channelModels = JSON.parse(models);
if (type in channelModels) {
return channelModels[type];
}
return [];
}
export function copy(text, name = '') {
try {
navigator.clipboard.writeText(text);
} catch (error) {
text = `复制${name}失败，请手动复制：<br /><br />${text}`;
enqueueSnackbar(<SnackbarHTMLContent htmlContent={text} />, getSnackbarOptions('COPY'));
return;
}
showSuccess(`复制${name}成功！`);
}

43
web/berry/src/views/Authentication/AuthForms/ResetPasswordForm.js
View File

@ -1,22 +1,22 @@
import { useState, useEffect } from "react"; import { useState, useEffect } from 'react';
import { useSearchParams } from "react-router-dom"; import { useSearchParams } from 'react-router-dom';
// material-ui // material-ui
import { Button, Stack, Typography, Alert } from "@mui/material"; import { Button, Stack, Typography, Alert } from '@mui/material';
// assets // assets
import { showError, showInfo } from "utils/common"; import { showError, copy } from 'utils/common';
import { API } from "utils/api"; import { API } from 'utils/api';
// ===========================|| FIREBASE - REGISTER ||=========================== // // ===========================|| FIREBASE - REGISTER ||=========================== //
const ResetPasswordForm = () => { const ResetPasswordForm = () => {
const [searchParams] = useSearchParams(); const [searchParams] = useSearchParams();
const [inputs, setInputs] = useState({ const [inputs, setInputs] = useState({
email: "", email: '',
token: "", token: ''
}); });
const [newPassword, setNewPassword] = useState(""); const [newPassword, setNewPassword] = useState('');
const submit = async () => { const submit = async () => {
const res = await API.post(`/api/user/reset`, inputs); const res = await API.post(`/api/user/reset`, inputs);
@ -24,31 +24,25 @@ const ResetPasswordForm = () => {
if (success) { if (success) {
let password = res.data.data; let password = res.data.data;
setNewPassword(password); setNewPassword(password);
navigator.clipboard.writeText(password); copy(password, '新密码');
showInfo(`新密码已复制到剪贴板：${password}`);
} else { } else {
showError(message); showError(message);
} }
}; };
useEffect(() => { useEffect(() => {
let email = searchParams.get("email"); let email = searchParams.get('email');
let token = searchParams.get("token"); let token = searchParams.get('token');
setInputs({ setInputs({
token, token,
email, email
}); });
}, []); }, []);
return ( return (
<Stack <Stack spacing={3} padding={'24px'} justifyContent={'center'} alignItems={'center'}>
spacing={3}
padding={"24px"}
justifyContent={"center"}
alignItems={"center"}
>
{!inputs.email || !inputs.token ? ( {!inputs.email || !inputs.token ? (
<Typography variant="h3" sx={{ textDecoration: "none" }}> <Typography variant="h3" sx={{ textDecoration: 'none' }}>
无效的链接 无效的链接
</Typography> </Typography>
) : newPassword ? ( ) : newPassword ? (
@ -57,14 +51,7 @@ const ResetPasswordForm = () => {
请登录后及时修改密码 请登录后及时修改密码
</Alert> </Alert>
) : ( ) : (
<Button <Button fullWidth onClick={submit} size="large" type="submit" variant="contained" color="primary">
fullWidth
onClick={submit}
size="large"
type="submit"
variant="contained"
color="primary"
>
点击重置密码 点击重置密码
</Button> </Button>
)} )}

502
web/berry/src/views/Channel/component/EditModal.js
View File

@ -1,9 +1,9 @@
import PropTypes from "prop-types"; import PropTypes from 'prop-types';
import { useState, useEffect } from "react"; import { useState, useEffect } from 'react';
import { CHANNEL_OPTIONS } from "constants/ChannelConstants"; import { CHANNEL_OPTIONS } from 'constants/ChannelConstants';
import { useTheme } from "@mui/material/styles"; import { useTheme } from '@mui/material/styles';
import { API } from "utils/api"; import { API } from 'utils/api';
import { showError, showSuccess } from "utils/common"; import { showError, showSuccess, getChannelModels } from 'utils/common';
import { import {
Dialog, Dialog,
DialogTitle, DialogTitle,
@ -22,15 +22,15 @@ import {
Autocomplete, Autocomplete,
FormHelperText, FormHelperText,
Switch, Switch,
Checkbox, Checkbox
} from "@mui/material"; } from '@mui/material';
import { Formik } from "formik"; import { Formik } from 'formik';
import * as Yup from "yup"; import * as Yup from 'yup';
import { defaultConfig, typeConfig } from "../type/Config"; //typeConfig import { defaultConfig, typeConfig } from '../type/Config'; //typeConfig
import { createFilterOptions } from "@mui/material/Autocomplete"; import { createFilterOptions } from '@mui/material/Autocomplete';
import CheckBoxOutlineBlankIcon from "@mui/icons-material/CheckBoxOutlineBlank"; import CheckBoxOutlineBlankIcon from '@mui/icons-material/CheckBoxOutlineBlank';
import CheckBoxIcon from "@mui/icons-material/CheckBox"; import CheckBoxIcon from '@mui/icons-material/CheckBox';
const icon = <CheckBoxOutlineBlankIcon fontSize="small" />; const icon = <CheckBoxOutlineBlankIcon fontSize="small" />;
const checkedIcon = <CheckBoxIcon fontSize="small" />; const checkedIcon = <CheckBoxIcon fontSize="small" />;
@ -38,38 +38,34 @@ const checkedIcon = <CheckBoxIcon fontSize="small" />;
const filter = createFilterOptions(); const filter = createFilterOptions();
const validationSchema = Yup.object().shape({ const validationSchema = Yup.object().shape({
is_edit: Yup.boolean(), is_edit: Yup.boolean(),
name: Yup.string().required("名称 不能为空"), name: Yup.string().required('名称 不能为空'),
type: Yup.number().required("渠道 不能为空"), type: Yup.number().required('渠道 不能为空'),
key: Yup.string().when("is_edit", { key: Yup.string().when(['is_edit', 'type'], {
is: false, is: (is_edit, type) => !is_edit && type !== 33,
then: Yup.string().required("密钥 不能为空"), then: Yup.string().required('密钥 不能为空')
}), }),
other: Yup.string(), other: Yup.string(),
models: Yup.array().min(1, "模型 不能为空"), models: Yup.array().min(1, '模型 不能为空'),
groups: Yup.array().min(1, "用户组 不能为空"), groups: Yup.array().min(1, '用户组 不能为空'),
base_url: Yup.string().when("type", { base_url: Yup.string().when('type', {
is: (value) => [3, 8].includes(value), is: (value) => [3, 8].includes(value),
then: Yup.string().required("渠道API地址 不能为空"), // base_url 是必需的 then: Yup.string().required('渠道API地址 不能为空'), // base_url 是必需的
otherwise: Yup.string(), // 在其他情况下，base_url 可以是任意字符串 otherwise: Yup.string() // 在其他情况下，base_url 可以是任意字符串
}), }),
model_mapping: Yup.string().test( model_mapping: Yup.string().test('is-json', '必须是有效的JSON字符串', function (value) {
"is-json", try {
"必须是有效的JSON字符串", if (value === '' || value === null || value === undefined) {
function (value) { return true;
try {
if (value === "" || value === null || value === undefined) {
return true;
}
const parsedValue = JSON.parse(value);
if (typeof parsedValue === "object") {
return true;
}
} catch (e) {
return false;
} }
const parsedValue = JSON.parse(value);
if (typeof parsedValue === 'object') {
return true;
}
} catch (e) {
return false; return false;
} }
), return false;
})
}); });
const EditModal = ({ open, channelId, onCancel, onOk }) => { const EditModal = ({ open, channelId, onCancel, onOk }) => {
@ -81,12 +77,13 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
const [groupOptions, setGroupOptions] = useState([]); const [groupOptions, setGroupOptions] = useState([]);
const [modelOptions, setModelOptions] = useState([]); const [modelOptions, setModelOptions] = useState([]);
const [batchAdd, setBatchAdd] = useState(false); const [batchAdd, setBatchAdd] = useState(false);
const [basicModels, setBasicModels] = useState([]);
const initChannel = (typeValue) => { const initChannel = (typeValue) => {
if (typeConfig[typeValue]?.inputLabel) { if (typeConfig[typeValue]?.inputLabel) {
setInputLabel({ setInputLabel({
...defaultConfig.inputLabel, ...defaultConfig.inputLabel,
...typeConfig[typeValue].inputLabel, ...typeConfig[typeValue].inputLabel
}); });
} else { } else {
setInputLabel(defaultConfig.inputLabel); setInputLabel(defaultConfig.inputLabel);
@ -95,7 +92,7 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
if (typeConfig[typeValue]?.prompt) { if (typeConfig[typeValue]?.prompt) {
setInputPrompt({ setInputPrompt({
...defaultConfig.prompt, ...defaultConfig.prompt,
...typeConfig[typeValue].prompt, ...typeConfig[typeValue].prompt
}); });
} else { } else {
setInputPrompt(defaultConfig.prompt); setInputPrompt(defaultConfig.prompt);
@ -104,40 +101,14 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
return typeConfig[typeValue]?.input; return typeConfig[typeValue]?.input;
}; };
const handleTypeChange = (setFieldValue, typeValue, values) => { const handleTypeChange = (setFieldValue, typeValue, values) => {
const newInput = initChannel(typeValue); initChannel(typeValue);
let localModels = getChannelModels(typeValue);
if (newInput) { setBasicModels(localModels);
Object.keys(newInput).forEach((key) => { if (localModels.length > 0 && Array.isArray(values['models']) && values['models'].length == 0) {
if ( setFieldValue('models', initialModel(localModels));
(!Array.isArray(values[key]) &&
values[key] !== null &&
values[key] !== undefined &&
values[key] !== "") ||
(Array.isArray(values[key]) && values[key].length > 0)
) {
return;
}
if (key === "models") {
setFieldValue(key, initialModel(newInput[key]));
return;
}
setFieldValue(key, newInput[key]);
});
} }
};
const basicModels = (channelType) => { setFieldValue('config', {});
let modelGroup =
typeConfig[channelType]?.modelGroup || defaultConfig.modelGroup;
// 循环 modelOptions，找到 modelGroup 对应的模型
let modelList = [];
modelOptions.forEach((model) => {
if (model.group === modelGroup) {
modelList.push(model);
}
});
return modelList;
}; };
const fetchGroups = async () => { const fetchGroups = async () => {
@ -155,7 +126,7 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
const { data } = res.data; const { data } = res.data;
data.forEach((item) => { data.forEach((item) => {
if (!item.owned_by) { if (!item.owned_by) {
item.owned_by = "未知"; item.owned_by = '未知';
} }
}); });
// 先对data排序 // 先对data排序
@ -171,7 +142,7 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
data.map((model) => { data.map((model) => {
return { return {
id: model.id, id: model.id,
group: model.owned_by, group: model.owned_by
}; };
}) })
); );
@ -182,33 +153,41 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
const submit = async (values, { setErrors, setStatus, setSubmitting }) => { const submit = async (values, { setErrors, setStatus, setSubmitting }) => {
setSubmitting(true); setSubmitting(true);
if (values.base_url && values.base_url.endsWith("/")) { if (values.base_url && values.base_url.endsWith('/')) {
values.base_url = values.base_url.slice(0, values.base_url.length - 1); values.base_url = values.base_url.slice(0, values.base_url.length - 1);
} }
if (values.type === 3 && values.other === "") { if (values.type === 3 && values.other === '') {
values.other = "2023-09-01-preview"; values.other = '2023-09-01-preview';
} }
if (values.type === 18 && values.other === "") { if (values.type === 18 && values.other === '') {
values.other = "v2.1"; values.other = 'v2.1';
} }
if (values.key === '') {
if (values.config.ak !== '' && values.config.sk !== '' && values.config.region !== '') {
values.key = `${values.config.ak}|${values.config.sk}|${values.config.region}`;
}
}
let res; let res;
const modelsStr = values.models.map((model) => model.id).join(","); const modelsStr = values.models.map((model) => model.id).join(',');
values.group = values.groups.join(","); const configStr = JSON.stringify(values.config);
values.group = values.groups.join(',');
if (channelId) { if (channelId) {
res = await API.put(`/api/channel/`, { res = await API.put(`/api/channel/`, {
...values, ...values,
id: parseInt(channelId), id: parseInt(channelId),
models: modelsStr, models: modelsStr,
config: configStr
}); });
} else { } else {
res = await API.post(`/api/channel/`, { ...values, models: modelsStr }); res = await API.post(`/api/channel/`, { ...values, models: modelsStr, config: configStr });
} }
const { success, message } = res.data; const { success, message } = res.data;
if (success) { if (success) {
if (channelId) { if (channelId) {
showSuccess("渠道更新成功！"); showSuccess('渠道更新成功！');
} else { } else {
showSuccess("渠道创建成功！"); showSuccess('渠道创建成功！');
} }
setSubmitting(false); setSubmitting(false);
setStatus({ success: true }); setStatus({ success: true });
@ -226,15 +205,15 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
} }
// 如果 channelModel 是一个字符串 // 如果 channelModel 是一个字符串
if (typeof channelModel === "string") { if (typeof channelModel === 'string') {
channelModel = channelModel.split(","); channelModel = channelModel.split(',');
} }
let modelList = channelModel.map((model) => { let modelList = channelModel.map((model) => {
const modelOption = modelOptions.find((option) => option.id === model); const modelOption = modelOptions.find((option) => option.id === model);
if (modelOption) { if (modelOption) {
return modelOption; return modelOption;
} }
return { id: model, group: "自定义：点击或回车输入" }; return { id: model, group: '自定义：点击或回车输入' };
}); });
return modelList; return modelList;
} }
@ -243,24 +222,24 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
let res = await API.get(`/api/channel/${channelId}`); let res = await API.get(`/api/channel/${channelId}`);
const { success, message, data } = res.data; const { success, message, data } = res.data;
if (success) { if (success) {
if (data.models === "") { if (data.models === '') {
data.models = []; data.models = [];
} else { } else {
data.models = initialModel(data.models); data.models = initialModel(data.models);
} }
if (data.group === "") { if (data.group === '') {
data.groups = []; data.groups = [];
} else { } else {
data.groups = data.group.split(","); data.groups = data.group.split(',');
} }
if (data.model_mapping !== "") { if (data.model_mapping !== '') {
data.model_mapping = JSON.stringify( data.model_mapping = JSON.stringify(JSON.parse(data.model_mapping), null, 2);
JSON.parse(data.model_mapping),
null,
2
);
} }
data.base_url = data.base_url ?? ""; if (data.config !== '') {
data.config = JSON.parse(data.config);
}
data.base_url = data.base_url ?? '';
data.is_edit = true; data.is_edit = true;
initChannel(data.type); initChannel(data.type);
setInitialInput(data); setInitialInput(data);
@ -286,45 +265,25 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
}, [channelId]); }, [channelId]);
return ( return (
<Dialog open={open} onClose={onCancel} fullWidth maxWidth={"md"}> <Dialog open={open} onClose={onCancel} fullWidth maxWidth={'md'}>
<DialogTitle <DialogTitle
sx={{ sx={{
margin: "0px", margin: '0px',
fontWeight: 700, fontWeight: 700,
lineHeight: "1.55556", lineHeight: '1.55556',
padding: "24px", padding: '24px',
fontSize: "1.125rem", fontSize: '1.125rem'
}} }}
> >
{channelId ? "编辑渠道" : "新建渠道"} {channelId ? '编辑渠道' : '新建渠道'}
</DialogTitle> </DialogTitle>
<Divider /> <Divider />
<DialogContent> <DialogContent>
<Formik <Formik initialValues={initialInput} enableReinitialize validationSchema={validationSchema} onSubmit={submit}>
initialValues={initialInput} {({ errors, handleBlur, handleChange, handleSubmit, isSubmitting, touched, values, setFieldValue }) => (
enableReinitialize
validationSchema={validationSchema}
onSubmit={submit}
>
{({
errors,
handleBlur,
handleChange,
handleSubmit,
isSubmitting,
touched,
values,
setFieldValue,
}) => (
<form noValidate onSubmit={handleSubmit}> <form noValidate onSubmit={handleSubmit}>
<FormControl <FormControl fullWidth error={Boolean(touched.type && errors.type)} sx={{ ...theme.typography.otherInput }}>
fullWidth <InputLabel htmlFor="channel-type-label">{inputLabel.type}</InputLabel>
error={Boolean(touched.type && errors.type)}
sx={{ ...theme.typography.otherInput }}
>
<InputLabel htmlFor="channel-type-label">
{inputLabel.type}
</InputLabel>
<Select <Select
id="channel-type-label" id="channel-type-label"
label={inputLabel.type} label={inputLabel.type}
@ -338,9 +297,9 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
MenuProps={{ MenuProps={{
PaperProps: { PaperProps: {
style: { style: {
maxHeight: 200, maxHeight: 200
}, }
}, }
}} }}
> >
{Object.values(CHANNEL_OPTIONS) {Object.values(CHANNEL_OPTIONS)
@ -360,21 +319,12 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
{errors.type} {errors.type}
</FormHelperText> </FormHelperText>
) : ( ) : (
<FormHelperText id="helper-tex-channel-type-label"> <FormHelperText id="helper-tex-channel-type-label"> {inputPrompt.type} </FormHelperText>
{" "}
{inputPrompt.type}{" "}
</FormHelperText>
)} )}
</FormControl> </FormControl>
<FormControl <FormControl fullWidth error={Boolean(touched.name && errors.name)} sx={{ ...theme.typography.otherInput }}>
fullWidth <InputLabel htmlFor="channel-name-label">{inputLabel.name}</InputLabel>
error={Boolean(touched.name && errors.name)}
sx={{ ...theme.typography.otherInput }}
>
<InputLabel htmlFor="channel-name-label">
{inputLabel.name}
</InputLabel>
<OutlinedInput <OutlinedInput
id="channel-name-label" id="channel-name-label"
label={inputLabel.name} label={inputLabel.name}
@ -383,7 +333,7 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
name="name" name="name"
onBlur={handleBlur} onBlur={handleBlur}
onChange={handleChange} onChange={handleChange}
inputProps={{ autoComplete: "name" }} inputProps={{ autoComplete: 'name' }}
aria-describedby="helper-text-channel-name-label" aria-describedby="helper-text-channel-name-label"
/> />
{touched.name && errors.name ? ( {touched.name && errors.name ? (
@ -391,21 +341,12 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
{errors.name} {errors.name}
</FormHelperText> </FormHelperText>
) : ( ) : (
<FormHelperText id="helper-tex-channel-name-label"> <FormHelperText id="helper-tex-channel-name-label"> {inputPrompt.name} </FormHelperText>
{" "}
{inputPrompt.name}{" "}
</FormHelperText>
)} )}
</FormControl> </FormControl>
<FormControl <FormControl fullWidth error={Boolean(touched.base_url && errors.base_url)} sx={{ ...theme.typography.otherInput }}>
fullWidth <InputLabel htmlFor="channel-base_url-label">{inputLabel.base_url}</InputLabel>
error={Boolean(touched.base_url && errors.base_url)}
sx={{ ...theme.typography.otherInput }}
>
<InputLabel htmlFor="channel-base_url-label">
{inputLabel.base_url}
</InputLabel>
<OutlinedInput <OutlinedInput
id="channel-base_url-label" id="channel-base_url-label"
label={inputLabel.base_url} label={inputLabel.base_url}
@ -422,22 +363,13 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
{errors.base_url} {errors.base_url}
</FormHelperText> </FormHelperText>
) : ( ) : (
<FormHelperText id="helper-tex-channel-base_url-label"> <FormHelperText id="helper-tex-channel-base_url-label"> {inputPrompt.base_url} </FormHelperText>
{" "}
{inputPrompt.base_url}{" "}
</FormHelperText>
)} )}
</FormControl> </FormControl>
{inputPrompt.other && ( {inputPrompt.other && (
<FormControl <FormControl fullWidth error={Boolean(touched.other && errors.other)} sx={{ ...theme.typography.otherInput }}>
fullWidth <InputLabel htmlFor="channel-other-label">{inputLabel.other}</InputLabel>
error={Boolean(touched.other && errors.other)}
sx={{ ...theme.typography.otherInput }}
>
<InputLabel htmlFor="channel-other-label">
{inputLabel.other}
</InputLabel>
<OutlinedInput <OutlinedInput
id="channel-other-label" id="channel-other-label"
label={inputLabel.other} label={inputLabel.other}
@ -454,10 +386,7 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
{errors.other} {errors.other}
</FormHelperText> </FormHelperText>
) : ( ) : (
<FormHelperText id="helper-tex-channel-other-label"> <FormHelperText id="helper-tex-channel-other-label"> {inputPrompt.other} </FormHelperText>
{" "}
{inputPrompt.other}{" "}
</FormHelperText>
)} )}
</FormControl> </FormControl>
)} )}
@ -471,22 +400,15 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
onChange={(e, value) => { onChange={(e, value) => {
const event = { const event = {
target: { target: {
name: "groups", name: 'groups',
value: value, value: value
}, }
}; };
handleChange(event); handleChange(event);
}} }}
onBlur={handleBlur} onBlur={handleBlur}
filterSelectedOptions filterSelectedOptions
renderInput={(params) => ( renderInput={(params) => <TextField {...params} name="groups" error={Boolean(errors.groups)} label={inputLabel.groups} />}
<TextField
{...params}
name="groups"
error={Boolean(errors.groups)}
label={inputLabel.groups}
/>
)}
aria-describedby="helper-text-channel-groups-label" aria-describedby="helper-text-channel-groups-label"
/> />
{errors.groups ? ( {errors.groups ? (
@ -494,10 +416,7 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
{errors.groups} {errors.groups}
</FormHelperText> </FormHelperText>
) : ( ) : (
<FormHelperText id="helper-tex-channel-groups-label"> <FormHelperText id="helper-tex-channel-groups-label"> {inputPrompt.groups} </FormHelperText>
{" "}
{inputPrompt.groups}{" "}
</FormHelperText>
)} )}
</FormControl> </FormControl>
@ -511,30 +430,19 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
onChange={(e, value) => { onChange={(e, value) => {
const event = { const event = {
target: { target: {
name: "models", name: 'models',
value: value.map((item) => value: value.map((item) => (typeof item === 'string' ? { id: item, group: '自定义：点击或回车输入' } : item))
typeof item === "string" }
? { id: item, group: "自定义：点击或回车输入" }
: item
),
},
}; };
handleChange(event); handleChange(event);
}} }}
onBlur={handleBlur} onBlur={handleBlur}
// filterSelectedOptions // filterSelectedOptions
disableCloseOnSelect disableCloseOnSelect
renderInput={(params) => ( renderInput={(params) => <TextField {...params} name="models" error={Boolean(errors.models)} label={inputLabel.models} />}
<TextField
{...params}
name="models"
error={Boolean(errors.models)}
label={inputLabel.models}
/>
)}
groupBy={(option) => option.group} groupBy={(option) => option.group}
getOptionLabel={(option) => { getOptionLabel={(option) => {
if (typeof option === "string") { if (typeof option === 'string') {
return option; return option;
} }
if (option.inputValue) { if (option.inputValue) {
@ -545,25 +453,18 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
filterOptions={(options, params) => { filterOptions={(options, params) => {
const filtered = filter(options, params); const filtered = filter(options, params);
const { inputValue } = params; const { inputValue } = params;
const isExisting = options.some( const isExisting = options.some((option) => inputValue === option.id);
(option) => inputValue === option.id if (inputValue !== '' && !isExisting) {
);
if (inputValue !== "" && !isExisting) {
filtered.push({ filtered.push({
id: inputValue, id: inputValue,
group: "自定义：点击或回车输入", group: '自定义：点击或回车输入'
}); });
} }
return filtered; return filtered;
}} }}
renderOption={(props, option, { selected }) => ( renderOption={(props, option, { selected }) => (
<li {...props}> <li {...props}>
<Checkbox <Checkbox icon={icon} checkedIcon={checkedIcon} style={{ marginRight: 8 }} checked={selected} />
icon={icon}
checkedIcon={checkedIcon}
style={{ marginRight: 8 }}
checked={selected}
/>
{option.id} {option.id}
</li> </li>
)} )}
@ -573,103 +474,104 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
{errors.models} {errors.models}
</FormHelperText> </FormHelperText>
) : ( ) : (
<FormHelperText id="helper-tex-channel-models-label"> <FormHelperText id="helper-tex-channel-models-label"> {inputPrompt.models} </FormHelperText>
{" "}
{inputPrompt.models}{" "}
</FormHelperText>
)} )}
</FormControl> </FormControl>
<Container <Container
sx={{ sx={{
textAlign: "right", textAlign: 'right'
}} }}
> >
<ButtonGroup <ButtonGroup variant="outlined" aria-label="small outlined primary button group">
variant="outlined"
aria-label="small outlined primary button group"
>
<Button <Button
onClick={() => { onClick={() => {
setFieldValue("models", basicModels(values.type)); setFieldValue('models', initialModel(basicModels));
}} }}
> >
填入渠道支持模型 填入相关模型
</Button> </Button>
<Button <Button
onClick={() => { onClick={() => {
setFieldValue("models", modelOptions); setFieldValue('models', modelOptions);
}} }}
> >
填入所有模型 填入所有模型
</Button> </Button>
</ButtonGroup> </ButtonGroup>
</Container> </Container>
<FormControl {inputLabel.key && (
fullWidth <>
error={Boolean(touched.key && errors.key)} <FormControl fullWidth error={Boolean(touched.key && errors.key)} sx={{ ...theme.typography.otherInput }}>
sx={{ ...theme.typography.otherInput }} {!batchAdd ? (
> <>
{!batchAdd ? ( <InputLabel htmlFor="channel-key-label">{inputLabel.key}</InputLabel>
<> <OutlinedInput
<InputLabel htmlFor="channel-key-label"> id="channel-key-label"
{inputLabel.key} label={inputLabel.key}
</InputLabel> type="text"
<OutlinedInput value={values.key}
id="channel-key-label" name="key"
label={inputLabel.key} onBlur={handleBlur}
type="text" onChange={handleChange}
value={values.key} inputProps={{}}
name="key" aria-describedby="helper-text-channel-key-label"
onBlur={handleBlur} />
onChange={handleChange} </>
inputProps={{}} ) : (
aria-describedby="helper-text-channel-key-label" <TextField
/> multiline
</> id="channel-key-label"
) : ( label={inputLabel.key}
<TextField value={values.key}
multiline name="key"
id="channel-key-label" onBlur={handleBlur}
label={inputLabel.key} onChange={handleChange}
value={values.key} aria-describedby="helper-text-channel-key-label"
name="key" minRows={5}
onBlur={handleBlur} placeholder={inputPrompt.key + '，一行一个密钥'}
onChange={handleChange} />
aria-describedby="helper-text-channel-key-label" )}
minRows={5}
placeholder={inputPrompt.key + "，一行一个密钥"}
/>
)}
{touched.key && errors.key ? ( {touched.key && errors.key ? (
<FormHelperText error id="helper-tex-channel-key-label"> <FormHelperText error id="helper-tex-channel-key-label">
{errors.key} {errors.key}
</FormHelperText> </FormHelperText>
) : ( ) : (
<FormHelperText id="helper-tex-channel-key-label"> <FormHelperText id="helper-tex-channel-key-label"> {inputPrompt.key} </FormHelperText>
{" "} )}
{inputPrompt.key}{" "} </FormControl>
</FormHelperText> {channelId === 0 && (
)} <Container
</FormControl> sx={{
{channelId === 0 && ( textAlign: 'right'
<Container }}
sx={{ >
textAlign: "right", <Switch checked={batchAdd} onChange={(e) => setBatchAdd(e.target.checked)} />
}} 批量添加
> </Container>
<Switch )}
checked={batchAdd} </>
onChange={(e) => setBatchAdd(e.target.checked)}
/>
批量添加
</Container>
)} )}
<FormControl
fullWidth {inputLabel.config &&
error={Boolean(touched.model_mapping && errors.model_mapping)} Object.keys(inputLabel.config).map((configName) => {
sx={{ ...theme.typography.otherInput }} return (
> <FormControl key={'config.' + configName} fullWidth sx={{ ...theme.typography.otherInput }}>
<TextField
multiline
key={'config.' + configName}
name={'config.' + configName}
value={values.config?.[configName] || ''}
label={configName}
placeholder={inputPrompt.config[configName]}
onChange={handleChange}
/>
<FormHelperText id={`helper-tex-config.${configName}-label`}> {inputPrompt.config[configName]} </FormHelperText>
</FormControl>
);
})}
<FormControl fullWidth error={Boolean(touched.model_mapping && errors.model_mapping)} sx={{ ...theme.typography.otherInput }}>
{/* <InputLabel htmlFor="channel-model_mapping-label">{inputLabel.model_mapping}</InputLabel> */} {/* <InputLabel htmlFor="channel-model_mapping-label">{inputLabel.model_mapping}</InputLabel> */}
<TextField <TextField
multiline multiline
@ -684,28 +586,16 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
placeholder={inputPrompt.model_mapping} placeholder={inputPrompt.model_mapping}
/> />
{touched.model_mapping && errors.model_mapping ? ( {touched.model_mapping && errors.model_mapping ? (
<FormHelperText <FormHelperText error id="helper-tex-channel-model_mapping-label">
error
id="helper-tex-channel-model_mapping-label"
>
{errors.model_mapping} {errors.model_mapping}
</FormHelperText> </FormHelperText>
) : ( ) : (
<FormHelperText id="helper-tex-channel-model_mapping-label"> <FormHelperText id="helper-tex-channel-model_mapping-label"> {inputPrompt.model_mapping} </FormHelperText>
{" "}
{inputPrompt.model_mapping}{" "}
</FormHelperText>
)} )}
</FormControl> </FormControl>
<DialogActions> <DialogActions>
<Button onClick={onCancel}>取消</Button> <Button onClick={onCancel}>取消</Button>
<Button <Button disableElevation disabled={isSubmitting} type="submit" variant="contained" color="primary">
disableElevation
disabled={isSubmitting}
type="submit"
variant="contained"
color="primary"
>
提交 提交
</Button> </Button>
</DialogActions> </DialogActions>
@ -723,5 +613,5 @@ EditModal.propTypes = {
open: PropTypes.bool, open: PropTypes.bool,
channelId: PropTypes.number, channelId: PropTypes.number,
onCancel: PropTypes.func, onCancel: PropTypes.func,
onOk: PropTypes.func, onOk: PropTypes.func
}; };

27
web/berry/src/views/Channel/component/NameLabel.js
View File

@ -1,20 +1,20 @@
import PropTypes from "prop-types"; import PropTypes from 'prop-types';
import { Tooltip, Stack, Container } from "@mui/material"; import { Tooltip, Stack, Container } from '@mui/material';
import Label from "ui-component/Label"; import Label from 'ui-component/Label';
import { styled } from "@mui/material/styles"; import { styled } from '@mui/material/styles';
import { showSuccess } from "utils/common"; import { showSuccess, copy } from 'utils/common';
const TooltipContainer = styled(Container)({ const TooltipContainer = styled(Container)({
maxHeight: "250px", maxHeight: '250px',
overflow: "auto", overflow: 'auto',
"&::-webkit-scrollbar": { '&::-webkit-scrollbar': {
width: "0px", // Set the width to 0 to hide the scrollbar width: '0px' // Set the width to 0 to hide the scrollbar
}, }
}); });
const NameLabel = ({ name, models }) => { const NameLabel = ({ name, models }) => {
let modelMap = []; let modelMap = [];
modelMap = models.split(","); modelMap = models.split(',');
modelMap.sort(); modelMap.sort();
return ( return (
@ -28,8 +28,7 @@ const NameLabel = ({ name, models }) => {
variant="ghost" variant="ghost"
key={index} key={index}
onClick={() => { onClick={() => {
navigator.clipboard.writeText(item); copy(item, '模型名称');
showSuccess("复制模型名称成功！");
}} }}
> >
{item} {item}
@ -48,7 +47,7 @@ const NameLabel = ({ name, models }) => {
NameLabel.propTypes = { NameLabel.propTypes = {
name: PropTypes.string, name: PropTypes.string,
models: PropTypes.string, models: PropTypes.string
}; };
export default NameLabel; export default NameLabel;

8
web/berry/src/views/Channel/index.js
View File

@ -1,5 +1,5 @@
import { useState, useEffect } from 'react'; import { useState, useEffect } from 'react';
import { showError, showSuccess, showInfo } from 'utils/common'; import { showError, showSuccess, showInfo, loadChannelModels } from 'utils/common';
import { useTheme } from '@mui/material/styles'; import { useTheme } from '@mui/material/styles';
import Table from '@mui/material/Table'; import Table from '@mui/material/Table';
@ -8,7 +8,6 @@ import TableContainer from '@mui/material/TableContainer';
import PerfectScrollbar from 'react-perfect-scrollbar'; import PerfectScrollbar from 'react-perfect-scrollbar';
import TablePagination from '@mui/material/TablePagination'; import TablePagination from '@mui/material/TablePagination';
import LinearProgress from '@mui/material/LinearProgress'; import LinearProgress from '@mui/material/LinearProgress';
import Alert from '@mui/material/Alert';
import ButtonGroup from '@mui/material/ButtonGroup'; import ButtonGroup from '@mui/material/ButtonGroup';
import Toolbar from '@mui/material/Toolbar'; import Toolbar from '@mui/material/Toolbar';
import useMediaQuery from '@mui/material/useMediaQuery'; import useMediaQuery from '@mui/material/useMediaQuery';
@ -189,6 +188,7 @@ export default function ChannelPage() {
.catch((reason) => { .catch((reason) => {
showError(reason); showError(reason);
}); });
loadChannelModels().then();
}, []); }, []);
return ( return (
@ -200,7 +200,7 @@ export default function ChannelPage() {
</Button> </Button>
</Stack> </Stack>
<Card> <Card>
<Box component="form" onSubmit={searchChannels} noValidate sx={{marginTop: 2}}> <Box component="form" onSubmit={searchChannels} noValidate sx={{ marginTop: 2 }}>
<TableToolBar filterName={searchKeyword} handleFilterName={handleSearchKeyword} placeholder={'搜索渠道的 ID，名称和密钥 ...'} /> <TableToolBar filterName={searchKeyword} handleFilterName={handleSearchKeyword} placeholder={'搜索渠道的 ID，名称和密钥 ...'} />
</Box> </Box>
<Toolbar <Toolbar
@ -214,7 +214,7 @@ export default function ChannelPage() {
> >
<Container> <Container>
{matchUpMd ? ( {matchUpMd ? (
<ButtonGroup variant="outlined" aria-label="outlined small primary button group" sx={{marginBottom: 2}}> <ButtonGroup variant="outlined" aria-label="outlined small primary button group" sx={{ marginBottom: 2 }}>
<Button onClick={handleRefresh} startIcon={<IconRefresh width={'18px'} />}> <Button onClick={handleRefresh} startIcon={<IconRefresh width={'18px'} />}>
刷新 刷新
</Button> </Button>

196
web/berry/src/views/Channel/type/Config.js
View File

@ -1,177 +1,209 @@
const defaultConfig = { const defaultConfig = {
input: { input: {
name: "", name: '',
type: 1, type: 1,
key: "", key: '',
base_url: "", base_url: '',
other: "", other: '',
model_mapping: "", model_mapping: '',
models: [], models: [],
groups: ["default"], groups: ['default'],
config: {}
}, },
inputLabel: { inputLabel: {
name: "渠道名称", name: '渠道名称',
type: "渠道类型", type: '渠道类型',
base_url: "渠道API地址", base_url: '渠道API地址',
key: "密钥", key: '密钥',
other: "其他参数", other: '其他参数',
models: "模型", models: '模型',
model_mapping: "模型映射关系", model_mapping: '模型映射关系',
groups: "用户组", groups: '用户组',
config: null
}, },
prompt: { prompt: {
type: "请选择渠道类型", type: '请选择渠道类型',
name: "请为渠道命名", name: '请为渠道命名',
base_url: "可空，请输入中转API地址，例如通过cloudflare中转", base_url: '可空，请输入中转API地址，例如通过cloudflare中转',
key: "请输入渠道对应的鉴权密钥", key: '请输入渠道对应的鉴权密钥',
other: "", other: '',
models: "请选择该渠道所支持的模型", models: '请选择该渠道所支持的模型',
model_mapping: model_mapping:
'请输入要修改的模型映射关系，格式为：api请求模型ID:实际转发给渠道的模型ID，使用JSON数组表示，例如：{"gpt-3.5": "gpt-35"}', '请输入要修改的模型映射关系，格式为：api请求模型ID:实际转发给渠道的模型ID，使用JSON数组表示，例如：{"gpt-3.5": "gpt-35"}',
groups: "请选择该渠道所支持的用户组", groups: '请选择该渠道所支持的用户组',
config: null
}, },
modelGroup: "openai", modelGroup: 'openai'
}; };
const typeConfig = { const typeConfig = {
3: { 3: {
inputLabel: { inputLabel: {
base_url: "AZURE_OPENAI_ENDPOINT", base_url: 'AZURE_OPENAI_ENDPOINT',
other: "默认 API 版本", other: '默认 API 版本'
}, },
prompt: { prompt: {
base_url: "请填写AZURE_OPENAI_ENDPOINT", base_url: '请填写AZURE_OPENAI_ENDPOINT',
other: "请输入默认API版本，例如：2024-03-01-preview", other: '请输入默认API版本，例如：2024-03-01-preview'
}, }
}, },
11: { 11: {
input: { input: {
models: ["PaLM-2"], models: ['PaLM-2']
}, },
modelGroup: "google palm", modelGroup: 'google palm'
}, },
14: { 14: {
input: { input: {
models: ["claude-instant-1", "claude-2", "claude-2.0", "claude-2.1"], models: ['claude-instant-1', 'claude-2', 'claude-2.0', 'claude-2.1']
}, },
modelGroup: "anthropic", modelGroup: 'anthropic'
}, },
15: { 15: {
input: { input: {
models: ["ERNIE-Bot", "ERNIE-Bot-turbo", "ERNIE-Bot-4", "Embedding-V1"], models: ['ERNIE-Bot', 'ERNIE-Bot-turbo', 'ERNIE-Bot-4', 'Embedding-V1']
}, },
prompt: { prompt: {
key: "按照如下格式输入：APIKey|SecretKey", key: '按照如下格式输入：APIKey|SecretKey'
}, },
modelGroup: "baidu", modelGroup: 'baidu'
}, },
16: { 16: {
input: { input: {
models: ["glm-4", "glm-4v", "glm-3-turbo", "chatglm_turbo", "chatglm_pro", "chatglm_std", "chatglm_lite"], models: ['glm-4', 'glm-4v', 'glm-3-turbo', 'chatglm_turbo', 'chatglm_pro', 'chatglm_std', 'chatglm_lite']
}, },
modelGroup: "zhipu", modelGroup: 'zhipu'
}, },
17: { 17: {
inputLabel: { inputLabel: {
other: "插件参数", other: '插件参数'
}, },
input: { input: {
models: [ models: ['qwen-turbo', 'qwen-plus', 'qwen-max', 'qwen-max-longcontext', 'text-embedding-v1']
"qwen-turbo",
"qwen-plus",
"qwen-max",
"qwen-max-longcontext",
"text-embedding-v1",
],
}, },
prompt: { prompt: {
other: "请输入插件参数，即 X-DashScope-Plugin 请求头的取值", other: '请输入插件参数，即 X-DashScope-Plugin 请求头的取值'
}, },
modelGroup: "ali", modelGroup: 'ali'
}, },
18: { 18: {
inputLabel: { inputLabel: {
other: "版本号", other: '版本号'
}, },
input: { input: {
models: [ models: ['SparkDesk', 'SparkDesk-v1.1', 'SparkDesk-v2.1', 'SparkDesk-v3.1', 'SparkDesk-v3.5']
"SparkDesk",
'SparkDesk-v1.1',
'SparkDesk-v2.1',
'SparkDesk-v3.1',
'SparkDesk-v3.5'
],
}, },
prompt: { prompt: {
key: "按照如下格式输入：APPID|APISecret|APIKey", key: '按照如下格式输入：APPID|APISecret|APIKey',
other: "请输入版本号，例如：v3.1", other: '请输入版本号，例如：v3.1'
}, },
modelGroup: "xunfei", modelGroup: 'xunfei'
}, },
19: { 19: {
input: { input: {
models: [ models: ['360GPT_S2_V9', 'embedding-bert-512-v1', 'embedding_s1_v1', 'semantic_similarity_s1_v1']
"360GPT_S2_V9",
"embedding-bert-512-v1",
"embedding_s1_v1",
"semantic_similarity_s1_v1",
],
}, },
modelGroup: "360", modelGroup: '360'
}, },
22: { 22: {
prompt: { prompt: {
key: "按照如下格式输入：APIKey-AppId，例如：fastgpt-0sp2gtvfdgyi4k30jwlgwf1i-64f335d84283f05518e9e041", key: '按照如下格式输入：APIKey-AppId，例如：fastgpt-0sp2gtvfdgyi4k30jwlgwf1i-64f335d84283f05518e9e041'
}, }
}, },
23: { 23: {
input: { input: {
models: ["hunyuan"], models: ['hunyuan']
}, },
prompt: { prompt: {
key: "按照如下格式输入：AppId|SecretId|SecretKey", key: '按照如下格式输入：AppId|SecretId|SecretKey'
}, },
modelGroup: "tencent", modelGroup: 'tencent'
}, },
24: { 24: {
inputLabel: { inputLabel: {
other: "版本号", other: '版本号'
}, },
input: { input: {
models: ["gemini-pro"], models: ['gemini-pro']
}, },
prompt: { prompt: {
other: "请输入版本号，例如：v1", other: '请输入版本号，例如：v1'
}, },
modelGroup: "google gemini", modelGroup: 'google gemini'
}, },
25: { 25: {
input: { input: {
models: ['moonshot-v1-8k', 'moonshot-v1-32k', 'moonshot-v1-128k'], models: ['moonshot-v1-8k', 'moonshot-v1-32k', 'moonshot-v1-128k']
}, },
modelGroup: "moonshot", modelGroup: 'moonshot'
}, },
26: { 26: {
input: { input: {
models: ['Baichuan2-Turbo', 'Baichuan2-Turbo-192k', 'Baichuan-Text-Embedding'], models: ['Baichuan2-Turbo', 'Baichuan2-Turbo-192k', 'Baichuan-Text-Embedding']
}, },
modelGroup: "baichuan", modelGroup: 'baichuan'
}, },
27: { 27: {
input: { input: {
models: ['abab5.5s-chat', 'abab5.5-chat', 'abab6-chat'], models: ['abab5.5s-chat', 'abab5.5-chat', 'abab6-chat']
}, },
modelGroup: "minimax", modelGroup: 'minimax'
}, },
29: { 29: {
modelGroup: "groq", modelGroup: 'groq'
}, },
30: { 30: {
modelGroup: "ollama", modelGroup: 'ollama'
}, },
31: { 31: {
modelGroup: "lingyiwanwu", modelGroup: 'lingyiwanwu'
}, },
33: {
inputLabel: {
key: '',
config: {
region: 'Region',
ak: 'Access Key',
sk: 'Secret Key'
}
},
prompt: {
key: '',
config: {
region: 'region，e.g. us-west-2',
ak: 'AWS IAM Access Key',
sk: 'AWS IAM Secret Key'
}
},
modelGroup: 'anthropic'
},
37: {
inputLabel: {
config: {
user_id: 'Account ID'
}
},
prompt: {
config: {
user_id: '请输入 Account ID，例如：d8d7c61dbc334c32d3ced580e4bf42b4'
}
},
modelGroup: 'Cloudflare'
},
34: {
inputLabel: {
config: {
user_id: 'User ID'
}
},
prompt: {
models: '对于 Coze 而言，模型名称即 Bot ID，你可以添加一个前缀 `bot-`，例如：`bot-123456`',
config: {
user_id: '生成该密钥的用户 ID'
}
},
modelGroup: 'Coze'
}
}; };
export { defaultConfig, typeConfig }; export { defaultConfig, typeConfig };

5
web/berry/src/views/Profile/index.js
View File

@ -21,7 +21,7 @@ import { IconBrandWechat, IconBrandGithub, IconMail } from '@tabler/icons-react'
import Label from 'ui-component/Label'; import Label from 'ui-component/Label';
import { API } from 'utils/api'; import { API } from 'utils/api';
import { showError, showSuccess } from 'utils/common'; import { showError, showSuccess } from 'utils/common';
import { onGitHubOAuthClicked, onLarkOAuthClicked } from 'utils/common'; import { onGitHubOAuthClicked, onLarkOAuthClicked, copy } from 'utils/common';
import * as Yup from 'yup'; import * as Yup from 'yup';
import WechatModal from 'views/Authentication/AuthForms/WechatModal'; import WechatModal from 'views/Authentication/AuthForms/WechatModal';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
@ -90,8 +90,7 @@ export default function Profile() {
const { success, message, data } = res.data; const { success, message, data } = res.data;
if (success) { if (success) {
setInputs((inputs) => ({ ...inputs, access_token: data })); setInputs((inputs) => ({ ...inputs, access_token: data }));
navigator.clipboard.writeText(data); copy(data, '访问令牌');
showSuccess(`令牌已重置并已复制到剪贴板`);
} else { } else {
showError(message); showError(message);
} }

5
web/berry/src/views/Redemption/component/TableRow.js
View File

@ -18,7 +18,7 @@ import {
import Label from 'ui-component/Label'; import Label from 'ui-component/Label';
import TableSwitch from 'ui-component/Switch'; import TableSwitch from 'ui-component/Switch';
import { timestamp2string, renderQuota, showSuccess } from 'utils/common'; import { timestamp2string, renderQuota, copy } from 'utils/common';
import { IconDotsVertical, IconEdit, IconTrash } from '@tabler/icons-react'; import { IconDotsVertical, IconEdit, IconTrash } from '@tabler/icons-react';
@ -83,8 +83,7 @@ export default function RedemptionTableRow({ item, manageRedemption, handleOpenM
variant="contained" variant="contained"
color="primary" color="primary"
onClick={() => { onClick={() => {
navigator.clipboard.writeText(item.key); copy(item.key, '兑换码');
showSuccess('已复制到剪贴板！');
}} }}
> >
复制 复制

14
web/berry/src/views/Token/component/TableRow.js
View File

@ -20,7 +20,7 @@ import {
} from '@mui/material'; } from '@mui/material';
import TableSwitch from 'ui-component/Switch'; import TableSwitch from 'ui-component/Switch';
import { renderQuota, showSuccess, timestamp2string } from 'utils/common'; import { renderQuota, timestamp2string, copy } from 'utils/common';
import { IconDotsVertical, IconEdit, IconTrash, IconCaretDownFilled } from '@tabler/icons-react'; import { IconDotsVertical, IconEdit, IconTrash, IconCaretDownFilled } from '@tabler/icons-react';
@ -141,8 +141,7 @@ export default function TokensTableRow({ item, manageToken, handleOpenModal, set
if (type === 'link') { if (type === 'link') {
window.open(text); window.open(text);
} else { } else {
navigator.clipboard.writeText(text); copy(text);
showSuccess('已复制到剪贴板！');
} }
handleCloseMenu(); handleCloseMenu();
}; };
@ -192,7 +191,7 @@ export default function TokensTableRow({ item, manageToken, handleOpenModal, set
id={`switch-${item.id}`} id={`switch-${item.id}`}
checked={statusSwitch === 1} checked={statusSwitch === 1}
onChange={handleStatus} onChange={handleStatus}
// disabled={statusSwitch !== 1 && statusSwitch !== 2} // disabled={statusSwitch !== 1 && statusSwitch !== 2}
/> />
</Tooltip> </Tooltip>
</TableCell> </TableCell>
@ -211,8 +210,7 @@ export default function TokensTableRow({ item, manageToken, handleOpenModal, set
<Button <Button
color="primary" color="primary"
onClick={() => { onClick={() => {
navigator.clipboard.writeText(`sk-${item.key}`); copy(`sk-${item.key}`);
showSuccess('已复制到剪贴板！');
}} }}
> >
复制 复制
@ -222,7 +220,9 @@ export default function TokensTableRow({ item, manageToken, handleOpenModal, set
</Button> </Button>
</ButtonGroup> </ButtonGroup>
<ButtonGroup size="small" aria-label="split button"> <ButtonGroup size="small" aria-label="split button">
<Button color="primary" onClick={(e) => handleCopy(COPY_OPTIONS[0], 'link')}>聊天</Button> <Button color="primary" onClick={(e) => handleCopy(COPY_OPTIONS[0], 'link')}>
聊天
</Button>
<Button size="small" onClick={(e) => handleOpenMenu(e, 'link')}> <Button size="small" onClick={(e) => handleOpenMenu(e, 'link')}>
<IconCaretDownFilled size={'16px'} /> <IconCaretDownFilled size={'16px'} />
</Button> </Button>

8
web/berry/src/views/Topup/component/InviteCard.js
View File

@ -4,7 +4,7 @@ import SubCard from 'ui-component/cards/SubCard';
import inviteImage from 'assets/images/invite/cwok_casual_19.webp'; import inviteImage from 'assets/images/invite/cwok_casual_19.webp';
import { useState } from 'react'; import { useState } from 'react';
import { API } from 'utils/api'; import { API } from 'utils/api';
import { showError, showSuccess } from 'utils/common'; import { showError, copy } from 'utils/common';
const InviteCard = () => { const InviteCard = () => {
const theme = useTheme(); const theme = useTheme();
@ -12,8 +12,7 @@ const InviteCard = () => {
const handleInviteUrl = async () => { const handleInviteUrl = async () => {
if (inviteUl) { if (inviteUl) {
navigator.clipboard.writeText(inviteUl); copy(inviteUl, '邀请链接');
showSuccess(`邀请链接已复制到剪切板`);
return; return;
} }
const res = await API.get('/api/user/aff'); const res = await API.get('/api/user/aff');
@ -21,8 +20,7 @@ const InviteCard = () => {
if (success) { if (success) {
let link = `${window.location.origin}/register?aff=${data}`; let link = `${window.location.origin}/register?aff=${data}`;
setInviteUrl(link); setInviteUrl(link);
navigator.clipboard.writeText(link); copy(link, '邀请链接');
showSuccess(`邀请链接已复制到剪切板`);
} else { } else {
showError(message); showError(message);
} }

2
web/default/public/index.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="zh-CN">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="logo.png" /> <link rel="icon" href="logo.png" />

1
web/default/src/constants/channel.constants.js
View File

@ -24,6 +24,7 @@ export const CHANNEL_OPTIONS = [
{key: 36, text: 'DeepSeek', value: 36, color: 'black'}, {key: 36, text: 'DeepSeek', value: 36, color: 'black'},
{key: 37, text: 'Cloudflare', value: 37, color: 'orange'}, {key: 37, text: 'Cloudflare', value: 37, color: 'orange'},
{key: 38, text: 'DeepL', value: 38, color: 'black'}, {key: 38, text: 'DeepL', value: 38, color: 'black'},
{key: 39, text: 'together.ai', value: 39, color: 'blue'},
{key: 8, text: '自定义渠道', value: 8, color: 'pink'}, {key: 8, text: '自定义渠道', value: 8, color: 'pink'},
{key: 22, text: '知识库：FastGPT', value: 22, color: 'blue'}, {key: 22, text: '知识库：FastGPT', value: 22, color: 'blue'},
{key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple'}, {key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple'},