`: 指定日志文件夹，如果没有设置，默认保存至工作目录的 `logs` 文件夹下。
- + 例子：`--log-dir ./logs`
-3. `--version`: 打印系统版本号并退出。
-4. `--help`: 查看命令的使用帮助和参数说明。
-
-## 演示
-### 在线演示
-注意，该演示站不提供对外服务：
-https://openai.justsong.cn
-
-### 截图展示
-
-
-
-## 常见问题
-1. 额度是什么？怎么计算的？One API 的额度计算有问题？
- + 额度 = 分组倍率 * 模型倍率 * （提示 token 数 + 补全 token 数 * 补全倍率）
- + 其中补全倍率对于 GPT3.5 固定为 1.33，GPT4 为 2，与官方保持一致。
- + 如果是非流模式，官方接口会返回消耗的总 token，但是你要注意提示和补全的消耗倍率不一样。
- + 注意，One API 的默认倍率就是官方倍率，是已经调整过的。
-2. 账户额度足够为什么提示额度不足？
- + 请检查你的令牌额度是否足够，这个和账户额度是分开的。
- + 令牌额度仅供用户设置最大使用量，用户可自由设置。
-3. 提示无可用渠道？
- + 请检查的用户分组和渠道分组设置。
- + 以及渠道的模型设置。
-4. 渠道测试报错：`invalid character '<' looking for beginning of value`
- + 这是因为返回值不是合法的 JSON，而是一个 HTML 页面。
- + 大概率是你的部署站的 IP 或代理的节点被 CloudFlare 封禁了。
-5. ChatGPT Next Web 报错：`Failed to fetch`
- + 部署的时候不要设置 `BASE_URL`。
- + 检查你的接口地址和 API Key 有没有填对。
- + 检查是否启用了 HTTPS，浏览器会拦截 HTTPS 域名下的 HTTP 请求。
-6. 报错：`当前分组负载已饱和，请稍后再试`
- + 上游渠道 429 了。
-7. 升级之后我的数据会丢失吗？
- + 如果使用 MySQL，不会。
- + 如果使用 SQLite，需要按照我所给的部署命令挂载 volume 持久化 one-api.db 数据库文件，否则容器重启后数据会丢失。
-8. 升级之前数据库需要做变更吗？
- + 一般情况下不需要，系统将在初始化的时候自动调整。
- + 如果需要的话，我会在更新日志中说明，并给出脚本。
-9. 手动修改数据库后报错：`数据库一致性已被破坏，请联系管理员`？
- + 这是检测到 ability 表里有些记录的渠道 id 是不存在的，这大概率是因为你删了 channel 表里的记录但是没有同步在 ability 表里清理无效的渠道。
- + 对于每一个渠道，其所支持的模型都需要有一个专门的 ability 表的记录，表示该渠道支持该模型。
-
-## 相关项目
-* [FastGPT](https://github.com/labring/FastGPT): 基于 LLM 大语言模型的知识库问答系统
-* [ChatGPT Next Web](https://github.com/Yidadaa/ChatGPT-Next-Web): 一键拥有你自己的跨平台 ChatGPT 应用
-* [VChart](https://github.com/VisActor/VChart): 不只是开箱即用的多端图表库，更是生动灵活的数据故事讲述者。
-* [VMind](https://github.com/VisActor/VMind): 不仅自动，还很智能。开源智能可视化解决方案。
-
-## 注意
-
-本项目使用 MIT 协议进行开源，**在此基础上**，必须在页面底部保留署名以及指向本项目的链接。如果不想保留署名，必须首先获得授权。
-
-同样适用于基于本项目的二开项目。
-
-依据 MIT 协议，使用者需自行承担使用本项目的风险与责任，本开源项目开发者与此无关。
+- [fix: 修复高并发下，高额度用户使用低额度令牌没有预扣费而导致令牌大额欠费 #25](https://github.com/Laisky/one-api/pull/25)
diff --git a/common/client/init.go b/common/client/init.go
index f803cbf8..0bd29ef7 100644
--- a/common/client/init.go
+++ b/common/client/init.go
@@ -2,11 +2,12 @@ package client
import (
"fmt"
- "github.com/songquanpeng/one-api/common/config"
- "github.com/songquanpeng/one-api/common/logger"
"net/http"
"net/url"
"time"
+
+ "github.com/songquanpeng/one-api/common/config"
+ "github.com/songquanpeng/one-api/common/logger"
)
var HTTPClient *http.Client
diff --git a/common/config/config.go b/common/config/config.go
index 2eb894ef..a9e56b07 100644
--- a/common/config/config.go
+++ b/common/config/config.go
@@ -1,16 +1,30 @@
package config
import (
- "github.com/songquanpeng/one-api/common/env"
+ "crypto/rand"
+ "encoding/base64"
+ "fmt"
"os"
"strconv"
"strings"
"sync"
"time"
- "github.com/google/uuid"
+ "github.com/songquanpeng/one-api/common/env"
)
+func init() {
+ if SessionSecret == "" {
+ fmt.Println("SESSION_SECRET not set, using random secret")
+ key := make([]byte, 32)
+ if _, err := rand.Read(key); err != nil {
+ panic(fmt.Sprintf("failed to generate random secret: %v", err))
+ }
+
+ SessionSecret = base64.StdEncoding.EncodeToString(key)
+ }
+}
+
var SystemName = "One API"
var ServerAddress = "http://localhost:3000"
var Footer = ""
@@ -23,7 +37,7 @@ var DisplayTokenStatEnabled = true
// Any options with "Secret", "Token" in its key won't be return by GetOptions
-var SessionSecret = uuid.New().String()
+var SessionSecret = os.Getenv("SESSION_SECRET")
var OptionMap map[string]string
var OptionMapRWMutex sync.RWMutex
@@ -112,6 +126,7 @@ var BatchUpdateEnabled = false
var BatchUpdateInterval = env.Int("BATCH_UPDATE_INTERVAL", 5)
var RelayTimeout = env.Int("RELAY_TIMEOUT", 0) // unit is second
+var IdleTimeout = env.Int("IDLE_TIMEOUT", 30) // unit is second
var GeminiSafetySetting = env.String("GEMINI_SAFETY_SETTING", "BLOCK_NONE")
diff --git a/common/ctxkey/key.go b/common/ctxkey/key.go
index 115558a5..949d558a 100644
--- a/common/ctxkey/key.go
+++ b/common/ctxkey/key.go
@@ -1,24 +1,31 @@
package ctxkey
const (
- Config = "config"
- Id = "id"
- Username = "username"
- Role = "role"
- Status = "status"
- Channel = "channel"
- ChannelId = "channel_id"
- SpecificChannelId = "specific_channel_id"
- RequestModel = "request_model"
- ConvertedRequest = "converted_request"
- OriginalModel = "original_model"
- Group = "group"
- ModelMapping = "model_mapping"
- ChannelName = "channel_name"
- TokenId = "token_id"
- TokenName = "token_name"
- BaseURL = "base_url"
- AvailableModels = "available_models"
- KeyRequestBody = "key_request_body"
- SystemPrompt = "system_prompt"
+ Config = "config"
+ Id = "id"
+ RequestId = "X-Oneapi-Request-Id"
+ Username = "username"
+ Role = "role"
+ Status = "status"
+ ChannelModel = "channel_model"
+ ChannelRatio = "channel_ratio"
+ Channel = "channel"
+ ChannelId = "channel_id"
+ SpecificChannelId = "specific_channel_id"
+ RequestModel = "request_model"
+ ConvertedRequest = "converted_request"
+ OriginalModel = "original_model"
+ Group = "group"
+ ModelMapping = "model_mapping"
+ ChannelName = "channel_name"
+ ContentType = "content_type"
+ TokenId = "token_id"
+ TokenName = "token_name"
+ TokenQuota = "token_quota"
+ TokenQuotaUnlimited = "token_quota_unlimited"
+ BaseURL = "base_url"
+ AvailableModels = "available_models"
+ KeyRequestBody = "key_request_body"
+ SystemPrompt = "system_prompt"
+ Meta = "meta"
)
diff --git a/common/gin.go b/common/gin.go
index 815b4ee5..c2451c88 100644
--- a/common/gin.go
+++ b/common/gin.go
@@ -3,43 +3,53 @@ package common
import (
"bytes"
"encoding/json"
- "github.com/gin-gonic/gin"
- "github.com/songquanpeng/one-api/common/ctxkey"
"io"
+ "reflect"
"strings"
+
+ "github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
+ "github.com/songquanpeng/one-api/common/ctxkey"
)
-func GetRequestBody(c *gin.Context) ([]byte, error) {
- requestBody, _ := c.Get(ctxkey.KeyRequestBody)
- if requestBody != nil {
- return requestBody.([]byte), nil
+func GetRequestBody(c *gin.Context) (requestBody []byte, err error) {
+ if requestBodyCache, _ := c.Get(ctxkey.KeyRequestBody); requestBodyCache != nil {
+ return requestBodyCache.([]byte), nil
}
- requestBody, err := io.ReadAll(c.Request.Body)
+ requestBody, err = io.ReadAll(c.Request.Body)
if err != nil {
- return nil, err
+ return nil, errors.Wrap(err, "read request body failed")
}
_ = c.Request.Body.Close()
c.Set(ctxkey.KeyRequestBody, requestBody)
- return requestBody.([]byte), nil
+
+ return requestBody, nil
}
func UnmarshalBodyReusable(c *gin.Context, v any) error {
requestBody, err := GetRequestBody(c)
if err != nil {
- return err
+ return errors.Wrap(err, "get request body failed")
}
+
+ // check v should be a pointer
+ if v == nil || reflect.TypeOf(v).Kind() != reflect.Ptr {
+ return errors.Errorf("UnmarshalBodyReusable only accept pointer, got %v", reflect.TypeOf(v))
+ }
+
contentType := c.Request.Header.Get("Content-Type")
if strings.HasPrefix(contentType, "application/json") {
- err = json.Unmarshal(requestBody, &v)
- c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))
+ err = json.Unmarshal(requestBody, v)
} else {
c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))
- err = c.ShouldBind(&v)
+ err = c.ShouldBind(v)
}
if err != nil {
- return err
+ return errors.Wrap(err, "unmarshal request body failed")
}
+
// Reset request body
+ c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))
return nil
}
diff --git a/common/helper/audio.go b/common/helper/audio.go
new file mode 100644
index 00000000..146d9412
--- /dev/null
+++ b/common/helper/audio.go
@@ -0,0 +1,63 @@
+package helper
+
+import (
+ "bytes"
+ "context"
+ "io"
+ "math"
+ "os"
+ "os/exec"
+ "strconv"
+
+ "github.com/pkg/errors"
+)
+
+// SaveTmpFile saves data to a temporary file. The filename would be apppended with a random string.
+func SaveTmpFile(filename string, data io.Reader) (string, error) {
+ if data == nil {
+ return "", errors.New("data is nil")
+ }
+
+ f, err := os.CreateTemp("", "*-"+filename)
+ if err != nil {
+ return "", errors.Wrapf(err, "failed to create temporary file %s", filename)
+ }
+ defer f.Close()
+
+ _, err = io.Copy(f, data)
+ if err != nil {
+ return "", errors.Wrapf(err, "failed to copy data to temporary file %s", filename)
+ }
+
+ return f.Name(), nil
+}
+
+// GetAudioTokens returns the number of tokens in an audio file.
+func GetAudioTokens(ctx context.Context, audio io.Reader, tokensPerSecond int) (int, error) {
+ filename, err := SaveTmpFile("audio", audio)
+ if err != nil {
+ return 0, errors.Wrap(err, "failed to save audio to temporary file")
+ }
+ defer os.Remove(filename)
+
+ duration, err := GetAudioDuration(ctx, filename)
+ if err != nil {
+ return 0, errors.Wrap(err, "failed to get audio tokens")
+ }
+
+ return int(math.Ceil(duration)) * tokensPerSecond, nil
+}
+
+// GetAudioDuration returns the duration of an audio file in seconds.
+func GetAudioDuration(ctx context.Context, filename string) (float64, error) {
+ // ffprobe -v error -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 {{input}}
+ c := exec.CommandContext(ctx, "/usr/bin/ffprobe", "-v", "error", "-show_entries", "format=duration", "-of", "default=noprint_wrappers=1:nokey=1", filename)
+ output, err := c.Output()
+ if err != nil {
+ return 0, errors.Wrap(err, "failed to get audio duration")
+ }
+
+ // Actually gpt-4-audio calculates tokens with 0.1s precision,
+ // while whisper calculates tokens with 1s precision
+ return strconv.ParseFloat(string(bytes.TrimSpace(output)), 64)
+}
diff --git a/common/helper/audio_test.go b/common/helper/audio_test.go
new file mode 100644
index 00000000..15f55bbb
--- /dev/null
+++ b/common/helper/audio_test.go
@@ -0,0 +1,55 @@
+package helper
+
+import (
+ "context"
+ "io"
+ "net/http"
+ "os"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+)
+
+func TestGetAudioDuration(t *testing.T) {
+ t.Run("should return correct duration for a valid audio file", func(t *testing.T) {
+ tmpFile, err := os.CreateTemp("", "test_audio*.mp3")
+ require.NoError(t, err)
+ defer os.Remove(tmpFile.Name())
+
+ // download test audio file
+ resp, err := http.Get("https://s3.laisky.com/uploads/2025/01/audio-sample.m4a")
+ require.NoError(t, err)
+ defer resp.Body.Close()
+
+ _, err = io.Copy(tmpFile, resp.Body)
+ require.NoError(t, err)
+ require.NoError(t, tmpFile.Close())
+
+ duration, err := GetAudioDuration(context.Background(), tmpFile.Name())
+ require.NoError(t, err)
+ require.Equal(t, duration, 3.904)
+ })
+
+ t.Run("should return an error for a non-existent file", func(t *testing.T) {
+ _, err := GetAudioDuration(context.Background(), "non_existent_file.mp3")
+ require.Error(t, err)
+ })
+}
+
+func TestGetAudioTokens(t *testing.T) {
+ t.Run("should return correct tokens for a valid audio file", func(t *testing.T) {
+ // download test audio file
+ resp, err := http.Get("https://s3.laisky.com/uploads/2025/01/audio-sample.m4a")
+ require.NoError(t, err)
+ defer resp.Body.Close()
+
+ tokens, err := GetAudioTokens(context.Background(), resp.Body, 50)
+ require.NoError(t, err)
+ require.Equal(t, tokens, 200)
+ })
+
+ t.Run("should return an error for a non-existent file", func(t *testing.T) {
+ _, err := GetAudioTokens(context.Background(), nil, 1)
+ require.Error(t, err)
+ })
+}
diff --git a/common/helper/helper.go b/common/helper/helper.go
index df7b0a5f..662de16c 100644
--- a/common/helper/helper.go
+++ b/common/helper/helper.go
@@ -2,8 +2,6 @@ package helper
import (
"fmt"
- "github.com/gin-gonic/gin"
- "github.com/songquanpeng/one-api/common/random"
"html/template"
"log"
"net"
@@ -11,6 +9,9 @@ import (
"runtime"
"strconv"
"strings"
+
+ "github.com/gin-gonic/gin"
+ "github.com/songquanpeng/one-api/common/random"
)
func OpenBrowser(url string) {
diff --git a/common/helper/time.go b/common/helper/time.go
index 302746db..b74cc74a 100644
--- a/common/helper/time.go
+++ b/common/helper/time.go
@@ -5,6 +5,7 @@ import (
"time"
)
+// GetTimestamp get current timestamp in seconds
func GetTimestamp() int64 {
return time.Now().Unix()
}
diff --git a/common/init.go b/common/init.go
index 6fd84764..391bc088 100644
--- a/common/init.go
+++ b/common/init.go
@@ -3,11 +3,12 @@ package common
import (
"flag"
"fmt"
- "github.com/songquanpeng/one-api/common/config"
- "github.com/songquanpeng/one-api/common/logger"
"log"
"os"
"path/filepath"
+
+ "github.com/songquanpeng/one-api/common/config"
+ "github.com/songquanpeng/one-api/common/logger"
)
var (
@@ -27,15 +28,15 @@ func printHelp() {
func Init() {
flag.Parse()
- if *PrintVersion {
- fmt.Println(Version)
- os.Exit(0)
- }
+ // if *PrintVersion {
+ // fmt.Println(Version)
+ // os.Exit(0)
+ // }
- if *PrintHelp {
- printHelp()
- os.Exit(0)
- }
+ // if *PrintHelp {
+ // printHelp()
+ // os.Exit(0)
+ // }
if os.Getenv("SESSION_SECRET") != "" {
if os.Getenv("SESSION_SECRET") == "random_string" {
diff --git a/common/message/email.go b/common/message/email.go
index 187ac8c3..6ba27019 100644
--- a/common/message/email.go
+++ b/common/message/email.go
@@ -5,6 +5,7 @@ import (
"crypto/tls"
"encoding/base64"
"fmt"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common/config"
"net"
"net/smtp"
@@ -18,7 +19,7 @@ func shouldAuth() bool {
func SendEmail(subject string, receiver string, content string) error {
if receiver == "" {
- return fmt.Errorf("receiver is empty")
+ return errors.Errorf("receiver is empty")
}
if config.SMTPFrom == "" { // for compatibility
config.SMTPFrom = config.SMTPAccount
@@ -57,7 +58,7 @@ func SendEmail(subject string, receiver string, content string) error {
var err error
if config.SMTPPort == 465 {
tlsConfig := &tls.Config{
- InsecureSkipVerify: true,
+ InsecureSkipVerify: false,
ServerName: config.SMTPServer,
}
conn, err = tls.Dial("tcp", fmt.Sprintf("%s:%d", config.SMTPServer, config.SMTPPort), tlsConfig)
diff --git a/common/message/main.go b/common/message/main.go
index 5ce82a64..a7d3269d 100644
--- a/common/message/main.go
+++ b/common/message/main.go
@@ -1,7 +1,7 @@
package message
import (
- "fmt"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common/config"
)
@@ -18,5 +18,5 @@ func Notify(by string, title string, description string, content string) error {
if by == ByMessagePusher {
return SendMessage(title, description, content)
}
- return fmt.Errorf("unknown notify method: %s", by)
+ return errors.Errorf("unknown notify method: %s", by)
}
diff --git a/common/message/message-pusher.go b/common/message/message-pusher.go
index 69949b4b..bc160891 100644
--- a/common/message/message-pusher.go
+++ b/common/message/message-pusher.go
@@ -3,7 +3,7 @@ package message
import (
"bytes"
"encoding/json"
- "errors"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common/config"
"net/http"
)
diff --git a/common/random/main.go b/common/random/main.go
index dbb772cd..c3c69488 100644
--- a/common/random/main.go
+++ b/common/random/main.go
@@ -1,10 +1,11 @@
package random
import (
- "github.com/google/uuid"
"math/rand"
"strings"
"time"
+
+ "github.com/google/uuid"
)
func GetUUID() string {
diff --git a/common/utils.go b/common/utils.go
index ecee2c8e..a3323526 100644
--- a/common/utils.go
+++ b/common/utils.go
@@ -7,8 +7,8 @@ import (
func LogQuota(quota int64) string {
if config.DisplayInCurrencyEnabled {
- return fmt.Sprintf("＄%.6f 额度", float64(quota)/config.QuotaPerUnit)
+ return fmt.Sprintf("＄%.6f quota", float64(quota)/config.QuotaPerUnit)
} else {
- return fmt.Sprintf("%d 点额度", quota)
+ return fmt.Sprintf("%d point quota", quota)
}
}
diff --git a/controller/auth/github.go b/controller/auth/github.go
index 15542655..95d44822 100644
--- a/controller/auth/github.go
+++ b/controller/auth/github.go
@@ -3,10 +3,10 @@ package auth
import (
"bytes"
"encoding/json"
- "errors"
"fmt"
"github.com/gin-contrib/sessions"
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/common/random"
@@ -31,7 +31,7 @@ type GitHubUser struct {
func getGitHubUserInfoByCode(code string) (*GitHubUser, error) {
if code == "" {
- return nil, errors.New("无效的参数")
+ return nil, errors.New("Invalid parameter")
}
values := map[string]string{"client_id": config.GitHubClientId, "client_secret": config.GitHubClientSecret, "code": code}
jsonData, err := json.Marshal(values)
@@ -50,7 +50,7 @@ func getGitHubUserInfoByCode(code string) (*GitHubUser, error) {
res, err := client.Do(req)
if err != nil {
logger.SysLog(err.Error())
- return nil, errors.New("无法连接至 GitHub 服务器，请稍后重试！")
+ return nil, errors.New("Unable to connect to GitHub server, please try again later!")
}
defer res.Body.Close()
var oAuthResponse GitHubOAuthResponse
@@ -66,7 +66,7 @@ func getGitHubUserInfoByCode(code string) (*GitHubUser, error) {
res2, err := client.Do(req)
if err != nil {
logger.SysLog(err.Error())
- return nil, errors.New("无法连接至 GitHub 服务器，请稍后重试！")
+ return nil, errors.New("Unable to connect to GitHub server, please try again later!")
}
defer res2.Body.Close()
var githubUser GitHubUser
@@ -75,7 +75,7 @@ func getGitHubUserInfoByCode(code string) (*GitHubUser, error) {
return nil, err
}
if githubUser.Login == "" {
- return nil, errors.New("返回值非法，用户字段为空，请稍后重试！")
+ return nil, errors.New("The return value is illegal, the user field is empty, please try again later!")
}
return &githubUser, nil
}
@@ -99,7 +99,7 @@ func GitHubOAuth(c *gin.Context) {
if !config.GitHubOAuthEnabled {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "管理员未开启通过 GitHub 登录以及注册",
+ "message": "The administrator did not turn on login and registration via GitHub",
})
return
}
@@ -146,7 +146,7 @@ func GitHubOAuth(c *gin.Context) {
} else {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "管理员关闭了新用户注册",
+ "message": "The administrator has turned off new user registration",
})
return
}
@@ -154,7 +154,7 @@ func GitHubOAuth(c *gin.Context) {
if user.Status != model.UserStatusEnabled {
c.JSON(http.StatusOK, gin.H{
- "message": "用户已被封禁",
+ "message": "User has been banned",
"success": false,
})
return
@@ -166,7 +166,7 @@ func GitHubBind(c *gin.Context) {
if !config.GitHubOAuthEnabled {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "管理员未开启通过 GitHub 登录以及注册",
+ "message": "The administrator did not turn on login and registration via GitHub",
})
return
}
@@ -185,7 +185,7 @@ func GitHubBind(c *gin.Context) {
if model.IsGitHubIdAlreadyTaken(user.GitHubId) {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "该 GitHub 账户已被绑定",
+ "message": "The GitHub account has been bound",
})
return
}
diff --git a/controller/auth/lark.go b/controller/auth/lark.go
index 39088b3c..43977d54 100644
--- a/controller/auth/lark.go
+++ b/controller/auth/lark.go
@@ -3,17 +3,18 @@ package auth
import (
"bytes"
"encoding/json"
- "errors"
"fmt"
+ "net/http"
+ "strconv"
+ "time"
+
"github.com/gin-contrib/sessions"
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/controller"
"github.com/songquanpeng/one-api/model"
- "net/http"
- "strconv"
- "time"
)
type LarkOAuthResponse struct {
@@ -27,7 +28,7 @@ type LarkUser struct {
func getLarkUserInfoByCode(code string) (*LarkUser, error) {
if code == "" {
- return nil, errors.New("无效的参数")
+ return nil, errors.New("Invalid parameter")
}
values := map[string]string{
"client_id": config.LarkClientId,
@@ -52,7 +53,7 @@ func getLarkUserInfoByCode(code string) (*LarkUser, error) {
res, err := client.Do(req)
if err != nil {
logger.SysLog(err.Error())
- return nil, errors.New("无法连接至飞书服务器，请稍后重试！")
+ return nil, errors.New("None法连接至飞书服务器，请稍后Retry！")
}
defer res.Body.Close()
var oAuthResponse LarkOAuthResponse
@@ -68,7 +69,7 @@ func getLarkUserInfoByCode(code string) (*LarkUser, error) {
res2, err := client.Do(req)
if err != nil {
logger.SysLog(err.Error())
- return nil, errors.New("无法连接至飞书服务器，请稍后重试！")
+ return nil, errors.New("None法连接至飞书服务器，请稍后Retry！")
}
var larkUser LarkUser
err = json.NewDecoder(res2.Body).Decode(&larkUser)
@@ -135,7 +136,7 @@ func LarkOAuth(c *gin.Context) {
} else {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "管理员关闭了新用户注册",
+ "message": "The administrator has turned off new user registration",
})
return
}
@@ -143,7 +144,7 @@ func LarkOAuth(c *gin.Context) {
if user.Status != model.UserStatusEnabled {
c.JSON(http.StatusOK, gin.H{
- "message": "用户已被封禁",
+ "message": "User has been banned",
"success": false,
})
return
@@ -167,7 +168,7 @@ func LarkBind(c *gin.Context) {
if model.IsLarkIdAlreadyTaken(user.LarkId) {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "该飞书账户已被绑定",
+ "message": "该飞书账户已被Bind",
})
return
}
diff --git a/controller/auth/oidc.go b/controller/auth/oidc.go
index 7b4ad4b9..6eafecb8 100644
--- a/controller/auth/oidc.go
+++ b/controller/auth/oidc.go
@@ -35,7 +35,7 @@ type OidcUser struct {
func getOidcUserInfoByCode(code string) (*OidcUser, error) {
if code == "" {
- return nil, errors.New("无效的参数")
+ return nil, errors.New("Invalid parameter")
}
values := map[string]string{
"client_id": config.OidcClientId,
@@ -60,7 +60,7 @@ func getOidcUserInfoByCode(code string) (*OidcUser, error) {
res, err := client.Do(req)
if err != nil {
logger.SysLog(err.Error())
- return nil, errors.New("无法连接至 OIDC 服务器，请稍后重试！")
+ return nil, errors.New("None法连接至 OIDC 服务器，请稍后Retry！")
}
defer res.Body.Close()
var oidcResponse OidcResponse
@@ -76,7 +76,7 @@ func getOidcUserInfoByCode(code string) (*OidcUser, error) {
res2, err := client.Do(req)
if err != nil {
logger.SysLog(err.Error())
- return nil, errors.New("无法连接至 OIDC 服务器，请稍后重试！")
+ return nil, errors.New("None法连接至 OIDC 服务器，请稍后Retry！")
}
var oidcUser OidcUser
err = json.NewDecoder(res2.Body).Decode(&oidcUser)
@@ -104,7 +104,7 @@ func OidcAuth(c *gin.Context) {
if !config.OidcEnabled {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "管理员未开启通过 OIDC 登录以及注册",
+ "message": "Administrator未开启通过 OIDC Log in以及Sign up",
})
return
}
@@ -153,7 +153,7 @@ func OidcAuth(c *gin.Context) {
} else {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "管理员关闭了新用户注册",
+ "message": "The administrator has turned off new user registration",
})
return
}
@@ -161,7 +161,7 @@ func OidcAuth(c *gin.Context) {
if user.Status != model.UserStatusEnabled {
c.JSON(http.StatusOK, gin.H{
- "message": "用户已被封禁",
+ "message": "User has been banned",
"success": false,
})
return
@@ -173,7 +173,7 @@ func OidcBind(c *gin.Context) {
if !config.OidcEnabled {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "管理员未开启通过 OIDC 登录以及注册",
+ "message": "Administrator未开启通过 OIDC Log in以及Sign up",
})
return
}
@@ -192,7 +192,7 @@ func OidcBind(c *gin.Context) {
if model.IsOidcIdAlreadyTaken(user.OidcId) {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "该 OIDC 账户已被绑定",
+ "message": "该 OIDC 账户已被Bind",
})
return
}
diff --git a/controller/auth/wechat.go b/controller/auth/wechat.go
index a561aec0..859ae262 100644
--- a/controller/auth/wechat.go
+++ b/controller/auth/wechat.go
@@ -2,16 +2,17 @@ package auth
import (
"encoding/json"
- "errors"
"fmt"
+ "net/http"
+ "strconv"
+ "time"
+
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/ctxkey"
"github.com/songquanpeng/one-api/controller"
"github.com/songquanpeng/one-api/model"
- "net/http"
- "strconv"
- "time"
)
type wechatLoginResponse struct {
@@ -22,7 +23,7 @@ type wechatLoginResponse struct {
func getWeChatIdByCode(code string) (string, error) {
if code == "" {
- return "", errors.New("无效的参数")
+ return "", errors.New("Invalid parameter")
}
req, err := http.NewRequest("GET", fmt.Sprintf("%s/api/wechat/user?code=%s", config.WeChatServerAddress, code), nil)
if err != nil {
@@ -46,7 +47,7 @@ func getWeChatIdByCode(code string) (string, error) {
return "", errors.New(res.Message)
}
if res.Data == "" {
- return "", errors.New("验证码错误或已过期")
+ return "", errors.New("Verification code error or expired")
}
return res.Data, nil
}
@@ -54,7 +55,7 @@ func getWeChatIdByCode(code string) (string, error) {
func WeChatAuth(c *gin.Context) {
if !config.WeChatAuthEnabled {
c.JSON(http.StatusOK, gin.H{
- "message": "管理员未开启通过微信登录以及注册",
+ "message": "The administrator has not enabled login and registration via WeChat",
"success": false,
})
return
@@ -97,7 +98,7 @@ func WeChatAuth(c *gin.Context) {
} else {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "管理员关闭了新用户注册",
+ "message": "The administrator has turned off new user registration",
})
return
}
@@ -105,7 +106,7 @@ func WeChatAuth(c *gin.Context) {
if user.Status != model.UserStatusEnabled {
c.JSON(http.StatusOK, gin.H{
- "message": "用户已被封禁",
+ "message": "User has been banned",
"success": false,
})
return
@@ -116,7 +117,7 @@ func WeChatAuth(c *gin.Context) {
func WeChatBind(c *gin.Context) {
if !config.WeChatAuthEnabled {
c.JSON(http.StatusOK, gin.H{
- "message": "管理员未开启通过微信登录以及注册",
+ "message": "The administrator has not enabled login and registration via WeChat",
"success": false,
})
return
@@ -133,7 +134,7 @@ func WeChatBind(c *gin.Context) {
if model.IsWeChatIdAlreadyTaken(wechatId) {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "该微信账号已被绑定",
+ "message": "The WeChat account has been bound",
})
return
}
diff --git a/controller/channel-billing.go b/controller/channel-billing.go
index e69cd9c2..f594831e 100644
--- a/controller/channel-billing.go
+++ b/controller/channel-billing.go
@@ -2,21 +2,20 @@ package controller
import (
"encoding/json"
- "errors"
"fmt"
"io"
"net/http"
"strconv"
"time"
+ "github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common/client"
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/model"
"github.com/songquanpeng/one-api/monitor"
"github.com/songquanpeng/one-api/relay/channeltype"
-
- "github.com/gin-gonic/gin"
)
// https://github.com/songquanpeng/one-api/issues/79
@@ -132,7 +131,7 @@ func GetResponseBody(method, url string, channel *model.Channel, headers http.He
return nil, err
}
if res.StatusCode != http.StatusOK {
- return nil, fmt.Errorf("status code: %d", res.StatusCode)
+ return nil, errors.Errorf("status code: %d", res.StatusCode)
}
body, err := io.ReadAll(res.Body)
if err != nil {
@@ -197,7 +196,7 @@ func updateChannelAIProxyBalance(channel *model.Channel) (float64, error) {
return 0, err
}
if !response.Success {
- return 0, fmt.Errorf("code: %d, message: %s", response.ErrorCode, response.Message)
+ return 0, errors.Errorf("code: %d, message: %s", response.ErrorCode, response.Message)
}
channel.UpdateBalance(response.Data.TotalPoints)
return response.Data.TotalPoints, nil
@@ -296,7 +295,7 @@ func updateChannelBalance(channel *model.Channel) (float64, error) {
baseURL = channel.GetBaseURL()
}
case channeltype.Azure:
- return 0, errors.New("尚未实现")
+ return 0, errors.New("Not yet implemented")
case channeltype.Custom:
baseURL = channel.GetBaseURL()
case channeltype.CloseAI:
@@ -314,7 +313,7 @@ func updateChannelBalance(channel *model.Channel) (float64, error) {
case channeltype.DeepSeek:
return updateChannelDeepSeekBalance(channel)
default:
- return 0, errors.New("尚未实现")
+ return 0, errors.New("Not yet implemented")
}
url := fmt.Sprintf("%s/v1/dashboard/billing/subscription", baseURL)
@@ -400,7 +399,7 @@ func updateAllChannelsBalance() error {
} else {
// err is nil & balance <= 0 means quota is used up
if balance <= 0 {
- monitor.DisableChannel(channel.Id, channel.Name, "余额不足")
+ monitor.DisableChannel(channel.Id, channel.Name, "Insufficient balance")
}
}
time.Sleep(config.RequestInterval)
diff --git a/controller/channel-test.go b/controller/channel-test.go
index 971f5382..ed755d28 100644
--- a/controller/channel-test.go
+++ b/controller/channel-test.go
@@ -3,18 +3,9 @@ package controller
import (
"bytes"
"encoding/json"
- "errors"
"fmt"
- "io"
- "net/http"
- "net/http/httptest"
- "net/url"
- "strconv"
- "strings"
- "sync"
- "time"
-
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/ctxkey"
"github.com/songquanpeng/one-api/common/logger"
@@ -28,6 +19,14 @@ import (
"github.com/songquanpeng/one-api/relay/meta"
relaymodel "github.com/songquanpeng/one-api/relay/model"
"github.com/songquanpeng/one-api/relay/relaymode"
+ "io"
+ "net/http"
+ "net/http/httptest"
+ "net/url"
+ "strconv"
+ "strings"
+ "sync"
+ "time"
)
func buildTestRequest(model string) *relaymodel.GeneralOpenAIRequest {
@@ -66,7 +65,7 @@ func testChannel(channel *model.Channel, request *relaymodel.GeneralOpenAIReques
apiType := channeltype.ToAPIType(channel.Type)
adaptor := relay.GetAdaptor(apiType)
if adaptor == nil {
- return fmt.Errorf("invalid api type: %d, adaptor is nil", apiType), nil
+ return errors.Errorf("invalid api type: %d, adaptor is nil", apiType), nil
}
adaptor.Init(meta)
modelName := request.Model
@@ -103,7 +102,7 @@ func testChannel(channel *model.Channel, request *relaymodel.GeneralOpenAIReques
}
usage, respErr := adaptor.DoResponse(c, resp, meta)
if respErr != nil {
- return fmt.Errorf("%s", respErr.Error.Message), &respErr.Error
+ return errors.Errorf("%s", respErr.Error.Message), &respErr.Error
}
if usage == nil {
return errors.New("usage is nil"), nil
@@ -174,7 +173,7 @@ func testChannels(notify bool, scope string) error {
testAllChannelsLock.Lock()
if testAllChannelsRunning {
testAllChannelsLock.Unlock()
- return errors.New("测试已在运行中")
+ return errors.New("Test is already running")
}
testAllChannelsRunning = true
testAllChannelsLock.Unlock()
@@ -195,11 +194,11 @@ func testChannels(notify bool, scope string) error {
tok := time.Now()
milliseconds := tok.Sub(tik).Milliseconds()
if isChannelEnabled && milliseconds > disableThreshold {
- err = fmt.Errorf("响应时间 %.2fs 超过阈值 %.2fs", float64(milliseconds)/1000.0, float64(disableThreshold)/1000.0)
+ err = fmt.Errorf("Response time %.2fs exceeds threshold %.2fs", float64(milliseconds)/1000.0, float64(disableThreshold)/1000.0)
if config.AutomaticDisableChannelEnabled {
monitor.DisableChannel(channel.Id, channel.Name, err.Error())
} else {
- _ = message.Notify(message.ByAll, fmt.Sprintf("渠道 %s （%d）测试超时", channel.Name, channel.Id), "", err.Error())
+ _ = message.Notify(message.ByAll, fmt.Sprintf("Channel %s （%d）Test超时", channel.Name, channel.Id), "", err.Error())
}
}
if isChannelEnabled && monitor.ShouldDisableChannel(openaiErr, -1) {
@@ -215,7 +214,7 @@ func testChannels(notify bool, scope string) error {
testAllChannelsRunning = false
testAllChannelsLock.Unlock()
if notify {
- err := message.Notify(message.ByAll, "渠道测试完成", "", "渠道测试完成，如果没有收到禁用通知，说明所有渠道都正常")
+ err := message.Notify(message.ByAll, "Channel test completed", "", "Channel test completed, if you have not received the disable notification, it means that all channels are normal")
if err != nil {
logger.SysError(fmt.Sprintf("failed to send email: %s", err.Error()))
}
diff --git a/controller/log.go b/controller/log.go
index 665f49be..00d062e5 100644
--- a/controller/log.go
+++ b/controller/log.go
@@ -1,12 +1,13 @@
package controller
import (
+ "net/http"
+ "strconv"
+
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/ctxkey"
"github.com/songquanpeng/one-api/model"
- "net/http"
- "strconv"
)
func GetAllLogs(c *gin.Context) {
diff --git a/controller/misc.go b/controller/misc.go
index ae900870..633a0354 100644
--- a/controller/misc.go
+++ b/controller/misc.go
@@ -85,7 +85,7 @@ func SendEmailVerification(c *gin.Context) {
if err := common.Validate.Var(email, "required,email"); err != nil {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无效的参数",
+ "message": "Invalid parameter",
})
return
}
@@ -100,7 +100,7 @@ func SendEmailVerification(c *gin.Context) {
if !allowed {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "管理员启用了邮箱域名白名单，您的邮箱地址的域名不在白名单中",
+ "message": "AdministratorEnable了邮箱域名白名单，您的Email address的域名不在白名单中",
})
return
}
@@ -108,16 +108,16 @@ func SendEmailVerification(c *gin.Context) {
if model.IsEmailAlreadyTaken(email) {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "邮箱地址已被占用",
+ "message": "Email address is occupied",
})
return
}
code := common.GenerateVerificationCode(6)
common.RegisterVerificationCodeWithKey(email, code, common.EmailVerificationPurpose)
- subject := fmt.Sprintf("%s邮箱验证邮件", config.SystemName)
- content := fmt.Sprintf("您好，你正在进行%s邮箱验证。
"+
- "您的验证码为: %s
"+
- "验证码 %d 分钟内有效，如果不是本人操作，请忽略。
", config.SystemName, code, common.VerificationValidMinutes)
+ subject := fmt.Sprintf("%s Email verification email", config.SystemName)
+ content := fmt.Sprintf("Hello, you are verifying %s email.
"+
+ "Your verification code is: %s
"+
+ "The verification code is valid within %d minutes. If it is not your operation, please ignore it.
", config.SystemName, code, common.VerificationValidMinutes)
err := message.SendEmail(subject, email, content)
if err != nil {
c.JSON(http.StatusOK, gin.H{
@@ -138,25 +138,25 @@ func SendPasswordResetEmail(c *gin.Context) {
if err := common.Validate.Var(email, "required,email"); err != nil {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无效的参数",
+ "message": "Invalid parameter",
})
return
}
if !model.IsEmailAlreadyTaken(email) {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "该邮箱地址未注册",
+ "message": "The email address is not registered",
})
return
}
code := common.GenerateVerificationCode(0)
common.RegisterVerificationCodeWithKey(email, code, common.PasswordResetPurpose)
link := fmt.Sprintf("%s/user/reset?email=%s&token=%s", config.ServerAddress, email, code)
- subject := fmt.Sprintf("%s密码重置", config.SystemName)
- content := fmt.Sprintf("您好，你正在进行%s密码重置。
"+
- "点击 此处 进行密码重置。
"+
- "如果链接无法点击，请尝试点击下面的链接或将其复制到浏览器中打开：
"+
- "重置链接 %d 分钟内有效，如果不是本人操作，请忽略。
", config.SystemName, link, link, common.VerificationValidMinutes)
+ subject := fmt.Sprintf("%s Password reset", config.SystemName)
+ content := fmt.Sprintf("Hello, you are resetting %s password.
"+
+ "点击 此处 进行Password reset。
"+
+ "如果链接None法点击，请尝试点击下面的链接或将其Copy到浏览器中打开：
"+
+ "The reset link is valid within %d minutes. If it is not your operation, please ignore it.
", config.SystemName, link, link, common.VerificationValidMinutes)
err := message.SendEmail(subject, email, content)
if err != nil {
c.JSON(http.StatusOK, gin.H{
@@ -183,14 +183,14 @@ func ResetPassword(c *gin.Context) {
if req.Email == "" || req.Token == "" {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无效的参数",
+ "message": "Invalid parameter",
})
return
}
if !common.VerifyCodeWithKey(req.Email, req.Token, common.PasswordResetPurpose) {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "重置链接非法或已过期",
+ "message": "Reset link is illegal or expired",
})
return
}
diff --git a/controller/model.go b/controller/model.go
index dcbe709e..e4822f89 100644
--- a/controller/model.go
+++ b/controller/model.go
@@ -2,6 +2,9 @@ package controller
import (
"fmt"
+ "net/http"
+ "strings"
+
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common/ctxkey"
"github.com/songquanpeng/one-api/model"
@@ -11,8 +14,6 @@ import (
"github.com/songquanpeng/one-api/relay/channeltype"
"github.com/songquanpeng/one-api/relay/meta"
relaymodel "github.com/songquanpeng/one-api/relay/model"
- "net/http"
- "strings"
)
// https://platform.openai.com/docs/api-reference/models/list
@@ -68,6 +69,10 @@ func init() {
continue
}
adaptor := relay.GetAdaptor(i)
+ if adaptor == nil {
+ continue
+ }
+
channelName := adaptor.GetChannelName()
modelNames := adaptor.GetModelList()
for _, modelName := range modelNames {
@@ -106,6 +111,10 @@ func init() {
channelId2Models = make(map[int][]string)
for i := 1; i < channeltype.Dummy; i++ {
adaptor := relay.GetAdaptor(channeltype.ToAPIType(i))
+ if adaptor == nil {
+ continue
+ }
+
meta := &meta.Meta{
ChannelType: i,
}
diff --git a/controller/option.go b/controller/option.go
index f86e3a64..3f16060e 100644
--- a/controller/option.go
+++ b/controller/option.go
@@ -38,7 +38,7 @@ func UpdateOption(c *gin.Context) {
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{
"success": false,
- "message": "无效的参数",
+ "message": "Invalid parameter",
})
return
}
@@ -47,7 +47,7 @@ func UpdateOption(c *gin.Context) {
if !config.ValidThemes[option.Value] {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无效的主题",
+ "message": "None效的主题",
})
return
}
@@ -55,7 +55,7 @@ func UpdateOption(c *gin.Context) {
if option.Value == "true" && config.GitHubClientId == "" {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无法启用 GitHub OAuth，请先填入 GitHub Client Id 以及 GitHub Client Secret！",
+ "message": "None法Enable GitHub OAuth，请先填入 GitHub Client Id 以及 GitHub Client Secret！",
})
return
}
@@ -63,7 +63,7 @@ func UpdateOption(c *gin.Context) {
if option.Value == "true" && len(config.EmailDomainWhitelist) == 0 {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无法启用邮箱域名限制，请先填入限制的邮箱域名！",
+ "message": "None法Enable邮箱域名限制，请先填入限制的邮箱域名！",
})
return
}
@@ -71,7 +71,7 @@ func UpdateOption(c *gin.Context) {
if option.Value == "true" && config.WeChatServerAddress == "" {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无法启用微信登录，请先填入微信登录相关配置信息！",
+ "message": "Unable to enable WeChat login, please fill in the relevant configuration information for WeChat login first!",
})
return
}
@@ -79,7 +79,7 @@ func UpdateOption(c *gin.Context) {
if option.Value == "true" && config.TurnstileSiteKey == "" {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无法启用 Turnstile 校验，请先填入 Turnstile 校验相关配置信息！",
+ "message": "Unable to enable Turnstile verification, please fill in the relevant configuration information for Turnstile verification first!",
})
return
}
diff --git a/controller/redemption.go b/controller/redemption.go
index 1d0ffbad..69ebc6d0 100644
--- a/controller/redemption.go
+++ b/controller/redemption.go
@@ -1,14 +1,15 @@
package controller
import (
+ "net/http"
+ "strconv"
+
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/ctxkey"
"github.com/songquanpeng/one-api/common/helper"
"github.com/songquanpeng/one-api/common/random"
"github.com/songquanpeng/one-api/model"
- "net/http"
- "strconv"
)
func GetAllRedemptions(c *gin.Context) {
@@ -88,21 +89,21 @@ func AddRedemption(c *gin.Context) {
if len(redemption.Name) == 0 || len(redemption.Name) > 20 {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "兑换码名称长度必须在1-20之间",
+ "message": "The length of the redemption code name must be between 1-20",
})
return
}
if redemption.Count <= 0 {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "兑换码个数必须大于0",
+ "message": "The number of redemption codes must be greater than 0",
})
return
}
if redemption.Count > 100 {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "一次兑换码批量生成的个数不能大于 100",
+ "message": "The number of redemption codes generated in a batch cannot be greater than 100",
})
return
}
diff --git a/controller/relay.go b/controller/relay.go
index 038123b3..92019fd6 100644
--- a/controller/relay.go
+++ b/controller/relay.go
@@ -8,6 +8,7 @@ import (
"net/http"
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/ctxkey"
@@ -26,7 +27,8 @@ import (
func relayHelper(c *gin.Context, relayMode int) *model.ErrorWithStatusCode {
var err *model.ErrorWithStatusCode
switch relayMode {
- case relaymode.ImagesGenerations:
+ case relaymode.ImagesGenerations,
+ relaymode.ImagesEdits:
err = controller.RelayImageHelper(c, relayMode)
case relaymode.AudioSpeech:
fallthrough
@@ -45,10 +47,6 @@ func relayHelper(c *gin.Context, relayMode int) *model.ErrorWithStatusCode {
func Relay(c *gin.Context) {
ctx := c.Request.Context()
relayMode := relaymode.GetByPath(c.Request.URL.Path)
- if config.DebugEnabled {
- requestBody, _ := common.GetRequestBody(c)
- logger.Debugf(ctx, "request body: %s", string(requestBody))
- }
channelId := c.GetInt(ctxkey.ChannelId)
userId := c.GetInt(ctxkey.Id)
bizErr := relayHelper(c, relayMode)
@@ -63,8 +61,8 @@ func Relay(c *gin.Context) {
go processChannelRelayError(ctx, userId, channelId, channelName, *bizErr)
requestId := c.GetString(helper.RequestIdKey)
retryTimes := config.RetryTimes
- if !shouldRetry(c, bizErr.StatusCode) {
- logger.Errorf(ctx, "relay error happen, status code is %d, won't retry in this case", bizErr.StatusCode)
+ if err := shouldRetry(c, bizErr.StatusCode); err != nil {
+ logger.Errorf(ctx, "relay error happen, won't retry since of %v", err.Error())
retryTimes = 0
}
for i := retryTimes; i > 0; i-- {
@@ -89,9 +87,10 @@ func Relay(c *gin.Context) {
channelName := c.GetString(ctxkey.ChannelName)
go processChannelRelayError(ctx, userId, channelId, channelName, *bizErr)
}
+
if bizErr != nil {
if bizErr.StatusCode == http.StatusTooManyRequests {
- bizErr.Error.Message = "当前分组上游负载已饱和，请稍后再试"
+ bizErr.Error.Message = "The current group load is saturated, please try again later"
}
// BUG: bizErr is in race condition
@@ -102,23 +101,20 @@ func Relay(c *gin.Context) {
}
}
-func shouldRetry(c *gin.Context, statusCode int) bool {
- if _, ok := c.Get(ctxkey.SpecificChannelId); ok {
- return false
+// shouldRetry returns nil if should retry, otherwise returns error
+func shouldRetry(c *gin.Context, statusCode int) error {
+ if v, ok := c.Get(ctxkey.SpecificChannelId); ok {
+ return errors.Errorf("specific channel = %v", v)
}
+
if statusCode == http.StatusTooManyRequests {
- return true
+ return errors.Errorf("status code = %d", statusCode)
}
if statusCode/100 == 5 {
- return true
+ return errors.Errorf("status code = %d", statusCode)
}
- if statusCode == http.StatusBadRequest {
- return false
- }
- if statusCode/100 == 2 {
- return false
- }
- return true
+
+ return nil
}
func processChannelRelayError(ctx context.Context, userId int, channelId int, channelName string, err model.ErrorWithStatusCode) {
diff --git a/controller/token.go b/controller/token.go
index 668ccd97..7d1a8066 100644
--- a/controller/token.go
+++ b/controller/token.go
@@ -2,17 +2,42 @@ package controller
import (
"fmt"
+ "net/http"
+ "strconv"
+
"github.com/gin-gonic/gin"
+ "github.com/jinzhu/copier"
+ "github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/ctxkey"
"github.com/songquanpeng/one-api/common/helper"
"github.com/songquanpeng/one-api/common/network"
"github.com/songquanpeng/one-api/common/random"
"github.com/songquanpeng/one-api/model"
- "net/http"
- "strconv"
)
+func GetRequestCost(c *gin.Context) {
+ reqId := c.Param("request_id")
+ if reqId == "" {
+ c.JSON(http.StatusOK, gin.H{
+ "success": false,
+ "message": "request_id 不能为空",
+ })
+ return
+ }
+
+ docu, err := model.GetCostByRequestId(reqId)
+ if err != nil {
+ c.JSON(http.StatusOK, gin.H{
+ "success": false,
+ "message": err.Error(),
+ })
+ return
+ }
+
+ c.JSON(http.StatusOK, docu)
+}
+
func GetAllTokens(c *gin.Context) {
userId := c.GetInt(ctxkey.Id)
p, _ := strconv.Atoi(c.Query("p"))
@@ -107,22 +132,24 @@ func GetTokenStatus(c *gin.Context) {
})
}
-func validateToken(c *gin.Context, token model.Token) error {
+func validateToken(c *gin.Context, token *model.Token) error {
if len(token.Name) > 30 {
- return fmt.Errorf("令牌名称过长")
+ return fmt.Errorf("Token name is too long")
}
+
if token.Subnet != nil && *token.Subnet != "" {
err := network.IsValidSubnets(*token.Subnet)
if err != nil {
- return fmt.Errorf("无效的网段：%s", err.Error())
+ return fmt.Errorf("None效的网段：%s", err.Error())
}
}
+
return nil
}
func AddToken(c *gin.Context) {
- token := model.Token{}
- err := c.ShouldBindJSON(&token)
+ token := new(model.Token)
+ err := c.ShouldBindJSON(token)
if err != nil {
c.JSON(http.StatusOK, gin.H{
"success": false,
@@ -130,11 +157,12 @@ func AddToken(c *gin.Context) {
})
return
}
+
err = validateToken(c, token)
if err != nil {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": fmt.Sprintf("参数错误：%s", err.Error()),
+ "message": fmt.Sprintf("参数Error:%s", err.Error()),
})
return
}
@@ -185,11 +213,18 @@ func DeleteToken(c *gin.Context) {
return
}
-func UpdateToken(c *gin.Context) {
- userId := c.GetInt(ctxkey.Id)
- statusOnly := c.Query("status_only")
- token := model.Token{}
- err := c.ShouldBindJSON(&token)
+type consumeTokenRequest struct {
+ // AddUsedQuota add or subtract used quota from another source
+ AddUsedQuota uint `json:"add_used_quota" gorm:"-"`
+ // AddReason is the reason for adding or subtracting used quota
+ AddReason string `json:"add_reason" gorm:"-"`
+}
+
+// ConsumeToken consume token from another source,
+// let one-api to gather billing from different sources.
+func ConsumeToken(c *gin.Context) {
+ tokenPatch := new(consumeTokenRequest)
+ err := c.ShouldBindJSON(tokenPatch)
if err != nil {
c.JSON(http.StatusOK, gin.H{
"success": false,
@@ -197,14 +232,115 @@ func UpdateToken(c *gin.Context) {
})
return
}
+
+ userID := c.GetInt(ctxkey.Id)
+ tokenID := c.GetInt(ctxkey.TokenId)
+ cleanToken, err := model.GetTokenByIds(tokenID, userID)
+ if err != nil {
+ c.JSON(http.StatusOK, gin.H{
+ "success": false,
+ "message": err.Error(),
+ })
+ return
+ }
+
+ if cleanToken.Status != model.TokenStatusEnabled {
+ c.JSON(http.StatusOK, gin.H{
+ "success": false,
+ "message": "API KeysNot enabled",
+ })
+ return
+ }
+
+ if cleanToken.Status == model.TokenStatusExpired &&
+ cleanToken.ExpiredTime <= helper.GetTimestamp() && cleanToken.ExpiredTime != -1 {
+ c.JSON(http.StatusOK, gin.H{
+ "success": false,
+ "message": "The token has expired and cannot be enabled. Please modify the expiration time of the token, or set it to never expire.",
+ })
+ return
+ }
+ if cleanToken.Status == model.TokenStatusExhausted &&
+ cleanToken.RemainQuota <= 0 && !cleanToken.UnlimitedQuota {
+ c.JSON(http.StatusOK, gin.H{
+ "success": false,
+ "message": "The available quota of the token has been used up and cannot be enabled. Please modify the remaining quota of the token, or set it to unlimited quota",
+ })
+ return
+ }
+
+ // let admin to add or subtract used quota,
+ // make it possible to aggregate billings from different sources.
+ if cleanToken.RemainQuota < int64(tokenPatch.AddUsedQuota) {
+ c.JSON(http.StatusOK, gin.H{
+ "success": false,
+ "message": "Remaining quota不足",
+ })
+ return
+ }
+
+ if err = model.DecreaseTokenQuota(cleanToken.Id, int64(tokenPatch.AddUsedQuota)); err != nil {
+ c.JSON(http.StatusOK, gin.H{
+ "success": false,
+ "message": err.Error(),
+ })
+ return
+ }
+
+ model.RecordConsumeLog(c.Request.Context(),
+ userID, 0, 0, 0, tokenPatch.AddReason, cleanToken.Name,
+ int64(tokenPatch.AddUsedQuota),
+ fmt.Sprintf("外部(%s)消耗 %s",
+ tokenPatch.AddReason, common.LogQuota(int64(tokenPatch.AddUsedQuota))))
+
+ err = cleanToken.Update()
+ if err != nil {
+ c.JSON(http.StatusOK, gin.H{
+ "success": false,
+ "message": err.Error(),
+ })
+ return
+ }
+ c.JSON(http.StatusOK, gin.H{
+ "success": true,
+ "message": "",
+ "data": cleanToken,
+ })
+
+ return
+}
+
+func UpdateToken(c *gin.Context) {
+ userId := c.GetInt(ctxkey.Id)
+ statusOnly := c.Query("status_only")
+ tokenPatch := new(model.Token)
+ err := c.ShouldBindJSON(tokenPatch)
+ if err != nil {
+ c.JSON(http.StatusOK, gin.H{
+ "success": false,
+ "message": err.Error(),
+ })
+ return
+ }
+
+ token := new(model.Token)
+ if err = copier.Copy(token, tokenPatch); err != nil {
+ c.JSON(http.StatusOK, gin.H{
+ "success": false,
+ "message": err.Error(),
+ })
+ return
+ }
+
err = validateToken(c, token)
if err != nil {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": fmt.Sprintf("参数错误：%s", err.Error()),
+ "message": fmt.Sprintf("参数Error:%s", err.Error()),
})
return
}
+
cleanToken, err := model.GetTokenByIds(token.Id, userId)
if err != nil {
c.JSON(http.StatusOK, gin.H{
@@ -213,33 +349,50 @@ func UpdateToken(c *gin.Context) {
})
return
}
- if token.Status == model.TokenStatusEnabled {
- if cleanToken.Status == model.TokenStatusExpired && cleanToken.ExpiredTime <= helper.GetTimestamp() && cleanToken.ExpiredTime != -1 {
+
+ switch token.Status {
+ case model.TokenStatusEnabled:
+ if cleanToken.Status == model.TokenStatusExpired &&
+ cleanToken.ExpiredTime <= helper.GetTimestamp() && cleanToken.ExpiredTime != -1 &&
+ token.ExpiredTime != -1 && token.ExpiredTime < helper.GetTimestamp() {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "令牌已过期，无法启用，请先修改令牌过期时间，或者设置为永不过期",
+ "message": "The token has expired and cannot be enabled. Please modify the expiration time of the token, or set it to never expire.",
})
return
}
- if cleanToken.Status == model.TokenStatusExhausted && cleanToken.RemainQuota <= 0 && !cleanToken.UnlimitedQuota {
+ if cleanToken.Status == model.TokenStatusExhausted &&
+ cleanToken.RemainQuota <= 0 && !cleanToken.UnlimitedQuota &&
+ token.RemainQuota <= 0 && !token.UnlimitedQuota {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "令牌可用额度已用尽，无法启用，请先修改令牌剩余额度，或者设置为无限额度",
+ "message": "The available quota of the token has been used up and cannot be enabled. Please modify the remaining quota of the token, or set it to unlimited quota",
})
return
}
+ case model.TokenStatusExhausted:
+ if token.RemainQuota > 0 || token.UnlimitedQuota {
+ token.Status = model.TokenStatusEnabled
+ }
+ case model.TokenStatusExpired:
+ if token.ExpiredTime == -1 || token.ExpiredTime > helper.GetTimestamp() {
+ token.Status = model.TokenStatusEnabled
+ }
}
+
if statusOnly != "" {
cleanToken.Status = token.Status
} else {
// If you add more fields, please also update token.Update()
cleanToken.Name = token.Name
cleanToken.ExpiredTime = token.ExpiredTime
- cleanToken.RemainQuota = token.RemainQuota
cleanToken.UnlimitedQuota = token.UnlimitedQuota
cleanToken.Models = token.Models
cleanToken.Subnet = token.Subnet
+ cleanToken.RemainQuota = token.RemainQuota
+ cleanToken.Status = token.Status
}
+
err = cleanToken.Update()
if err != nil {
c.JSON(http.StatusOK, gin.H{
diff --git a/controller/user.go b/controller/user.go
index e79881c2..dd2762b2 100644
--- a/controller/user.go
+++ b/controller/user.go
@@ -3,17 +3,17 @@ package controller
import (
"encoding/json"
"fmt"
- "github.com/songquanpeng/one-api/common"
- "github.com/songquanpeng/one-api/common/config"
- "github.com/songquanpeng/one-api/common/ctxkey"
- "github.com/songquanpeng/one-api/common/random"
- "github.com/songquanpeng/one-api/model"
"net/http"
"strconv"
"time"
"github.com/gin-contrib/sessions"
"github.com/gin-gonic/gin"
+ "github.com/songquanpeng/one-api/common"
+ "github.com/songquanpeng/one-api/common/config"
+ "github.com/songquanpeng/one-api/common/ctxkey"
+ "github.com/songquanpeng/one-api/common/random"
+ "github.com/songquanpeng/one-api/model"
)
type LoginRequest struct {
@@ -24,7 +24,7 @@ type LoginRequest struct {
func Login(c *gin.Context) {
if !config.PasswordLoginEnabled {
c.JSON(http.StatusOK, gin.H{
- "message": "管理员关闭了密码登录",
+ "message": "The administrator has turned off password login",
"success": false,
})
return
@@ -33,7 +33,7 @@ func Login(c *gin.Context) {
err := json.NewDecoder(c.Request.Body).Decode(&loginRequest)
if err != nil {
c.JSON(http.StatusOK, gin.H{
- "message": "无效的参数",
+ "message": "Invalid parameter",
"success": false,
})
return
@@ -42,7 +42,7 @@ func Login(c *gin.Context) {
password := loginRequest.Password
if username == "" || password == "" {
c.JSON(http.StatusOK, gin.H{
- "message": "无效的参数",
+ "message": "Invalid parameter",
"success": false,
})
return
@@ -72,11 +72,17 @@ func SetupLogin(user *model.User, c *gin.Context) {
err := session.Save()
if err != nil {
c.JSON(http.StatusOK, gin.H{
- "message": "无法保存会话信息，请重试",
+ "message": "Unable to save session information, please try again",
"success": false,
})
return
}
+
+ // set auth header
+ // c.Set("id", user.Id)
+ // GenerateAccessToken(c)
+ // c.Header("Authorization", user.AccessToken)
+
cleanUser := model.User{
Id: user.Id,
Username: user.Username,
@@ -111,14 +117,14 @@ func Logout(c *gin.Context) {
func Register(c *gin.Context) {
if !config.RegisterEnabled {
c.JSON(http.StatusOK, gin.H{
- "message": "管理员关闭了新用户注册",
+ "message": "The administrator has turned off new user registration",
"success": false,
})
return
}
if !config.PasswordRegisterEnabled {
c.JSON(http.StatusOK, gin.H{
- "message": "管理员关闭了通过密码进行注册，请使用第三方账户验证的形式进行注册",
+ "message": "The administrator has turned off registration via password. Please use the form of third-party account verification to register",
"success": false,
})
return
@@ -128,14 +134,14 @@ func Register(c *gin.Context) {
if err != nil {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无效的参数",
+ "message": "Invalid parameter",
})
return
}
if err := common.Validate.Struct(&user); err != nil {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "输入不合法 " + err.Error(),
+ "message": "Input is illegal " + err.Error(),
})
return
}
@@ -143,14 +149,14 @@ func Register(c *gin.Context) {
if user.Email == "" || user.VerificationCode == "" {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "管理员开启了邮箱验证，请输入邮箱地址和验证码",
+ "message": "The administrator has turned on email verification, please enter the email address and verification code",
})
return
}
if !common.VerifyCodeWithKey(user.Email, user.VerificationCode, common.EmailVerificationPurpose) {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "验证码错误或已过期",
+ "message": "Verification code error or expired",
})
return
}
@@ -173,7 +179,6 @@ func Register(c *gin.Context) {
})
return
}
-
c.JSON(http.StatusOK, gin.H{
"success": true,
"message": "",
@@ -244,7 +249,7 @@ func GetUser(c *gin.Context) {
if myRole <= user.Role && myRole != model.RoleRootUser {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无权获取同级或更高等级用户的信息",
+ "message": "No permission to get information of users at the same level or higher",
})
return
}
@@ -266,7 +271,7 @@ func GetUserDashboard(c *gin.Context) {
if err != nil {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无法获取统计信息",
+ "message": "None法获取Statistics",
"data": nil,
})
return
@@ -294,7 +299,7 @@ func GenerateAccessToken(c *gin.Context) {
if model.DB.Where("access_token = ?", user.AccessToken).First(user).RowsAffected != 0 {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "请重试，系统生成的 UUID 竟然重复了！",
+ "message": "Please try again, the system-generated UUID is actually duplicated!",
})
return
}
@@ -343,6 +348,16 @@ func GetAffCode(c *gin.Context) {
return
}
+// GetSelfByToken get user by openai api token
+func GetSelfByToken(c *gin.Context) {
+ c.JSON(http.StatusOK, gin.H{
+ "uid": c.GetInt("id"),
+ "token_id": c.GetInt("token_id"),
+ "username": c.GetString("username"),
+ })
+ return
+}
+
func GetSelf(c *gin.Context) {
id := c.GetInt(ctxkey.Id)
user, err := model.GetUserById(id, false)
@@ -367,7 +382,7 @@ func UpdateUser(c *gin.Context) {
if err != nil || updatedUser.Id == 0 {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无效的参数",
+ "message": "Invalid parameter",
})
return
}
@@ -377,7 +392,7 @@ func UpdateUser(c *gin.Context) {
if err := common.Validate.Struct(&updatedUser); err != nil {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "输入不合法 " + err.Error(),
+ "message": "Input is illegal " + err.Error(),
})
return
}
@@ -393,14 +408,14 @@ func UpdateUser(c *gin.Context) {
if myRole <= originUser.Role && myRole != model.RoleRootUser {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无权更新同权限等级或更高权限等级的用户信息",
+ "message": "No permission to update user information with the same permission level or higher permission level",
})
return
}
if myRole <= updatedUser.Role && myRole != model.RoleRootUser {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无权将其他用户权限等级提升到大于等于自己的权限等级",
+ "message": "None权将其他Users权限等级Promote到大于Equals自己的权限等级",
})
return
}
@@ -416,7 +431,7 @@ func UpdateUser(c *gin.Context) {
return
}
if originUser.Quota != updatedUser.Quota {
- model.RecordLog(originUser.Id, model.LogTypeManage, fmt.Sprintf("管理员将用户额度从 %s修改为 %s", common.LogQuota(originUser.Quota), common.LogQuota(updatedUser.Quota)))
+ model.RecordLog(originUser.Id, model.LogTypeManage, fmt.Sprintf("The administrator changed the user quota from %s to %s", common.LogQuota(originUser.Quota), common.LogQuota(updatedUser.Quota)))
}
c.JSON(http.StatusOK, gin.H{
"success": true,
@@ -431,7 +446,7 @@ func UpdateSelf(c *gin.Context) {
if err != nil {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无效的参数",
+ "message": "Invalid parameter",
})
return
}
@@ -441,7 +456,7 @@ func UpdateSelf(c *gin.Context) {
if err := common.Validate.Struct(&user); err != nil {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "输入不合法 " + err.Error(),
+ "message": "Input is illegal " + err.Error(),
})
return
}
@@ -493,7 +508,7 @@ func DeleteUser(c *gin.Context) {
if myRole <= originUser.Role {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无权删除同权限等级或更高权限等级的用户",
+ "message": "No permission to delete users with the same permission level or higher permission level",
})
return
}
@@ -514,7 +529,7 @@ func DeleteSelf(c *gin.Context) {
if user.Role == model.RoleRootUser {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "不能删除超级管理员账户",
+ "message": "不能DeleteSuper administrator账户",
})
return
}
@@ -540,14 +555,14 @@ func CreateUser(c *gin.Context) {
if err != nil || user.Username == "" || user.Password == "" {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无效的参数",
+ "message": "Invalid parameter",
})
return
}
if err := common.Validate.Struct(&user); err != nil {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "输入不合法 " + err.Error(),
+ "message": "Input is illegal " + err.Error(),
})
return
}
@@ -558,7 +573,7 @@ func CreateUser(c *gin.Context) {
if user.Role >= myRole {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无法创建权限大于等于自己的用户",
+ "message": "Unable to create users with permissions greater than or equal to your own",
})
return
}
@@ -596,7 +611,7 @@ func ManageUser(c *gin.Context) {
if err != nil {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无效的参数",
+ "message": "Invalid parameter",
})
return
}
@@ -608,7 +623,7 @@ func ManageUser(c *gin.Context) {
if user.Id == 0 {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "用户不存在",
+ "message": "User does not exist",
})
return
}
@@ -616,7 +631,7 @@ func ManageUser(c *gin.Context) {
if myRole <= user.Role && myRole != model.RoleRootUser {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无权更新同权限等级或更高权限等级的用户信息",
+ "message": "No permission to update user information with the same permission level or higher permission level",
})
return
}
@@ -626,7 +641,7 @@ func ManageUser(c *gin.Context) {
if user.Role == model.RoleRootUser {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无法禁用超级管理员用户",
+ "message": "Unable to disable super administrator user",
})
return
}
@@ -636,7 +651,7 @@ func ManageUser(c *gin.Context) {
if user.Role == model.RoleRootUser {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无法删除超级管理员用户",
+ "message": "Unable to delete super administrator user",
})
return
}
@@ -651,14 +666,14 @@ func ManageUser(c *gin.Context) {
if myRole != model.RoleRootUser {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "普通管理员用户无法提升其他用户为管理员",
+ "message": "Ordinary administrator users cannot promote other users to administrators",
})
return
}
if user.Role >= model.RoleAdminUser {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "该用户已经是管理员",
+ "message": "The user is already an administrator",
})
return
}
@@ -667,14 +682,14 @@ func ManageUser(c *gin.Context) {
if user.Role == model.RoleRootUser {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无法降级超级管理员用户",
+ "message": "Unable to downgrade super administrator user",
})
return
}
if user.Role == model.RoleCommonUser {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "该用户已经是普通用户",
+ "message": "The user is already an ordinary user",
})
return
}
@@ -706,7 +721,7 @@ func EmailBind(c *gin.Context) {
if !common.VerifyCodeWithKey(email, code, common.EmailVerificationPurpose) {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "验证码错误或已过期",
+ "message": "Verification code error or expired",
})
return
}
@@ -798,7 +813,7 @@ func AdminTopUp(c *gin.Context) {
return
}
if req.Remark == "" {
- req.Remark = fmt.Sprintf("通过 API 充值 %s", common.LogQuota(int64(req.Quota)))
+ req.Remark = fmt.Sprintf("通过 API Recharge %s", common.LogQuota(int64(req.Quota)))
}
model.RecordTopupLog(req.UserId, req.Remark, req.Quota)
c.JSON(http.StatusOK, gin.H{
diff --git a/go.mod b/go.mod
index 2106cf0f..5ce08ca4 100644
--- a/go.mod
+++ b/go.mod
@@ -1,111 +1,126 @@
module github.com/songquanpeng/one-api
// +heroku goVersion go1.18
-go 1.20
+go 1.23
+
+toolchain go1.23.0
require (
- cloud.google.com/go/iam v1.1.10
- github.com/aws/aws-sdk-go-v2 v1.27.0
- github.com/aws/aws-sdk-go-v2/credentials v1.17.15
- github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.8.3
- github.com/gin-contrib/cors v1.7.2
- github.com/gin-contrib/gzip v1.0.1
- github.com/gin-contrib/sessions v1.0.1
- github.com/gin-contrib/static v1.1.2
+ cloud.google.com/go/iam v1.3.1
+ github.com/Laisky/go-utils/v4 v4.10.0
+ github.com/aws/aws-sdk-go-v2 v1.32.7
+ github.com/aws/aws-sdk-go-v2/credentials v1.17.48
+ github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.23.1
+ github.com/gin-contrib/cors v1.7.3
+ github.com/gin-contrib/gzip v1.1.0
+ github.com/gin-contrib/sessions v1.0.2
+ github.com/gin-contrib/static v1.1.3
github.com/gin-gonic/gin v1.10.0
- github.com/go-playground/validator/v10 v10.20.0
+ github.com/go-playground/validator/v10 v10.23.0
github.com/go-redis/redis/v8 v8.11.5
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/google/uuid v1.6.0
- github.com/gorilla/websocket v1.5.1
+ github.com/gorilla/websocket v1.5.3
github.com/jinzhu/copier v0.4.0
github.com/joho/godotenv v1.5.1
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/pkoukk/tiktoken-go v0.1.7
github.com/smartystreets/goconvey v1.8.1
- github.com/stretchr/testify v1.9.0
- golang.org/x/crypto v0.31.0
- golang.org/x/image v0.18.0
- google.golang.org/api v0.187.0
- gorm.io/driver/mysql v1.5.6
- gorm.io/driver/postgres v1.5.7
- gorm.io/driver/sqlite v1.5.5
- gorm.io/gorm v1.25.10
+ github.com/stretchr/testify v1.10.0
+ golang.org/x/crypto v0.32.0
+ golang.org/x/image v0.23.0
+ golang.org/x/sync v0.10.0
+ google.golang.org/api v0.215.0
+ gorm.io/driver/mysql v1.5.7
+ gorm.io/driver/postgres v1.5.11
+ gorm.io/driver/sqlite v1.5.7
+ gorm.io/gorm v1.25.12
)
require (
- cloud.google.com/go/auth v0.6.1 // indirect
- cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
- cloud.google.com/go/compute/metadata v0.3.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/internal/configsources v1.3.7 // 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/bytedance/sonic v1.11.6 // indirect
- github.com/bytedance/sonic/loader v0.1.1 // indirect
+ cloud.google.com/go/auth v0.13.0 // indirect
+ cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
+ cloud.google.com/go/compute/metadata v0.6.0 // indirect
+ github.com/GoWebProd/gip v0.0.0-20230623090727-b60d41d5d320 // indirect
+ github.com/GoWebProd/uuid7 v0.0.0-20231130161441-17ee54b097d4 // indirect
+ github.com/Laisky/errors/v2 v2.0.1 // indirect
+ github.com/Laisky/fast-skiplist/v2 v2.0.1 // indirect
+ github.com/Laisky/go-chaining v0.0.0-20180507092046-43dcdc5a21be // indirect
+ github.com/Laisky/golang-fifo v1.0.1-0.20240403091456-fc83d5e38c0b // indirect
+ github.com/Laisky/graphql v1.0.6 // indirect
+ github.com/Laisky/zap v1.27.1-0.20240628060440-a253d90172e3 // indirect
+ github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26 // indirect
+ github.com/aws/smithy-go v1.22.1 // indirect
+ github.com/bytedance/sonic v1.12.6 // indirect
+ github.com/bytedance/sonic/loader v0.2.1 // indirect
+ github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
- github.com/dlclark/regexp2 v1.11.0 // indirect
+ github.com/dlclark/regexp2 v1.10.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
- github.com/gabriel-vasile/mimetype v1.4.3 // indirect
+ github.com/gabriel-vasile/mimetype v1.4.7 // indirect
+ github.com/gammazero/deque v0.2.1 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
- github.com/go-logr/logr v1.4.1 // indirect
+ github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
- github.com/go-sql-driver/mysql v1.8.1 // indirect
- github.com/goccy/go-json v0.10.3 // indirect
- github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
- github.com/golang/protobuf v1.5.4 // indirect
- github.com/google/s2a-go v0.1.7 // indirect
- github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
- github.com/googleapis/gax-go/v2 v2.12.5 // indirect
+ github.com/go-sql-driver/mysql v1.7.0 // indirect
+ github.com/goccy/go-json v0.10.4 // indirect
+ github.com/google/go-cpy v0.0.0-20211218193943-a9c933c06932 // indirect
+ github.com/google/s2a-go v0.1.8 // indirect
+ github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
+ github.com/googleapis/gax-go/v2 v2.14.1 // indirect
github.com/gopherjs/gopherjs v1.17.2 // indirect
github.com/gorilla/context v1.1.2 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
github.com/gorilla/sessions v1.2.2 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
- github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
+ github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgx/v5 v5.5.5 // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/jtolds/gls v4.20.0+incompatible // indirect
- github.com/klauspost/cpuid/v2 v2.2.7 // indirect
- github.com/kr/text v0.2.0 // indirect
+ github.com/klauspost/cpuid/v2 v2.2.9 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-sqlite3 v1.14.22 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
- github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+ github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/smarty/assertions v1.15.0 // indirect
+ github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
- go.opencensus.io v0.24.0 // indirect
- go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
- go.opentelemetry.io/otel v1.24.0 // indirect
- go.opentelemetry.io/otel/metric v1.24.0 // indirect
- go.opentelemetry.io/otel/trace v1.24.0 // indirect
- golang.org/x/arch v0.8.0 // indirect
- golang.org/x/net v0.26.0 // indirect
- golang.org/x/oauth2 v0.21.0 // indirect
- golang.org/x/sync v0.10.0 // indirect
- golang.org/x/sys v0.28.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
+ go.opentelemetry.io/otel v1.29.0 // indirect
+ go.opentelemetry.io/otel/metric v1.29.0 // indirect
+ go.opentelemetry.io/otel/trace v1.29.0 // indirect
+ go.uber.org/automaxprocs v1.5.3 // indirect
+ go.uber.org/multierr v1.10.0 // indirect
+ golang.org/x/arch v0.12.0 // indirect
+ golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
+ golang.org/x/net v0.33.0 // indirect
+ golang.org/x/oauth2 v0.24.0 // indirect
+ golang.org/x/sys v0.29.0 // indirect
+ golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
- golang.org/x/time v0.5.0 // indirect
- google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d // indirect
- google.golang.org/grpc v1.64.1 // indirect
- google.golang.org/protobuf v1.34.2 // indirect
+ golang.org/x/time v0.8.0 // indirect
+ golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
+ google.golang.org/grpc v1.67.3 // indirect
+ google.golang.org/protobuf v1.36.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/go.sum b/go.sum
index c98f1965..6d01bb31 100644
--- a/go.sum
+++ b/go.sum
@@ -1,127 +1,129 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go/auth v0.6.1 h1:T0Zw1XM5c1GlpN2HYr2s+m3vr1p2wy+8VN+Z1FKxW38=
-cloud.google.com/go/auth v0.6.1/go.mod h1:eFHG7zDzbXHKmjJddFG/rBlcGp6t25SwRUiEQSlO4x4=
-cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4=
-cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q=
-cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
-cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
-cloud.google.com/go/iam v1.1.10 h1:ZSAr64oEhQSClwBL670MsJAW5/RLiC6kfw3Bqmd5ZDI=
-cloud.google.com/go/iam v1.1.10/go.mod h1:iEgMq62sg8zx446GCaijmA2Miwg5o3UbO+nI47WHJps=
-filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
-filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-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/go.mod h1:lPprDr1e6cJdyYeGXnRaJoP4Md+cDBvi2eOj00BlGmg=
-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.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.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.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/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
-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.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
+cloud.google.com/go/auth v0.13.0 h1:8Fu8TZy167JkW8Tj3q7dIkr2v4cndv41ouecJx0PAHs=
+cloud.google.com/go/auth v0.13.0/go.mod h1:COOjD9gwfKNKz+IIduatIhYJQIc0mG3H102r/EMxX6Q=
+cloud.google.com/go/auth/oauth2adapt v0.2.6 h1:V6a6XDu2lTwPZWOawrAa9HUK+DB2zfJyTuciBG5hFkU=
+cloud.google.com/go/auth/oauth2adapt v0.2.6/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8=
+cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
+cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
+cloud.google.com/go/iam v1.3.1 h1:KFf8SaT71yYq+sQtRISn90Gyhyf4X8RGgeAVC8XGf3E=
+cloud.google.com/go/iam v1.3.1/go.mod h1:3wMtuyT4NcbnYNPLMBzYRFiEfjKfJlLVLrisE7bwm34=
+github.com/GoWebProd/gip v0.0.0-20230623090727-b60d41d5d320 h1:lddR7TsA0fUX8Kh+oc01z4GwmCoBveT79zhNLK43xLk=
+github.com/GoWebProd/gip v0.0.0-20230623090727-b60d41d5d320/go.mod h1:eTC6ev1JFq+zoOOS5WKuHdBwtihV/9/Ouv3fZ3ufS0A=
+github.com/GoWebProd/uuid7 v0.0.0-20231130161441-17ee54b097d4 h1:IjxKU4UMzoALLBo3JF7QNi5E0H22R2lDKT3RM9yNCQU=
+github.com/GoWebProd/uuid7 v0.0.0-20231130161441-17ee54b097d4/go.mod h1:YIx3++ypr3VYDYlz62Zs6zxq/iPT5e9vShuqxwL/5Us=
+github.com/Laisky/errors/v2 v2.0.1 h1:yqCBrRzaP012AMB+7fVlXrP34OWRHrSO/hZ38CFdH84=
+github.com/Laisky/errors/v2 v2.0.1/go.mod h1:mTn1LHSmKm4CYug0rpYO7rz13dp/DKrtzlSELSrxvT0=
+github.com/Laisky/fast-skiplist/v2 v2.0.1 h1:mZD3G/cwNovXsd21Vyvt3HCI9dEg1V7OD64qXsUUgpQ=
+github.com/Laisky/fast-skiplist/v2 v2.0.1/go.mod h1:JlDGOmsJOwW7Uo46L9aVG7nJAeqP7X7nfU5TABOiiE8=
+github.com/Laisky/go-chaining v0.0.0-20180507092046-43dcdc5a21be h1:7Rxhm6IjOtDAyj8eScOFntevwzkWhx94zi48lxo4m4w=
+github.com/Laisky/go-chaining v0.0.0-20180507092046-43dcdc5a21be/go.mod h1:1mdzaETo0kjvCQICPSePsoaatJN4l7JvEA1200lyevo=
+github.com/Laisky/go-utils/v4 v4.10.0 h1:kSYHk0ONde1ZVMNVw/sLAOAKu/+9mOS9KtVLtY0upAo=
+github.com/Laisky/go-utils/v4 v4.10.0/go.mod h1:TepxY90+WGujsezm9rN7Ctk8faB2Xgtz4bQ/C8PHBJ8=
+github.com/Laisky/golang-fifo v1.0.1-0.20240403091456-fc83d5e38c0b h1:o2BuVyXFkDTkEiuz1Ur32jGvaErgEHqhb8AtTIkrvE0=
+github.com/Laisky/golang-fifo v1.0.1-0.20240403091456-fc83d5e38c0b/go.mod h1:j90tUqwBaEncIzpAd6ZGPZHWjclgAyMY8fdOqsewitE=
+github.com/Laisky/graphql v1.0.6 h1:NEULGxfxo+wbsW2OmqBXOMNUGgqo8uFjWNabwuNK10g=
+github.com/Laisky/graphql v1.0.6/go.mod h1:zaKVqXmMQTnTkFJ2AA53oyBWMzlGCnzr3aodKTrtOxI=
+github.com/Laisky/zap v1.27.1-0.20240628060440-a253d90172e3 h1:SD0siYXoInGc6MqVsmJrBJl4TNHYXfeGu92fRSUNnas=
+github.com/Laisky/zap v1.27.1-0.20240628060440-a253d90172e3/go.mod h1:HABqM5YDQlPq8w+Pmp9h/x9F6Vy+3oHBLP+2+pBoaJw=
+github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/aws/aws-sdk-go-v2 v1.32.7 h1:ky5o35oENWi0JYWUZkB7WYvVPP+bcRF5/Iq7JWSb5Rw=
+github.com/aws/aws-sdk-go-v2 v1.32.7/go.mod h1:P5WJBrYqqbWVaOxgH0X/FYYD47/nooaPOZPlQdmiN2U=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 h1:lL7IfaFzngfx0ZwUGOZdsFFnQ5uLvR0hWqqhyE7Q9M8=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7/go.mod h1:QraP0UcVlQJsmHfioCrveWOC1nbiWUl3ej08h4mXWoc=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.48 h1:IYdLD1qTJ0zanRavulofmqut4afs45mOWEI+MzZtTfQ=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.48/go.mod h1:tOscxHN3CGmuX9idQ3+qbkzrjVIx32lqDSU1/0d/qXs=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 h1:I/5wmGMffY4happ8NOCuIUEWGUvvFp5NSeQcXl9RHcI=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26/go.mod h1:FR8f4turZtNy6baO0KJ5FJUmXH/cSkI9fOngs0yl6mA=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26 h1:zXFLuEuMMUOvEARXFUVJdfqZ4bvvSgdGRq/ATcrQxzM=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26/go.mod h1:3o2Wpy0bogG1kyOPrgkXA8pgIfEEv0+m19O9D5+W8y8=
+github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.23.1 h1:rqrvjFScEwD7VfP4L0hhnrXyTkgUkpQWAdwOrW2slOo=
+github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.23.1/go.mod h1:Vn5GopXsOAC6kbwzjfM6V37dxc4mo4J4xCRiF27pSZA=
+github.com/aws/smithy-go v1.22.1 h1:/HPHZQ0g7f4eUeK6HKglFz8uwVfZKgoI25rb/J+dnro=
+github.com/aws/smithy-go v1.22.1/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
+github.com/brianvoe/gofakeit/v6 v6.23.2 h1:lVde18uhad5wII/f5RMVFLtdQNE0HaGFuBUXmYKk8i8=
+github.com/brianvoe/gofakeit/v6 v6.23.2/go.mod h1:Ow6qC71xtwm79anlwKRlWZW6zVq9D2XHE4QSSMP/rU8=
+github.com/bytedance/sonic v1.12.6 h1:/isNmCUF2x3Sh8RAp/4mh4ZGkcFAX/hLrzrK3AvpRzk=
+github.com/bytedance/sonic v1.12.6/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/bytedance/sonic/loader v0.2.1 h1:1GgorWTqf12TA8mma4DDSbaQigE2wOgQo7iCjjJv3+E=
+github.com/bytedance/sonic/loader v0.2.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
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/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/deckarep/golang-set/v2 v2.1.0 h1:g47V4Or+DUdzbs8FxCCmgb6VYd+ptPAngjM6dtGktsI=
+github.com/deckarep/golang-set/v2 v2.1.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
-github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
-github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/dlclark/regexp2 v1.10.0 h1:+/GIL799phkJqYW+3YbOd8LCcbHzT0Pbo8zl70MHsq0=
+github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
-github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
-github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
-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.1 h1:HQ8ENHODeLY7a4g1Au/46Z92bdGFl74OhxcZble9WJE=
-github.com/gin-contrib/gzip v1.0.1/go.mod h1:njt428fdUNRvjuJf16tZMYZ2Yl+WQB53X5wmhDwXvC4=
-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/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA=
+github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU=
+github.com/gammazero/deque v0.2.1 h1:qSdsbG6pgp6nL7A0+K/B7s12mcCY/5l5SIUpMOl+dC0=
+github.com/gammazero/deque v0.2.1/go.mod h1:LFroj8x4cMYCukHJDbxFCkT+r9AndaJnFMuZDV34tuU=
+github.com/gin-contrib/cors v1.7.3 h1:hV+a5xp8hwJoTw7OY+a70FsL8JkVVFTXw9EcfrYUdns=
+github.com/gin-contrib/cors v1.7.3/go.mod h1:M3bcKZhxzsvI+rlRSkkxHyljJt1ESd93COUvemZ79j4=
+github.com/gin-contrib/gzip v1.1.0 h1:kVw7Nr9M+Z6Ch4qo7aGMbiqxDeyQFru+07MgAcUF62M=
+github.com/gin-contrib/gzip v1.1.0/go.mod h1:iHJXCup4CWiKyPUEl+GwkHjchl+YyYuMKbOCiXujPIA=
+github.com/gin-contrib/sessions v1.0.2 h1:UaIjUvTH1cMeOdj3in6dl+Xb6It8RiKRF9Z1anbUyCA=
+github.com/gin-contrib/sessions v1.0.2/go.mod h1:KxKxWqWP5LJVDCInulOl4WbLzK2KSPlLesfZ66wRvMs=
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/static v1.1.2 h1:c3kT4bFkUJn2aoRU3s6XnMjJT8J6nNWJkR0NglqmlZ4=
-github.com/gin-contrib/static v1.1.2/go.mod h1:Fw90ozjHCmZBWbgrsqrDvO28YbhKEKzKp8GixhR4yLw=
+github.com/gin-contrib/static v1.1.3 h1:WLOpkBtMDJ3gATFZgNJyVibFMio/UHonnueqJsQ0w4U=
+github.com/gin-contrib/static v1.1.3/go.mod h1:zejpJ/YWp8cZj/6EpiL5f/+skv5daQTNwRx1E8Pci30=
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-json-experiment/json v0.0.0-20231011163920-8aa127fd5801 h1:PRieymvnGuBZUnWVQPBOemqlIhRznqtSxs/1LqlWe20=
+github.com/go-json-experiment/json v0.0.0-20231011163920-8aa127fd5801/go.mod h1:6daplAwHHGbUGib4990V3Il26O0OC4aRyvewaaAihaA=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
-github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
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/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-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-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o=
+github.com/go-playground/validator/v10 v10.23.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/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
+github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
-github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
-github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
-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/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
+github.com/goccy/go-json v0.10.4/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/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cpy v0.0.0-20211218193943-a9c933c06932 h1:5/4TSDzpDnHQ8rKEEQBjRlYx77mHOvXu08oGchxej7o=
+github.com/google/go-cpy v0.0.0-20211218193943-a9c933c06932/go.mod h1:cC6EdPbj/17GFCPDK39NRarlMI+kt+O60S12cNB5J9Y=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
-github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
-github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM=
+github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=
-github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
-github.com/googleapis/gax-go/v2 v2.12.5 h1:8gw9KZK8TiVKB6q3zHY3SBzLnrGp6HQjyfYBYGmXdxA=
-github.com/googleapis/gax-go/v2 v2.12.5/go.mod h1:BUDKcWo+RaKq5SC9vVYL0wLADa3VcfswbOMMRmB9H3E=
+github.com/googleapis/enterprise-certificate-proxy v0.3.4 h1:XYIDZApgAnrN1c855gTgghdIA6Stxb52D5RnLI1SLyw=
+github.com/googleapis/enterprise-certificate-proxy v0.3.4/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA=
+github.com/googleapis/gax-go/v2 v2.14.1 h1:hb0FFeiPaQskmvakKu5EbCbpntQn48jyHuvrkurSS/Q=
+github.com/googleapis/gax-go/v2 v2.14.1/go.mod h1:Hb/NubMaVM88SrNkvl8X/o8XWwDJEPqouaLeN2IUxoA=
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
github.com/gorilla/context v1.1.2 h1:WRkNAv2uoa03QNIc1A6u4O7DAGMUVoopZhkiXWA2V1o=
@@ -130,12 +132,13 @@ github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kX
github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY=
github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ=
-github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
-github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/graph-gophers/graphql-go v1.5.0/go.mod h1:YtmJZDLbF1YYNrlNAuiO5zAStUWc3XZT07iGsVqe1Os=
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 h1:L0QtFUgDarD7Fpv9jeVMgy/+Ec0mtnmYuImjTz6dtDA=
-github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
github.com/jackc/pgx/v5 v5.5.5 h1:amBjrZVmksIdNjxGW/IiIMzxMKZFelXbUoPNb+8sjQw=
github.com/jackc/pgx/v5 v5.5.5/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A=
github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
@@ -153,10 +156,11 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
-github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
+github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
@@ -171,147 +175,132 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
+github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
+github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-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/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
+github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
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/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
+github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
+github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
github.com/smarty/assertions v1.15.0 h1:cR//PqUBUiQRakZWqBiFFQ9wb8emQGDb0HeGdqGByCY=
github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec=
github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY=
github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a h1:SJy1Pu0eH1C29XwJucQo73FrleVK6t4kYz4NVhp34Yw=
+github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a/go.mod h1:DFSS3NAGHthKo1gTlmEcSBiZrRJXi28rLNd/1udP1c8=
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
-go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
-go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
-go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
-go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
-go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
-go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
-go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
-golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
-golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 h1:r6I7RJCN86bpD/FQwedZ0vSixDpwuWREjW9oRMsmqDc=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0/go.mod h1:B9yO6b04uB80CzjedvewuqDhxJxi11s7/GtiGa8bAjI=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8=
+go.opentelemetry.io/otel v1.6.3/go.mod h1:7BgNga5fNlF/iZjG06hM3yofffp0ofKCDwSXx1GC4dI=
+go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw=
+go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8=
+go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc=
+go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8=
+go.opentelemetry.io/otel/trace v1.6.3/go.mod h1:GNJQusJlUgZl9/TQBPKU/Y/ty+0iVB5fjhKeJGZPGFs=
+go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4=
+go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ=
+go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
+go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
+go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+golang.org/x/arch v0.12.0 h1:UsYJhbzPYGsT0HbEdmYcqtCv8UNGvnaL561NnIUvaKg=
+golang.org/x/arch v0.12.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
-golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
+golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
+golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
-golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
-golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
+golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-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.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
-golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
+golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.187.0 h1:Mxs7VATVC2v7CY+7Xwm4ndkX71hpElcvx0D1Ji/p1eo=
-google.golang.org/api v0.187.0/go.mod h1:KIHlTc4x7N7gKKuVsdmfBXN13yEEWXWFURWY6SBp2gk=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 h1:MuYw1wJzT+ZkybKfaOXKp5hJiZDn2iHaXRw0mRYdHSc=
-google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4/go.mod h1:px9SlOOZBg1wM1zdnr8jEL4CNGUBZ+ZKYtNPApNQc4c=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d h1:k3zyW3BYYR30e8v3x0bTDdE9vpYFjZHK+HcyqkrppWk=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA=
-google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/api v0.215.0 h1:jdYF4qnyczlEz2ReWIsosNLDuzXyvFHJtI5gcr0J7t0=
+google.golang.org/api v0.215.0/go.mod h1:fta3CVtuJYOEdugLNWm6WodzOS8KdFckABwN4I40hzY=
+google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q=
+google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 h1:TqExAhdPaB60Ux47Cn0oLV07rGnxZzIsaRhQaqS666A=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
+google.golang.org/grpc v1.67.3 h1:OgPcDAFKHnH8X3O4WcO4XUc8GRDeKsKReqbQtiCj7N8=
+google.golang.org/grpc v1.67.3/go.mod h1:YGaHCc6Oap+FzBJTZLBzkGSYt/cvGPFTPxkn7QfSU8s=
+google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
+google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
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/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/mysql v1.5.6 h1:Ld4mkIickM+EliaQZQx3uOJDJHtrd70MxAUqWqlx3Y8=
-gorm.io/driver/mysql v1.5.6/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
-gorm.io/driver/postgres v1.5.7 h1:8ptbNJTDbEmhdr62uReG5BGkdQyeasu/FZHxI0IMGnM=
-gorm.io/driver/postgres v1.5.7/go.mod h1:3e019WlBaYI5o5LIdNV+LyxCMNtLOQETBXL2h4chKpA=
-gorm.io/driver/sqlite v1.5.5 h1:7MDMtUZhV065SilG62E0MquljeArQZNfJnjd9i9gx3E=
-gorm.io/driver/sqlite v1.5.5/go.mod h1:6NgQ7sQWAIFsPrJJl1lSNSu2TABh0ZZ/zm5fosATavE=
+gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo=
+gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
+gorm.io/driver/postgres v1.5.11 h1:ubBVAfbKEUld/twyKZ0IYn9rSQh448EdelLYk9Mv314=
+gorm.io/driver/postgres v1.5.11/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI=
+gorm.io/driver/sqlite v1.5.7 h1:8NvsrhP0ifM7LX9G4zPB97NwovUakUxc+2V2uuf3Z1I=
+gorm.io/driver/sqlite v1.5.7/go.mod h1:U+J8craQU6Fzkcvu8oLeAQmi50TkwPEhHDEjQZXDah4=
gorm.io/gorm v1.25.7/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=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
+gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
-rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
diff --git a/main.go b/main.go
index 67a3cd95..97d712b8 100644
--- a/main.go
+++ b/main.go
@@ -2,7 +2,11 @@ package main
import (
"embed"
+ "encoding/base64"
"fmt"
+ "os"
+ "strconv"
+
"github.com/gin-contrib/sessions"
"github.com/gin-contrib/sessions/cookie"
"github.com/gin-gonic/gin"
@@ -16,8 +20,6 @@ import (
"github.com/songquanpeng/one-api/model"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/router"
- "os"
- "strconv"
)
//go:embed web/build/*
@@ -99,8 +101,15 @@ func main() {
server.Use(middleware.RequestId())
middleware.SetUpLogger(server)
// Initialize session store
- store := cookie.NewStore([]byte(config.SessionSecret))
- server.Use(sessions.Sessions("session", store))
+ sessionSecret, err := base64.StdEncoding.DecodeString(config.SessionSecret)
+ if err != nil {
+ logger.SysLog("session secret is not base64 encoded, using raw value instead")
+ store := cookie.NewStore([]byte(config.SessionSecret))
+ server.Use(sessions.Sessions("session", store))
+ } else {
+ store := cookie.NewStore(sessionSecret, sessionSecret)
+ server.Use(sessions.Sessions("session", store))
+ }
router.SetRouter(server, buildFS)
var port = os.Getenv("PORT")
diff --git a/middleware/auth.go b/middleware/auth.go
index e0019838..8fc62027 100644
--- a/middleware/auth.go
+++ b/middleware/auth.go
@@ -2,14 +2,16 @@ package middleware
import (
"fmt"
+ "net/http"
+ "strings"
+
"github.com/gin-contrib/sessions"
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common/blacklist"
"github.com/songquanpeng/one-api/common/ctxkey"
+ "github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/common/network"
"github.com/songquanpeng/one-api/model"
- "net/http"
- "strings"
)
func authHelper(c *gin.Context, minRole int) {
@@ -19,16 +21,18 @@ func authHelper(c *gin.Context, minRole int) {
id := session.Get("id")
status := session.Get("status")
if username == nil {
+ logger.SysLog("no user session found, try to use access token")
// Check access token
accessToken := c.Request.Header.Get("Authorization")
if accessToken == "" {
c.JSON(http.StatusUnauthorized, gin.H{
"success": false,
- "message": "无权进行此操作，未登录且未提供 access token",
+ "message": "No permission to perform this operation, not logged in and no access token provided",
})
c.Abort()
return
}
+
user := model.ValidateAccessToken(accessToken)
if user != nil && user.Username != "" {
// Token is valid
@@ -39,7 +43,7 @@ func authHelper(c *gin.Context, minRole int) {
} else {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无权进行此操作，access token 无效",
+ "message": "No permission to perform this operation, access token is invalid",
})
c.Abort()
return
@@ -48,7 +52,7 @@ func authHelper(c *gin.Context, minRole int) {
if status.(int) == model.UserStatusDisabled || blacklist.IsUserBanned(id.(int)) {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "用户已被封禁",
+ "message": "User has been banned",
})
session := sessions.Default(c)
session.Clear()
@@ -59,7 +63,7 @@ func authHelper(c *gin.Context, minRole int) {
if role.(int) < minRole {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无权进行此操作，权限不足",
+ "message": "No permission to perform this operation, insufficient permissions",
})
c.Abort()
return
@@ -93,7 +97,7 @@ func TokenAuth() func(c *gin.Context) {
ctx := c.Request.Context()
key := c.Request.Header.Get("Authorization")
key = strings.TrimPrefix(key, "Bearer ")
- key = strings.TrimPrefix(key, "sk-")
+ key = strings.TrimPrefix(strings.TrimPrefix(key, "sk-"), "laisky-")
parts := strings.Split(key, "-")
key = parts[0]
token, err := model.ValidateUserToken(key)
@@ -103,7 +107,7 @@ func TokenAuth() func(c *gin.Context) {
}
if token.Subnet != nil && *token.Subnet != "" {
if !network.IsIpInSubnets(ctx, c.ClientIP(), *token.Subnet) {
- abortWithMessage(c, http.StatusForbidden, fmt.Sprintf("该令牌只能在指定网段使用：%s，当前 ip：%s", *token.Subnet, c.ClientIP()))
+ abortWithMessage(c, http.StatusForbidden, fmt.Sprintf("该API Keys只能在指定网段使用：%s，当前 ip：%s", *token.Subnet, c.ClientIP()))
return
}
}
@@ -113,7 +117,7 @@ func TokenAuth() func(c *gin.Context) {
return
}
if !userEnabled || blacklist.IsUserBanned(token.UserId) {
- abortWithMessage(c, http.StatusForbidden, "用户已被封禁")
+ abortWithMessage(c, http.StatusForbidden, "User has been banned")
return
}
requestModel, err := getRequestModel(c)
@@ -125,18 +129,22 @@ func TokenAuth() func(c *gin.Context) {
if token.Models != nil && *token.Models != "" {
c.Set(ctxkey.AvailableModels, *token.Models)
if requestModel != "" && !isModelInList(requestModel, *token.Models) {
- abortWithMessage(c, http.StatusForbidden, fmt.Sprintf("该令牌无权使用模型：%s", requestModel))
+ abortWithMessage(c, http.StatusForbidden, fmt.Sprintf("该API KeysNone权使用Model：%s", requestModel))
return
}
}
+
c.Set(ctxkey.Id, token.UserId)
c.Set(ctxkey.TokenId, token.Id)
c.Set(ctxkey.TokenName, token.Name)
+ c.Set(ctxkey.TokenQuota, token.RemainQuota)
+ c.Set(ctxkey.TokenQuotaUnlimited, token.UnlimitedQuota)
+
if len(parts) > 1 {
if model.IsAdmin(token.UserId) {
c.Set(ctxkey.SpecificChannelId, parts[1])
} else {
- abortWithMessage(c, http.StatusForbidden, "普通用户不支持指定渠道")
+ abortWithMessage(c, http.StatusForbidden, "Ordinary users do not support specifying channels")
return
}
}
diff --git a/middleware/distributor.go b/middleware/distributor.go
index 0aceb29d..8098c307 100644
--- a/middleware/distributor.go
+++ b/middleware/distributor.go
@@ -2,13 +2,17 @@ package middleware
import (
"fmt"
+ "net/http"
+ "strconv"
+ "strings"
+
+ gutils "github.com/Laisky/go-utils/v4"
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common/ctxkey"
"github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/model"
+ "github.com/songquanpeng/one-api/relay/billing/ratio"
"github.com/songquanpeng/one-api/relay/channeltype"
- "net/http"
- "strconv"
)
type ModelRequest struct {
@@ -26,16 +30,16 @@ func Distribute() func(c *gin.Context) {
if ok {
id, err := strconv.Atoi(channelId.(string))
if err != nil {
- abortWithMessage(c, http.StatusBadRequest, "无效的渠道 Id")
+ abortWithMessage(c, http.StatusBadRequest, "None效的Channel Id")
return
}
channel, err = model.GetChannelById(id, true)
if err != nil {
- abortWithMessage(c, http.StatusBadRequest, "无效的渠道 Id")
+ abortWithMessage(c, http.StatusBadRequest, "None效的Channel Id")
return
}
if channel.Status != model.ChannelStatusEnabled {
- abortWithMessage(c, http.StatusForbidden, "该渠道已被禁用")
+ abortWithMessage(c, http.StatusForbidden, "The channel has been disabled")
return
}
} else {
@@ -43,10 +47,10 @@ func Distribute() func(c *gin.Context) {
var err error
channel, err = model.CacheGetRandomSatisfiedChannel(userGroup, requestModel, false)
if err != nil {
- message := fmt.Sprintf("当前分组 %s 下对于模型 %s 无可用渠道", userGroup, requestModel)
+ message := fmt.Sprintf("当前Group %s 下对于Model %s No available channels", userGroup, requestModel)
if channel != nil {
- logger.SysError(fmt.Sprintf("渠道不存在：%d", channel.Id))
- message = "数据库一致性已被破坏，请联系管理员"
+ logger.SysError(fmt.Sprintf("Channel does not exist: %d", channel.Id))
+ message = "Database consistency has been broken, please contact the administrator"
}
abortWithMessage(c, http.StatusServiceUnavailable, message)
return
@@ -58,9 +62,29 @@ func Distribute() func(c *gin.Context) {
}
func SetupContextForSelectedChannel(c *gin.Context, channel *model.Channel, modelName string) {
+ // one channel could relates to multiple groups,
+ // and each groud has individual ratio,
+ // set minimal group ratio as channel_ratio
+ var minimalRatio float64 = -1
+ for _, grp := range strings.Split(channel.Group, ",") {
+ v := ratio.GetGroupRatio(grp)
+ if minimalRatio < 0 || v < minimalRatio {
+ minimalRatio = v
+ }
+ }
+ logger.Info(c.Request.Context(), fmt.Sprintf("set channel %s ratio to %f", channel.Name, minimalRatio))
+ c.Set(ctxkey.ChannelRatio, minimalRatio)
+ c.Set(ctxkey.ChannelModel, channel)
+
+ // generate an unique cost id for each request
+ if _, ok := c.Get(ctxkey.RequestId); !ok {
+ c.Set(ctxkey.RequestId, gutils.UUID7())
+ }
+
c.Set(ctxkey.Channel, channel.Type)
c.Set(ctxkey.ChannelId, channel.Id)
c.Set(ctxkey.ChannelName, channel.Name)
+ c.Set(ctxkey.ContentType, c.Request.Header.Get("Content-Type"))
if channel.SystemPrompt != nil && *channel.SystemPrompt != "" {
c.Set(ctxkey.SystemPrompt, *channel.SystemPrompt)
}
diff --git a/middleware/logger.go b/middleware/logger.go
index 191364f8..587d748c 100644
--- a/middleware/logger.go
+++ b/middleware/logger.go
@@ -2,6 +2,7 @@ package middleware
import (
"fmt"
+
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common/helper"
)
diff --git a/middleware/recover.go b/middleware/recover.go
index cfc3f827..a690c77b 100644
--- a/middleware/recover.go
+++ b/middleware/recover.go
@@ -14,11 +14,11 @@ func RelayPanicRecover() gin.HandlerFunc {
defer func() {
if err := recover(); err != nil {
ctx := c.Request.Context()
- logger.Errorf(ctx, fmt.Sprintf("panic detected: %v", err))
- logger.Errorf(ctx, fmt.Sprintf("stacktrace from panic: %s", string(debug.Stack())))
- logger.Errorf(ctx, fmt.Sprintf("request: %s %s", c.Request.Method, c.Request.URL.Path))
+ logger.Errorf(ctx, "panic detected: %v", err)
+ logger.Errorf(ctx, "stacktrace from panic: %s", string(debug.Stack()))
+ logger.Errorf(ctx, "request: %s %s", c.Request.Method, c.Request.URL.Path)
body, _ := common.GetRequestBody(c)
- logger.Errorf(ctx, fmt.Sprintf("request body: %s", string(body)))
+ logger.Errorf(ctx, "request body: %s", string(body))
c.JSON(http.StatusInternalServerError, gin.H{
"error": gin.H{
"message": fmt.Sprintf("Panic detected, error: %v. Please submit an issue with the related log here: https://github.com/songquanpeng/one-api", err),
diff --git a/middleware/request-id.go b/middleware/request-id.go
index bef09e32..c1f3adc2 100644
--- a/middleware/request-id.go
+++ b/middleware/request-id.go
@@ -2,6 +2,7 @@ package middleware
import (
"context"
+
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common/helper"
)
diff --git a/middleware/turnstile-check.go b/middleware/turnstile-check.go
index 403bcb34..c3451afa 100644
--- a/middleware/turnstile-check.go
+++ b/middleware/turnstile-check.go
@@ -27,7 +27,7 @@ func TurnstileCheck() gin.HandlerFunc {
if response == "" {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "Turnstile token 为空",
+ "message": "Turnstile token is empty",
})
c.Abort()
return
@@ -61,7 +61,7 @@ func TurnstileCheck() gin.HandlerFunc {
if !res.Success {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "Turnstile 校验失败，请刷新重试！",
+ "message": "Turnstile verification failed, please refresh and try again!",
})
c.Abort()
return
@@ -70,7 +70,7 @@ func TurnstileCheck() gin.HandlerFunc {
err = session.Save()
if err != nil {
c.JSON(http.StatusOK, gin.H{
- "message": "无法保存会话信息，请重试",
+ "message": "Unable to save session information, please try again",
"success": false,
})
return
diff --git a/middleware/utils.go b/middleware/utils.go
index 4d2f8092..46120f2a 100644
--- a/middleware/utils.go
+++ b/middleware/utils.go
@@ -1,12 +1,13 @@
package middleware
import (
- "fmt"
+ "strings"
+
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/helper"
"github.com/songquanpeng/one-api/common/logger"
- "strings"
)
func abortWithMessage(c *gin.Context, statusCode int, message string) {
@@ -24,28 +25,30 @@ func getRequestModel(c *gin.Context) (string, error) {
var modelRequest ModelRequest
err := common.UnmarshalBodyReusable(c, &modelRequest)
if err != nil {
- return "", fmt.Errorf("common.UnmarshalBodyReusable failed: %w", err)
+ return "", errors.Wrap(err, "common.UnmarshalBodyReusable failed")
}
- if strings.HasPrefix(c.Request.URL.Path, "/v1/moderations") {
+
+ switch {
+ case strings.HasPrefix(c.Request.URL.Path, "/v1/moderations"):
if modelRequest.Model == "" {
modelRequest.Model = "text-moderation-stable"
}
- }
- if strings.HasSuffix(c.Request.URL.Path, "embeddings") {
+ case strings.HasSuffix(c.Request.URL.Path, "embeddings"):
if modelRequest.Model == "" {
modelRequest.Model = c.Param("model")
}
- }
- if strings.HasPrefix(c.Request.URL.Path, "/v1/images/generations") {
+ case strings.HasPrefix(c.Request.URL.Path, "/v1/images/generations"),
+ strings.HasPrefix(c.Request.URL.Path, "/v1/images/edits"):
if modelRequest.Model == "" {
modelRequest.Model = "dall-e-2"
}
- }
- if strings.HasPrefix(c.Request.URL.Path, "/v1/audio/transcriptions") || strings.HasPrefix(c.Request.URL.Path, "/v1/audio/translations") {
+ case strings.HasPrefix(c.Request.URL.Path, "/v1/audio/transcriptions"),
+ strings.HasPrefix(c.Request.URL.Path, "/v1/audio/translations"):
if modelRequest.Model == "" {
modelRequest.Model = "whisper-1"
}
}
+
return modelRequest.Model, nil
}
diff --git a/model/cache.go b/model/cache.go
index cfb0f8a4..997d8361 100644
--- a/model/cache.go
+++ b/model/cache.go
@@ -3,8 +3,8 @@ package model
import (
"context"
"encoding/json"
- "errors"
"fmt"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/logger"
@@ -51,6 +51,7 @@ func CacheGetTokenByKey(key string) (*Token, error) {
}
return &token, nil
}
+
err = json.Unmarshal([]byte(tokenObjectString), &token)
return &token, err
}
diff --git a/model/cost.go b/model/cost.go
new file mode 100644
index 00000000..82efe855
--- /dev/null
+++ b/model/cost.go
@@ -0,0 +1,75 @@
+package model
+
+import (
+ "fmt"
+ "math/rand"
+ "sync"
+
+ "github.com/pkg/errors"
+ "github.com/songquanpeng/one-api/common/helper"
+ "github.com/songquanpeng/one-api/common/logger"
+)
+
+type UserRequestCost struct {
+ Id int `json:"id"`
+ CreatedTime int64 `json:"created_time" gorm:"bigint"`
+ UserID int `json:"user_id"`
+ RequestID string `json:"request_id"`
+ Quota int64 `json:"quota"`
+ CostUSD float64 `json:"cost_usd" gorm:"-"`
+}
+
+// NewUserRequestCost create a new UserRequestCost
+func NewUserRequestCost(userID int, quotaID string, quota int64) *UserRequestCost {
+ return &UserRequestCost{
+ CreatedTime: helper.GetTimestamp(),
+ UserID: userID,
+ RequestID: quotaID,
+ Quota: quota,
+ }
+}
+
+func (docu *UserRequestCost) Insert() error {
+ go removeOldRequestCost()
+
+ err := DB.Create(docu).Error
+ return errors.Wrap(err, "failed to insert UserRequestCost")
+}
+
+// GetCostByRequestId get cost by request id
+func GetCostByRequestId(reqid string) (*UserRequestCost, error) {
+ if reqid == "" {
+ return nil, errors.New("request id is empty")
+ }
+
+ docu := &UserRequestCost{RequestID: reqid}
+ var err error = nil
+ if err = DB.First(docu, "request_id = ?", reqid).Error; err != nil {
+ return nil, errors.Wrap(err, "failed to get cost by request id")
+ }
+
+ docu.CostUSD = float64(docu.Quota) / 500000
+ return docu, nil
+}
+
+var muRemoveOldRequestCost sync.Mutex
+
+// removeOldRequestCost remove old request cost data,
+// this function will be executed every 1/1000 times.
+func removeOldRequestCost() {
+ if rand.Float32() > 0.001 {
+ return
+ }
+
+ if ok := muRemoveOldRequestCost.TryLock(); !ok {
+ return
+ }
+ defer muRemoveOldRequestCost.Unlock()
+
+ err := DB.
+ Where("created_time < ?", helper.GetTimestamp()-3600*24*7).
+ Delete(&UserRequestCost{}).Error
+ if err != nil {
+ logger.SysError(fmt.Sprintf("failed to remove old request cost: %s", err.Error()))
+ }
+}
diff --git a/model/main.go b/model/main.go
index 72e271a0..fcf2b3ae 100644
--- a/model/main.go
+++ b/model/main.go
@@ -3,6 +3,11 @@ package model
import (
"database/sql"
"fmt"
+ "os"
+ "strings"
+ "time"
+
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/env"
@@ -13,9 +18,6 @@ import (
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"
- "os"
- "strings"
- "time"
)
var DB *gorm.DB
@@ -28,7 +30,7 @@ func CreateRootAccountIfNeed() error {
logger.SysLog("no user exists, creating a root user for you: username is root, password is 123456")
hashedPassword, err := common.Password2Hash("123456")
if err != nil {
- return err
+ return errors.WithStack(err)
}
accessToken := random.GetUUID()
if config.InitialRootAccessToken != "" {
@@ -157,7 +159,7 @@ func migrateDB() error {
if err = DB.AutoMigrate(&Log{}); err != nil {
return err
}
- if err = DB.AutoMigrate(&Channel{}); err != nil {
+ if err = DB.AutoMigrate(&UserRequestCost{}); err != nil {
return err
}
return nil
@@ -220,10 +222,10 @@ func setDBConns(db *gorm.DB) *sql.DB {
func closeDB(db *gorm.DB) error {
sqlDB, err := db.DB()
if err != nil {
- return err
+ return errors.WithStack(err)
}
err = sqlDB.Close()
- return err
+ return errors.WithStack(err)
}
func CloseDB() error {
diff --git a/model/redemption.go b/model/redemption.go
index 45871a71..4f5ae4c9 100644
--- a/model/redemption.go
+++ b/model/redemption.go
@@ -1,8 +1,8 @@
package model
import (
- "errors"
"fmt"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/helper"
"gorm.io/gorm"
@@ -40,7 +40,7 @@ func SearchRedemptions(keyword string) (redemptions []*Redemption, err error) {
func GetRedemptionById(id int) (*Redemption, error) {
if id == 0 {
- return nil, errors.New("id 为空！")
+ return nil, errors.New("id is empty!")
}
redemption := Redemption{Id: id}
var err error = nil
@@ -50,10 +50,10 @@ func GetRedemptionById(id int) (*Redemption, error) {
func Redeem(key string, userId int) (quota int64, err error) {
if key == "" {
- return 0, errors.New("未提供兑换码")
+ return 0, errors.New("No redemption code provided")
}
if userId == 0 {
- return 0, errors.New("无效的 user id")
+ return 0, errors.New("Invalid user id")
}
redemption := &Redemption{}
@@ -65,10 +65,10 @@ func Redeem(key string, userId int) (quota int64, err error) {
err = DB.Transaction(func(tx *gorm.DB) error {
err := tx.Set("gorm:query_option", "FOR UPDATE").Where(keyCol+" = ?", key).First(redemption).Error
if err != nil {
- return errors.New("无效的兑换码")
+ return errors.New("Invalid redemption code")
}
if redemption.Status != RedemptionCodeStatusEnabled {
- return errors.New("该兑换码已被使用")
+ return errors.New("The redemption code has been used")
}
err = tx.Model(&User{}).Where("id = ?", userId).Update("quota", gorm.Expr("quota + ?", redemption.Quota)).Error
if err != nil {
@@ -80,9 +80,9 @@ func Redeem(key string, userId int) (quota int64, err error) {
return err
})
if err != nil {
- return 0, errors.New("兑换失败，" + err.Error())
+ return 0, errors.New("Redeem失败，" + err.Error())
}
- RecordLog(userId, LogTypeTopup, fmt.Sprintf("通过兑换码充值 %s", common.LogQuota(redemption.Quota)))
+ RecordLog(userId, LogTypeTopup, fmt.Sprintf("Recharge %s through redemption code", common.LogQuota(redemption.Quota)))
return redemption.Quota, nil
}
@@ -112,7 +112,7 @@ func (redemption *Redemption) Delete() error {
func DeleteRedemptionById(id int) (err error) {
if id == 0 {
- return errors.New("id 为空！")
+ return errors.New("id is empty!")
}
redemption := Redemption{Id: id}
err = DB.Where(redemption).First(&redemption).Error
diff --git a/model/token.go b/model/token.go
index 91e72a82..ce281923 100644
--- a/model/token.go
+++ b/model/token.go
@@ -1,8 +1,9 @@
package model
import (
- "errors"
"fmt"
+
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/helper"
@@ -59,23 +60,24 @@ func SearchUserTokens(userId int, keyword string) (tokens []*Token, err error) {
func ValidateUserToken(key string) (token *Token, err error) {
if key == "" {
- return nil, errors.New("未提供令牌")
+ return nil, errors.New("No token provided")
}
token, err = CacheGetTokenByKey(key)
if err != nil {
logger.SysError("CacheGetTokenByKey failed: " + err.Error())
if errors.Is(err, gorm.ErrRecordNotFound) {
- return nil, errors.New("无效的令牌")
+ return nil, errors.Wrap(err, "token not found")
}
- return nil, errors.New("令牌验证失败")
+
+ return nil, errors.Wrap(err, "failed to get token by key")
}
if token.Status == TokenStatusExhausted {
- return nil, fmt.Errorf("令牌 %s（#%d）额度已用尽", token.Name, token.Id)
+ return nil, fmt.Errorf("API Keys %s（#%d）Quota已用尽", token.Name, token.Id)
} else if token.Status == TokenStatusExpired {
- return nil, errors.New("该令牌已过期")
+ return nil, errors.New("The token has expired")
}
if token.Status != TokenStatusEnabled {
- return nil, errors.New("该令牌状态不可用")
+ return nil, errors.New("The token status is not available")
}
if token.ExpiredTime != -1 && token.ExpiredTime < helper.GetTimestamp() {
if !common.RedisEnabled {
@@ -85,7 +87,7 @@ func ValidateUserToken(key string) (token *Token, err error) {
logger.SysError("failed to update token status" + err.Error())
}
}
- return nil, errors.New("该令牌已过期")
+ return nil, errors.New("The token has expired")
}
if !token.UnlimitedQuota && token.RemainQuota <= 0 {
if !common.RedisEnabled {
@@ -96,14 +98,14 @@ func ValidateUserToken(key string) (token *Token, err error) {
logger.SysError("failed to update token status" + err.Error())
}
}
- return nil, errors.New("该令牌额度已用尽")
+ return nil, errors.New("The token quota has been used up")
}
return token, nil
}
func GetTokenByIds(id int, userId int) (*Token, error) {
if id == 0 || userId == 0 {
- return nil, errors.New("id 或 userId 为空！")
+ return nil, errors.New("id or userId is empty!")
}
token := Token{Id: id, UserId: userId}
var err error = nil
@@ -113,7 +115,7 @@ func GetTokenByIds(id int, userId int) (*Token, error) {
func GetTokenById(id int) (*Token, error) {
if id == 0 {
- return nil, errors.New("id 为空！")
+ return nil, errors.New("id is empty!")
}
token := Token{Id: id}
var err error = nil
@@ -158,7 +160,7 @@ func (t *Token) GetModels() string {
func DeleteTokenById(id int, userId int) (err error) {
// Why we need userId here? In case user want to delete other's token.
if id == 0 || userId == 0 {
- return errors.New("id 或 userId 为空！")
+ return errors.New("id or userId is empty!")
}
token := Token{Id: id, UserId: userId}
err = DB.Where(token).First(&token).Error
@@ -170,7 +172,7 @@ func DeleteTokenById(id int, userId int) (err error) {
func IncreaseTokenQuota(id int, quota int64) (err error) {
if quota < 0 {
- return errors.New("quota 不能为负数！")
+ return errors.New("quota cannot be negative!")
}
if config.BatchUpdateEnabled {
addNewRecord(BatchUpdateTypeTokenQuota, id, quota)
@@ -192,7 +194,7 @@ func increaseTokenQuota(id int, quota int64) (err error) {
func DecreaseTokenQuota(id int, quota int64) (err error) {
if quota < 0 {
- return errors.New("quota 不能为负数！")
+ return errors.New("quota cannot be negative!")
}
if config.BatchUpdateEnabled {
addNewRecord(BatchUpdateTypeTokenQuota, id, -quota)
@@ -214,21 +216,21 @@ func decreaseTokenQuota(id int, quota int64) (err error) {
func PreConsumeTokenQuota(tokenId int, quota int64) (err error) {
if quota < 0 {
- return errors.New("quota 不能为负数！")
+ return errors.New("quota cannot be negative!")
}
token, err := GetTokenById(tokenId)
if err != nil {
return err
}
if !token.UnlimitedQuota && token.RemainQuota < quota {
- return errors.New("令牌额度不足")
+ return errors.New("Insufficient token quota")
}
userQuota, err := GetUserQuota(token.UserId)
if err != nil {
return err
}
if userQuota < quota {
- return errors.New("用户额度不足")
+ return errors.New("Insufficient user quota")
}
quotaTooLow := userQuota >= config.QuotaRemindThreshold && userQuota-quota < config.QuotaRemindThreshold
noMoreQuota := userQuota-quota <= 0
@@ -238,14 +240,14 @@ func PreConsumeTokenQuota(tokenId int, quota int64) (err error) {
if err != nil {
logger.SysError("failed to fetch user email: " + err.Error())
}
- prompt := "您的额度即将用尽"
+ prompt := "Your quota is about to run out"
if noMoreQuota {
- prompt = "您的额度已用尽"
+ prompt = "Your quota has been used up"
}
if email != "" {
topUpLink := fmt.Sprintf("%s/topup", config.ServerAddress)
err = message.SendEmail(prompt, email,
- fmt.Sprintf("%s，当前剩余额度为 %d，为了不影响您的使用，请及时充值。%s ", prompt, userQuota, topUpLink, topUpLink))
+ fmt.Sprintf("%s, the current remaining quota is %d, in order not to affect your use, please recharge in time. %s ", prompt, userQuota, topUpLink, topUpLink))
if err != nil {
logger.SysError("failed to send email" + err.Error())
}
diff --git a/model/user.go b/model/user.go
index a964a0d7..9ff8a093 100644
--- a/model/user.go
+++ b/model/user.go
@@ -1,8 +1,10 @@
package model
import (
- "errors"
"fmt"
+ "strings"
+
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/blacklist"
"github.com/songquanpeng/one-api/common/config"
@@ -10,7 +12,6 @@ import (
"github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/common/random"
"gorm.io/gorm"
- "strings"
)
const (
@@ -85,7 +86,7 @@ func SearchUsers(keyword string) (users []*User, err error) {
func GetUserById(id int, selectAll bool) (*User, error) {
if id == 0 {
- return nil, errors.New("id 为空！")
+ return nil, errors.New("id is empty!")
}
user := User{Id: id}
var err error = nil
@@ -99,7 +100,7 @@ func GetUserById(id int, selectAll bool) (*User, error) {
func GetUserIdByAffCode(affCode string) (int, error) {
if affCode == "" {
- return 0, errors.New("affCode 为空！")
+ return 0, errors.New("affCode is empty!")
}
var user User
err := DB.Select("id").First(&user, "aff_code = ?", affCode).Error
@@ -108,7 +109,7 @@ func GetUserIdByAffCode(affCode string) (int, error) {
func DeleteUserById(id int) (err error) {
if id == 0 {
- return errors.New("id 为空！")
+ return errors.New("id is empty!")
}
user := User{Id: id}
return user.Delete()
@@ -130,16 +131,16 @@ func (user *User) Insert(inviterId int) error {
return result.Error
}
if config.QuotaForNewUser > 0 {
- RecordLog(user.Id, LogTypeSystem, fmt.Sprintf("新用户注册赠送 %s", common.LogQuota(config.QuotaForNewUser)))
+ RecordLog(user.Id, LogTypeSystem, fmt.Sprintf("New user registration gives %s", common.LogQuota(config.QuotaForNewUser)))
}
if inviterId != 0 {
if config.QuotaForInvitee > 0 {
_ = IncreaseUserQuota(user.Id, config.QuotaForInvitee)
- RecordLog(user.Id, LogTypeSystem, fmt.Sprintf("使用邀请码赠送 %s", common.LogQuota(config.QuotaForInvitee)))
+ RecordLog(user.Id, LogTypeSystem, fmt.Sprintf("Use invitation code to give %s", common.LogQuota(config.QuotaForInvitee)))
}
if config.QuotaForInviter > 0 {
_ = IncreaseUserQuota(inviterId, config.QuotaForInviter)
- RecordLog(inviterId, LogTypeSystem, fmt.Sprintf("邀请用户赠送 %s", common.LogQuota(config.QuotaForInviter)))
+ RecordLog(inviterId, LogTypeSystem, fmt.Sprintf("Invite users to give %s", common.LogQuota(config.QuotaForInviter)))
}
}
// create default token
@@ -180,7 +181,7 @@ func (user *User) Update(updatePassword bool) error {
func (user *User) Delete() error {
if user.Id == 0 {
- return errors.New("id 为空！")
+ return errors.New("id is empty!")
}
blacklist.BanUser(user.Id)
user.Username = fmt.Sprintf("deleted_%s", random.GetUUID())
@@ -196,7 +197,7 @@ func (user *User) ValidateAndFill() (err error) {
// it won’t be used to build query conditions
password := user.Password
if user.Username == "" || password == "" {
- return errors.New("用户名或密码为空")
+ return errors.New("Username or password is empty")
}
err = DB.Where("username = ?", user.Username).First(user).Error
if err != nil {
@@ -204,19 +205,19 @@ func (user *User) ValidateAndFill() (err error) {
// consider this case: a malicious user set his username as other's email
err := DB.Where("email = ?", user.Username).First(user).Error
if err != nil {
- return errors.New("用户名或密码错误，或用户已被封禁")
+ return errors.New("Username or password is wrong, or user has been banned")
}
}
okay := common.ValidatePasswordAndHash(password, user.Password)
if !okay || user.Status != UserStatusEnabled {
- return errors.New("用户名或密码错误，或用户已被封禁")
+ return errors.New("Username or password is wrong, or user has been banned")
}
return nil
}
func (user *User) FillUserById() error {
if user.Id == 0 {
- return errors.New("id 为空！")
+ return errors.New("id is empty!")
}
DB.Where(User{Id: user.Id}).First(user)
return nil
@@ -224,7 +225,7 @@ func (user *User) FillUserById() error {
func (user *User) FillUserByEmail() error {
if user.Email == "" {
- return errors.New("email 为空！")
+ return errors.New("email is empty!")
}
DB.Where(User{Email: user.Email}).First(user)
return nil
@@ -232,7 +233,7 @@ func (user *User) FillUserByEmail() error {
func (user *User) FillUserByGitHubId() error {
if user.GitHubId == "" {
- return errors.New("GitHub id 为空！")
+ return errors.New("GitHub id is empty!")
}
DB.Where(User{GitHubId: user.GitHubId}).First(user)
return nil
@@ -240,7 +241,7 @@ func (user *User) FillUserByGitHubId() error {
func (user *User) FillUserByLarkId() error {
if user.LarkId == "" {
- return errors.New("lark id 为空！")
+ return errors.New("lark id is empty!")
}
DB.Where(User{LarkId: user.LarkId}).First(user)
return nil
@@ -248,7 +249,7 @@ func (user *User) FillUserByLarkId() error {
func (user *User) FillUserByOidcId() error {
if user.OidcId == "" {
- return errors.New("oidc id 为空！")
+ return errors.New("oidc id is empty!")
}
DB.Where(User{OidcId: user.OidcId}).First(user)
return nil
@@ -256,7 +257,7 @@ func (user *User) FillUserByOidcId() error {
func (user *User) FillUserByWeChatId() error {
if user.WeChatId == "" {
- return errors.New("WeChat id 为空！")
+ return errors.New("WeChat id is empty!")
}
DB.Where(User{WeChatId: user.WeChatId}).First(user)
return nil
@@ -264,7 +265,7 @@ func (user *User) FillUserByWeChatId() error {
func (user *User) FillUserByUsername() error {
if user.Username == "" {
- return errors.New("username 为空！")
+ return errors.New("username is empty!")
}
DB.Where(User{Username: user.Username}).First(user)
return nil
@@ -296,7 +297,7 @@ func IsUsernameAlreadyTaken(username string) bool {
func ResetUserPasswordByEmail(email string, password string) error {
if email == "" || password == "" {
- return errors.New("邮箱地址或密码为空！")
+ return errors.New("Email address or password is empty!")
}
hashedPassword, err := common.Password2Hash(password)
if err != nil {
@@ -370,7 +371,7 @@ func GetUserGroup(id int) (group string, err error) {
func IncreaseUserQuota(id int, quota int64) (err error) {
if quota < 0 {
- return errors.New("quota 不能为负数！")
+ return errors.New("quota cannot be negative!")
}
if config.BatchUpdateEnabled {
addNewRecord(BatchUpdateTypeUserQuota, id, quota)
@@ -386,7 +387,7 @@ func increaseUserQuota(id int, quota int64) (err error) {
func DecreaseUserQuota(id int, quota int64) (err error) {
if quota < 0 {
- return errors.New("quota 不能为负数！")
+ return errors.New("quota cannot be negative!")
}
if config.BatchUpdateEnabled {
addNewRecord(BatchUpdateTypeUserQuota, id, -quota)
diff --git a/monitor/channel.go b/monitor/channel.go
index 7e5dc58a..39705e40 100644
--- a/monitor/channel.go
+++ b/monitor/channel.go
@@ -30,16 +30,16 @@ func notifyRootUser(subject string, content string) {
func DisableChannel(channelId int, channelName string, reason string) {
model.UpdateChannelStatusById(channelId, model.ChannelStatusAutoDisabled)
logger.SysLog(fmt.Sprintf("channel #%d has been disabled: %s", channelId, reason))
- subject := fmt.Sprintf("渠道「%s」（#%d）已被禁用", channelName, channelId)
- content := fmt.Sprintf("渠道「%s」（#%d）已被禁用，原因：%s", channelName, channelId, reason)
+ subject := fmt.Sprintf("Channel %s (#%d) has been disabled", channelName, channelId)
+ content := fmt.Sprintf("Channel %s (#%d) has been disabled, reason: %s", channelName, channelId, reason)
notifyRootUser(subject, content)
}
func MetricDisableChannel(channelId int, successRate float64) {
model.UpdateChannelStatusById(channelId, model.ChannelStatusAutoDisabled)
logger.SysLog(fmt.Sprintf("channel #%d has been disabled due to low success rate: %.2f", channelId, successRate*100))
- subject := fmt.Sprintf("渠道 #%d 已被禁用", channelId)
- content := fmt.Sprintf("该渠道（#%d）在最近 %d 次调用中成功率为 %.2f%%，低于阈值 %.2f%%，因此被系统自动禁用。",
+ subject := fmt.Sprintf("Channel #%d 已被Disable", channelId)
+ content := fmt.Sprintf("该Channel（#%d）在最近 %d 次调用中成功率为 %.2f%%，低于阈值 %.2f%%，因此被System自动Disable。",
channelId, config.MetricQueueSize, successRate*100, config.MetricSuccessRateThreshold*100)
notifyRootUser(subject, content)
}
@@ -48,7 +48,7 @@ func MetricDisableChannel(channelId int, successRate float64) {
func EnableChannel(channelId int, channelName string) {
model.UpdateChannelStatusById(channelId, model.ChannelStatusEnabled)
logger.SysLog(fmt.Sprintf("channel #%d has been enabled", channelId))
- subject := fmt.Sprintf("渠道「%s」（#%d）已被启用", channelName, channelId)
- content := fmt.Sprintf("渠道「%s」（#%d）已被启用", channelName, channelId)
+ subject := fmt.Sprintf("Channel「%s」（#%d）已被Enable", channelName, channelId)
+ content := fmt.Sprintf("Channel「%s」（#%d）已被Enable", channelName, channelId)
notifyRootUser(subject, content)
}
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..e10a6764
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+ "name": "one-api",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {}
+}
diff --git a/relay/adaptor.go b/relay/adaptor.go
index 03e83903..d6fbf058 100644
--- a/relay/adaptor.go
+++ b/relay/adaptor.go
@@ -65,5 +65,6 @@ func GetAdaptor(apiType int) adaptor.Adaptor {
case apitype.Replicate:
return &replicate.Adaptor{}
}
+
return nil
}
diff --git a/relay/adaptor/aiproxy/adaptor.go b/relay/adaptor/aiproxy/adaptor.go
index 42d49c0a..99456abf 100644
--- a/relay/adaptor/aiproxy/adaptor.go
+++ b/relay/adaptor/aiproxy/adaptor.go
@@ -1,14 +1,15 @@
package aiproxy
import (
- "errors"
"fmt"
+ "io"
+ "net/http"
+
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/relay/adaptor"
"github.com/songquanpeng/one-api/relay/meta"
"github.com/songquanpeng/one-api/relay/model"
- "io"
- "net/http"
)
type Adaptor struct {
@@ -38,7 +39,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
return aiProxyLibraryRequest, nil
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
if request == nil {
return nil, errors.New("request is nil")
}
diff --git a/relay/adaptor/aiproxy/main.go b/relay/adaptor/aiproxy/main.go
index d64b6809..03eeefa4 100644
--- a/relay/adaptor/aiproxy/main.go
+++ b/relay/adaptor/aiproxy/main.go
@@ -4,7 +4,6 @@ import (
"bufio"
"encoding/json"
"fmt"
- "github.com/songquanpeng/one-api/common/render"
"io"
"net/http"
"strconv"
@@ -15,6 +14,7 @@ import (
"github.com/songquanpeng/one-api/common/helper"
"github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/common/random"
+ "github.com/songquanpeng/one-api/common/render"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/relay/constant"
"github.com/songquanpeng/one-api/relay/model"
diff --git a/relay/adaptor/ali/adaptor.go b/relay/adaptor/ali/adaptor.go
index 4aa8a11a..25fbc704 100644
--- a/relay/adaptor/ali/adaptor.go
+++ b/relay/adaptor/ali/adaptor.go
@@ -3,13 +3,14 @@ package ali
import (
"errors"
"fmt"
+ "io"
+ "net/http"
+
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/relay/adaptor"
"github.com/songquanpeng/one-api/relay/meta"
"github.com/songquanpeng/one-api/relay/model"
"github.com/songquanpeng/one-api/relay/relaymode"
- "io"
- "net/http"
)
// https://help.aliyun.com/zh/dashscope/developer-reference/api-details
@@ -67,7 +68,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
}
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
if request == nil {
return nil, errors.New("request is nil")
}
diff --git a/relay/adaptor/ali/image.go b/relay/adaptor/ali/image.go
index 8261803d..a251d4d8 100644
--- a/relay/adaptor/ali/image.go
+++ b/relay/adaptor/ali/image.go
@@ -5,15 +5,16 @@ import (
"encoding/json"
"errors"
"fmt"
+ "io"
+ "net/http"
+ "strings"
+ "time"
+
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common/helper"
"github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/relay/model"
- "io"
- "net/http"
- "strings"
- "time"
)
func ImageHandler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusCode, *model.Usage) {
diff --git a/relay/adaptor/ali/main.go b/relay/adaptor/ali/main.go
index 6a73c707..78cd11ca 100644
--- a/relay/adaptor/ali/main.go
+++ b/relay/adaptor/ali/main.go
@@ -3,16 +3,16 @@ package ali
import (
"bufio"
"encoding/json"
- "github.com/songquanpeng/one-api/common/ctxkey"
- "github.com/songquanpeng/one-api/common/render"
"io"
"net/http"
"strings"
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common"
+ "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/render"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/relay/model"
)
diff --git a/relay/adaptor/anthropic/adaptor.go b/relay/adaptor/anthropic/adaptor.go
index bd0949be..76557b31 100644
--- a/relay/adaptor/anthropic/adaptor.go
+++ b/relay/adaptor/anthropic/adaptor.go
@@ -1,13 +1,13 @@
package anthropic
import (
- "errors"
"fmt"
"io"
"net/http"
"strings"
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/relay/adaptor"
"github.com/songquanpeng/one-api/relay/meta"
"github.com/songquanpeng/one-api/relay/model"
@@ -20,6 +20,8 @@ func (a *Adaptor) Init(meta *meta.Meta) {
}
+// https://docs.anthropic.com/claude/reference/messages_post
+// anthopic migrate to Message API
func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
return fmt.Sprintf("%s/v1/messages", meta.BaseURL), nil
}
@@ -47,10 +49,12 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
if request == nil {
return nil, errors.New("request is nil")
}
+
+ c.Set("claude_model", request.Model)
return ConvertRequest(*request), nil
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
if request == nil {
return nil, errors.New("request is nil")
}
diff --git a/relay/adaptor/anthropic/main.go b/relay/adaptor/anthropic/main.go
index d3e306c8..22cb4aad 100644
--- a/relay/adaptor/anthropic/main.go
+++ b/relay/adaptor/anthropic/main.go
@@ -261,7 +261,6 @@ func StreamHandler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusC
}
return 0, nil, nil
})
-
common.SetEventStreamHeaders(c)
var usage model.Usage
diff --git a/relay/adaptor/anthropic/model.go b/relay/adaptor/anthropic/model.go
index 47f193fa..a6566d68 100644
--- a/relay/adaptor/anthropic/model.go
+++ b/relay/adaptor/anthropic/model.go
@@ -66,6 +66,20 @@ type Error struct {
Message string `json:"message"`
}
+type ResponseType string
+
+const (
+ TypeError ResponseType = "error"
+ TypeStart ResponseType = "message_start"
+ TypeContentStart ResponseType = "content_block_start"
+ TypeContent ResponseType = "content_block_delta"
+ TypePing ResponseType = "ping"
+ TypeContentStop ResponseType = "content_block_stop"
+ TypeMessageDelta ResponseType = "message_delta"
+ TypeMessageStop ResponseType = "message_stop"
+)
+
+// https://docs.anthropic.com/claude/reference/messages-streaming
type Response struct {
Id string `json:"id"`
Type string `json:"type"`
diff --git a/relay/adaptor/aws/adaptor.go b/relay/adaptor/aws/adaptor.go
index 62221346..9a85f510 100644
--- a/relay/adaptor/aws/adaptor.go
+++ b/relay/adaptor/aws/adaptor.go
@@ -1,7 +1,6 @@
package aws
import (
- "errors"
"io"
"net/http"
@@ -9,6 +8,7 @@ import (
"github.com/aws/aws-sdk-go-v2/credentials"
"github.com/aws/aws-sdk-go-v2/service/bedrockruntime"
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/relay/adaptor"
"github.com/songquanpeng/one-api/relay/adaptor/aws/utils"
"github.com/songquanpeng/one-api/relay/meta"
@@ -72,7 +72,7 @@ func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, meta *me
return nil
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
if request == nil {
return nil, errors.New("request is nil")
}
diff --git a/relay/adaptor/aws/utils/adaptor.go b/relay/adaptor/aws/utils/adaptor.go
index 4cb880f2..f5fc0038 100644
--- a/relay/adaptor/aws/utils/adaptor.go
+++ b/relay/adaptor/aws/utils/adaptor.go
@@ -39,7 +39,7 @@ func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, meta *me
return nil
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
if request == nil {
return nil, errors.New("request is nil")
}
diff --git a/relay/adaptor/baidu/adaptor.go b/relay/adaptor/baidu/adaptor.go
index 15306b95..6587b575 100644
--- a/relay/adaptor/baidu/adaptor.go
+++ b/relay/adaptor/baidu/adaptor.go
@@ -3,15 +3,15 @@ package baidu
import (
"errors"
"fmt"
- "github.com/songquanpeng/one-api/relay/meta"
- "github.com/songquanpeng/one-api/relay/relaymode"
"io"
"net/http"
"strings"
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/relay/adaptor"
+ "github.com/songquanpeng/one-api/relay/meta"
"github.com/songquanpeng/one-api/relay/model"
+ "github.com/songquanpeng/one-api/relay/relaymode"
)
type Adaptor struct {
@@ -109,7 +109,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
}
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
if request == nil {
return nil, errors.New("request is nil")
}
diff --git a/relay/adaptor/baidu/main.go b/relay/adaptor/baidu/main.go
index ac8a5625..d96a2377 100644
--- a/relay/adaptor/baidu/main.go
+++ b/relay/adaptor/baidu/main.go
@@ -5,7 +5,6 @@ import (
"encoding/json"
"errors"
"fmt"
- "github.com/songquanpeng/one-api/common/render"
"io"
"net/http"
"strings"
@@ -16,6 +15,7 @@ import (
"github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/client"
"github.com/songquanpeng/one-api/common/logger"
+ "github.com/songquanpeng/one-api/common/render"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/relay/constant"
"github.com/songquanpeng/one-api/relay/model"
diff --git a/relay/adaptor/baidu/model.go b/relay/adaptor/baidu/model.go
index cc1feb2f..8c55c18d 100644
--- a/relay/adaptor/baidu/model.go
+++ b/relay/adaptor/baidu/model.go
@@ -1,8 +1,9 @@
package baidu
import (
- "github.com/songquanpeng/one-api/relay/model"
"time"
+
+ "github.com/songquanpeng/one-api/relay/model"
)
type ChatResponse struct {
diff --git a/relay/adaptor/cloudflare/adaptor.go b/relay/adaptor/cloudflare/adaptor.go
index 97e3dbb2..8958466d 100644
--- a/relay/adaptor/cloudflare/adaptor.go
+++ b/relay/adaptor/cloudflare/adaptor.go
@@ -19,7 +19,7 @@ type Adaptor struct {
}
// ConvertImageRequest implements adaptor.Adaptor.
-func (*Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (*Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
return nil, errors.New("not implemented")
}
diff --git a/relay/adaptor/cohere/adaptor.go b/relay/adaptor/cohere/adaptor.go
index 6fdb1b04..dd90bd7b 100644
--- a/relay/adaptor/cohere/adaptor.go
+++ b/relay/adaptor/cohere/adaptor.go
@@ -15,7 +15,7 @@ import (
type Adaptor struct{}
// ConvertImageRequest implements adaptor.Adaptor.
-func (*Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (*Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
return nil, errors.New("not implemented")
}
diff --git a/relay/adaptor/cohere/model.go b/relay/adaptor/cohere/model.go
index 3a8bc99d..c613c3d9 100644
--- a/relay/adaptor/cohere/model.go
+++ b/relay/adaptor/cohere/model.go
@@ -2,23 +2,23 @@ package cohere
type Request struct {
Message string `json:"message" required:"true"`
- Model string `json:"model,omitempty"` // 默认值为"command-r"
- Stream bool `json:"stream,omitempty"` // 默认值为false
+ Model string `json:"model,omitempty"` // Default值为"command-r"
+ Stream bool `json:"stream,omitempty"` // Default值为false
Preamble string `json:"preamble,omitempty"`
ChatHistory []ChatMessage `json:"chat_history,omitempty"`
ConversationID string `json:"conversation_id,omitempty"`
- PromptTruncation string `json:"prompt_truncation,omitempty"` // 默认值为"AUTO"
+ PromptTruncation string `json:"prompt_truncation,omitempty"` // Default值为"AUTO"
Connectors []Connector `json:"connectors,omitempty"`
Documents []Document `json:"documents,omitempty"`
- Temperature *float64 `json:"temperature,omitempty"` // 默认值为0.3
+ Temperature *float64 `json:"temperature,omitempty"` // Default值为0.3
MaxTokens int `json:"max_tokens,omitempty"`
MaxInputTokens int `json:"max_input_tokens,omitempty"`
- K int `json:"k,omitempty"` // 默认值为0
- P *float64 `json:"p,omitempty"` // 默认值为0.75
+ K int `json:"k,omitempty"` // Default值为0
+ P *float64 `json:"p,omitempty"` // Default值为0.75
Seed int `json:"seed,omitempty"`
StopSequences []string `json:"stop_sequences,omitempty"`
- FrequencyPenalty *float64 `json:"frequency_penalty,omitempty"` // 默认值为0.0
- PresencePenalty *float64 `json:"presence_penalty,omitempty"` // 默认值为0.0
+ FrequencyPenalty *float64 `json:"frequency_penalty,omitempty"` // Default值为0.0
+ PresencePenalty *float64 `json:"presence_penalty,omitempty"` // Default值为0.0
Tools []Tool `json:"tools,omitempty"`
ToolResults []ToolResult `json:"tool_results,omitempty"`
}
diff --git a/relay/adaptor/common.go b/relay/adaptor/common.go
index 8953d7a3..302e661a 100644
--- a/relay/adaptor/common.go
+++ b/relay/adaptor/common.go
@@ -1,13 +1,14 @@
package adaptor
import (
- "errors"
- "fmt"
- "github.com/gin-gonic/gin"
- "github.com/songquanpeng/one-api/common/client"
- "github.com/songquanpeng/one-api/relay/meta"
"io"
"net/http"
+
+ "github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
+ "github.com/songquanpeng/one-api/common/client"
+ "github.com/songquanpeng/one-api/common/ctxkey"
+ "github.com/songquanpeng/one-api/relay/meta"
)
func SetupCommonRequestHeader(c *gin.Context, req *http.Request, meta *meta.Meta) {
@@ -21,19 +22,24 @@ func SetupCommonRequestHeader(c *gin.Context, req *http.Request, meta *meta.Meta
func DoRequestHelper(a Adaptor, c *gin.Context, meta *meta.Meta, requestBody io.Reader) (*http.Response, error) {
fullRequestURL, err := a.GetRequestURL(meta)
if err != nil {
- return nil, fmt.Errorf("get request url failed: %w", err)
+ return nil, errors.Wrap(err, "get request url failed")
}
- req, err := http.NewRequest(c.Request.Method, fullRequestURL, requestBody)
+
+ req, err := http.NewRequestWithContext(c.Request.Context(),
+ c.Request.Method, fullRequestURL, requestBody)
if err != nil {
- return nil, fmt.Errorf("new request failed: %w", err)
+ return nil, errors.Wrap(err, "new request failed")
}
+
+ req.Header.Set("Content-Type", c.GetString(ctxkey.ContentType))
+
err = a.SetupRequestHeader(c, req, meta)
if err != nil {
- return nil, fmt.Errorf("setup request header failed: %w", err)
+ return nil, errors.Wrap(err, "setup request header failed")
}
resp, err := DoRequest(c, req)
if err != nil {
- return nil, fmt.Errorf("do request failed: %w", err)
+ return nil, errors.Wrap(err, "do request failed")
}
return resp, nil
}
@@ -48,5 +54,6 @@ func DoRequest(c *gin.Context, req *http.Request) (*http.Response, error) {
}
_ = req.Body.Close()
_ = c.Request.Body.Close()
+
return resp, nil
}
diff --git a/relay/adaptor/coze/adaptor.go b/relay/adaptor/coze/adaptor.go
index 44f560e8..30f43353 100644
--- a/relay/adaptor/coze/adaptor.go
+++ b/relay/adaptor/coze/adaptor.go
@@ -3,13 +3,14 @@ package coze
import (
"errors"
"fmt"
+ "io"
+ "net/http"
+
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/relay/adaptor"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/relay/meta"
"github.com/songquanpeng/one-api/relay/model"
- "io"
- "net/http"
)
type Adaptor struct {
@@ -38,7 +39,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
return ConvertRequest(*request), nil
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
if request == nil {
return nil, errors.New("request is nil")
}
diff --git a/relay/adaptor/deepl/adaptor.go b/relay/adaptor/deepl/adaptor.go
index d018a096..5a03c261 100644
--- a/relay/adaptor/deepl/adaptor.go
+++ b/relay/adaptor/deepl/adaptor.go
@@ -39,7 +39,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
return convertedRequest, nil
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
if request == nil {
return nil, errors.New("request is nil")
}
diff --git a/relay/adaptor/gemini/adaptor.go b/relay/adaptor/gemini/adaptor.go
index a86fde40..67a1b72e 100644
--- a/relay/adaptor/gemini/adaptor.go
+++ b/relay/adaptor/gemini/adaptor.go
@@ -1,12 +1,12 @@
package gemini
import (
- "errors"
"fmt"
"io"
"net/http"
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/helper"
channelhelper "github.com/songquanpeng/one-api/relay/adaptor"
@@ -24,9 +24,14 @@ func (a *Adaptor) Init(meta *meta.Meta) {
}
func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
- defaultVersion := config.GeminiVersion
- if meta.ActualModelName == "gemini-2.0-flash-exp" {
+ var defaultVersion string
+ switch meta.ActualModelName {
+ case "gemini-2.0-flash-exp",
+ "gemini-2.0-flash-thinking-exp",
+ "gemini-2.0-flash-thinking-exp-01-21":
defaultVersion = "v1beta"
+ default:
+ defaultVersion = config.GeminiVersion
}
version := helper.AssignOrDefault(meta.Config.APIVersion, defaultVersion)
@@ -48,6 +53,7 @@ func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, meta *meta.Meta) error {
channelhelper.SetupCommonRequestHeader(c, req, meta)
req.Header.Set("x-goog-api-key", meta.APIKey)
+ req.URL.Query().Add("key", meta.APIKey)
return nil
}
@@ -65,7 +71,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
}
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
if request == nil {
return nil, errors.New("request is nil")
}
diff --git a/relay/adaptor/gemini/constants.go b/relay/adaptor/gemini/constants.go
index 9d1cbc4a..381d0c12 100644
--- a/relay/adaptor/gemini/constants.go
+++ b/relay/adaptor/gemini/constants.go
@@ -7,5 +7,5 @@ var ModelList = []string{
"gemini-1.5-flash", "gemini-1.5-pro",
"text-embedding-004", "aqa",
"gemini-2.0-flash-exp",
- "gemini-2.0-flash-thinking-exp",
+ "gemini-2.0-flash-thinking-exp", "gemini-2.0-flash-thinking-exp-01-21",
}
diff --git a/relay/adaptor/gemini/main.go b/relay/adaptor/gemini/main.go
index 3aa4974b..28960706 100644
--- a/relay/adaptor/gemini/main.go
+++ b/relay/adaptor/gemini/main.go
@@ -8,7 +8,7 @@ import (
"net/http"
"strings"
- "github.com/songquanpeng/one-api/common/render"
+ "github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/config"
@@ -16,11 +16,10 @@ import (
"github.com/songquanpeng/one-api/common/image"
"github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/common/random"
+ "github.com/songquanpeng/one-api/common/render"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/relay/constant"
"github.com/songquanpeng/one-api/relay/model"
-
- "github.com/gin-gonic/gin"
)
// https://ai.google.dev/docs/gemini_api_overview?hl=zh-cn
@@ -34,6 +33,12 @@ var mimeTypeMap = map[string]string{
"text": "text/plain",
}
+var toolChoiceTypeMap = map[string]string{
+ "none": "NONE",
+ "auto": "AUTO",
+ "required": "ANY",
+}
+
// Setting safety to the lowest possible values since Gemini is already powerless enough
func ConvertRequest(textRequest model.GeneralOpenAIRequest) *ChatRequest {
geminiRequest := ChatRequest{
@@ -92,7 +97,24 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *ChatRequest {
},
}
}
- shouldAddDummyModelMessage := false
+ if textRequest.ToolChoice != nil {
+ geminiRequest.ToolConfig = &ToolConfig{
+ FunctionCallingConfig: FunctionCallingConfig{
+ Mode: "auto",
+ },
+ }
+ switch mode := textRequest.ToolChoice.(type) {
+ case string:
+ geminiRequest.ToolConfig.FunctionCallingConfig.Mode = toolChoiceTypeMap[mode]
+ case map[string]interface{}:
+ geminiRequest.ToolConfig.FunctionCallingConfig.Mode = "ANY"
+ if fn, ok := mode["function"].(map[string]interface{}); ok {
+ if name, ok := fn["name"].(string); ok {
+ geminiRequest.ToolConfig.FunctionCallingConfig.AllowedFunctionNames = []string{name}
+ }
+ }
+ }
+ }
for _, message := range textRequest.Messages {
content := ChatContent{
Role: message.Role,
@@ -130,25 +152,12 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *ChatRequest {
if content.Role == "assistant" {
content.Role = "model"
}
- // Converting system prompt to prompt from user for the same reason
+ // Converting system prompt to SystemInstructions
if content.Role == "system" {
- content.Role = "user"
- shouldAddDummyModelMessage = true
+ geminiRequest.SystemInstruction = &content
+ continue
}
geminiRequest.Contents = append(geminiRequest.Contents, content)
-
- // If a system message is the last message, we need to add a dummy model message to make gemini happy
- if shouldAddDummyModelMessage {
- geminiRequest.Contents = append(geminiRequest.Contents, ChatContent{
- Role: "model",
- Parts: []Part{
- {
- Text: "Okay",
- },
- },
- })
- shouldAddDummyModelMessage = false
- }
}
return &geminiRequest
@@ -186,10 +195,16 @@ func (g *ChatResponse) GetResponseText() string {
if g == nil {
return ""
}
- if len(g.Candidates) > 0 && len(g.Candidates[0].Content.Parts) > 0 {
- return g.Candidates[0].Content.Parts[0].Text
+ var builder strings.Builder
+ for _, candidate := range g.Candidates {
+ for idx, part := range candidate.Content.Parts {
+ if idx > 0 {
+ builder.WriteString("\n")
+ }
+ builder.WriteString(part.Text)
+ }
}
- return ""
+ return builder.String()
}
type ChatCandidate struct {
@@ -252,8 +267,8 @@ func responseGeminiChat2OpenAI(response *ChatResponse) *openai.TextResponse {
choice.Message.ToolCalls = getToolCalls(&candidate)
} else {
var builder strings.Builder
- for _, part := range candidate.Content.Parts {
- if i > 0 {
+ for idx, part := range candidate.Content.Parts {
+ if idx > 0 {
builder.WriteString("\n")
}
builder.WriteString(part.Text)
diff --git a/relay/adaptor/gemini/model.go b/relay/adaptor/gemini/model.go
index 720cb65d..a19248bc 100644
--- a/relay/adaptor/gemini/model.go
+++ b/relay/adaptor/gemini/model.go
@@ -1,10 +1,12 @@
package gemini
type ChatRequest struct {
- Contents []ChatContent `json:"contents"`
- SafetySettings []ChatSafetySettings `json:"safety_settings,omitempty"`
- GenerationConfig ChatGenerationConfig `json:"generation_config,omitempty"`
- Tools []ChatTools `json:"tools,omitempty"`
+ Contents []ChatContent `json:"contents"`
+ SystemInstruction *ChatContent `json:"system_instruction,omitempty"`
+ SafetySettings []ChatSafetySettings `json:"safety_settings,omitempty"`
+ GenerationConfig ChatGenerationConfig `json:"generation_config,omitempty"`
+ Tools []ChatTools `json:"tools,omitempty"`
+ ToolConfig *ToolConfig `json:"tool_config,omitempty"`
}
type EmbeddingRequest struct {
@@ -74,3 +76,12 @@ type ChatGenerationConfig struct {
CandidateCount int `json:"candidateCount,omitempty"`
StopSequences []string `json:"stopSequences,omitempty"`
}
+
+type FunctionCallingConfig struct {
+ Mode string `json:"mode,omitempty"`
+ AllowedFunctionNames []string `json:"allowed_function_names,omitempty"`
+}
+
+type ToolConfig struct {
+ FunctionCallingConfig FunctionCallingConfig `json:"function_calling_config"`
+}
diff --git a/relay/adaptor/interface.go b/relay/adaptor/interface.go
index 01b2e2cb..88667561 100644
--- a/relay/adaptor/interface.go
+++ b/relay/adaptor/interface.go
@@ -13,7 +13,7 @@ type Adaptor interface {
GetRequestURL(meta *meta.Meta) (string, error)
SetupRequestHeader(c *gin.Context, req *http.Request, meta *meta.Meta) error
ConvertRequest(c *gin.Context, relayMode int, request *model.GeneralOpenAIRequest) (any, error)
- ConvertImageRequest(request *model.ImageRequest) (any, error)
+ ConvertImageRequest(c *gin.Context, request *model.ImageRequest) (any, error)
DoRequest(c *gin.Context, meta *meta.Meta, requestBody io.Reader) (*http.Response, error)
DoResponse(c *gin.Context, resp *http.Response, meta *meta.Meta) (usage *model.Usage, err *model.ErrorWithStatusCode)
GetModelList() []string
diff --git a/relay/adaptor/ollama/adaptor.go b/relay/adaptor/ollama/adaptor.go
index ad1f8983..35cc2a61 100644
--- a/relay/adaptor/ollama/adaptor.go
+++ b/relay/adaptor/ollama/adaptor.go
@@ -1,16 +1,16 @@
package ollama
import (
- "errors"
"fmt"
- "github.com/songquanpeng/one-api/relay/meta"
- "github.com/songquanpeng/one-api/relay/relaymode"
"io"
"net/http"
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/relay/adaptor"
+ "github.com/songquanpeng/one-api/relay/meta"
"github.com/songquanpeng/one-api/relay/model"
+ "github.com/songquanpeng/one-api/relay/relaymode"
)
type Adaptor struct {
@@ -48,7 +48,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
}
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
if request == nil {
return nil, errors.New("request is nil")
}
diff --git a/relay/adaptor/ollama/main.go b/relay/adaptor/ollama/main.go
index fa1b05f0..2462fc3e 100644
--- a/relay/adaptor/ollama/main.go
+++ b/relay/adaptor/ollama/main.go
@@ -5,18 +5,17 @@ import (
"context"
"encoding/json"
"fmt"
- "github.com/songquanpeng/one-api/common/render"
"io"
"net/http"
"strings"
- "github.com/songquanpeng/one-api/common/helper"
- "github.com/songquanpeng/one-api/common/random"
-
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common"
+ "github.com/songquanpeng/one-api/common/helper"
"github.com/songquanpeng/one-api/common/image"
"github.com/songquanpeng/one-api/common/logger"
+ "github.com/songquanpeng/one-api/common/random"
+ "github.com/songquanpeng/one-api/common/render"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/relay/constant"
"github.com/songquanpeng/one-api/relay/model"
diff --git a/relay/adaptor/openai/adaptor.go b/relay/adaptor/openai/adaptor.go
index 6946e402..5612105c 100644
--- a/relay/adaptor/openai/adaptor.go
+++ b/relay/adaptor/openai/adaptor.go
@@ -1,13 +1,14 @@
package openai
import (
- "errors"
"fmt"
"io"
"net/http"
"strings"
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
+ "github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/relay/adaptor"
"github.com/songquanpeng/one-api/relay/adaptor/doubao"
"github.com/songquanpeng/one-api/relay/adaptor/minimax"
@@ -75,17 +76,39 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
if request == nil {
return nil, errors.New("request is nil")
}
- if request.Stream {
+
+ if config.EnforceIncludeUsage && request.Stream {
// always return usage in stream mode
if request.StreamOptions == nil {
request.StreamOptions = &model.StreamOptions{}
}
request.StreamOptions.IncludeUsage = true
}
+
+ // o1/o1-mini/o1-preview do not support system prompt and max_tokens
+ if strings.HasPrefix(request.Model, "o1") {
+ request.MaxTokens = 0
+ request.Messages = func(raw []model.Message) (filtered []model.Message) {
+ for i := range raw {
+ if raw[i].Role != "system" {
+ filtered = append(filtered, raw[i])
+ }
+ }
+
+ return
+ }(request.Messages)
+ }
+
+ if request.Stream && strings.HasPrefix(request.Model, "gpt-4o-audio") {
+ // TODO: Since it is not clear how to implement billing in stream mode,
+ // it is temporarily not supported
+ return nil, errors.New("stream mode is not supported for gpt-4o-audio")
+ }
+
return request, nil
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
if request == nil {
return nil, errors.New("request is nil")
}
@@ -111,10 +134,13 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *meta.Met
switch meta.Mode {
case relaymode.ImagesGenerations:
err, _ = ImageHandler(c, resp)
+ case relaymode.ImagesEdits:
+ err, _ = ImagesEditsHandler(c, resp)
default:
err, usage = Handler(c, resp, meta.PromptTokens, meta.ActualModelName)
}
}
+
return
}
diff --git a/relay/adaptor/openai/constants.go b/relay/adaptor/openai/constants.go
index 8a643bc6..7f116e28 100644
--- a/relay/adaptor/openai/constants.go
+++ b/relay/adaptor/openai/constants.go
@@ -7,11 +7,9 @@ var ModelList = []string{
"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-turbo-preview", "gpt-4-turbo", "gpt-4-turbo-2024-04-09",
- "gpt-4o", "gpt-4o-2024-05-13",
- "gpt-4o-2024-08-06",
- "gpt-4o-2024-11-20",
- "chatgpt-4o-latest",
+ "gpt-4o", "gpt-4o-2024-05-13", "gpt-4o-2024-08-06", "gpt-4o-2024-11-20", "chatgpt-4o-latest",
"gpt-4o-mini", "gpt-4o-mini-2024-07-18",
+ "gpt-4o-audio-preview", "gpt-4o-audio-preview-2024-12-17", "gpt-4o-audio-preview-2024-10-01",
"gpt-4-vision-preview",
"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",
diff --git a/relay/adaptor/openai/image.go b/relay/adaptor/openai/image.go
index 0f89618a..433d9421 100644
--- a/relay/adaptor/openai/image.go
+++ b/relay/adaptor/openai/image.go
@@ -3,12 +3,30 @@ package openai
import (
"bytes"
"encoding/json"
- "github.com/gin-gonic/gin"
- "github.com/songquanpeng/one-api/relay/model"
"io"
"net/http"
+
+ "github.com/gin-gonic/gin"
+ "github.com/songquanpeng/one-api/relay/model"
)
+// ImagesEditsHandler just copy response body to client
+//
+// https://platform.openai.com/docs/api-reference/images/createEdit
+func ImagesEditsHandler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusCode, *model.Usage) {
+ c.Writer.WriteHeader(resp.StatusCode)
+ for k, v := range resp.Header {
+ c.Writer.Header().Set(k, v[0])
+ }
+
+ if _, err := io.Copy(c.Writer, resp.Body); err != nil {
+ return ErrorWrapper(err, "copy_response_body_failed", http.StatusInternalServerError), nil
+ }
+ defer resp.Body.Close()
+
+ return nil, nil
+}
+
func ImageHandler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusCode, *model.Usage) {
var imageResponse ImageResponse
responseBody, err := io.ReadAll(resp.Body)
diff --git a/relay/adaptor/openai/main.go b/relay/adaptor/openai/main.go
index 97080738..f986ed09 100644
--- a/relay/adaptor/openai/main.go
+++ b/relay/adaptor/openai/main.go
@@ -5,15 +5,16 @@ import (
"bytes"
"encoding/json"
"io"
+ "math"
"net/http"
"strings"
- "github.com/songquanpeng/one-api/common/render"
-
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/conv"
"github.com/songquanpeng/one-api/common/logger"
+ "github.com/songquanpeng/one-api/common/render"
+ "github.com/songquanpeng/one-api/relay/billing/ratio"
"github.com/songquanpeng/one-api/relay/model"
"github.com/songquanpeng/one-api/relay/relaymode"
)
@@ -96,6 +97,7 @@ func StreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*model.E
return nil, responseText, usage
}
+// Handler handles the non-stream response from OpenAI API
func Handler(c *gin.Context, resp *http.Response, promptTokens int, modelName string) (*model.ErrorWithStatusCode, *model.Usage) {
var textResponse SlimTextResponse
responseBody, err := io.ReadAll(resp.Body)
@@ -116,8 +118,10 @@ func Handler(c *gin.Context, resp *http.Response, promptTokens int, modelName st
StatusCode: resp.StatusCode,
}, nil
}
+
// Reset response body
resp.Body = io.NopCloser(bytes.NewBuffer(responseBody))
+ logger.Debugf(c.Request.Context(), "handler response: %s", string(responseBody))
// We shouldn't set the header before we parse the response body, because the parse part may fail.
// And then we will have to send an error response, but in this case, the header has already been set.
@@ -146,6 +150,24 @@ func Handler(c *gin.Context, resp *http.Response, promptTokens int, modelName st
CompletionTokens: completionTokens,
TotalTokens: promptTokens + completionTokens,
}
+ } else if textResponse.PromptTokensDetails.AudioTokens+textResponse.CompletionTokensDetails.AudioTokens > 0 {
+ // Convert the more expensive audio tokens to uniformly priced text tokens.
+ // Note that when there are no audio tokens in prompt and completion,
+ // OpenAI will return empty PromptTokensDetails and CompletionTokensDetails, which can be misleading.
+ textResponse.Usage.PromptTokens = textResponse.PromptTokensDetails.TextTokens +
+ int(math.Ceil(
+ float64(textResponse.PromptTokensDetails.AudioTokens)*
+ ratio.GetAudioPromptRatio(modelName),
+ ))
+ textResponse.Usage.CompletionTokens = textResponse.CompletionTokensDetails.TextTokens +
+ int(math.Ceil(
+ float64(textResponse.CompletionTokensDetails.AudioTokens)*
+ ratio.GetAudioPromptRatio(modelName)*ratio.GetAudioCompletionRatio(modelName),
+ ))
+
+ textResponse.Usage.TotalTokens = textResponse.Usage.PromptTokens +
+ textResponse.Usage.CompletionTokens
}
+
return nil, &textResponse.Usage
}
diff --git a/relay/adaptor/openai/model.go b/relay/adaptor/openai/model.go
index 4c974de4..39e87262 100644
--- a/relay/adaptor/openai/model.go
+++ b/relay/adaptor/openai/model.go
@@ -1,6 +1,10 @@
package openai
-import "github.com/songquanpeng/one-api/relay/model"
+import (
+ "mime/multipart"
+
+ "github.com/songquanpeng/one-api/relay/model"
+)
type TextContent struct {
Type string `json:"type,omitempty"`
@@ -71,6 +75,24 @@ type TextToSpeechRequest struct {
ResponseFormat string `json:"response_format"`
}
+type AudioTranscriptionRequest struct {
+ File *multipart.FileHeader `form:"file" binding:"required"`
+ Model string `form:"model" binding:"required"`
+ Language string `form:"language"`
+ Prompt string `form:"prompt"`
+ ReponseFormat string `form:"response_format" binding:"oneof=json text srt verbose_json vtt"`
+ Temperature float64 `form:"temperature"`
+ TimestampGranularity []string `form:"timestamp_granularity"`
+}
+
+type AudioTranslationRequest struct {
+ File *multipart.FileHeader `form:"file" binding:"required"`
+ Model string `form:"model" binding:"required"`
+ Prompt string `form:"prompt"`
+ ResponseFormat string `form:"response_format" binding:"oneof=json text srt verbose_json vtt"`
+ Temperature float64 `form:"temperature"`
+}
+
type UsageOrResponseText struct {
*model.Usage
ResponseText string
diff --git a/relay/adaptor/openai/token.go b/relay/adaptor/openai/token.go
index 7c8468b9..53ac5297 100644
--- a/relay/adaptor/openai/token.go
+++ b/relay/adaptor/openai/token.go
@@ -1,16 +1,22 @@
package openai
import (
- "errors"
+ "bytes"
+ "context"
+ "encoding/base64"
"fmt"
- "github.com/pkoukk/tiktoken-go"
- "github.com/songquanpeng/one-api/common/config"
- "github.com/songquanpeng/one-api/common/image"
- "github.com/songquanpeng/one-api/common/logger"
- billingratio "github.com/songquanpeng/one-api/relay/billing/ratio"
- "github.com/songquanpeng/one-api/relay/model"
"math"
"strings"
+
+ "github.com/pkg/errors"
+ "github.com/pkoukk/tiktoken-go"
+ "github.com/songquanpeng/one-api/common/config"
+ "github.com/songquanpeng/one-api/common/helper"
+ "github.com/songquanpeng/one-api/common/image"
+ "github.com/songquanpeng/one-api/common/logger"
+ "github.com/songquanpeng/one-api/relay/billing/ratio"
+ billingratio "github.com/songquanpeng/one-api/relay/billing/ratio"
+ "github.com/songquanpeng/one-api/relay/model"
)
// tokenEncoderMap won't grow after initialization
@@ -70,8 +76,9 @@ func getTokenNum(tokenEncoder *tiktoken.Tiktoken, text string) int {
return len(tokenEncoder.Encode(text, nil, nil))
}
-func CountTokenMessages(messages []model.Message, model string) int {
- tokenEncoder := getTokenEncoder(model)
+func CountTokenMessages(ctx context.Context,
+ messages []model.Message, actualModel string) int {
+ tokenEncoder := getTokenEncoder(actualModel)
// Reference:
// https://github.com/openai/openai-cookbook/blob/main/examples/How_to_count_tokens_with_tiktoken.ipynb
// https://github.com/pkoukk/tiktoken-go/issues/6
@@ -79,7 +86,7 @@ func CountTokenMessages(messages []model.Message, model string) int {
// Every message follows <|start|>{role/name}\n{content}<|end|>\n
var tokensPerMessage int
var tokensPerName int
- if model == "gpt-3.5-turbo-0301" {
+ if actualModel == "gpt-3.5-turbo-0301" {
tokensPerMessage = 4
tokensPerName = -1 // If there's a name, the role is omitted
} else {
@@ -89,37 +96,38 @@ func CountTokenMessages(messages []model.Message, model string) int {
tokenNum := 0
for _, message := range messages {
tokenNum += tokensPerMessage
- switch v := message.Content.(type) {
- case string:
- tokenNum += getTokenNum(tokenEncoder, v)
- case []any:
- for _, it := range v {
- m := it.(map[string]any)
- switch m["type"] {
- case "text":
- if textValue, ok := m["text"]; ok {
- if textString, ok := textValue.(string); ok {
- tokenNum += getTokenNum(tokenEncoder, textString)
- }
- }
- case "image_url":
- imageUrl, ok := m["image_url"].(map[string]any)
- if ok {
- url := imageUrl["url"].(string)
- detail := ""
- if imageUrl["detail"] != nil {
- detail = imageUrl["detail"].(string)
- }
- imageTokens, err := countImageTokens(url, detail, model)
- if err != nil {
- logger.SysError("error counting image tokens: " + err.Error())
- } else {
- tokenNum += imageTokens
- }
- }
+ contents := message.ParseContent()
+ for _, content := range contents {
+ switch content.Type {
+ case model.ContentTypeText:
+ tokenNum += getTokenNum(tokenEncoder, content.Text)
+ case model.ContentTypeImageURL:
+ imageTokens, err := countImageTokens(
+ content.ImageURL.Url,
+ content.ImageURL.Detail,
+ actualModel)
+ if err != nil {
+ logger.SysError("error counting image tokens: " + err.Error())
+ } else {
+ tokenNum += imageTokens
+ }
+ case model.ContentTypeInputAudio:
+ audioData, err := base64.StdEncoding.DecodeString(content.InputAudio.Data)
+ if err != nil {
+ logger.SysError("error decoding audio data: " + err.Error())
+ }
+
+ tokens, err := helper.GetAudioTokens(ctx,
+ bytes.NewReader(audioData),
+ ratio.GetAudioPromptTokensPerSecond(actualModel))
+ if err != nil {
+ logger.SysError("error counting audio tokens: " + err.Error())
+ } else {
+ tokenNum += tokens
}
}
}
+
tokenNum += getTokenNum(tokenEncoder, message.Role)
if message.Name != nil {
tokenNum += tokensPerName
@@ -130,6 +138,53 @@ func CountTokenMessages(messages []model.Message, model string) int {
return tokenNum
}
+// func countVisonTokenMessages(messages []VisionMessage, model string) (int, error) {
+// tokenEncoder := getTokenEncoder(model)
+// // Reference:
+// // https://github.com/openai/openai-cookbook/blob/main/examples/How_to_count_tokens_with_tiktoken.ipynb
+// // https://github.com/pkoukk/tiktoken-go/issues/6
+// //
+// // Every message follows <|start|>{role/name}\n{content}<|end|>\n
+// var tokensPerMessage int
+// var tokensPerName int
+// if model == "gpt-3.5-turbo-0301" {
+// tokensPerMessage = 4
+// tokensPerName = -1 // If there's a name, the role is omitted
+// } else {
+// tokensPerMessage = 3
+// tokensPerName = 1
+// }
+// tokenNum := 0
+// for _, message := range messages {
+// tokenNum += tokensPerMessage
+// for _, cnt := range message.Content {
+// switch cnt.Type {
+// case OpenaiVisionMessageContentTypeText:
+// tokenNum += getTokenNum(tokenEncoder, cnt.Text)
+// case OpenaiVisionMessageContentTypeImageUrl:
+// imgblob, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(cnt.ImageUrl.URL, "data:image/jpeg;base64,"))
+// if err != nil {
+// return 0, errors.Wrap(err, "failed to decode base64 image")
+// }
+
+// if imgtoken, err := CountVisionImageToken(imgblob, cnt.ImageUrl.Detail); err != nil {
+// return 0, errors.Wrap(err, "failed to count vision image token")
+// } else {
+// tokenNum += imgtoken
+// }
+// }
+// }
+
+// tokenNum += getTokenNum(tokenEncoder, message.Role)
+// if message.Name != nil {
+// tokenNum += tokensPerName
+// tokenNum += getTokenNum(tokenEncoder, *message.Name)
+// }
+// }
+// tokenNum += 3 // Every reply is primed with <|start|>assistant<|message|>
+// return tokenNum, nil
+// }
+
const (
lowDetailCost = 85
highDetailCostPerTile = 170
diff --git a/relay/adaptor/palm/adaptor.go b/relay/adaptor/palm/adaptor.go
index 98aa3e18..65e3d3c5 100644
--- a/relay/adaptor/palm/adaptor.go
+++ b/relay/adaptor/palm/adaptor.go
@@ -1,9 +1,9 @@
package palm
import (
- "errors"
"fmt"
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/relay/adaptor"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/relay/meta"
@@ -36,7 +36,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
return ConvertRequest(*request), nil
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
if request == nil {
return nil, errors.New("request is nil")
}
diff --git a/relay/adaptor/proxy/adaptor.go b/relay/adaptor/proxy/adaptor.go
index 670c7628..32984fc7 100644
--- a/relay/adaptor/proxy/adaptor.go
+++ b/relay/adaptor/proxy/adaptor.go
@@ -80,7 +80,7 @@ func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, meta *me
return nil
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
return nil, errors.Errorf("not implement")
}
diff --git a/relay/adaptor/replicate/adaptor.go b/relay/adaptor/replicate/adaptor.go
index a60a7de3..296a9aaa 100644
--- a/relay/adaptor/replicate/adaptor.go
+++ b/relay/adaptor/replicate/adaptor.go
@@ -1,6 +1,7 @@
package replicate
import (
+ "bytes"
"fmt"
"io"
"net/http"
@@ -10,6 +11,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/pkg/errors"
+ "github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/relay/adaptor"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
@@ -23,7 +25,31 @@ type Adaptor struct {
}
// ConvertImageRequest implements adaptor.Adaptor.
-func (*Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
+ return nil, errors.New("should call replicate.ConvertImageRequest instead")
+}
+
+func ConvertImageRequest(c *gin.Context, request *model.ImageRequest) (any, error) {
+ meta := meta.GetByContext(c)
+
+ if request.ResponseFormat != "b64_json" {
+ return nil, errors.New("only support b64_json response format")
+ }
+ if request.N != 1 && request.N != 0 {
+ return nil, errors.New("only support N=1")
+ }
+
+ switch meta.Mode {
+ case relaymode.ImagesGenerations:
+ return convertImageCreateRequest(request)
+ case relaymode.ImagesEdits:
+ return convertImageRemixRequest(c)
+ default:
+ return nil, errors.New("not implemented")
+ }
+}
+
+func convertImageCreateRequest(request *model.ImageRequest) (any, error) {
return DrawImageRequest{
Input: ImageInput{
Steps: 25,
@@ -39,6 +65,23 @@ func (*Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
}, nil
}
+func convertImageRemixRequest(c *gin.Context) (any, error) {
+ // recover request body
+ requestBody, err := common.GetRequestBody(c)
+ if err != nil {
+ return nil, errors.Wrap(err, "get request body")
+ }
+ c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))
+
+ rawReq := new(OpenaiImageEditRequest)
+ if err := c.ShouldBind(rawReq); err != nil {
+ return nil, errors.Wrap(err, "parse image edit form")
+ }
+
+ return rawReq.toFluxRemixRequest()
+}
+
+// ConvertRequest converts the request to the format that the target API expects.
func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.GeneralOpenAIRequest) (any, error) {
if !request.Stream {
// TODO: support non-stream mode
@@ -116,7 +159,8 @@ func (a *Adaptor) DoRequest(c *gin.Context, meta *meta.Meta, requestBody io.Read
func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *meta.Meta) (usage *model.Usage, err *model.ErrorWithStatusCode) {
switch meta.Mode {
- case relaymode.ImagesGenerations:
+ case relaymode.ImagesGenerations,
+ relaymode.ImagesEdits:
err, usage = ImageHandler(c, resp)
case relaymode.ChatCompletions:
err, usage = ChatHandler(c, resp)
diff --git a/relay/adaptor/replicate/image.go b/relay/adaptor/replicate/image.go
index 3687249a..d4f7f749 100644
--- a/relay/adaptor/replicate/image.go
+++ b/relay/adaptor/replicate/image.go
@@ -22,26 +22,11 @@ import (
"golang.org/x/sync/errgroup"
)
-// ImagesEditsHandler just copy response body to client
-//
-// https://replicate.com/black-forest-labs/flux-fill-pro
-// func ImagesEditsHandler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusCode, *model.Usage) {
-// c.Writer.WriteHeader(resp.StatusCode)
-// for k, v := range resp.Header {
-// c.Writer.Header().Set(k, v[0])
-// }
-
-// if _, err := io.Copy(c.Writer, resp.Body); err != nil {
-// return ErrorWrapper(err, "copy_response_body_failed", http.StatusInternalServerError), nil
-// }
-// defer resp.Body.Close()
-
-// return nil, nil
-// }
-
var errNextLoop = errors.New("next_loop")
-func ImageHandler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusCode, *model.Usage) {
+// ImageHandler handles the response from the image creation or remix request
+func ImageHandler(c *gin.Context, resp *http.Response) (
+ *model.ErrorWithStatusCode, *model.Usage) {
if resp.StatusCode != http.StatusCreated {
payload, _ := io.ReadAll(resp.Body)
return openai.ErrorWrapper(
@@ -95,7 +80,7 @@ func ImageHandler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusCo
switch taskData.Status {
case "succeeded":
case "failed", "canceled":
- return errors.Errorf("task failed: %s", taskData.Status)
+ return errors.Errorf("task failed, [%s]%s", taskData.Status, taskData.Error)
default:
time.Sleep(time.Second * 3)
return errNextLoop
diff --git a/relay/adaptor/replicate/model.go b/relay/adaptor/replicate/model.go
index dba277eb..04fe5277 100644
--- a/relay/adaptor/replicate/model.go
+++ b/relay/adaptor/replicate/model.go
@@ -1,11 +1,129 @@
package replicate
import (
+ "bytes"
+ "encoding/base64"
+ "image"
+ "image/png"
+ "io"
+ "mime/multipart"
"time"
"github.com/pkg/errors"
)
+type OpenaiImageEditRequest struct {
+ Image *multipart.FileHeader `json:"image" form:"image" binding:"required"`
+ Prompt string `json:"prompt" form:"prompt" binding:"required"`
+ Mask *multipart.FileHeader `json:"mask" form:"mask" binding:"required"`
+ Model string `json:"model" form:"model" binding:"required"`
+ N int `json:"n" form:"n" binding:"min=0,max=10"`
+ Size string `json:"size" form:"size"`
+ ResponseFormat string `json:"response_format" form:"response_format"`
+}
+
+// toFluxRemixRequest convert OpenAI's image edit request to Flux's remix request.
+//
+// Note that the mask formats of OpenAI and Flux are different:
+// OpenAI's mask sets the parts to be modified as transparent (0, 0, 0, 0),
+// while Flux sets the parts to be modified as black (255, 255, 255, 255),
+// so we need to convert the format here.
+//
+// Both OpenAI's Image and Mask are browser-native ImageData,
+// which need to be converted to base64 dataURI format.
+func (r *OpenaiImageEditRequest) toFluxRemixRequest() (*InpaintingImageByFlusReplicateRequest, error) {
+ if r.ResponseFormat != "b64_json" {
+ return nil, errors.New("response_format must be b64_json for replicate models")
+ }
+
+ fluxReq := &InpaintingImageByFlusReplicateRequest{
+ Input: FluxInpaintingInput{
+ Prompt: r.Prompt,
+ Seed: int(time.Now().UnixNano()),
+ Steps: 30,
+ Guidance: 3,
+ SafetyTolerance: 5,
+ PromptUnsampling: false,
+ OutputFormat: "png",
+ },
+ }
+
+ imgFile, err := r.Image.Open()
+ if err != nil {
+ return nil, errors.Wrap(err, "open image file")
+ }
+ defer imgFile.Close()
+ imgData, err := io.ReadAll(imgFile)
+ if err != nil {
+ return nil, errors.Wrap(err, "read image file")
+ }
+
+ maskFile, err := r.Mask.Open()
+ if err != nil {
+ return nil, errors.Wrap(err, "open mask file")
+ }
+ defer maskFile.Close()
+
+ // Convert image to base64
+ imageBase64 := "data:image/png;base64," + base64.StdEncoding.EncodeToString(imgData)
+ fluxReq.Input.Image = imageBase64
+
+ // Convert mask data to RGBA
+ maskPNG, err := png.Decode(maskFile)
+ if err != nil {
+ return nil, errors.Wrap(err, "decode mask file")
+ }
+
+ // convert mask to RGBA
+ var maskRGBA *image.RGBA
+ switch converted := maskPNG.(type) {
+ case *image.RGBA:
+ maskRGBA = converted
+ default:
+ // Convert to RGBA
+ bounds := maskPNG.Bounds()
+ maskRGBA = image.NewRGBA(bounds)
+ for y := bounds.Min.Y; y < bounds.Max.Y; y++ {
+ for x := bounds.Min.X; x < bounds.Max.X; x++ {
+ maskRGBA.Set(x, y, maskPNG.At(x, y))
+ }
+ }
+ }
+
+ maskData := maskRGBA.Pix
+ invertedMask := make([]byte, len(maskData))
+ for i := 0; i+4 <= len(maskData); i += 4 {
+ // If pixel is transparent (alpha = 0), make it black (255)
+ if maskData[i+3] == 0 {
+ invertedMask[i] = 255 // R
+ invertedMask[i+1] = 255 // G
+ invertedMask[i+2] = 255 // B
+ invertedMask[i+3] = 255 // A
+ } else {
+ // Copy original pixel
+ copy(invertedMask[i:i+4], maskData[i:i+4])
+ }
+ }
+
+ // Convert inverted mask to base64 encoded png image
+ invertedMaskRGBA := &image.RGBA{
+ Pix: invertedMask,
+ Stride: maskRGBA.Stride,
+ Rect: maskRGBA.Rect,
+ }
+
+ var buf bytes.Buffer
+ err = png.Encode(&buf, invertedMaskRGBA)
+ if err != nil {
+ return nil, errors.Wrap(err, "encode inverted mask to png")
+ }
+
+ invertedMaskBase64 := "data:image/png;base64," + base64.StdEncoding.EncodeToString(buf.Bytes())
+ fluxReq.Input.Mask = invertedMaskBase64
+
+ return fluxReq, nil
+}
+
// DrawImageRequest draw image by fluxpro
//
// https://replicate.com/black-forest-labs/flux-pro?prediction=kg1krwsdf9rg80ch1sgsrgq7h8&output=json
diff --git a/relay/adaptor/replicate/model_test.go b/relay/adaptor/replicate/model_test.go
new file mode 100644
index 00000000..6cde5e94
--- /dev/null
+++ b/relay/adaptor/replicate/model_test.go
@@ -0,0 +1,106 @@
+package replicate
+
+import (
+ "bytes"
+ "image"
+ "image/draw"
+ "image/png"
+ "io"
+ "mime/multipart"
+ "net/http"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+)
+
+type nopCloser struct {
+ io.Reader
+}
+
+func (n nopCloser) Close() error { return nil }
+
+// Custom FileHeader to override Open method
+type customFileHeader struct {
+ *multipart.FileHeader
+ openFunc func() (multipart.File, error)
+}
+
+func (c *customFileHeader) Open() (multipart.File, error) {
+ return c.openFunc()
+}
+
+func TestOpenaiImageEditRequest_toFluxRemixRequest(t *testing.T) {
+ // Create a simple image for testing
+ img := image.NewRGBA(image.Rect(0, 0, 10, 10))
+ draw.Draw(img, img.Bounds(), &image.Uniform{C: image.Black}, image.Point{}, draw.Src)
+ var imgBuf bytes.Buffer
+ err := png.Encode(&imgBuf, img)
+ require.NoError(t, err)
+
+ // Create a simple mask for testing
+ mask := image.NewRGBA(image.Rect(0, 0, 10, 10))
+ draw.Draw(mask, mask.Bounds(), &image.Uniform{C: image.Black}, image.Point{}, draw.Src)
+ var maskBuf bytes.Buffer
+ err = png.Encode(&maskBuf, mask)
+ require.NoError(t, err)
+
+ // Create a multipart.FileHeader from the image and mask bytes
+ imgFileHeader, err := createFileHeader("image", "test.png", imgBuf.Bytes())
+ require.NoError(t, err)
+ maskFileHeader, err := createFileHeader("mask", "test.png", maskBuf.Bytes())
+ require.NoError(t, err)
+
+ req := &OpenaiImageEditRequest{
+ Image: imgFileHeader,
+ Mask: maskFileHeader,
+ Prompt: "Test prompt",
+ Model: "test-model",
+ ResponseFormat: "b64_json",
+ }
+
+ fluxReq, err := req.toFluxRemixRequest()
+ require.NoError(t, err)
+ require.NotNil(t, fluxReq)
+ require.Equal(t, req.Prompt, fluxReq.Input.Prompt)
+ require.NotEmpty(t, fluxReq.Input.Image)
+ require.NotEmpty(t, fluxReq.Input.Mask)
+}
+
+// createFileHeader creates a multipart.FileHeader from file bytes
+func createFileHeader(fieldname, filename string, fileBytes []byte) (*multipart.FileHeader, error) {
+ body := &bytes.Buffer{}
+ writer := multipart.NewWriter(body)
+
+ // Create a form file field
+ part, err := writer.CreateFormFile(fieldname, filename)
+ if err != nil {
+ return nil, err
+ }
+
+ // Write the file bytes to the form file field
+ _, err = part.Write(fileBytes)
+ if err != nil {
+ return nil, err
+ }
+
+ // Close the writer to finalize the form
+ err = writer.Close()
+ if err != nil {
+ return nil, err
+ }
+
+ // Parse the multipart form
+ req := &http.Request{
+ Header: http.Header{},
+ Body: io.NopCloser(body),
+ }
+ req.Header.Set("Content-Type", writer.FormDataContentType())
+ err = req.ParseMultipartForm(int64(body.Len()))
+ if err != nil {
+ return nil, err
+ }
+
+ // Retrieve the file header from the parsed form
+ fileHeader := req.MultipartForm.File[fieldname][0]
+ return fileHeader, nil
+}
diff --git a/relay/adaptor/tencent/adaptor.go b/relay/adaptor/tencent/adaptor.go
index 0de92d4a..9d086eed 100644
--- a/relay/adaptor/tencent/adaptor.go
+++ b/relay/adaptor/tencent/adaptor.go
@@ -2,16 +2,17 @@ package tencent
import (
"errors"
+ "io"
+ "net/http"
+ "strconv"
+ "strings"
+
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common/helper"
"github.com/songquanpeng/one-api/relay/adaptor"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/relay/meta"
"github.com/songquanpeng/one-api/relay/model"
- "io"
- "net/http"
- "strconv"
- "strings"
)
// https://cloud.tencent.com/document/api/1729/101837
@@ -58,7 +59,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
return tencentRequest, nil
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
if request == nil {
return nil, errors.New("request is nil")
}
diff --git a/relay/adaptor/tencent/main.go b/relay/adaptor/tencent/main.go
index 827c8a46..c402e543 100644
--- a/relay/adaptor/tencent/main.go
+++ b/relay/adaptor/tencent/main.go
@@ -8,7 +8,6 @@ import (
"encoding/json"
"errors"
"fmt"
- "github.com/songquanpeng/one-api/common/render"
"io"
"net/http"
"strconv"
@@ -21,6 +20,7 @@ import (
"github.com/songquanpeng/one-api/common/helper"
"github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/common/random"
+ "github.com/songquanpeng/one-api/common/render"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/relay/constant"
"github.com/songquanpeng/one-api/relay/model"
diff --git a/relay/adaptor/tencent/model.go b/relay/adaptor/tencent/model.go
index fb97724e..7f5e7eb2 100644
--- a/relay/adaptor/tencent/model.go
+++ b/relay/adaptor/tencent/model.go
@@ -6,39 +6,39 @@ type Message struct {
}
type ChatRequest struct {
- // 模型名称，可选值包括 hunyuan-lite、hunyuan-standard、hunyuan-standard-256K、hunyuan-pro。
- // 各模型介绍请阅读 [产品概述](https://cloud.tencent.com/document/product/1729/104753) 中的说明。
+ // Model name，Optional values包括 hunyuan-lite、hunyuan-standard、hunyuan-standard-256K、hunyuan-pro。
+ // 各Model介绍请阅读 [产品概述](https://cloud.tencent.com/document/product/1729/104753) 中的说明。
//
- // 注意：
- // 不同的模型计费不同，请根据 [购买指南](https://cloud.tencent.com/document/product/1729/97731) 按需调用。
+ // Note：
+ // 不同的Model计费不同，请根据 [购买指南](https://cloud.tencent.com/document/product/1729/97731) 按需调用。
Model *string `json:"Model"`
- // 聊天上下文信息。
+ // Chat上下文信息。
// 说明：
- // 1. 长度最多为 40，按对话时间从旧到新在数组中排列。
- // 2. Message.Role 可选值：system、user、assistant。
+ // 1. 长度最多为 40，按对话Time从旧到新在数Group中排列。
+ // 2. Message.Role Optional values：system、user、assistant。
// 其中，system 角色可选，如存在则必须位于列表的最开始。user 和 assistant 需交替出现（一问一答），以 user 提问开始和结束，且 Content 不能为空。Role 的顺序示例：[system（可选） user assistant user assistant user ...]。
- // 3. Messages 中 Content 总长度不能超过模型输入长度上限（可参考 [产品概述](https://cloud.tencent.com/document/product/1729/104753) 文档），超过则会截断最前面的内容，只保留尾部内容。
+ // 3. Messages 中 Content 总长度不能超过ModelEnter长度上限（可参考 [产品概述](https://cloud.tencent.com/document/product/1729/104753) 文档），超过则会截断最前面的内容，只保留尾部内容。
Messages []*Message `json:"Messages"`
// 流式调用开关。
// 说明：
- // 1. 未传值时默认为非流式调用（false）。
+ // 1. 未传值时Default为非流式调用（false）。
// 2. 流式调用时以 SSE 协议增量返回结果（返回值取 Choices[n].Delta 中的值，需要拼接增量数据才能获得完整结果）。
// 3. 非流式调用时：
- // 调用方式与普通 HTTP 请求无异。
- // 接口响应耗时较长，**如需更低时延建议设置为 true**。
+ // 调用方式与普通 HTTP 请求None异。
+ // 接口响应耗时较长，**如需更低时延建议Settings为 true**。
// 只返回一次最终结果（返回值取 Choices[n].Message 中的值）。
//
- // 注意：
+ // Note：
// 通过 SDK 调用时，流式和非流式调用需用**不同的方式**获取返回值，具体参考 SDK 中的注释或示例（在各语言 SDK 代码仓库的 examples/hunyuan/v20230901/ 目录中）。
Stream *bool `json:"Stream"`
// 说明：
// 1. 影响输出文本的多样性，取值越大，生成文本的多样性越强。
- // 2. 取值区间为 [0.0, 1.0]，未传值时使用各模型推荐值。
+ // 2. 取值区间为 [0.0, 1.0]，未传值时使用各Model推荐值。
// 3. 非必要不建议使用，不合理的取值会影响效果。
TopP *float64 `json:"TopP"`
// 说明：
// 1. 较高的数值会使输出更加随机，而较低的数值会使其更加集中和确定。
- // 2. 取值区间为 [0.0, 2.0]，未传值时使用各模型推荐值。
+ // 2. 取值区间为 [0.0, 2.0]，未传值时使用各Model推荐值。
// 3. 非必要不建议使用，不合理的取值会影响效果。
Temperature *float64 `json:"Temperature"`
}
@@ -62,10 +62,10 @@ type ResponseChoices struct {
type ChatResponse struct {
Choices []ResponseChoices `json:"Choices,omitempty"` // 结果
- Created int64 `json:"Created,omitempty"` // unix 时间戳的字符串
+ Created int64 `json:"Created,omitempty"` // unix Time戳的字符串
Id string `json:"Id,omitempty"` // 会话 id
Usage Usage `json:"Usage,omitempty"` // token 数量
- Error Error `json:"Error,omitempty"` // 错误信息 注意：此字段可能返回 null，表示取不到有效值
+ Error Error `json:"Error,omitempty"` // 错误信息 Note：此字段可能返回 null，表示取不到有效值
Note string `json:"Note,omitempty"` // 注释
ReqID string `json:"Req_id,omitempty"` // 唯一请求 Id，每次请求都会返回。用于反馈接口入参
}
diff --git a/relay/adaptor/vertexai/adaptor.go b/relay/adaptor/vertexai/adaptor.go
index 3fab4a45..131506eb 100644
--- a/relay/adaptor/vertexai/adaptor.go
+++ b/relay/adaptor/vertexai/adaptor.go
@@ -1,18 +1,20 @@
package vertexai
import (
- "errors"
"fmt"
"io"
"net/http"
+ "slices"
"strings"
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/relay/adaptor"
channelhelper "github.com/songquanpeng/one-api/relay/adaptor"
+ "github.com/songquanpeng/one-api/relay/adaptor/vertexai/imagen"
"github.com/songquanpeng/one-api/relay/meta"
"github.com/songquanpeng/one-api/relay/model"
- relaymodel "github.com/songquanpeng/one-api/relay/model"
+ relayModel "github.com/songquanpeng/one-api/relay/model"
)
var _ adaptor.Adaptor = new(Adaptor)
@@ -24,14 +26,27 @@ type Adaptor struct{}
func (a *Adaptor) Init(meta *meta.Meta) {
}
-func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.GeneralOpenAIRequest) (any, error) {
- if request == nil {
- return nil, errors.New("request is nil")
+func (a *Adaptor) ConvertImageRequest(c *gin.Context, request *model.ImageRequest) (any, error) {
+ meta := meta.GetByContext(c)
+
+ if request.ResponseFormat != "b64_json" {
+ return nil, errors.New("only support b64_json response format")
}
- adaptor := GetAdaptor(request.Model)
+ adaptor := GetAdaptor(meta.ActualModelName)
if adaptor == nil {
- return nil, errors.New("adaptor not found")
+ return nil, errors.Errorf("cannot found vertex image adaptor for model %s", meta.ActualModelName)
+ }
+
+ return adaptor.ConvertImageRequest(c, request)
+}
+
+func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.GeneralOpenAIRequest) (any, error) {
+ meta := meta.GetByContext(c)
+
+ adaptor := GetAdaptor(meta.ActualModelName)
+ if adaptor == nil {
+ return nil, errors.Errorf("cannot found vertex chat adaptor for model %s", meta.ActualModelName)
}
return adaptor.ConvertRequest(c, relayMode, request)
@@ -40,9 +55,9 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *meta.Meta) (usage *model.Usage, err *model.ErrorWithStatusCode) {
adaptor := GetAdaptor(meta.ActualModelName)
if adaptor == nil {
- return nil, &relaymodel.ErrorWithStatusCode{
+ return nil, &relayModel.ErrorWithStatusCode{
StatusCode: http.StatusInternalServerError,
- Error: relaymodel.Error{
+ Error: relayModel.Error{
Message: "adaptor not found",
},
}
@@ -60,14 +75,19 @@ func (a *Adaptor) GetChannelName() string {
}
func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
- suffix := ""
- if strings.HasPrefix(meta.ActualModelName, "gemini") {
+ var suffix string
+ switch {
+ case strings.HasPrefix(meta.ActualModelName, "gemini"):
if meta.IsStream {
suffix = "streamGenerateContent?alt=sse"
} else {
suffix = "generateContent"
}
- } else {
+ case slices.Contains(imagen.ModelList, meta.ActualModelName):
+ return fmt.Sprintf("https://%s-aiplatform.googleapis.com/v1/projects/%s/locations/%s/publishers/google/models/imagen-3.0-generate-001:predict",
+ meta.Config.Region, meta.Config.VertexAIProjectID, meta.Config.Region,
+ ), nil
+ default:
if meta.IsStream {
suffix = "streamRawPredict?alt=sse"
} else {
@@ -85,6 +105,7 @@ func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
suffix,
), nil
}
+
return fmt.Sprintf(
"https://%s-aiplatform.googleapis.com/v1/projects/%s/locations/%s/publishers/google/models/%s:%s",
meta.Config.Region,
@@ -105,13 +126,6 @@ func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, meta *me
return nil
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
- if request == nil {
- return nil, errors.New("request is nil")
- }
- return request, nil
-}
-
func (a *Adaptor) DoRequest(c *gin.Context, meta *meta.Meta, requestBody io.Reader) (*http.Response, error) {
return channelhelper.DoRequestHelper(a, c, meta, requestBody)
}
diff --git a/relay/adaptor/vertexai/claude/adapter.go b/relay/adaptor/vertexai/claude/adapter.go
index cb911cfe..14733924 100644
--- a/relay/adaptor/vertexai/claude/adapter.go
+++ b/relay/adaptor/vertexai/claude/adapter.go
@@ -14,8 +14,8 @@ import (
var ModelList = []string{
"claude-3-haiku@20240307",
- "claude-3-sonnet@20240229",
"claude-3-opus@20240229",
+ "claude-3-sonnet@20240229",
"claude-3-5-sonnet@20240620",
"claude-3-5-sonnet-v2@20241022",
"claude-3-5-haiku@20241022",
@@ -50,6 +50,10 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
return req, nil
}
+func (a *Adaptor) ConvertImageRequest(c *gin.Context, request *model.ImageRequest) (any, error) {
+ return nil, errors.New("not support image request")
+}
+
func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *meta.Meta) (usage *model.Usage, err *model.ErrorWithStatusCode) {
if meta.IsStream {
err, usage = anthropic.StreamHandler(c, resp)
diff --git a/relay/adaptor/vertexai/gemini/adapter.go b/relay/adaptor/vertexai/gemini/adapter.go
index b5377875..36f983b4 100644
--- a/relay/adaptor/vertexai/gemini/adapter.go
+++ b/relay/adaptor/vertexai/gemini/adapter.go
@@ -18,7 +18,8 @@ var ModelList = []string{
"gemini-pro", "gemini-pro-vision",
"gemini-1.5-pro-001", "gemini-1.5-flash-001",
"gemini-1.5-pro-002", "gemini-1.5-flash-002",
- "gemini-2.0-flash-exp", "gemini-2.0-flash-thinking-exp",
+ "gemini-2.0-flash-exp",
+ "gemini-2.0-flash-thinking-exp", "gemini-2.0-flash-thinking-exp-01-21",
}
type Adaptor struct {
@@ -35,6 +36,10 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
return geminiRequest, nil
}
+func (a *Adaptor) ConvertImageRequest(c *gin.Context, request *model.ImageRequest) (any, error) {
+ return nil, errors.New("not support image request")
+}
+
func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *meta.Meta) (usage *model.Usage, err *model.ErrorWithStatusCode) {
if meta.IsStream {
var responseText string
diff --git a/relay/adaptor/vertexai/imagen/adaptor.go b/relay/adaptor/vertexai/imagen/adaptor.go
new file mode 100644
index 00000000..0dc428ec
--- /dev/null
+++ b/relay/adaptor/vertexai/imagen/adaptor.go
@@ -0,0 +1,107 @@
+package imagen
+
+import (
+ "encoding/json"
+ "io"
+ "net/http"
+ "time"
+
+ "github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
+ "github.com/songquanpeng/one-api/relay/adaptor/openai"
+ "github.com/songquanpeng/one-api/relay/meta"
+ "github.com/songquanpeng/one-api/relay/model"
+ "github.com/songquanpeng/one-api/relay/relaymode"
+)
+
+var ModelList = []string{
+ "imagen-3.0-generate-001",
+}
+
+type Adaptor struct {
+}
+
+func (a *Adaptor) ConvertImageRequest(c *gin.Context, request *model.ImageRequest) (any, error) {
+ meta := meta.GetByContext(c)
+
+ if request.ResponseFormat != "b64_json" {
+ return nil, errors.New("only support b64_json response format")
+ }
+ if request.N <= 0 {
+ return nil, errors.New("n must be greater than 0")
+ }
+
+ switch meta.Mode {
+ case relaymode.ImagesGenerations:
+ return convertImageCreateRequest(request)
+ case relaymode.ImagesEdits:
+ return nil, errors.New("not implemented")
+ default:
+ return nil, errors.New("not implemented")
+ }
+}
+
+func convertImageCreateRequest(request *model.ImageRequest) (any, error) {
+ return CreateImageRequest{
+ Instances: []createImageInstance{
+ {
+ Prompt: request.Prompt,
+ },
+ },
+ Parameters: createImageParameters{
+ SampleCount: request.N,
+ },
+ }, nil
+}
+
+func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.GeneralOpenAIRequest) (any, error) {
+ return nil, errors.New("not implemented")
+}
+
+func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *meta.Meta) (usage *model.Usage, wrapErr *model.ErrorWithStatusCode) {
+ respBody, err := io.ReadAll(resp.Body)
+ if err != nil {
+ return nil, openai.ErrorWrapper(
+ errors.Wrap(err, "failed to read response body"),
+ "read_response_body",
+ http.StatusInternalServerError,
+ )
+ }
+
+ if resp.StatusCode != http.StatusOK {
+ return nil, openai.ErrorWrapper(
+ errors.Errorf("upstream response status code: %d, body: %s", resp.StatusCode, string(respBody)),
+ "upstream_response",
+ http.StatusInternalServerError,
+ )
+ }
+
+ imagenResp := new(CreateImageResponse)
+ if err := json.Unmarshal(respBody, imagenResp); err != nil {
+ return nil, openai.ErrorWrapper(
+ errors.Wrap(err, "failed to decode response body"),
+ "unmarshal_upstream_response",
+ http.StatusInternalServerError,
+ )
+ }
+
+ if len(imagenResp.Predictions) == 0 {
+ return nil, openai.ErrorWrapper(
+ errors.New("empty predictions"),
+ "empty_predictions",
+ http.StatusInternalServerError,
+ )
+ }
+
+ oaiResp := openai.ImageResponse{
+ Created: time.Now().Unix(),
+ }
+ for _, prediction := range imagenResp.Predictions {
+ oaiResp.Data = append(oaiResp.Data, openai.ImageData{
+ B64Json: prediction.BytesBase64Encoded,
+ })
+ }
+
+ c.JSON(http.StatusOK, oaiResp)
+ return nil, nil
+}
diff --git a/relay/adaptor/vertexai/imagen/model.go b/relay/adaptor/vertexai/imagen/model.go
new file mode 100644
index 00000000..b890d30d
--- /dev/null
+++ b/relay/adaptor/vertexai/imagen/model.go
@@ -0,0 +1,23 @@
+package imagen
+
+type CreateImageRequest struct {
+ Instances []createImageInstance `json:"instances" binding:"required,min=1"`
+ Parameters createImageParameters `json:"parameters" binding:"required"`
+}
+
+type createImageInstance struct {
+ Prompt string `json:"prompt"`
+}
+
+type createImageParameters struct {
+ SampleCount int `json:"sample_count" binding:"required,min=1"`
+}
+
+type CreateImageResponse struct {
+ Predictions []createImageResponsePrediction `json:"predictions"`
+}
+
+type createImageResponsePrediction struct {
+ MimeType string `json:"mimeType"`
+ BytesBase64Encoded string `json:"bytesBase64Encoded"`
+}
diff --git a/relay/adaptor/vertexai/registry.go b/relay/adaptor/vertexai/registry.go
index 41099f02..37dd06ef 100644
--- a/relay/adaptor/vertexai/registry.go
+++ b/relay/adaptor/vertexai/registry.go
@@ -6,6 +6,7 @@ import (
"github.com/gin-gonic/gin"
claude "github.com/songquanpeng/one-api/relay/adaptor/vertexai/claude"
gemini "github.com/songquanpeng/one-api/relay/adaptor/vertexai/gemini"
+ "github.com/songquanpeng/one-api/relay/adaptor/vertexai/imagen"
"github.com/songquanpeng/one-api/relay/meta"
"github.com/songquanpeng/one-api/relay/model"
)
@@ -13,8 +14,9 @@ import (
type VertexAIModelType int
const (
- VerterAIClaude VertexAIModelType = iota + 1
- VerterAIGemini
+ VertexAIClaude VertexAIModelType = iota + 1
+ VertexAIGemini
+ VertexAIImagen
)
var modelMapping = map[string]VertexAIModelType{}
@@ -23,27 +25,35 @@ var modelList = []string{}
func init() {
modelList = append(modelList, claude.ModelList...)
for _, model := range claude.ModelList {
- modelMapping[model] = VerterAIClaude
+ modelMapping[model] = VertexAIClaude
}
modelList = append(modelList, gemini.ModelList...)
for _, model := range gemini.ModelList {
- modelMapping[model] = VerterAIGemini
+ modelMapping[model] = VertexAIGemini
+ }
+
+ modelList = append(modelList, imagen.ModelList...)
+ for _, model := range imagen.ModelList {
+ modelMapping[model] = VertexAIImagen
}
}
type innerAIAdapter interface {
ConvertRequest(c *gin.Context, relayMode int, request *model.GeneralOpenAIRequest) (any, error)
+ ConvertImageRequest(c *gin.Context, request *model.ImageRequest) (any, error)
DoResponse(c *gin.Context, resp *http.Response, meta *meta.Meta) (usage *model.Usage, err *model.ErrorWithStatusCode)
}
func GetAdaptor(model string) innerAIAdapter {
adaptorType := modelMapping[model]
switch adaptorType {
- case VerterAIClaude:
+ case VertexAIClaude:
return &claude.Adaptor{}
- case VerterAIGemini:
+ case VertexAIGemini:
return &gemini.Adaptor{}
+ case VertexAIImagen:
+ return &imagen.Adaptor{}
default:
return nil
}
diff --git a/relay/adaptor/xunfei/adaptor.go b/relay/adaptor/xunfei/adaptor.go
index b5967f26..62aa7240 100644
--- a/relay/adaptor/xunfei/adaptor.go
+++ b/relay/adaptor/xunfei/adaptor.go
@@ -2,14 +2,15 @@ package xunfei
import (
"errors"
+ "io"
+ "net/http"
+ "strings"
+
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/relay/adaptor"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/relay/meta"
"github.com/songquanpeng/one-api/relay/model"
- "io"
- "net/http"
- "strings"
)
type Adaptor struct {
@@ -39,7 +40,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
return nil, nil
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
if request == nil {
return nil, errors.New("request is nil")
}
diff --git a/relay/adaptor/zhipu/adaptor.go b/relay/adaptor/zhipu/adaptor.go
index 660bd379..9a535e6b 100644
--- a/relay/adaptor/zhipu/adaptor.go
+++ b/relay/adaptor/zhipu/adaptor.go
@@ -3,6 +3,10 @@ package zhipu
import (
"errors"
"fmt"
+ "io"
+ "net/http"
+ "strings"
+
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common/helper"
"github.com/songquanpeng/one-api/relay/adaptor"
@@ -10,9 +14,6 @@ import (
"github.com/songquanpeng/one-api/relay/meta"
"github.com/songquanpeng/one-api/relay/model"
"github.com/songquanpeng/one-api/relay/relaymode"
- "io"
- "net/http"
- "strings"
)
type Adaptor struct {
@@ -80,7 +81,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
}
}
-func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
+func (a *Adaptor) ConvertImageRequest(_ *gin.Context, request *model.ImageRequest) (any, error) {
if request == nil {
return nil, errors.New("request is nil")
}
diff --git a/relay/adaptor/zhipu/main.go b/relay/adaptor/zhipu/main.go
index ab3a5678..0489136e 100644
--- a/relay/adaptor/zhipu/main.go
+++ b/relay/adaptor/zhipu/main.go
@@ -3,7 +3,6 @@ package zhipu
import (
"bufio"
"encoding/json"
- "github.com/songquanpeng/one-api/common/render"
"io"
"net/http"
"strings"
@@ -15,6 +14,7 @@ import (
"github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/helper"
"github.com/songquanpeng/one-api/common/logger"
+ "github.com/songquanpeng/one-api/common/render"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/relay/constant"
"github.com/songquanpeng/one-api/relay/model"
diff --git a/relay/adaptor/zhipu/model.go b/relay/adaptor/zhipu/model.go
index 06e22dc1..9a692c01 100644
--- a/relay/adaptor/zhipu/model.go
+++ b/relay/adaptor/zhipu/model.go
@@ -1,8 +1,9 @@
package zhipu
import (
- "github.com/songquanpeng/one-api/relay/model"
"time"
+
+ "github.com/songquanpeng/one-api/relay/model"
)
type Message struct {
diff --git a/relay/billing/billing.go b/relay/billing/billing.go
index a99d37ee..6017b1af 100644
--- a/relay/billing/billing.go
+++ b/relay/billing/billing.go
@@ -31,7 +31,7 @@ func PostConsumeQuota(ctx context.Context, tokenId int, quotaDelta int64, totalQ
}
// totalQuota is total quota consumed
if totalQuota != 0 {
- logContent := fmt.Sprintf("模型倍率 %.2f，分组倍率 %.2f", modelRatio, groupRatio)
+ logContent := fmt.Sprintf("model rate %.2f, group rate %.2f", modelRatio, groupRatio)
model.RecordConsumeLog(ctx, userId, channelId, int(totalQuota), 0, modelName, tokenName, totalQuota, logContent)
model.UpdateUserUsedQuotaAndRequestCount(userId, totalQuota)
model.UpdateChannelUsedQuota(channelId, totalQuota)
diff --git a/relay/billing/ratio/model.go b/relay/billing/ratio/model.go
index f83aa70c..49316dc4 100644
--- a/relay/billing/ratio/model.go
+++ b/relay/billing/ratio/model.go
@@ -3,6 +3,7 @@ package ratio
import (
"encoding/json"
"fmt"
+ "math"
"strings"
"github.com/songquanpeng/one-api/common/logger"
@@ -22,65 +23,71 @@ const (
// 1 === ￥0.014 / 1k tokens
var ModelRatio = map[string]float64{
// https://openai.com/pricing
- "gpt-4": 15,
- "gpt-4-0314": 15,
- "gpt-4-0613": 15,
- "gpt-4-32k": 30,
- "gpt-4-32k-0314": 30,
- "gpt-4-32k-0613": 30,
- "gpt-4-1106-preview": 5, // $0.01 / 1K tokens
- "gpt-4-0125-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-2024-04-09": 5, // $0.01 / 1K tokens
- "gpt-4o": 2.5, // $0.005 / 1K tokens
- "chatgpt-4o-latest": 2.5, // $0.005 / 1K tokens
- "gpt-4o-2024-05-13": 2.5, // $0.005 / 1K tokens
- "gpt-4o-2024-08-06": 1.25, // $0.0025 / 1K tokens
- "gpt-4o-2024-11-20": 1.25, // $0.0025 / 1K tokens
- "gpt-4o-mini": 0.075, // $0.00015 / 1K tokens
- "gpt-4o-mini-2024-07-18": 0.075, // $0.00015 / 1K tokens
- "gpt-4-vision-preview": 5, // $0.01 / 1K tokens
- "gpt-3.5-turbo": 0.25, // $0.0005 / 1K tokens
- "gpt-3.5-turbo-0301": 0.75,
- "gpt-3.5-turbo-0613": 0.75,
- "gpt-3.5-turbo-16k": 1.5, // $0.003 / 1K tokens
- "gpt-3.5-turbo-16k-0613": 1.5,
- "gpt-3.5-turbo-instruct": 0.75, // $0.0015 / 1K tokens
- "gpt-3.5-turbo-1106": 0.5, // $0.001 / 1K tokens
- "gpt-3.5-turbo-0125": 0.25, // $0.0005 / 1K tokens
- "o1": 7.5, // $15.00 / 1M input tokens
- "o1-2024-12-17": 7.5,
- "o1-preview": 7.5, // $15.00 / 1M input tokens
- "o1-preview-2024-09-12": 7.5,
- "o1-mini": 1.5, // $3.00 / 1M input tokens
- "o1-mini-2024-09-12": 1.5,
- "davinci-002": 1, // $0.002 / 1K tokens
- "babbage-002": 0.2, // $0.0004 / 1K tokens
- "text-ada-001": 0.2,
- "text-babbage-001": 0.25,
- "text-curie-001": 1,
- "text-davinci-002": 10,
- "text-davinci-003": 10,
- "text-davinci-edit-001": 10,
- "code-davinci-edit-001": 10,
- "whisper-1": 15, // $0.006 / minute -> $0.006 / 150 words -> $0.006 / 200 tokens -> $0.03 / 1k tokens
- "tts-1": 7.5, // $0.015 / 1K characters
- "tts-1-1106": 7.5,
- "tts-1-hd": 15, // $0.030 / 1K characters
- "tts-1-hd-1106": 15,
- "davinci": 10,
- "curie": 10,
- "babbage": 10,
- "ada": 10,
- "text-embedding-ada-002": 0.05,
- "text-embedding-3-small": 0.01,
- "text-embedding-3-large": 0.065,
- "text-search-ada-doc-001": 10,
- "text-moderation-stable": 0.1,
- "text-moderation-latest": 0.1,
- "dall-e-2": 0.02 * USD, // $0.016 - $0.020 / image
- "dall-e-3": 0.04 * USD, // $0.040 - $0.120 / image
+ "gpt-4": 15,
+ "gpt-4-0314": 15,
+ "gpt-4-0613": 15,
+ "gpt-4-32k": 30,
+ "gpt-4-32k-0314": 30,
+ "gpt-4-32k-0613": 30,
+ "gpt-4-1106-preview": 5, // $0.01 / 1K tokens
+ "gpt-4-0125-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-2024-04-09": 5, // $0.01 / 1K tokens
+ "gpt-4o": 2.5, // $0.005 / 1K tokens
+ "chatgpt-4o-latest": 2.5, // $0.005 / 1K tokens
+ "gpt-4o-2024-05-13": 2.5, // $0.005 / 1K tokens
+ "gpt-4o-2024-08-06": 1.25, // $0.0025 / 1K tokens
+ "gpt-4o-2024-11-20": 1.25, // $0.0025 / 1K tokens
+ "gpt-4o-mini": 0.075, // $0.00015 / 1K tokens
+ "gpt-4o-mini-2024-07-18": 0.075, // $0.00015 / 1K tokens
+ "gpt-4-vision-preview": 5, // $0.01 / 1K tokens
+ // Audio billing will mix text and audio tokens, the unit price is different.
+ // Here records the cost of text, the cost multiplier of audio
+ // relative to text is in AudioRatio
+ "gpt-4o-audio-preview": 1.25, // $0.0025 / 1K tokens
+ "gpt-4o-audio-preview-2024-12-17": 1.25, // $0.0025 / 1K tokens
+ "gpt-4o-audio-preview-2024-10-01": 1.25, // $0.0025 / 1K tokens
+ "gpt-3.5-turbo": 0.25, // $0.0005 / 1K tokens
+ "gpt-3.5-turbo-0301": 0.75,
+ "gpt-3.5-turbo-0613": 0.75,
+ "gpt-3.5-turbo-16k": 1.5, // $0.003 / 1K tokens
+ "gpt-3.5-turbo-16k-0613": 1.5,
+ "gpt-3.5-turbo-instruct": 0.75, // $0.0015 / 1K tokens
+ "gpt-3.5-turbo-1106": 0.5, // $0.001 / 1K tokens
+ "gpt-3.5-turbo-0125": 0.25, // $0.0005 / 1K tokens
+ "o1": 7.5, // $15.00 / 1M input tokens
+ "o1-2024-12-17": 7.5,
+ "o1-preview": 7.5, // $15.00 / 1M input tokens
+ "o1-preview-2024-09-12": 7.5,
+ "o1-mini": 1.5, // $3.00 / 1M input tokens
+ "o1-mini-2024-09-12": 1.5,
+ "davinci-002": 1, // $0.002 / 1K tokens
+ "babbage-002": 0.2, // $0.0004 / 1K tokens
+ "text-ada-001": 0.2,
+ "text-babbage-001": 0.25,
+ "text-curie-001": 1,
+ "text-davinci-002": 10,
+ "text-davinci-003": 10,
+ "text-davinci-edit-001": 10,
+ "code-davinci-edit-001": 10,
+ "whisper-1": 15, // $0.006 / minute -> $0.006 / 150 words -> $0.006 / 200 tokens -> $0.03 / 1k tokens
+ "tts-1": 7.5, // $0.015 / 1K characters
+ "tts-1-1106": 7.5,
+ "tts-1-hd": 15, // $0.030 / 1K characters
+ "tts-1-hd-1106": 15,
+ "davinci": 10,
+ "curie": 10,
+ "babbage": 10,
+ "ada": 10,
+ "text-embedding-ada-002": 0.05,
+ "text-embedding-3-small": 0.01,
+ "text-embedding-3-large": 0.065,
+ "text-search-ada-doc-001": 10,
+ "text-moderation-stable": 0.1,
+ "text-moderation-latest": 0.1,
+ "dall-e-2": 0.02 * USD, // $0.016 - $0.020 / image
+ "dall-e-3": 0.04 * USD, // $0.040 - $0.120 / image
// https://www.anthropic.com/api#pricing
"claude-instant-1.2": 0.8 / 1000 * USD,
"claude-2.0": 8.0 / 1000 * USD,
@@ -90,6 +97,7 @@ var ModelRatio = map[string]float64{
"claude-3-sonnet-20240229": 3.0 / 1000 * USD,
"claude-3-5-sonnet-20240620": 3.0 / 1000 * USD,
"claude-3-5-sonnet-20241022": 3.0 / 1000 * USD,
+ "claude-3-5-sonnet-latest": 3.0 / 1000 * USD,
"claude-3-opus-20240229": 15.0 / 1000 * USD,
// https://cloud.baidu.com/doc/WENXINWORKSHOP/s/hlrk4akp7
"ERNIE-4.0-8K": 0.120 * RMB,
@@ -109,15 +117,16 @@ var ModelRatio = map[string]float64{
"bge-large-en": 0.002 * RMB,
"tao-8k": 0.002 * RMB,
// https://ai.google.dev/pricing
- "gemini-pro": 1, // $0.00025 / 1k characters -> $0.001 / 1k tokens
- "gemini-1.0-pro": 1,
- "gemini-1.5-pro": 1,
- "gemini-1.5-pro-001": 1,
- "gemini-1.5-flash": 1,
- "gemini-1.5-flash-001": 1,
- "gemini-2.0-flash-exp": 1,
- "gemini-2.0-flash-thinking-exp": 1,
- "aqa": 1,
+ "gemini-pro": 1, // $0.00025 / 1k characters -> $0.001 / 1k tokens
+ "gemini-1.0-pro": 1,
+ "gemini-1.5-pro": 1,
+ "gemini-1.5-pro-001": 1,
+ "gemini-1.5-flash": 1,
+ "gemini-1.5-flash-001": 1,
+ "gemini-2.0-flash-exp": 1,
+ "gemini-2.0-flash-thinking-exp": 1,
+ "gemini-2.0-flash-thinking-exp-01-21": 1,
+ "aqa": 1,
// https://open.bigmodel.cn/pricing
"glm-4": 0.1 * RMB,
"glm-4v": 0.1 * RMB,
@@ -254,7 +263,6 @@ var ModelRatio = map[string]float64{
"llama3-groq-70b-8192-tool-use-preview": 0.89 / 1000000 * USD,
"llama3-groq-8b-8192-tool-use-preview": 0.19 / 1000000 * USD,
"mixtral-8x7b-32768": 0.24 / 1000000 * USD,
-
// https://platform.lingyiwanwu.com/docs#-计费单元
"yi-34b-chat-0205": 2.5 / 1000 * RMB,
"yi-34b-chat-200k": 12.0 / 1000 * RMB,
@@ -287,6 +295,9 @@ var ModelRatio = map[string]float64{
"deepl-ja": 25.0 / 1000 * USD,
// https://console.x.ai/
"grok-beta": 5.0 / 1000 * USD,
+ // vertex imagen3
+ // https://cloud.google.com/vertex-ai/generative-ai/pricing#imagen-models
+ "imagen-3.0-generate-001": 0.02 * USD,
// replicate charges based on the number of generated images
// https://replicate.com/pricing
"black-forest-labs/flux-1.1-pro": 0.04 * USD,
@@ -333,10 +344,74 @@ var ModelRatio = map[string]float64{
"mistralai/mixtral-8x7b-instruct-v0.1": 0.300 * USD,
}
+// AudioRatio represents the price ratio between audio tokens and text tokens
+var AudioRatio = map[string]float64{
+ "gpt-4o-audio-preview": 16,
+ "gpt-4o-audio-preview-2024-12-17": 16,
+ "gpt-4o-audio-preview-2024-10-01": 40,
+}
+
+// GetAudioPromptRatio returns the audio prompt ratio for the given model.
+func GetAudioPromptRatio(actualModelName string) float64 {
+ var v float64
+ if ratio, ok := AudioRatio[actualModelName]; ok {
+ v = ratio
+ } else {
+ v = 16
+ }
+
+ return v
+}
+
+// AudioCompletionRatio is the completion ratio for audio models.
+var AudioCompletionRatio = map[string]float64{
+ "whisper-1": 0,
+ "gpt-4o-audio-preview": 2,
+ "gpt-4o-audio-preview-2024-12-17": 2,
+ "gpt-4o-audio-preview-2024-10-01": 2,
+}
+
+// GetAudioCompletionRatio returns the completion ratio for audio models.
+func GetAudioCompletionRatio(actualModelName string) float64 {
+ var v float64
+ if ratio, ok := AudioCompletionRatio[actualModelName]; ok {
+ v = ratio
+ } else {
+ v = 2
+ }
+
+ return v
+}
+
+// AudioTokensPerSecond is the number of audio tokens per second for each model.
+var AudioPromptTokensPerSecond = map[string]float64{
+ // $0.006 / minute -> $0.002 / 20 seconds -> $0.002 / 1K tokens
+ "whisper-1": 1000 / 20,
+ // gpt-4o-audio series processes 10 tokens per second
+ "gpt-4o-audio-preview": 10,
+ "gpt-4o-audio-preview-2024-12-17": 10,
+ "gpt-4o-audio-preview-2024-10-01": 10,
+}
+
+// GetAudioPromptTokensPerSecond returns the number of audio tokens per second
+// for the given model.
+func GetAudioPromptTokensPerSecond(actualModelName string) int {
+ var v float64
+ if tokensPerSecond, ok := AudioPromptTokensPerSecond[actualModelName]; ok {
+ v = tokensPerSecond
+ } else {
+ v = 10
+ }
+
+ return int(math.Ceil(v))
+}
+
var CompletionRatio = map[string]float64{
// aws llama3
"llama3-8b-8192(33)": 0.0006 / 0.0003,
"llama3-70b-8192(33)": 0.0035 / 0.00265,
+ // whisper
+ "whisper-1": 0, // only count input tokens
}
var (
@@ -395,19 +470,21 @@ func GetModelRatio(name string, channelType int) float64 {
if strings.HasPrefix(name, "command-") && strings.HasSuffix(name, "-internet") {
name = strings.TrimSuffix(name, "-internet")
}
+
model := fmt.Sprintf("%s(%d)", name, channelType)
- if ratio, ok := ModelRatio[model]; ok {
- return ratio
- }
- if ratio, ok := DefaultModelRatio[model]; ok {
- return ratio
- }
- if ratio, ok := ModelRatio[name]; ok {
- return ratio
- }
- if ratio, ok := DefaultModelRatio[name]; ok {
- return ratio
+
+ for _, targetName := range []string{model, name} {
+ for _, ratioMap := range []map[string]float64{
+ ModelRatio,
+ DefaultModelRatio,
+ AudioRatio,
+ } {
+ if ratio, ok := ratioMap[targetName]; ok {
+ return ratio
+ }
+ }
}
+
logger.SysError("model ratio not found: " + name)
return 30
}
@@ -430,18 +507,19 @@ func GetCompletionRatio(name string, channelType int) float64 {
name = strings.TrimSuffix(name, "-internet")
}
model := fmt.Sprintf("%s(%d)", name, channelType)
- if ratio, ok := CompletionRatio[model]; ok {
- return ratio
- }
- if ratio, ok := DefaultCompletionRatio[model]; ok {
- return ratio
- }
- if ratio, ok := CompletionRatio[name]; ok {
- return ratio
- }
- if ratio, ok := DefaultCompletionRatio[name]; ok {
- return ratio
+
+ for _, targetName := range []string{model, name} {
+ for _, ratioMap := range []map[string]float64{
+ CompletionRatio,
+ DefaultCompletionRatio,
+ AudioCompletionRatio,
+ } {
+ if ratio, ok := ratioMap[targetName]; ok {
+ return ratio
+ }
+ }
}
+
if strings.HasPrefix(name, "gpt-3.5") {
if name == "gpt-3.5-turbo" || strings.HasSuffix(name, "0125") {
// https://openai.com/blog/new-embedding-models-and-api-updates
@@ -466,7 +544,7 @@ func GetCompletionRatio(name string, channelType int) float64 {
}
return 2
}
- // including o1, o1-preview, o1-mini
+ // including o1/o1-preview/o1-mini
if strings.HasPrefix(name, "o1") {
return 4
}
diff --git a/relay/channel/tencent/main.go b/relay/channel/tencent/main.go
new file mode 100644
index 00000000..435ab366
--- /dev/null
+++ b/relay/channel/tencent/main.go
@@ -0,0 +1,238 @@
+package tencent
+
+// import (
+// "bufio"
+// "crypto/hmac"
+// "crypto/sha1"
+// "encoding/base64"
+// "encoding/json"
+// "github.com/pkg/errors"
+// "fmt"
+// "github.com/gin-gonic/gin"
+// "github.com/songquanpeng/one-api/common"
+// "github.com/songquanpeng/one-api/common/helper"
+// "github.com/songquanpeng/one-api/common/logger"
+// "github.com/songquanpeng/one-api/relay/channel/openai"
+// "github.com/songquanpeng/one-api/relay/constant"
+// "github.com/songquanpeng/one-api/relay/model"
+// "io"
+// "net/http"
+// "sort"
+// "strconv"
+// "strings"
+// )
+
+// // https://cloud.tencent.com/document/product/1729/97732
+
+// func ConvertRequest(request model.GeneralOpenAIRequest) *ChatRequest {
+// messages := make([]Message, 0, len(request.Messages))
+// for i := 0; i < len(request.Messages); i++ {
+// message := request.Messages[i]
+// if message.Role == "system" {
+// messages = append(messages, Message{
+// Role: "user",
+// Content: message.StringContent(),
+// })
+// messages = append(messages, Message{
+// Role: "assistant",
+// Content: "Okay",
+// })
+// continue
+// }
+// messages = append(messages, Message{
+// Content: message.StringContent(),
+// Role: message.Role,
+// })
+// }
+// stream := 0
+// if request.Stream {
+// stream = 1
+// }
+// return &ChatRequest{
+// Timestamp: helper.GetTimestamp(),
+// Expired: helper.GetTimestamp() + 24*60*60,
+// QueryID: helper.GetUUID(),
+// Temperature: request.Temperature,
+// TopP: request.TopP,
+// Stream: stream,
+// Messages: messages,
+// }
+// }
+
+// func responseTencent2OpenAI(response *ChatResponse) *openai.TextResponse {
+// fullTextResponse := openai.TextResponse{
+// Object: "chat.completion",
+// Created: helper.GetTimestamp(),
+// Usage: response.Usage,
+// }
+// if len(response.Choices) > 0 {
+// choice := openai.TextResponseChoice{
+// Index: 0,
+// Message: model.Message{
+// Role: "assistant",
+// Content: response.Choices[0].Messages.Content,
+// },
+// FinishReason: response.Choices[0].FinishReason,
+// }
+// fullTextResponse.Choices = append(fullTextResponse.Choices, choice)
+// }
+// return &fullTextResponse
+// }
+
+// func streamResponseTencent2OpenAI(TencentResponse *ChatResponse) *openai.ChatCompletionsStreamResponse {
+// response := openai.ChatCompletionsStreamResponse{
+// Object: "chat.completion.chunk",
+// Created: helper.GetTimestamp(),
+// Model: "tencent-hunyuan",
+// }
+// if len(TencentResponse.Choices) > 0 {
+// var choice openai.ChatCompletionsStreamResponseChoice
+// choice.Delta.Content = TencentResponse.Choices[0].Delta.Content
+// if TencentResponse.Choices[0].FinishReason == "stop" {
+// choice.FinishReason = &constant.StopFinishReason
+// }
+// response.Choices = append(response.Choices, choice)
+// }
+// return &response
+// }
+
+// func StreamHandler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusCode, string) {
+// var responseText string
+// scanner := bufio.NewScanner(resp.Body)
+// scanner.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) {
+// if atEOF && len(data) == 0 {
+// return 0, nil, nil
+// }
+// if i := strings.Index(string(data), "\n"); i >= 0 {
+// return i + 1, data[0:i], nil
+// }
+// if atEOF {
+// return len(data), data, nil
+// }
+// return 0, nil, nil
+// })
+// dataChan := make(chan string)
+// stopChan := make(chan bool)
+// go func() {
+// for scanner.Scan() {
+// data := scanner.Text()
+// if len(data) < 5 { // ignore blank line or wrong format
+// continue
+// }
+// if data[:5] != "data:" {
+// continue
+// }
+// data = data[5:]
+// dataChan <- data
+// }
+// stopChan <- true
+// }()
+// common.SetEventStreamHeaders(c)
+// c.Stream(func(w io.Writer) bool {
+// select {
+// case data := <-dataChan:
+// var TencentResponse ChatResponse
+// err := json.Unmarshal([]byte(data), &TencentResponse)
+// if err != nil {
+// logger.SysError("error unmarshalling stream response: " + err.Error())
+// return true
+// }
+// response := streamResponseTencent2OpenAI(&TencentResponse)
+// if len(response.Choices) != 0 {
+// responseText += response.Choices[0].Delta.Content
+// }
+// jsonResponse, err := json.Marshal(response)
+// if err != nil {
+// logger.SysError("error marshalling stream response: " + err.Error())
+// return true
+// }
+// c.Render(-1, common.CustomEvent{Data: "data: " + string(jsonResponse)})
+// return true
+// case <-stopChan:
+// c.Render(-1, common.CustomEvent{Data: "data: [DONE]"})
+// return false
+// }
+// })
+// err := resp.Body.Close()
+// if err != nil {
+// return openai.ErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), ""
+// }
+// return nil, responseText
+// }
+
+// func Handler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusCode, *model.Usage) {
+// var TencentResponse ChatResponse
+// responseBody, err := io.ReadAll(resp.Body)
+// if err != nil {
+// return openai.ErrorWrapper(err, "read_response_body_failed", http.StatusInternalServerError), nil
+// }
+// err = resp.Body.Close()
+// if err != nil {
+// return openai.ErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
+// }
+// err = json.Unmarshal(responseBody, &TencentResponse)
+// if err != nil {
+// return openai.ErrorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil
+// }
+// if TencentResponse.Error.Code != 0 {
+// return &model.ErrorWithStatusCode{
+// Error: model.Error{
+// Message: TencentResponse.Error.Message,
+// Code: TencentResponse.Error.Code,
+// },
+// StatusCode: resp.StatusCode,
+// }, nil
+// }
+// fullTextResponse := responseTencent2OpenAI(&TencentResponse)
+// fullTextResponse.Model = "hunyuan"
+// jsonResponse, err := json.Marshal(fullTextResponse)
+// if err != nil {
+// return openai.ErrorWrapper(err, "marshal_response_body_failed", http.StatusInternalServerError), nil
+// }
+// c.Writer.Header().Set("Content-Type", "application/json")
+// c.Writer.WriteHeader(resp.StatusCode)
+// _, err = c.Writer.Write(jsonResponse)
+// if err != nil {
+// return openai.ErrorWrapper(err, "write_response_body_failed", http.StatusInternalServerError), nil
+// }
+// return nil, &fullTextResponse.Usage
+// }
+
+// func ParseConfig(config string) (appId int64, secretId string, secretKey string, err error) {
+// parts := strings.Split(config, "|")
+// if len(parts) != 3 {
+// err = errors.New("invalid tencent config")
+// return
+// }
+// appId, err = strconv.ParseInt(parts[0], 10, 64)
+// secretId = parts[1]
+// secretKey = parts[2]
+// return
+// }
+
+// func GetSign(req ChatRequest, secretKey string) string {
+// params := make([]string, 0)
+// params = append(params, "app_id="+strconv.FormatInt(req.AppId, 10))
+// params = append(params, "secret_id="+req.SecretId)
+// params = append(params, "timestamp="+strconv.FormatInt(req.Timestamp, 10))
+// params = append(params, "query_id="+req.QueryID)
+// params = append(params, "temperature="+strconv.FormatFloat(req.Temperature, 'f', -1, 64))
+// params = append(params, "top_p="+strconv.FormatFloat(req.TopP, 'f', -1, 64))
+// params = append(params, "stream="+strconv.Itoa(req.Stream))
+// params = append(params, "expired="+strconv.FormatInt(req.Expired, 10))
+
+// var messageStr string
+// for _, msg := range req.Messages {
+// messageStr += fmt.Sprintf(`{"role":"%s","content":"%s"},`, msg.Role, msg.Content)
+// }
+// messageStr = strings.TrimSuffix(messageStr, ",")
+// params = append(params, "messages=["+messageStr+"]")
+
+// sort.Strings(params)
+// url := "hunyuan.cloud.tencent.com/hyllm/v1/chat/completions?" + strings.Join(params, "&")
+// mac := hmac.New(sha1.New, []byte(secretKey))
+// signURL := url
+// mac.Write([]byte(signURL))
+// sign := mac.Sum([]byte(nil))
+// return base64.StdEncoding.EncodeToString(sign)
+// }
diff --git a/relay/client/init.go b/relay/client/init.go
new file mode 100644
index 00000000..73108700
--- /dev/null
+++ b/relay/client/init.go
@@ -0,0 +1,36 @@
+package client
+
+import (
+ "net/http"
+ "os"
+ "time"
+
+ gutils "github.com/Laisky/go-utils/v4"
+ "github.com/songquanpeng/one-api/common/config"
+)
+
+var HTTPClient *http.Client
+var ImpatientHTTPClient *http.Client
+
+func init() {
+ var opts []gutils.HTTPClientOptFunc
+
+ timeout := time.Duration(max(config.IdleTimeout, 30)) * time.Second
+ opts = append(opts, gutils.WithHTTPClientTimeout(timeout))
+ if os.Getenv("RELAY_PROXY") != "" {
+ opts = append(opts, gutils.WithHTTPClientProxy(os.Getenv("RELAY_PROXY")))
+ }
+
+ var err error
+ HTTPClient, err = gutils.NewHTTPClient(opts...)
+ if err != nil {
+ panic(err)
+ }
+
+ ImpatientHTTPClient, err = gutils.NewHTTPClient(
+ gutils.WithHTTPClientTimeout(5 * time.Second),
+ )
+ if err != nil {
+ panic(err)
+ }
+}
diff --git a/relay/controller/audio.go b/relay/controller/audio.go
index e3d57b1e..a27a5dcb 100644
--- a/relay/controller/audio.go
+++ b/relay/controller/audio.go
@@ -5,21 +5,23 @@ import (
"bytes"
"context"
"encoding/json"
- "errors"
"fmt"
"io"
+ "mime/multipart"
"net/http"
"strings"
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/client"
- "github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/ctxkey"
+ "github.com/songquanpeng/one-api/common/helper"
"github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/model"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/relay/billing"
+ "github.com/songquanpeng/one-api/relay/billing/ratio"
billingratio "github.com/songquanpeng/one-api/relay/billing/ratio"
"github.com/songquanpeng/one-api/relay/channeltype"
"github.com/songquanpeng/one-api/relay/meta"
@@ -27,6 +29,35 @@ import (
"github.com/songquanpeng/one-api/relay/relaymode"
)
+type commonAudioRequest struct {
+ File *multipart.FileHeader `form:"file" binding:"required"`
+}
+
+func countAudioTokens(c *gin.Context) (int, error) {
+ body, err := common.GetRequestBody(c)
+ if err != nil {
+ return 0, errors.WithStack(err)
+ }
+
+ reqBody := new(commonAudioRequest)
+ c.Request.Body = io.NopCloser(bytes.NewReader(body))
+ if err = c.ShouldBind(reqBody); err != nil {
+ return 0, errors.WithStack(err)
+ }
+
+ reqFp, err := reqBody.File.Open()
+ if err != nil {
+ return 0, errors.WithStack(err)
+ }
+ defer reqFp.Close()
+
+ ctxMeta := meta.GetByContext(c)
+
+ return helper.GetAudioTokens(c.Request.Context(),
+ reqFp,
+ ratio.GetAudioPromptTokensPerSecond(ctxMeta.ActualModelName))
+}
+
func RelayAudioHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatusCode {
ctx := c.Request.Context()
meta := meta.GetByContext(c)
@@ -36,7 +67,7 @@ func RelayAudioHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
channelType := c.GetInt(ctxkey.Channel)
channelId := c.GetInt(ctxkey.ChannelId)
userId := c.GetInt(ctxkey.Id)
- group := c.GetString(ctxkey.Group)
+ // group := c.GetString(ctxkey.Group)
tokenName := c.GetString(ctxkey.TokenName)
var ttsRequest openai.TextToSpeechRequest
@@ -55,7 +86,8 @@ func RelayAudioHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
}
modelRatio := billingratio.GetModelRatio(audioModel, channelType)
- groupRatio := billingratio.GetGroupRatio(group)
+ // groupRatio := billingratio.GetGroupRatio(group)
+ groupRatio := c.GetFloat64(ctxkey.ChannelRatio)
ratio := modelRatio * groupRatio
var quota int64
var preConsumedQuota int64
@@ -63,9 +95,21 @@ func RelayAudioHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
case relaymode.AudioSpeech:
preConsumedQuota = int64(float64(len(ttsRequest.Input)) * ratio)
quota = preConsumedQuota
+ case relaymode.AudioTranscription,
+ relaymode.AudioTranslation:
+ audioTokens, err := countAudioTokens(c)
+ if err != nil {
+ return openai.ErrorWrapper(err, "count_audio_tokens_failed", http.StatusInternalServerError)
+ }
+
+ preConsumedQuota = int64(float64(audioTokens) * ratio)
+ quota = preConsumedQuota
default:
- preConsumedQuota = int64(float64(config.PreConsumedQuota) * ratio)
+ return openai.ErrorWrapper(errors.New("unexpected_relay_mode"), "unexpected_relay_mode", http.StatusInternalServerError)
}
+
+ tokenQuota := c.GetInt64(ctxkey.TokenQuota)
+ tokenQuotaUnlimited := c.GetBool(ctxkey.TokenQuotaUnlimited)
userQuota, err := model.CacheGetUserQuota(ctx, userId)
if err != nil {
return openai.ErrorWrapper(err, "get_user_quota_failed", http.StatusInternalServerError)
@@ -79,7 +123,8 @@ func RelayAudioHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
if err != nil {
return openai.ErrorWrapper(err, "decrease_user_quota_failed", http.StatusInternalServerError)
}
- if userQuota > 100*preConsumedQuota {
+ if userQuota > 100*preConsumedQuota &&
+ (tokenQuotaUnlimited || tokenQuota > 100*preConsumedQuota) {
// in this case, we do not pre-consume quota
// because the user has enough quota
preConsumedQuota = 0
@@ -139,7 +184,7 @@ func RelayAudioHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
return openai.ErrorWrapper(err, "new_request_body_failed", http.StatusInternalServerError)
}
c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody.Bytes()))
- responseFormat := c.DefaultPostForm("response_format", "json")
+ // responseFormat := c.DefaultPostForm("response_format", "json")
req, err := http.NewRequest(c.Request.Method, fullRequestURL, requestBody)
if err != nil {
@@ -172,47 +217,53 @@ func RelayAudioHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
return openai.ErrorWrapper(err, "close_request_body_failed", http.StatusInternalServerError)
}
- if relayMode != relaymode.AudioSpeech {
- responseBody, err := io.ReadAll(resp.Body)
- if err != nil {
- return openai.ErrorWrapper(err, "read_response_body_failed", http.StatusInternalServerError)
- }
- err = resp.Body.Close()
- if err != nil {
- return openai.ErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError)
- }
+ // https://github.com/Laisky/one-api/pull/21
+ // Commenting out the following code because Whisper's transcription
+ // only charges for the length of the input audio, not for the output.
+ // -------------------------------------
+ // if relayMode != relaymode.AudioSpeech {
+ // responseBody, err := io.ReadAll(resp.Body)
+ // if err != nil {
+ // return openai.ErrorWrapper(err, "read_response_body_failed", http.StatusInternalServerError)
+ // }
+ // err = resp.Body.Close()
+ // if err != nil {
+ // return openai.ErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError)
+ // }
- var openAIErr openai.SlimTextResponse
- if err = json.Unmarshal(responseBody, &openAIErr); err == nil {
- if openAIErr.Error.Message != "" {
- return openai.ErrorWrapper(fmt.Errorf("type %s, code %v, message %s", openAIErr.Error.Type, openAIErr.Error.Code, openAIErr.Error.Message), "request_error", http.StatusInternalServerError)
- }
- }
+ // var openAIErr openai.SlimTextResponse
+ // if err = json.Unmarshal(responseBody, &openAIErr); err == nil {
+ // if openAIErr.Error.Message != "" {
+ // return openai.ErrorWrapper(errors.Errorf("type %s, code %v, message %s", openAIErr.Error.Type, openAIErr.Error.Code, openAIErr.Error.Message), "request_error", http.StatusInternalServerError)
+ // }
+ // }
+
+ // var text string
+ // switch responseFormat {
+ // case "json":
+ // text, err = getTextFromJSON(responseBody)
+ // case "text":
+ // text, err = getTextFromText(responseBody)
+ // case "srt":
+ // text, err = getTextFromSRT(responseBody)
+ // case "verbose_json":
+ // text, err = getTextFromVerboseJSON(responseBody)
+ // case "vtt":
+ // text, err = getTextFromVTT(responseBody)
+ // default:
+ // return openai.ErrorWrapper(errors.New("unexpected_response_format"), "unexpected_response_format", http.StatusInternalServerError)
+ // }
+ // if err != nil {
+ // return openai.ErrorWrapper(err, "get_text_from_body_err", http.StatusInternalServerError)
+ // }
+ // quota = int64(openai.CountTokenText(text, audioModel))
+ // resp.Body = io.NopCloser(bytes.NewBuffer(responseBody))
+ // }
- var text string
- switch responseFormat {
- case "json":
- text, err = getTextFromJSON(responseBody)
- case "text":
- text, err = getTextFromText(responseBody)
- case "srt":
- text, err = getTextFromSRT(responseBody)
- case "verbose_json":
- text, err = getTextFromVerboseJSON(responseBody)
- case "vtt":
- text, err = getTextFromVTT(responseBody)
- default:
- return openai.ErrorWrapper(errors.New("unexpected_response_format"), "unexpected_response_format", http.StatusInternalServerError)
- }
- if err != nil {
- return openai.ErrorWrapper(err, "get_text_from_body_err", http.StatusInternalServerError)
- }
- quota = int64(openai.CountTokenText(text, audioModel))
- resp.Body = io.NopCloser(bytes.NewBuffer(responseBody))
- }
if resp.StatusCode != http.StatusOK {
return RelayErrorHandler(resp)
}
+
succeed = true
quotaDelta := quota - preConsumedQuota
defer func(ctx context.Context) {
@@ -242,8 +293,9 @@ func getTextFromVTT(body []byte) (string, error) {
func getTextFromVerboseJSON(body []byte) (string, error) {
var whisperResponse openai.WhisperVerboseJSONResponse
if err := json.Unmarshal(body, &whisperResponse); err != nil {
- return "", fmt.Errorf("unmarshal_response_body_failed err :%w", err)
+ return "", errors.Wrap(err, "unmarshal_response_body_failed")
}
+
return whisperResponse.Text, nil
}
@@ -275,7 +327,7 @@ func getTextFromText(body []byte) (string, error) {
func getTextFromJSON(body []byte) (string, error) {
var whisperResponse openai.WhisperJSONResponse
if err := json.Unmarshal(body, &whisperResponse); err != nil {
- return "", fmt.Errorf("unmarshal_response_body_failed err :%w", err)
+ return "", errors.Wrap(err, "unmarshal_response_body_failed")
}
return whisperResponse.Text, nil
}
diff --git a/relay/controller/helper.go b/relay/controller/helper.go
index 5f5fc90c..f9d4fd48 100644
--- a/relay/controller/helper.go
+++ b/relay/controller/helper.go
@@ -2,21 +2,22 @@ package controller
import (
"context"
- "errors"
"fmt"
- "github.com/songquanpeng/one-api/relay/constant/role"
"math"
"net/http"
"strings"
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/config"
+ "github.com/songquanpeng/one-api/common/ctxkey"
"github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/model"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
billingratio "github.com/songquanpeng/one-api/relay/billing/ratio"
"github.com/songquanpeng/one-api/relay/channeltype"
+ "github.com/songquanpeng/one-api/relay/constant/role"
"github.com/songquanpeng/one-api/relay/controller/validator"
"github.com/songquanpeng/one-api/relay/meta"
relaymodel "github.com/songquanpeng/one-api/relay/model"
@@ -42,10 +43,10 @@ func getAndValidateTextRequest(c *gin.Context, relayMode int) (*relaymodel.Gener
return textRequest, nil
}
-func getPromptTokens(textRequest *relaymodel.GeneralOpenAIRequest, relayMode int) int {
+func getPromptTokens(ctx context.Context, textRequest *relaymodel.GeneralOpenAIRequest, relayMode int) int {
switch relayMode {
case relaymode.ChatCompletions:
- return openai.CountTokenMessages(textRequest.Messages, textRequest.Model)
+ return openai.CountTokenMessages(ctx, textRequest.Messages, textRequest.Model)
case relaymode.Completions:
return openai.CountTokenInput(textRequest.Prompt, textRequest.Model)
case relaymode.Moderations:
@@ -62,10 +63,12 @@ func getPreConsumedQuota(textRequest *relaymodel.GeneralOpenAIRequest, promptTok
return int64(float64(preConsumedTokens) * ratio)
}
-func preConsumeQuota(ctx context.Context, textRequest *relaymodel.GeneralOpenAIRequest, promptTokens int, ratio float64, meta *meta.Meta) (int64, *relaymodel.ErrorWithStatusCode) {
+func preConsumeQuota(c *gin.Context, textRequest *relaymodel.GeneralOpenAIRequest, promptTokens int, ratio float64, meta *meta.Meta) (int64, *relaymodel.ErrorWithStatusCode) {
preConsumedQuota := getPreConsumedQuota(textRequest, promptTokens, ratio)
- userQuota, err := model.CacheGetUserQuota(ctx, meta.UserId)
+ tokenQuota := c.GetInt64(ctxkey.TokenQuota)
+ tokenQuotaUnlimited := c.GetBool(ctxkey.TokenQuotaUnlimited)
+ userQuota, err := model.CacheGetUserQuota(c.Request.Context(), meta.UserId)
if err != nil {
return preConsumedQuota, openai.ErrorWrapper(err, "get_user_quota_failed", http.StatusInternalServerError)
}
@@ -76,11 +79,12 @@ func preConsumeQuota(ctx context.Context, textRequest *relaymodel.GeneralOpenAIR
if err != nil {
return preConsumedQuota, openai.ErrorWrapper(err, "decrease_user_quota_failed", http.StatusInternalServerError)
}
- if userQuota > 100*preConsumedQuota {
+ if userQuota > 100*preConsumedQuota &&
+ (tokenQuotaUnlimited || tokenQuota > 100*preConsumedQuota) {
// in this case, we do not pre-consume quota
- // because the user has enough quota
+ // because the user and token have enough quota
preConsumedQuota = 0
- logger.Info(ctx, fmt.Sprintf("user %d has enough quota %d, trusted and no need to pre-consume", meta.UserId, userQuota))
+ logger.Info(c.Request.Context(), fmt.Sprintf("user %d has enough quota %d, trusted and no need to pre-consume", meta.UserId, userQuota))
}
if preConsumedQuota > 0 {
err := model.PreConsumeTokenQuota(meta.TokenId, preConsumedQuota)
@@ -91,12 +95,12 @@ func preConsumeQuota(ctx context.Context, textRequest *relaymodel.GeneralOpenAIR
return preConsumedQuota, nil
}
-func postConsumeQuota(ctx context.Context, usage *relaymodel.Usage, meta *meta.Meta, textRequest *relaymodel.GeneralOpenAIRequest, ratio float64, preConsumedQuota int64, modelRatio float64, groupRatio float64, systemPromptReset bool) {
+func postConsumeQuota(ctx context.Context, usage *relaymodel.Usage, meta *meta.Meta, textRequest *relaymodel.GeneralOpenAIRequest, ratio float64, preConsumedQuota int64, modelRatio float64, groupRatio float64, systemPromptReset bool) (quota int64) {
if usage == nil {
logger.Error(ctx, "usage is nil, which is unexpected")
return
}
- var quota int64
+
completionRatio := billingratio.GetCompletionRatio(textRequest.Model, meta.ChannelType)
promptTokens := usage.PromptTokens
completionTokens := usage.CompletionTokens
@@ -121,12 +125,14 @@ func postConsumeQuota(ctx context.Context, usage *relaymodel.Usage, meta *meta.M
}
var extraLog string
if systemPromptReset {
- extraLog = " （注意系统提示词已被重置）"
+ extraLog = " （NoteSystemPrompt词已被重置）"
}
- logContent := fmt.Sprintf("模型倍率 %.2f，分组倍率 %.2f，补全倍率 %.2f%s", modelRatio, groupRatio, completionRatio, extraLog)
+ logContent := fmt.Sprintf("model rate %.2f, group rate %.2f, completion rate %.2f%s", modelRatio, groupRatio, completionRatio, extraLog)
model.RecordConsumeLog(ctx, meta.UserId, meta.ChannelId, promptTokens, completionTokens, textRequest.Model, meta.TokenName, quota, logContent)
model.UpdateUserUsedQuotaAndRequestCount(meta.UserId, quota)
model.UpdateChannelUsedQuota(meta.ChannelId, quota)
+
+ return quota
}
func getMappedModelName(modelName string, mapping map[string]string) (string, bool) {
diff --git a/relay/controller/image.go b/relay/controller/image.go
index 1b69d97d..a3ae3b76 100644
--- a/relay/controller/image.go
+++ b/relay/controller/image.go
@@ -4,21 +4,23 @@ import (
"bytes"
"context"
"encoding/json"
- "errors"
"fmt"
"io"
"net/http"
+ "strings"
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/ctxkey"
"github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/model"
"github.com/songquanpeng/one-api/relay"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
+ "github.com/songquanpeng/one-api/relay/adaptor/replicate"
billingratio "github.com/songquanpeng/one-api/relay/billing/ratio"
"github.com/songquanpeng/one-api/relay/channeltype"
- "github.com/songquanpeng/one-api/relay/meta"
+ metalib "github.com/songquanpeng/one-api/relay/meta"
relaymodel "github.com/songquanpeng/one-api/relay/model"
)
@@ -26,7 +28,7 @@ func getImageRequest(c *gin.Context, _ int) (*relaymodel.ImageRequest, error) {
imageRequest := &relaymodel.ImageRequest{}
err := common.UnmarshalBodyReusable(c, imageRequest)
if err != nil {
- return nil, err
+ return nil, errors.WithStack(err)
}
if imageRequest.N == 0 {
imageRequest.N = 1
@@ -65,7 +67,7 @@ func getImageSizeRatio(model string, size string) float64 {
return 1
}
-func validateImageRequest(imageRequest *relaymodel.ImageRequest, _ *meta.Meta) *relaymodel.ErrorWithStatusCode {
+func validateImageRequest(imageRequest *relaymodel.ImageRequest, _ *metalib.Meta) *relaymodel.ErrorWithStatusCode {
// check prompt length
if imageRequest.Prompt == "" {
return openai.ErrorWrapper(errors.New("prompt is required"), "prompt_missing", http.StatusBadRequest)
@@ -104,7 +106,7 @@ func getImageCostRatio(imageRequest *relaymodel.ImageRequest) (float64, error) {
func RelayImageHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatusCode {
ctx := c.Request.Context()
- meta := meta.GetByContext(c)
+ meta := metalib.GetByContext(c)
imageRequest, err := getImageRequest(c, meta.Mode)
if err != nil {
logger.Errorf(ctx, "getImageRequest failed: %s", err.Error())
@@ -116,6 +118,7 @@ func RelayImageHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
meta.OriginModelName = imageRequest.Model
imageRequest.Model, isModelMapped = getMappedModelName(imageRequest.Model, meta.ModelMapping)
meta.ActualModelName = imageRequest.Model
+ metalib.Set2Context(c, meta)
// model validation
bizErr := validateImageRequest(imageRequest, meta)
@@ -134,7 +137,8 @@ func RelayImageHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
c.Set("response_format", imageRequest.ResponseFormat)
var requestBody io.Reader
- if isModelMapped || meta.ChannelType == channeltype.Azure { // make Azure channel request body
+ if strings.ToLower(c.GetString(ctxkey.ContentType)) == "application/json" &&
+ isModelMapped || meta.ChannelType == channeltype.Azure { // make Azure channel request body
jsonStr, err := json.Marshal(imageRequest)
if err != nil {
return openai.ErrorWrapper(err, "marshal_image_request_failed", http.StatusInternalServerError)
@@ -154,9 +158,19 @@ func RelayImageHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
switch meta.ChannelType {
case channeltype.Zhipu,
channeltype.Ali,
- channeltype.Replicate,
+ channeltype.VertextAI,
channeltype.Baidu:
- finalRequest, err := adaptor.ConvertImageRequest(imageRequest)
+ finalRequest, err := adaptor.ConvertImageRequest(c, imageRequest)
+ if err != nil {
+ return openai.ErrorWrapper(err, "convert_image_request_failed", http.StatusInternalServerError)
+ }
+ jsonStr, err := json.Marshal(finalRequest)
+ if err != nil {
+ return openai.ErrorWrapper(err, "marshal_image_request_failed", http.StatusInternalServerError)
+ }
+ requestBody = bytes.NewBuffer(jsonStr)
+ case channeltype.Replicate:
+ finalRequest, err := replicate.ConvertImageRequest(c, imageRequest)
if err != nil {
return openai.ErrorWrapper(err, "convert_image_request_failed", http.StatusInternalServerError)
}
@@ -168,7 +182,9 @@ func RelayImageHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
}
modelRatio := billingratio.GetModelRatio(imageModel, meta.ChannelType)
- groupRatio := billingratio.GetGroupRatio(meta.Group)
+ // groupRatio := billingratio.GetGroupRatio(meta.Group)
+ groupRatio := c.GetFloat64(ctxkey.ChannelRatio)
+
ratio := modelRatio * groupRatio
userQuota, err := model.CacheGetUserQuota(ctx, meta.UserId)
@@ -207,13 +223,23 @@ func RelayImageHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
if err != nil {
logger.SysError("error update user quota cache: " + err.Error())
}
- if quota != 0 {
+ if quota >= 0 {
tokenName := c.GetString(ctxkey.TokenName)
- logContent := fmt.Sprintf("模型倍率 %.2f，分组倍率 %.2f", modelRatio, groupRatio)
+ logContent := fmt.Sprintf("model rate %.2f, group rate %.2f", modelRatio, groupRatio)
model.RecordConsumeLog(ctx, meta.UserId, meta.ChannelId, 0, 0, imageRequest.Model, tokenName, quota, logContent)
model.UpdateUserUsedQuotaAndRequestCount(meta.UserId, quota)
channelId := c.GetInt(ctxkey.ChannelId)
model.UpdateChannelUsedQuota(channelId, quota)
+
+ // also update user request cost
+ docu := model.NewUserRequestCost(
+ c.GetInt(ctxkey.Id),
+ c.GetString(ctxkey.RequestId),
+ quota,
+ )
+ if err = docu.Insert(); err != nil {
+ logger.Errorf(c, "insert user request cost failed: %+v", err)
+ }
}
}(c.Request.Context())
diff --git a/relay/controller/text.go b/relay/controller/text.go
index 9a47c58b..d7532eff 100644
--- a/relay/controller/text.go
+++ b/relay/controller/text.go
@@ -2,14 +2,18 @@ package controller
import (
"bytes"
+ "context"
"encoding/json"
- "fmt"
- "github.com/songquanpeng/one-api/common/config"
"io"
"net/http"
+ "time"
"github.com/gin-gonic/gin"
+ "github.com/pkg/errors"
+ "github.com/songquanpeng/one-api/common/config"
+ "github.com/songquanpeng/one-api/common/ctxkey"
"github.com/songquanpeng/one-api/common/logger"
+ "github.com/songquanpeng/one-api/model"
"github.com/songquanpeng/one-api/relay"
"github.com/songquanpeng/one-api/relay/adaptor"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
@@ -18,10 +22,10 @@ import (
billingratio "github.com/songquanpeng/one-api/relay/billing/ratio"
"github.com/songquanpeng/one-api/relay/channeltype"
"github.com/songquanpeng/one-api/relay/meta"
- "github.com/songquanpeng/one-api/relay/model"
+ relaymodel "github.com/songquanpeng/one-api/relay/model"
)
-func RelayTextHelper(c *gin.Context) *model.ErrorWithStatusCode {
+func RelayTextHelper(c *gin.Context) *relaymodel.ErrorWithStatusCode {
ctx := c.Request.Context()
meta := meta.GetByContext(c)
// get & validate textRequest
@@ -40,12 +44,14 @@ func RelayTextHelper(c *gin.Context) *model.ErrorWithStatusCode {
systemPromptReset := setSystemPrompt(ctx, textRequest, meta.SystemPrompt)
// get model ratio & group ratio
modelRatio := billingratio.GetModelRatio(textRequest.Model, meta.ChannelType)
- groupRatio := billingratio.GetGroupRatio(meta.Group)
+ // groupRatio := billingratio.GetGroupRatio(meta.Group)
+ groupRatio := c.GetFloat64(ctxkey.ChannelRatio)
+
ratio := modelRatio * groupRatio
// pre-consume quota
- promptTokens := getPromptTokens(textRequest, meta.Mode)
+ promptTokens := getPromptTokens(c.Request.Context(), textRequest, meta.Mode)
meta.PromptTokens = promptTokens
- preConsumedQuota, bizErr := preConsumeQuota(ctx, textRequest, promptTokens, ratio, meta)
+ preConsumedQuota, bizErr := preConsumeQuota(c, textRequest, promptTokens, ratio, meta)
if bizErr != nil {
logger.Warnf(ctx, "preConsumeQuota failed: %+v", *bizErr)
return bizErr
@@ -53,7 +59,7 @@ func RelayTextHelper(c *gin.Context) *model.ErrorWithStatusCode {
adaptor := relay.GetAdaptor(meta.APIType)
if adaptor == nil {
- return openai.ErrorWrapper(fmt.Errorf("invalid api type: %d", meta.APIType), "invalid_api_type", http.StatusBadRequest)
+ return openai.ErrorWrapper(errors.Errorf("invalid api type: %d", meta.APIType), "invalid_api_type", http.StatusBadRequest)
}
adaptor.Init(meta)
@@ -63,6 +69,10 @@ func RelayTextHelper(c *gin.Context) *model.ErrorWithStatusCode {
return openai.ErrorWrapper(err, "convert_request_failed", http.StatusInternalServerError)
}
+ // for debug
+ requestBodyBytes, _ := io.ReadAll(requestBody)
+ requestBody = bytes.NewBuffer(requestBodyBytes)
+
// do request
resp, err := adaptor.DoRequest(c, meta, requestBody)
if err != nil {
@@ -81,14 +91,38 @@ func RelayTextHelper(c *gin.Context) *model.ErrorWithStatusCode {
billing.ReturnPreConsumedQuota(ctx, preConsumedQuota, meta.TokenId)
return respErr
}
+
// post-consume quota
- go postConsumeQuota(ctx, usage, meta, textRequest, ratio, preConsumedQuota, modelRatio, groupRatio, systemPromptReset)
+ quotaId := c.GetInt(ctxkey.Id)
+ requestId := c.GetString(ctxkey.RequestId)
+ go func() {
+ ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+ defer cancel()
+
+ quota := postConsumeQuota(ctx, usage, meta, textRequest, ratio, preConsumedQuota, modelRatio, groupRatio, systemPromptReset)
+
+ // also update user request cost
+ if quota != 0 {
+ docu := model.NewUserRequestCost(
+ quotaId,
+ requestId,
+ quota,
+ )
+ if err = docu.Insert(); err != nil {
+ logger.Errorf(ctx, "insert user request cost failed: %+v", err)
+ }
+ }
+ }()
+
return nil
}
-func getRequestBody(c *gin.Context, meta *meta.Meta, textRequest *model.GeneralOpenAIRequest, adaptor adaptor.Adaptor) (io.Reader, error) {
- if !config.EnforceIncludeUsage && meta.APIType == apitype.OpenAI && meta.OriginModelName == meta.ActualModelName && meta.ChannelType != channeltype.Baichuan {
- // no need to convert request for openai
+func getRequestBody(c *gin.Context, meta *meta.Meta, textRequest *relaymodel.GeneralOpenAIRequest, adaptor adaptor.Adaptor) (io.Reader, error) {
+ if !config.EnforceIncludeUsage &&
+ meta.APIType == apitype.OpenAI &&
+ meta.OriginModelName == meta.ActualModelName &&
+ meta.ChannelType != channeltype.OpenAI && // openai also need to convert request
+ meta.ChannelType != channeltype.Baichuan {
return c.Request.Body, nil
}
diff --git a/relay/controller/validator/validation.go b/relay/controller/validator/validation.go
index 8ff520b8..3d5d755f 100644
--- a/relay/controller/validator/validation.go
+++ b/relay/controller/validator/validation.go
@@ -1,10 +1,11 @@
package validator
import (
- "errors"
+ "math"
+
+ "github.com/pkg/errors"
"github.com/songquanpeng/one-api/relay/model"
"github.com/songquanpeng/one-api/relay/relaymode"
- "math"
)
func ValidateTextRequest(textRequest *model.GeneralOpenAIRequest, relayMode int) error {
diff --git a/relay/meta/relay_meta.go b/relay/meta/relay_meta.go
index bcbe1045..b4bcf687 100644
--- a/relay/meta/relay_meta.go
+++ b/relay/meta/relay_meta.go
@@ -1,12 +1,13 @@
package meta
import (
+ "strings"
+
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common/ctxkey"
"github.com/songquanpeng/one-api/model"
"github.com/songquanpeng/one-api/relay/channeltype"
"github.com/songquanpeng/one-api/relay/relaymode"
- "strings"
)
type Meta struct {
@@ -30,10 +31,15 @@ type Meta struct {
ActualModelName string
RequestURLPath string
PromptTokens int // only for DoResponse
+ ChannelRatio float64
SystemPrompt string
}
func GetByContext(c *gin.Context) *Meta {
+ if v, ok := c.Get(ctxkey.Meta); ok {
+ return v.(*Meta)
+ }
+
meta := Meta{
Mode: relaymode.GetByPath(c.Request.URL.Path),
ChannelType: c.GetInt(ctxkey.Channel),
@@ -47,6 +53,7 @@ func GetByContext(c *gin.Context) *Meta {
BaseURL: c.GetString(ctxkey.BaseURL),
APIKey: strings.TrimPrefix(c.Request.Header.Get("Authorization"), "Bearer "),
RequestURLPath: c.Request.URL.String(),
+ ChannelRatio: c.GetFloat64(ctxkey.ChannelRatio), // add by Laisky
SystemPrompt: c.GetString(ctxkey.SystemPrompt),
}
cfg, ok := c.Get(ctxkey.Config)
@@ -57,5 +64,11 @@ func GetByContext(c *gin.Context) *Meta {
meta.BaseURL = channeltype.ChannelBaseURLs[meta.ChannelType]
}
meta.APIType = channeltype.ToAPIType(meta.ChannelType)
+
+ Set2Context(c, &meta)
return &meta
}
+
+func Set2Context(c *gin.Context, meta *Meta) {
+ c.Set(ctxkey.Meta, meta)
+}
diff --git a/relay/model/general.go b/relay/model/general.go
index 288c07ff..5354694c 100644
--- a/relay/model/general.go
+++ b/relay/model/general.go
@@ -23,36 +23,37 @@ type StreamOptions struct {
type GeneralOpenAIRequest struct {
// https://platform.openai.com/docs/api-reference/chat/create
- Messages []Message `json:"messages,omitempty"`
- Model string `json:"model,omitempty"`
- Store *bool `json:"store,omitempty"`
- Metadata any `json:"metadata,omitempty"`
- FrequencyPenalty *float64 `json:"frequency_penalty,omitempty"`
- LogitBias any `json:"logit_bias,omitempty"`
- Logprobs *bool `json:"logprobs,omitempty"`
- TopLogprobs *int `json:"top_logprobs,omitempty"`
- MaxTokens int `json:"max_tokens,omitempty"`
- MaxCompletionTokens *int `json:"max_completion_tokens,omitempty"`
- N int `json:"n,omitempty"`
- Modalities []string `json:"modalities,omitempty"`
- Prediction any `json:"prediction,omitempty"`
- Audio *Audio `json:"audio,omitempty"`
- PresencePenalty *float64 `json:"presence_penalty,omitempty"`
- ResponseFormat *ResponseFormat `json:"response_format,omitempty"`
- Seed float64 `json:"seed,omitempty"`
- ServiceTier *string `json:"service_tier,omitempty"`
- Stop any `json:"stop,omitempty"`
- Stream bool `json:"stream,omitempty"`
- StreamOptions *StreamOptions `json:"stream_options,omitempty"`
- Temperature *float64 `json:"temperature,omitempty"`
- TopP *float64 `json:"top_p,omitempty"`
- TopK int `json:"top_k,omitempty"`
- Tools []Tool `json:"tools,omitempty"`
- ToolChoice any `json:"tool_choice,omitempty"`
- ParallelTooCalls *bool `json:"parallel_tool_calls,omitempty"`
- User string `json:"user,omitempty"`
- FunctionCall any `json:"function_call,omitempty"`
- Functions any `json:"functions,omitempty"`
+ Messages []Message `json:"messages,omitempty"`
+ Model string `json:"model,omitempty"`
+ Store *bool `json:"store,omitempty"`
+ Metadata any `json:"metadata,omitempty"`
+ FrequencyPenalty *float64 `json:"frequency_penalty,omitempty"`
+ LogitBias any `json:"logit_bias,omitempty"`
+ Logprobs *bool `json:"logprobs,omitempty"`
+ TopLogprobs *int `json:"top_logprobs,omitempty"`
+ MaxTokens int `json:"max_tokens,omitempty"`
+ MaxCompletionTokens *int `json:"max_completion_tokens,omitempty"`
+ N int `json:"n,omitempty"`
+ // Modalities currently the model only programmatically allows modalities = [“text”, “audio”]
+ Modalities []string `json:"modalities,omitempty"`
+ Prediction any `json:"prediction,omitempty"`
+ Audio *Audio `json:"audio,omitempty"`
+ PresencePenalty *float64 `json:"presence_penalty,omitempty"`
+ ResponseFormat *ResponseFormat `json:"response_format,omitempty"`
+ Seed float64 `json:"seed,omitempty"`
+ ServiceTier *string `json:"service_tier,omitempty"`
+ Stop any `json:"stop,omitempty"`
+ Stream bool `json:"stream,omitempty"`
+ StreamOptions *StreamOptions `json:"stream_options,omitempty"`
+ Temperature *float64 `json:"temperature,omitempty"`
+ TopP *float64 `json:"top_p,omitempty"`
+ TopK int `json:"top_k,omitempty"`
+ Tools []Tool `json:"tools,omitempty"`
+ ToolChoice any `json:"tool_choice,omitempty"`
+ ParallelTooCalls *bool `json:"parallel_tool_calls,omitempty"`
+ User string `json:"user,omitempty"`
+ FunctionCall any `json:"function_call,omitempty"`
+ Functions any `json:"functions,omitempty"`
// https://platform.openai.com/docs/api-reference/embeddings/create
Input any `json:"input,omitempty"`
EncodingFormat string `json:"encoding_format,omitempty"`
diff --git a/relay/model/image.go b/relay/model/image.go
index bab84256..ec3e7691 100644
--- a/relay/model/image.go
+++ b/relay/model/image.go
@@ -1,12 +1,12 @@
package model
type ImageRequest struct {
- Model string `json:"model"`
- Prompt string `json:"prompt" binding:"required"`
- N int `json:"n,omitempty"`
- Size string `json:"size,omitempty"`
- Quality string `json:"quality,omitempty"`
- ResponseFormat string `json:"response_format,omitempty"`
- Style string `json:"style,omitempty"`
- User string `json:"user,omitempty"`
+ Model string `json:"model" form:"model"`
+ Prompt string `json:"prompt" form:"prompt" binding:"required"`
+ N int `json:"n,omitempty" form:"n"`
+ Size string `json:"size,omitempty" form:"size"`
+ Quality string `json:"quality,omitempty" form:"quality"`
+ ResponseFormat string `json:"response_format,omitempty" form:"response_format"`
+ Style string `json:"style,omitempty" form:"style"`
+ User string `json:"user,omitempty" form:"user"`
}
diff --git a/relay/model/message.go b/relay/model/message.go
index b908f989..48ddb3ad 100644
--- a/relay/model/message.go
+++ b/relay/model/message.go
@@ -1,11 +1,26 @@
package model
+import (
+ "context"
+
+ "github.com/songquanpeng/one-api/common/logger"
+)
+
type Message struct {
- Role string `json:"role,omitempty"`
- Content any `json:"content,omitempty"`
- Name *string `json:"name,omitempty"`
- ToolCalls []Tool `json:"tool_calls,omitempty"`
- ToolCallId string `json:"tool_call_id,omitempty"`
+ Role string `json:"role,omitempty"`
+ // Content is a string or a list of objects
+ Content any `json:"content,omitempty"`
+ Name *string `json:"name,omitempty"`
+ ToolCalls []Tool `json:"tool_calls,omitempty"`
+ ToolCallId string `json:"tool_call_id,omitempty"`
+ Audio *messageAudio `json:"audio,omitempty"`
+}
+
+type messageAudio struct {
+ Id string `json:"id"`
+ Data string `json:"data,omitempty"`
+ ExpiredAt int `json:"expired_at,omitempty"`
+ Transcript string `json:"transcript,omitempty"`
}
func (m Message) IsStringContent() bool {
@@ -26,6 +41,7 @@ func (m Message) StringContent() string {
if !ok {
continue
}
+
if contentMap["type"] == ContentTypeText {
if subStr, ok := contentMap["text"].(string); ok {
contentStr += subStr
@@ -34,6 +50,7 @@ func (m Message) StringContent() string {
}
return contentStr
}
+
return ""
}
@@ -47,6 +64,7 @@ func (m Message) ParseContent() []MessageContent {
})
return contentList
}
+
anyList, ok := m.Content.([]any)
if ok {
for _, contentItem := range anyList {
@@ -71,8 +89,21 @@ func (m Message) ParseContent() []MessageContent {
},
})
}
+ case ContentTypeInputAudio:
+ if subObj, ok := contentMap["input_audio"].(map[string]any); ok {
+ contentList = append(contentList, MessageContent{
+ Type: ContentTypeInputAudio,
+ InputAudio: &InputAudio{
+ Data: subObj["data"].(string),
+ Format: subObj["format"].(string),
+ },
+ })
+ }
+ default:
+ logger.Warnf(context.TODO(), "unknown content type: %s", contentMap["type"])
}
}
+
return contentList
}
return nil
@@ -84,7 +115,18 @@ type ImageURL struct {
}
type MessageContent struct {
- Type string `json:"type,omitempty"`
- Text string `json:"text"`
- ImageURL *ImageURL `json:"image_url,omitempty"`
+ // Type should be one of the following: text/input_audio
+ Type string `json:"type,omitempty"`
+ Text string `json:"text"`
+ ImageURL *ImageURL `json:"image_url,omitempty"`
+ InputAudio *InputAudio `json:"input_audio,omitempty"`
+}
+
+type InputAudio struct {
+ // Data is the base64 encoded audio data
+ Data string `json:"data" binding:"required"`
+ // Format is the audio format, should be one of the
+ // following: mp3/mp4/mpeg/mpga/m4a/wav/webm/pcm16.
+ // When stream=true, format should be pcm16
+ Format string `json:"format"`
}
diff --git a/relay/model/misc.go b/relay/model/misc.go
index 163bc398..62c3fe6f 100644
--- a/relay/model/misc.go
+++ b/relay/model/misc.go
@@ -4,6 +4,12 @@ type Usage struct {
PromptTokens int `json:"prompt_tokens"`
CompletionTokens int `json:"completion_tokens"`
TotalTokens int `json:"total_tokens"`
+ // PromptTokensDetails may be empty for some models
+ PromptTokensDetails usagePromptTokensDetails `gorm:"-" json:"prompt_tokens_details,omitempty"`
+ // CompletionTokensDetails may be empty for some models
+ CompletionTokensDetails usageCompletionTokensDetails `gorm:"-" json:"completion_tokens_details,omitempty"`
+ ServiceTier string `gorm:"-" json:"service_tier,omitempty"`
+ SystemFingerprint string `gorm:"-" json:"system_fingerprint,omitempty"`
}
type Error struct {
@@ -17,3 +23,20 @@ type ErrorWithStatusCode struct {
Error
StatusCode int `json:"status_code"`
}
+
+type usagePromptTokensDetails struct {
+ CachedTokens int `json:"cached_tokens"`
+ AudioTokens int `json:"audio_tokens"`
+ // TextTokens could be zero for pure text chats
+ TextTokens int `json:"text_tokens"`
+ ImageTokens int `json:"image_tokens"`
+}
+
+type usageCompletionTokensDetails struct {
+ ReasoningTokens int `json:"reasoning_tokens"`
+ AudioTokens int `json:"audio_tokens"`
+ AcceptedPredictionTokens int `json:"accepted_prediction_tokens"`
+ RejectedPredictionTokens int `json:"rejected_prediction_tokens"`
+ // TextTokens could be zero for pure text chats
+ TextTokens int `json:"text_tokens"`
+}
diff --git a/relay/relaymode/define.go b/relay/relaymode/define.go
index aa771205..12acb940 100644
--- a/relay/relaymode/define.go
+++ b/relay/relaymode/define.go
@@ -13,4 +13,5 @@ const (
AudioTranslation
// Proxy is a special relay mode for proxying requests to custom upstream
Proxy
+ ImagesEdits
)
diff --git a/relay/relaymode/helper.go b/relay/relaymode/helper.go
index 2cde5b85..35a0535e 100644
--- a/relay/relaymode/helper.go
+++ b/relay/relaymode/helper.go
@@ -24,8 +24,11 @@ func GetByPath(path string) int {
relayMode = AudioTranscription
} else if strings.HasPrefix(path, "/v1/audio/translations") {
relayMode = AudioTranslation
+ } else if strings.HasPrefix(path, "/v1/images/edits") {
+ relayMode = ImagesEdits
} else if strings.HasPrefix(path, "/v1/oneapi/proxy") {
relayMode = Proxy
}
+
return relayMode
}
diff --git a/router/api.go b/router/api.go
index 6d00c6ea..d5a6bf4f 100644
--- a/router/api.go
+++ b/router/api.go
@@ -21,6 +21,7 @@ func SetApiRouter(router *gin.Engine) {
apiRouter.GET("/home_page_content", controller.GetHomePageContent)
apiRouter.GET("/verification", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.SendEmailVerification)
apiRouter.GET("/reset_password", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.SendPasswordResetEmail)
+ apiRouter.GET("/user/get-by-token", middleware.TokenAuth(), controller.GetSelfByToken)
apiRouter.POST("/user/reset", middleware.CriticalRateLimit(), controller.ResetPassword)
apiRouter.GET("/oauth/github", middleware.CriticalRateLimit(), auth.GitHubOAuth)
apiRouter.GET("/oauth/oidc", middleware.CriticalRateLimit(), auth.OidcAuth)
@@ -93,6 +94,11 @@ func SetApiRouter(router *gin.Engine) {
tokenRoute.POST("/", controller.AddToken)
tokenRoute.PUT("/", controller.UpdateToken)
tokenRoute.DELETE("/:id", controller.DeleteToken)
+ apiRouter.POST("/token/consume", middleware.TokenAuth(), controller.ConsumeToken)
+ }
+ costRoute := apiRouter.Group("/cost")
+ {
+ costRoute.GET("/request/:request_id", controller.GetRequestCost)
}
redemptionRoute := apiRouter.Group("/redemption")
redemptionRoute.Use(middleware.AdminAuth())
diff --git a/router/relay.go b/router/relay.go
index 8f3c7303..554a64f4 100644
--- a/router/relay.go
+++ b/router/relay.go
@@ -25,7 +25,7 @@ func SetRelayRouter(router *gin.Engine) {
relayV1Router.POST("/chat/completions", controller.Relay)
relayV1Router.POST("/edits", controller.Relay)
relayV1Router.POST("/images/generations", controller.Relay)
- relayV1Router.POST("/images/edits", controller.RelayNotImplemented)
+ relayV1Router.POST("/images/edits", controller.Relay)
relayV1Router.POST("/images/variations", controller.RelayNotImplemented)
relayV1Router.POST("/embeddings", controller.Relay)
relayV1Router.POST("/engines/:model/embeddings", controller.Relay)
diff --git a/router/web.go b/router/web.go
index 3c9b4643..ebfc2ae1 100644
--- a/router/web.go
+++ b/router/web.go
@@ -3,6 +3,9 @@ package router
import (
"embed"
"fmt"
+ "net/http"
+ "strings"
+
"github.com/gin-contrib/gzip"
"github.com/gin-contrib/static"
"github.com/gin-gonic/gin"
@@ -10,8 +13,6 @@ import (
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/controller"
"github.com/songquanpeng/one-api/middleware"
- "net/http"
- "strings"
)
func SetWebRouter(router *gin.Engine, buildFS embed.FS) {
diff --git a/web/air/src/pages/Home/index.js b/web/air/src/pages/Home/index.js
index 4803ba4e..ba39e91c 100644
--- a/web/air/src/pages/Home/index.js
+++ b/web/air/src/pages/Home/index.js
@@ -127,4 +127,4 @@ const Home = () => {
);
};
-export default Home;
\ No newline at end of file
+export default Home;
diff --git a/web/berry/src/constants/ChannelConstants.js b/web/berry/src/constants/ChannelConstants.js
index 375adcd9..b5a855a6 100644
--- a/web/berry/src/constants/ChannelConstants.js
+++ b/web/berry/src/constants/ChannelConstants.js
@@ -185,7 +185,7 @@ export const CHANNEL_OPTIONS = {
value: 45,
color: 'primary'
},
- 45: {
+ 46: {
key: 46,
text: 'Replicate',
value: 46,
diff --git a/web/berry/src/utils/common.js b/web/berry/src/utils/common.js
index be296122..0e03b1cf 100644
--- a/web/berry/src/utils/common.js
+++ b/web/berry/src/utils/common.js
@@ -145,7 +145,7 @@ export function timestamp2string(timestamp) {
return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
}
-export function calculateQuota(quota, digits = 2) {
+export function calculateQuota(quota = 0, digits = 2) {
let quotaPerUnit = localStorage.getItem('quota_per_unit');
quotaPerUnit = parseFloat(quotaPerUnit);
diff --git a/web/berry/src/views/Log/component/TableHead.js b/web/berry/src/views/Log/component/TableHead.js
index 671170ce..072ac557 100644
--- a/web/berry/src/views/Log/component/TableHead.js
+++ b/web/berry/src/views/Log/component/TableHead.js
@@ -13,7 +13,7 @@ const LogTableHead = ({ userIsAdmin }) => {
模型
提示
补全
- 额度
+ 费用
详情
diff --git a/web/default/public/index.html b/web/default/public/index.html
index f22b8843..4e30ff92 100644
--- a/web/default/public/index.html
+++ b/web/default/public/index.html
@@ -7,7 +7,7 @@
One API
diff --git a/web/default/src/App.js b/web/default/src/App.js
index 4ece4eeb..bd1b920a 100644
--- a/web/default/src/App.js
+++ b/web/default/src/App.js
@@ -62,11 +62,11 @@ function App() {
process.env.REACT_APP_VERSION !== ''
) {
showNotice(
- `新版本可用：${data.version}，请使用快捷键 Shift + F5 刷新页面`
+ `New version available: ${data.version}, please refresh the page using the shortcut key Shift + F5`
);
}
} else {
- showError('无法正常连接至服务器！');
+ showError('Unable to connect to the server normally!');
}
};
diff --git a/web/default/src/components/ChannelsTable.js b/web/default/src/components/ChannelsTable.js
index e745814b..38a180d5 100644
--- a/web/default/src/components/ChannelsTable.js
+++ b/web/default/src/components/ChannelsTable.js
@@ -31,7 +31,7 @@ function renderType(type) {
for (let i = 0; i < CHANNEL_OPTIONS.length; i++) {
type2label[CHANNEL_OPTIONS[i].value] = CHANNEL_OPTIONS[i];
}
- type2label[0] = { value: 0, text: '未知类型', color: 'grey' };
+ type2label[0] = { value: 0, text: 'Unknown type', color: 'grey' };
}
return {type2label[type] ? type2label[type].text : type} ;
}
@@ -42,7 +42,7 @@ function renderBalance(type, balance) {
return ${balance.toFixed(2)} ;
case 4: // CloseAI
return ¥{balance.toFixed(2)} ;
- case 8: // 自定义
+ case 8: // Custom
return ${balance.toFixed(2)} ;
case 5: // OpenAI-SB
return ¥{(balance / 10000).toFixed(2)} ;
@@ -57,7 +57,7 @@ function renderBalance(type, balance) {
case 44: // SiliconFlow
return ¥{balance.toFixed(2)} ;
default:
- return 不支持 ;
+ return Not supported ;
}
}
@@ -178,7 +178,7 @@ const ChannelsTable = () => {
}
const { success, message } = res.data;
if (success) {
- showSuccess('操作成功完成！');
+ showSuccess('Operation successfully completed!');
let channel = res.data.data;
let newChannels = [...channels];
let realIdx = (activePage - 1) * ITEMS_PER_PAGE + idx;
@@ -196,14 +196,14 @@ const ChannelsTable = () => {
const renderStatus = (status) => {
switch (status) {
case 1:
- return 已启用 ;
+ return Enabled ;
case 2:
return (
- 已禁用
+ Disabled
}
- content='本渠道被手动禁用'
+ content='本Channel被手动Disable'
basic
/>
);
@@ -211,16 +211,16 @@ const ChannelsTable = () => {
return (
- 已禁用
+ Disabled
}
- content='本渠道被程序自动禁用'
+ content='本Channel被程序自动Disable'
basic
/>
);
default:
return (
- 未知状态
+ Unknown status
);
}
@@ -228,9 +228,9 @@ const ChannelsTable = () => {
const renderResponseTime = (responseTime) => {
let time = responseTime / 1000;
- time = time.toFixed(2) + ' 秒';
+ time = time.toFixed(2) + 's';
if (responseTime === 0) {
- return 未测试 ;
+ return Not tested ;
} else if (responseTime <= 1000) {
return {time} ;
} else if (responseTime <= 3000) {
@@ -277,7 +277,7 @@ const ChannelsTable = () => {
newChannels[realIdx].response_time = time * 1000;
newChannels[realIdx].test_time = Date.now() / 1000;
setChannels(newChannels);
- showInfo(`渠道 ${name} 测试成功，模型 ${model}，耗时 ${time.toFixed(2)} 秒。`);
+ showInfo(`Channel ${name} Test成功，Model ${model}，耗时 ${time.toFixed(2)}s。`);
} else {
showError(message);
}
@@ -292,7 +292,7 @@ const ChannelsTable = () => {
const res = await API.get(`/api/channel/test?scope=${scope}`);
const { success, message } = res.data;
if (success) {
- showInfo('已成功开始测试渠道，请刷新页面查看结果。');
+ showInfo('已成功开始TestChannel，请Refresh页面查看结果。');
} else {
showError(message);
}
@@ -302,7 +302,7 @@ const ChannelsTable = () => {
const res = await API.delete(`/api/channel/disabled`);
const { success, message, data } = res.data;
if (success) {
- showSuccess(`已删除所有禁用渠道，共计 ${data} 个`);
+ showSuccess(`已Delete所有DisableChannel，共计 ${data} 个`);
await refresh();
} else {
showError(message);
@@ -318,7 +318,7 @@ const ChannelsTable = () => {
newChannels[realIdx].balance = balance;
newChannels[realIdx].balance_updated_time = Date.now() / 1000;
setChannels(newChannels);
- showInfo(`渠道 ${name} 余额更新成功！`);
+ showInfo(`Channel ${name} balance updated successfully!`);
} else {
showError(message);
}
@@ -329,7 +329,7 @@ const ChannelsTable = () => {
const res = await API.get(`/api/channel/update_balance`);
const { success, message } = res.data;
if (success) {
- showInfo('已更新完毕所有已启用渠道余额！');
+ showInfo('The balance of all enabled channels has been updated!');
} else {
showError(message);
}
@@ -368,7 +368,7 @@ const ChannelsTable = () => {
icon='search'
fluid
iconPosition='left'
- placeholder='搜索渠道的 ID，名称和密钥 ...'
+ placeholder='Search for channel ID, name and key ...'
value={searchKeyword}
loading={searching}
onChange={handleKeywordChange}
@@ -380,11 +380,11 @@ const ChannelsTable = () => {
setShowPrompt(false);
setPromptShown(promptID);
}}>
- OpenAI 渠道已经不再支持通过 key 获取余额，因此余额显示为 0。对于支持的渠道类型，请点击余额进行刷新。
+ OpenAI Channel已经不再支持通过 key 获取Balance，因此Balance显示为 0。对于支持的ChannelType，请点击Balance进行Refresh。
{
sortChannel('group');
}}
>
- 分组
+ Group
{
sortChannel('type');
}}
>
- 类型
+ Type
{
sortChannel('status');
}}
>
- 状态
+ Status
{
sortChannel('response_time');
}}
>
- 响应时间
+ Response time
{
}}
hidden={!showDetail}
>
- 余额
+ Balance
{
>
优先级
- 测试模型
- 操作
+ TestModel
+ Operation
@@ -472,13 +472,13 @@ const ChannelsTable = () => {
return (
{channel.id}
- {channel.name ? channel.name : '无'}
+ {channel.name ? channel.name : 'None'}
{renderGroup(channel.group)}
{renderType(channel.type)}
{renderStatus(channel.status)}
{
}}>
{
testChannel(channel.id, channel.name, idx, channel.test_model);
}}
>
- 测试
+ Test
{/* {
{/* updateChannelBalance(channel.id, channel.name, idx);*/}
{/* }}*/}
{/*>*/}
- {/* 更新余额*/}
+ {/* Update balance*/}
{/**/}
- 删除
+ Delete
}
on='click'
@@ -559,7 +559,7 @@ const ChannelsTable = () => {
manageChannel(channel.id, 'delete', idx);
}}
>
- 删除渠道 {channel.name}
+ Delete channel {channel.name}
{
);
}}
>
- {channel.status === 1 ? '禁用' : '启用'}
+ {channel.status === 1 ? 'Disable' : 'Enable'}
- 编辑
+ Edit
@@ -592,20 +592,20 @@ const ChannelsTable = () => {
- 添加新的渠道
+ Add a new channel
{testChannels("all")}}>
- 测试所有渠道
+ Test all channels
{testChannels("disabled")}}>
- 测试禁用渠道
+ TestDisableChannel
{/*更新已启用渠道余额 */}
+ {/* loading={loading || updatingBalance}>Update the balance of enabled channels*/}
- 删除禁用渠道
+ DeleteDisableChannel
}
on='click'
@@ -613,7 +613,7 @@ const ChannelsTable = () => {
hoverable
>
- 确认删除
+ Confirm deletion
{
(channels.length % ITEMS_PER_PAGE === 0 ? 1 : 0)
}
/>
- 刷新
- {showDetail ? "隐藏详情" : "详情"}
+ Refresh
+ {showDetail ? "隐藏Details" : "Details"}
diff --git a/web/default/src/components/Footer.js b/web/default/src/components/Footer.js
index 334ee379..c303e79b 100644
--- a/web/default/src/components/Footer.js
+++ b/web/default/src/components/Footer.js
@@ -43,14 +43,6 @@ const Footer = () => {
>
{systemName} {process.env.REACT_APP_VERSION}{' '}
- 由{' '}
-
- JustSong
- {' '}
- 构建，源代码遵循{' '}
-
- MIT 协议
-
)}
diff --git a/web/default/src/components/GitHubOAuth.js b/web/default/src/components/GitHubOAuth.js
index c43ed2a1..c0f3ac65 100644
--- a/web/default/src/components/GitHubOAuth.js
+++ b/web/default/src/components/GitHubOAuth.js
@@ -8,7 +8,7 @@ const GitHubOAuth = () => {
const [searchParams, setSearchParams] = useSearchParams();
const [userState, userDispatch] = useContext(UserContext);
- const [prompt, setPrompt] = useState('处理中...');
+ const [prompt, setPrompt] = useState('Processing...');
const [processing, setProcessing] = useState(true);
let navigate = useNavigate();
@@ -18,23 +18,23 @@ const GitHubOAuth = () => {
const { success, message, data } = res.data;
if (success) {
if (message === 'bind') {
- showSuccess('绑定成功！');
+ showSuccess('Binding successful!');
navigate('/setting');
} else {
userDispatch({ type: 'login', payload: data });
localStorage.setItem('user', JSON.stringify(data));
- showSuccess('登录成功！');
+ showSuccess('Login successful!');
navigate('/');
}
} else {
showError(message);
if (count === 0) {
- setPrompt(`操作失败，重定向至登录界面中...`);
+ setPrompt(`Operation failed, redirecting to login screen...`);
navigate('/setting'); // in case this is failed to bind GitHub
return;
}
count++;
- setPrompt(`出现错误，第 ${count} 次重试中...`);
+ setPrompt(`An error occurred, retrying ${count}...`);
await new Promise((resolve) => setTimeout(resolve, count * 2000));
await sendCode(code, state, count);
}
diff --git a/web/default/src/components/Header.js b/web/default/src/components/Header.js
index 21ebcab6..091a4b5e 100644
--- a/web/default/src/components/Header.js
+++ b/web/default/src/components/Header.js
@@ -9,50 +9,50 @@ import '../index.css';
// Header Buttons
let headerButtons = [
{
- name: '首页',
+ name: 'Home',
to: '/',
icon: 'home'
},
{
- name: '渠道',
+ name: 'Channel',
to: '/channel',
icon: 'sitemap',
admin: true
},
{
- name: '令牌',
+ name: 'API Keys',
to: '/token',
icon: 'key'
},
{
- name: '兑换',
+ name: 'Redeem',
to: '/redemption',
icon: 'dollar sign',
admin: true
},
{
- name: '充值',
+ name: 'Recharge',
to: '/topup',
icon: 'cart'
},
{
- name: '用户',
+ name: 'Users',
to: '/user',
icon: 'user',
admin: true
},
{
- name: '日志',
+ name: 'Logs',
to: '/log',
icon: 'book'
},
{
- name: '设置',
+ name: 'Settings',
to: '/setting',
icon: 'setting'
},
{
- name: '关于',
+ name: 'About',
to: '/about',
icon: 'info circle'
}
@@ -60,7 +60,7 @@ let headerButtons = [
if (localStorage.getItem('chat_link')) {
headerButtons.splice(1, 0, {
- name: '聊天',
+ name: 'Chat',
to: '/chat',
icon: 'comments'
});
@@ -77,7 +77,7 @@ const Header = () => {
async function logout() {
setShowSidebar(false);
await API.get('/api/user/logout');
- showSuccess('注销成功!');
+ showSuccess('Logout successful!');
userDispatch({ type: 'logout' });
localStorage.removeItem('user');
navigate('/login');
@@ -152,7 +152,7 @@ const Header = () => {
{renderButtons(true)}
{userState.user ? (
- 注销
+ Log out
) : (
<>
{
navigate('/login');
}}
>
- 登录
+ Log in
{
@@ -169,7 +169,7 @@ const Header = () => {
navigate('/register');
}}
>
- 注册
+ Sign up
)}
@@ -202,12 +202,12 @@ const Header = () => {
className='link item'
>
- 注销
+ Log out
) : (
{
const [searchParams, setSearchParams] = useSearchParams();
const [userState, userDispatch] = useContext(UserContext);
- const [prompt, setPrompt] = useState('处理中...');
+ const [prompt, setPrompt] = useState('Processing...');
const [processing, setProcessing] = useState(true);
let navigate = useNavigate();
@@ -18,23 +18,23 @@ const LarkOAuth = () => {
const { success, message, data } = res.data;
if (success) {
if (message === 'bind') {
- showSuccess('绑定成功！');
+ showSuccess('Binding successful!');
navigate('/setting');
} else {
userDispatch({ type: 'login', payload: data });
localStorage.setItem('user', JSON.stringify(data));
- showSuccess('登录成功！');
+ showSuccess('Login successful!');
navigate('/');
}
} else {
showError(message);
if (count === 0) {
- setPrompt(`操作失败，重定向至登录界面中...`);
+ setPrompt(`Operation failed, redirecting to login screen...`);
navigate('/setting'); // in case this is failed to bind lark
return;
}
count++;
- setPrompt(`出现错误，第 ${count} 次重试中...`);
+ setPrompt(`An error occurred, retrying ${count}...`);
await new Promise((resolve) => setTimeout(resolve, count * 2000));
await sendCode(code, state, count);
}
diff --git a/web/default/src/components/Loading.js b/web/default/src/components/Loading.js
index 1210a56f..b2cb728d 100644
--- a/web/default/src/components/Loading.js
+++ b/web/default/src/components/Loading.js
@@ -5,7 +5,7 @@ const Loading = ({ prompt: name = 'page' }) => {
return (
- 加载{name}中...
+ Loading {name}...
);
diff --git a/web/default/src/components/LoginForm.js b/web/default/src/components/LoginForm.js
index 71566ef8..68a19581 100644
--- a/web/default/src/components/LoginForm.js
+++ b/web/default/src/components/LoginForm.js
@@ -22,7 +22,7 @@ const LoginForm = () => {
useEffect(() => {
if (searchParams.get('expired')) {
- showError('未登录或登录已过期，请重新登录！');
+ showError('Not logged in or login has expired, please log in again!');
}
let status = localStorage.getItem('status');
if (status) {
@@ -46,7 +46,7 @@ const LoginForm = () => {
userDispatch({ type: 'login', payload: data });
localStorage.setItem('user', JSON.stringify(data));
navigate('/');
- showSuccess('登录成功！');
+ showSuccess('Login successful!');
setShowWeChatLoginModal(false);
} else {
showError(message);
@@ -71,11 +71,11 @@ const LoginForm = () => {
localStorage.setItem('user', JSON.stringify(data));
if (username === 'root' && password === '123456') {
navigate('/user/edit');
- showSuccess('登录成功！');
- showWarning('请立刻修改默认密码！');
+ showSuccess('Login successful!');
+ showWarning('Please change the default password immediately!');
} else {
navigate('/token');
- showSuccess('登录成功！');
+ showSuccess('Login successful!');
}
} else {
showError(message);
@@ -87,7 +87,7 @@ const LoginForm = () => {
- 忘记密码？
+ Forget password?
{status.github_oauth || status.wechat_login || status.lark_client_id ? (
@@ -186,13 +186,13 @@ const LoginForm = () => {
- 微信扫码关注公众号，输入「验证码」获取验证码（三分钟内有效）
+ Scan the QR code with WeChat, follow the official account and enter 'verification code' to get the verification code (valid within three minutes)
diff --git a/web/default/src/components/LogsTable.js b/web/default/src/components/LogsTable.js
index e266d79a..813e62fe 100644
--- a/web/default/src/components/LogsTable.js
+++ b/web/default/src/components/LogsTable.js
@@ -14,30 +14,30 @@ function renderTimestamp(timestamp) {
}
const MODE_OPTIONS = [
- { key: 'all', text: '全部用户', value: 'all' },
- { key: 'self', text: '当前用户', value: 'self' }
+ { key: 'all', text: 'All users', value: 'all' },
+ { key: 'self', text: 'Current user', value: 'self' }
];
const LOG_OPTIONS = [
- { key: '0', text: '全部', value: 0 },
- { key: '1', text: '充值', value: 1 },
- { key: '2', text: '消费', value: 2 },
- { key: '3', text: '管理', value: 3 },
- { key: '4', text: '系统', value: 4 }
+ { key: '0', text: 'All', value: 0 },
+ { key: '1', text: 'Recharge', value: 1 },
+ { key: '2', text: 'Consumption', value: 2 },
+ { key: '3', text: 'Management', value: 3 },
+ { key: '4', text: 'System', value: 4 }
];
function renderType(type) {
switch (type) {
case 1:
- return 充值 ;
+ return Recharge ;
case 2:
- return 消费 ;
+ return Consumption ;
case 3:
- return 管理 ;
+ return Management ;
case 4:
- return 系统 ;
+ return System ;
default:
- return 未知 ;
+ return Unknown ;
}
}
@@ -199,34 +199,34 @@ const LogsTable = () => {
<>
- 使用明细（总消耗额度：
+ Usages（Total consumption limit：
{showStat && renderQuota(stat.quota)}
- {!showStat && 点击查看 }
+ {!showStat && click to view }
）
@@ -359,7 +359,7 @@ const LogsTable = () => {
{log.model_name ? {log.model_name} : ''}
{log.prompt_tokens ? log.prompt_tokens : ''}
{log.completion_tokens ? log.completion_tokens : ''}
- {log.quota ? renderQuota(log.quota, 6) : ''}
+ {log.quota ? renderQuota(log.quota, 6) : 'free'}
{log.content}
);
@@ -370,7 +370,7 @@ const LogsTable = () => {
{
setLogType(value);
}}
/>
- 刷新
+ Refresh
{
case 'ratio':
if (originInputs['ModelRatio'] !== inputs.ModelRatio) {
if (!verifyJSON(inputs.ModelRatio)) {
- showError('模型倍率不是合法的 JSON 字符串');
+ showError('Model rate is not a valid JSON string');
return;
}
await updateOption('ModelRatio', inputs.ModelRatio);
}
if (originInputs['GroupRatio'] !== inputs.GroupRatio) {
if (!verifyJSON(inputs.GroupRatio)) {
- showError('分组倍率不是合法的 JSON 字符串');
+ showError('Group rate is not a valid JSON string');
return;
}
await updateOption('GroupRatio', inputs.GroupRatio);
}
if (originInputs['CompletionRatio'] !== inputs.CompletionRatio) {
if (!verifyJSON(inputs.CompletionRatio)) {
- showError('补全倍率不是合法的 JSON 字符串');
+ showError('Completion倍率不是合法的 JSON 字符串');
return;
}
await updateOption('CompletionRatio', inputs.CompletionRatio);
@@ -149,10 +149,10 @@ const OperationSetting = () => {
const res = await API.delete(`/api/log/?target_timestamp=${Date.parse(historyTimestamp) / 1000}`);
const { success, message, data } = res.data;
if (success) {
- showSuccess(`${data} 条日志已清理！`);
+ showSuccess(`${data} 条Logs已清理！`);
return;
}
- showError('日志清理失败：' + message);
+ showError('Logs清理失败：' + message);
};
return (
@@ -160,39 +160,39 @@ const OperationSetting = () => {
diff --git a/web/default/src/components/OtherSetting.js b/web/default/src/components/OtherSetting.js
index ae924d9f..fabefacb 100644
--- a/web/default/src/components/OtherSetting.js
+++ b/web/default/src/components/OtherSetting.js
@@ -99,7 +99,7 @@ const OtherSetting = () => {
);
const { tag_name, body } = res.data;
if (tag_name === process.env.REACT_APP_VERSION) {
- showSuccess(`已是最新版本：${tag_name}`);
+ showSuccess(`Is the latest version：${tag_name}`);
} else {
setUpdateData({
tag_name: tag_name,
@@ -113,87 +113,87 @@ const OtherSetting = () => {
{
onOpen={() => setShowUpdateModal(true)}
open={showUpdateModal}
>
- 新版本：{updateData.tag_name}
+ New Version：{updateData.tag_name}
- setShowUpdateModal(false)}>关闭
+ setShowUpdateModal(false)}>Close
{
setShowUpdateModal(false);
openGitHubRelease();
diff --git a/web/default/src/components/PasswordResetConfirm.js b/web/default/src/components/PasswordResetConfirm.js
index d82ae895..76889f63 100644
--- a/web/default/src/components/PasswordResetConfirm.js
+++ b/web/default/src/components/PasswordResetConfirm.js
@@ -53,7 +53,7 @@ const PasswordResetConfirm = () => {
let password = res.data.data;
setNewPassword(password);
await copy(password);
- showNotice(`新密码已复制到剪贴板：${password}`);
+ showNotice(`New password has been copied to the clipboard:${password}`);
} else {
showError(message);
}
@@ -64,7 +64,7 @@ const PasswordResetConfirm = () => {
-
diff --git a/web/default/src/components/PasswordResetForm.js b/web/default/src/components/PasswordResetForm.js
index 435fa70b..b03209f2 100644
--- a/web/default/src/components/PasswordResetForm.js
+++ b/web/default/src/components/PasswordResetForm.js
@@ -49,7 +49,7 @@ const PasswordResetForm = () => {
setDisableButton(true);
if (!email) return;
if (turnstileEnabled && turnstileToken === '') {
- showInfo('请稍后几秒重试，Turnstile 正在检查用户环境！');
+ showInfo('Please try again in a few seconds, Turnstile is checking the user environment!');
return;
}
setLoading(true);
@@ -58,7 +58,7 @@ const PasswordResetForm = () => {
);
const { success, message } = res.data;
if (success) {
- showSuccess('重置邮件发送成功，请检查邮箱！');
+ showSuccess('Reset email sent successfully, please check your email!');
setInputs({ ...inputs, email: '' });
} else {
showError(message);
@@ -70,7 +70,7 @@ const PasswordResetForm = () => {
diff --git a/web/default/src/components/PersonalSetting.js b/web/default/src/components/PersonalSetting.js
index 0c968462..8bd7b857 100644
--- a/web/default/src/components/PersonalSetting.js
+++ b/web/default/src/components/PersonalSetting.js
@@ -65,7 +65,7 @@ const PersonalSetting = () => {
setSystemToken(data);
setAffLink("");
await copy(data);
- showSuccess(`令牌已重置并已复制到剪贴板`);
+ showSuccess(`Token has been reset and copied to the clipboard`);
} else {
showError(message);
}
@@ -79,7 +79,7 @@ const PersonalSetting = () => {
setAffLink(link);
setSystemToken("");
await copy(link);
- showSuccess(`邀请链接已复制到剪切板`);
+ showSuccess(`Invitation link has been copied to the clipboard`);
} else {
showError(message);
}
@@ -88,18 +88,18 @@ const PersonalSetting = () => {
const handleAffLinkClick = async (e) => {
e.target.select();
await copy(e.target.value);
- showSuccess(`邀请链接已复制到剪切板`);
+ showSuccess(`Invitation link has been copied to the clipboard`);
};
const handleSystemTokenClick = async (e) => {
e.target.select();
await copy(e.target.value);
- showSuccess(`系统令牌已复制到剪切板`);
+ showSuccess(`System token has been copied to the clipboard`);
};
const deleteAccount = async () => {
if (inputs.self_account_deletion_confirmation !== userState.user.username) {
- showError('请输入你的账户名以确认删除！');
+ showError('Please enter your account name to confirm deletion!');
return;
}
@@ -107,7 +107,7 @@ const PersonalSetting = () => {
const { success, message } = res.data;
if (success) {
- showSuccess('账户已删除！');
+ showSuccess('Account has been deleted!');
await API.get('/api/user/logout');
userDispatch({ type: 'logout' });
localStorage.removeItem('user');
@@ -124,7 +124,7 @@ const PersonalSetting = () => {
);
const { success, message } = res.data;
if (success) {
- showSuccess('微信账户绑定成功！');
+ showSuccess('WeChat account binding successful!');
setShowWeChatBindModal(false);
} else {
showError(message);
@@ -135,7 +135,7 @@ const PersonalSetting = () => {
setDisableButton(true);
if (inputs.email === '') return;
if (turnstileEnabled && turnstileToken === '') {
- showInfo('请稍后几秒重试，Turnstile 正在检查用户环境！');
+ showInfo('Please try again in a few seconds, Turnstile is checking the user environment!');
return;
}
setLoading(true);
@@ -144,7 +144,7 @@ const PersonalSetting = () => {
);
const { success, message } = res.data;
if (success) {
- showSuccess('验证码发送成功，请检查邮箱！');
+ showSuccess('Verification code sent successfully, please check your email!');
} else {
showError(message);
}
@@ -159,7 +159,7 @@ const PersonalSetting = () => {
);
const { success, message } = res.data;
if (success) {
- showSuccess('邮箱账户绑定成功！');
+ showSuccess('Email account binding successful!');
setShowEmailBindModal(false);
} else {
showError(message);
@@ -169,18 +169,18 @@ const PersonalSetting = () => {
return (
-
+
- 注意，此处生成的令牌用于系统管理，而非用于请求 OpenAI 相关的服务，请知悉。
+ Note that, The token generated here is used for system management，Not for requesting OpenAI related services，Please be aware。
- 更新个人信息
+ Update Personal Information
-
生成系统访问令牌
-
复制邀请链接
+
Generate system access token
+
Copy invitation link
{
setShowAccountDeleteModal(true);
- }}>删除个人账户
+ }}>Delete个人账户
{systemToken && (
{
/>
)}
{
setShowWeChatBindModal(true);
}}
>
- 绑定微信账号
+ Bind WeChat Account
)
}
@@ -224,19 +224,19 @@ const PersonalSetting = () => {
- 微信扫码关注公众号，输入「验证码」获取验证码（三分钟内有效）
+ Scan the QR code with WeChat, follow the official account and enter 'verification code' to get the verification code (valid within three minutes)
@@ -244,12 +244,12 @@ const PersonalSetting = () => {
{
status.github_oauth && (
- {onGitHubOAuthClicked(status.github_client_id)}}>绑定 GitHub 账号
+ {onGitHubOAuthClicked(status.github_client_id)}}>Bind GitHub Account
)
}
{
status.lark_client_id && (
- {onLarkOAuthClicked(status.lark_client_id)}}>绑定飞书账号
+ {onLarkOAuthClicked(status.lark_client_id)}}>Bind飞书账号
)
}
{
setShowEmailBindModal(true);
}}
>
- 绑定邮箱地址
+ Bind email address
setShowEmailBindModal(false)}
@@ -266,25 +266,25 @@ const PersonalSetting = () => {
size={'tiny'}
style={{ maxWidth: '450px' }}
>
- 绑定邮箱地址
+ Bind email address
危险操作
+ Dangerous operation
- 您正在删除自己的帐户，将清空所有数据且不可恢复
+ You are deleting your own account, all data will be cleared and cannot be recovered
diff --git a/web/default/src/components/RedemptionsTable.js b/web/default/src/components/RedemptionsTable.js
index dfd59685..297ba73f 100644
--- a/web/default/src/components/RedemptionsTable.js
+++ b/web/default/src/components/RedemptionsTable.js
@@ -17,13 +17,13 @@ function renderTimestamp(timestamp) {
function renderStatus(status) {
switch (status) {
case 1:
- return 未使用 ;
+ return Not used ;
case 2:
- return 已禁用 ;
+ return Disabled ;
case 3:
- return 已使用 ;
+ return Used ;
default:
- return 未知状态 ;
+ return Unknown status ;
}
}
@@ -87,7 +87,7 @@ const RedemptionsTable = () => {
}
const { success, message } = res.data;
if (success) {
- showSuccess('操作成功完成！');
+ showSuccess('Operation successfully completed!');
let redemption = res.data.data;
let newRedemptions = [...redemptions];
let realIdx = (activePage - 1) * ITEMS_PER_PAGE + idx;
@@ -152,7 +152,7 @@ const RedemptionsTable = () => {
icon='search'
fluid
iconPosition='left'
- placeholder='搜索兑换码的 ID 和名称 ...'
+ placeholder='Search for the ID and name of the redemption code ...'
value={searchKeyword}
loading={searching}
onChange={handleKeywordChange}
@@ -176,7 +176,7 @@ const RedemptionsTable = () => {
sortRedemption('name');
}}
>
- 名称
+ Name
{
sortRedemption('status');
}}
>
- 状态
+ Status
{
sortRedemption('quota');
}}
>
- 额度
+ Quota
{
sortRedemption('created_time');
}}
>
- 创建时间
+ Creation time
{
sortRedemption('redeemed_time');
}}
>
- 兑换时间
+ Redemption time
- 操作
+ Operation
@@ -225,11 +225,11 @@ const RedemptionsTable = () => {
return (
{redemption.id}
- {redemption.name ? redemption.name : '无'}
+ {redemption.name ? redemption.name : 'None'}
{renderStatus(redemption.status)}
{renderQuota(redemption.quota)}
{renderTimestamp(redemption.created_time)}
- {redemption.redeemed_time ? renderTimestamp(redemption.redeemed_time) : "尚未兑换"}
+ {redemption.redeemed_time ? renderTimestamp(redemption.redeemed_time) : "Not yet redeemed"}
{
positive
onClick={async () => {
if (await copy(redemption.key)) {
- showSuccess('已复制到剪贴板！');
+ showSuccess('Copied to clipboard!');
} else {
- showWarning('无法复制到剪贴板，请手动复制，已将兑换码填入搜索框。')
+ showWarning('Unable to copy to clipboard, please copy manually. The redemption code has been filled in the search box.')
setSearchKeyword(redemption.key);
}
}}
>
- 复制
+ Copy
- 删除
+ Delete
}
on='click'
@@ -262,7 +262,7 @@ const RedemptionsTable = () => {
manageRedemption(redemption.id, 'delete', idx);
}}
>
- 确认删除
+ Confirm deletion
{
);
}}
>
- {redemption.status === 1 ? '禁用' : '启用'}
+ {redemption.status === 1 ? 'Disable' : 'Enable'}
- 编辑
+ Edit
@@ -296,7 +296,7 @@ const RedemptionsTable = () => {
- 添加新的兑换码
+ Add new redemption code
{
async function handleSubmit(e) {
if (password.length < 8) {
- showInfo('密码长度不得小于 8 位！');
+ showInfo('Password length must not be less than 8 characters!');
return;
}
if (password !== password2) {
- showInfo('两次输入的密码不一致');
+ showInfo('The two passwords entered do not match');
return;
}
if (username && password) {
if (turnstileEnabled && turnstileToken === '') {
- showInfo('请稍后几秒重试，Turnstile 正在检查用户环境！');
+ showInfo('Please try again in a few seconds, Turnstile is checking the user environment!');
return;
}
setLoading(true);
@@ -70,7 +70,7 @@ const RegisterForm = () => {
const { success, message } = res.data;
if (success) {
navigate('/login');
- showSuccess('注册成功！');
+ showSuccess('Registration successful!');
} else {
showError(message);
}
@@ -81,7 +81,7 @@ const RegisterForm = () => {
const sendVerificationCode = async () => {
if (inputs.email === '') return;
if (turnstileEnabled && turnstileToken === '') {
- showInfo('请稍后几秒重试，Turnstile 正在检查用户环境！');
+ showInfo('Please try again in a few seconds, Turnstile is checking the user environment!');
return;
}
setLoading(true);
@@ -90,7 +90,7 @@ const RegisterForm = () => {
);
const { success, message } = res.data;
if (success) {
- showSuccess('验证码发送成功，请检查你的邮箱！');
+ showSuccess('Verification code sent successfully, please check your email!');
} else {
showError(message);
}
@@ -101,7 +101,7 @@ const RegisterForm = () => {
-
- 已有账户？
+ Already have an account?
diff --git a/web/default/src/components/SystemSetting.js b/web/default/src/components/SystemSetting.js
index 7eeae92e..0f049b70 100644
--- a/web/default/src/components/SystemSetting.js
+++ b/web/default/src/components/SystemSetting.js
@@ -260,25 +260,25 @@ const SystemSetting = () => {
diff --git a/web/default/src/components/TokensTable.js b/web/default/src/components/TokensTable.js
index 64f77845..13d333ac 100644
--- a/web/default/src/components/TokensTable.js
+++ b/web/default/src/components/TokensTable.js
@@ -7,8 +7,7 @@ import { ITEMS_PER_PAGE } from '../constants';
import { renderQuota } from '../helpers/render';
const COPY_OPTIONS = [
- { key: 'next', text: 'ChatGPT Next Web', value: 'next' },
- { key: 'ama', text: 'BotGem', value: 'ama' },
+ { key: 'web', text: 'Web', value: 'web' },
{ key: 'opencat', text: 'OpenCat', value: 'opencat' },
{ key: 'lobechat', text: 'LobeChat', value: 'lobechat' },
];
@@ -31,15 +30,15 @@ function renderTimestamp(timestamp) {
function renderStatus(status) {
switch (status) {
case 1:
- return 已启用 ;
+ return Enabled ;
case 2:
- return 已禁用 ;
+ return Disabled ;
case 3:
- return 已过期 ;
+ return Expired ;
case 4:
- return 已耗尽 ;
+ return Exhausted ;
default:
- return 未知状态 ;
+ return Unknown status ;
}
}
@@ -96,14 +95,14 @@ const TokensTable = () => {
serverAddress = window.location.origin;
}
let encodedServerAddress = encodeURIComponent(serverAddress);
- const nextLink = localStorage.getItem('chat_link');
- let nextUrl;
-
- if (nextLink) {
- nextUrl = nextLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
- } else {
- nextUrl = `https://app.nextchat.dev/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
- }
+ // const nextLink = localStorage.getItem('chat_link');
+ // let nextUrl;
+
+ // if (nextLink) {
+ // nextUrl = nextLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
+ // } else {
+ // nextUrl = `https://app.nextchat.dev/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
+ // }
let url;
switch (type) {
@@ -113,8 +112,8 @@ const TokensTable = () => {
case 'opencat':
url = `opencat://team/join?domain=${encodedServerAddress}&token=sk-${key}`;
break;
- case 'next':
- url = nextUrl;
+ case 'web':
+ url = `https://chat.laisky.com?apikey=sk-${key}`;
break;
case 'lobechat':
url = nextLink + `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}/v1"}}}`;
@@ -123,9 +122,9 @@ const TokensTable = () => {
url = `sk-${key}`;
}
if (await copy(url)) {
- showSuccess('已复制到剪贴板！');
+ showSuccess('Copied to clipboard!');
} else {
- showWarning('无法复制到剪贴板，请手动复制，已将令牌填入搜索框。');
+ showWarning('Unable to copy to clipboard, please copy manually, the token has been entered into the search box。');
setSearchKeyword(url);
}
};
@@ -135,7 +134,7 @@ const TokensTable = () => {
let serverAddress = '';
if (status) {
status = JSON.parse(status);
- serverAddress = status.server_address;
+ serverAddress = status.server_address;
}
if (serverAddress === '') {
serverAddress = window.location.origin;
@@ -143,7 +142,7 @@ const TokensTable = () => {
let encodedServerAddress = encodeURIComponent(serverAddress);
const chatLink = localStorage.getItem('chat_link');
let defaultUrl;
-
+
if (chatLink) {
defaultUrl = chatLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
} else {
@@ -154,7 +153,7 @@ const TokensTable = () => {
case 'ama':
url = `ama://set-api-key?server=${encodedServerAddress}&key=sk-${key}`;
break;
-
+
case 'opencat':
url = `opencat://team/join?domain=${encodedServerAddress}&token=sk-${key}`;
break;
@@ -166,7 +165,7 @@ const TokensTable = () => {
default:
url = defaultUrl;
}
-
+
window.open(url, '_blank');
}
@@ -196,7 +195,7 @@ const TokensTable = () => {
}
const { success, message } = res.data;
if (success) {
- showSuccess('操作成功完成！');
+ showSuccess('Operation successfully completed!');
let token = res.data.data;
let newTokens = [...tokens];
let realIdx = (activePage - 1) * ITEMS_PER_PAGE + idx;
@@ -267,7 +266,7 @@ const TokensTable = () => {
icon='search'
fluid
iconPosition='left'
- placeholder='搜索令牌的名称 ...'
+ placeholder='Search for the name of the token...'
value={searchKeyword}
loading={searching}
onChange={handleKeywordChange}
@@ -283,7 +282,7 @@ const TokensTable = () => {
sortToken('name');
}}
>
- 名称
+ Name
{
sortToken('status');
}}
>
- 状态
+ Status
{
sortToken('used_quota');
}}
>
- 已用额度
+ Used quota
{
sortToken('remain_quota');
}}
>
- 剩余额度
+ Remaining quota
{
sortToken('created_time');
}}
>
- 创建时间
+ Creation time
{
sortToken('expired_time');
}}
>
- 过期时间
+ Expiration time
- 操作
+ Operation
@@ -339,12 +338,12 @@ const TokensTable = () => {
if (token.deleted) return <>;
return (
- {token.name ? token.name : '无'}
+ {token.name ? token.name : 'None'}
{renderStatus(token.status)}
{renderQuota(token.used_quota)}
- {token.unlimited_quota ? '无限制' : renderQuota(token.remain_quota, 2)}
+ {token.unlimited_quota ? 'Unlimited' : renderQuota(token.remain_quota, 2)}
{renderTimestamp(token.created_time)}
- {token.expired_time === -1 ? '永不过期' : renderTimestamp(token.expired_time)}
+ {token.expired_time === -1 ? 'Never expires' : renderTimestamp(token.expired_time)}
@@ -355,7 +354,7 @@ const TokensTable = () => {
await onCopy('', token.key);
}}
>
- 复制
+ Copy
{
/>
{' '}
-
- {
- onOpenLink('', token.key);
- }}>
- 聊天
-
- ({
- ...option,
- onClick: async () => {
- await onOpenLink(option.value, token.key);
- }
- }))}
- trigger={<>}
- />
-
- {' '}
- 删除
+ Delete
}
on='click'
@@ -408,7 +385,7 @@ const TokensTable = () => {
manageToken(token.id, 'delete', idx);
}}
>
- 删除令牌 {token.name}
+ Delete Token {token.name}
{
);
}}
>
- {token.status === 1 ? '禁用' : '启用'}
+ {token.status === 1 ? 'Disable' : 'Enable'}
- 编辑
+ Edit
@@ -441,16 +418,16 @@ const TokensTable = () => {
- 添加新的令牌
+ Add New Token
- 刷新
+ Refresh
普通用户;
+ return Regular user ;
case 10:
- return 管理员 ;
+ return Administrator ;
case 100:
- return 超级管理员 ;
+ return Super administrator ;
default:
- return 未知身份 ;
+ return Unknown Identity ;
}
}
@@ -70,7 +70,7 @@ const UsersTable = () => {
});
const { success, message } = res.data;
if (success) {
- showSuccess('操作成功完成！');
+ showSuccess('Operation successfully completed!');
let user = res.data.data;
let newUsers = [...users];
let realIdx = (activePage - 1) * ITEMS_PER_PAGE + idx;
@@ -90,17 +90,17 @@ const UsersTable = () => {
const renderStatus = (status) => {
switch (status) {
case 1:
- return 已激活 ;
+ return Activated ;
case 2:
return (
- 已封禁
+ Banned
);
default:
return (
- 未知状态
+ Unknown status
);
}
@@ -162,7 +162,7 @@ const UsersTable = () => {
icon='search'
fluid
iconPosition='left'
- placeholder='搜索用户的 ID，用户名，显示名称，以及邮箱地址 ...'
+ placeholder='Search user ID, username, display name, and email address...'
value={searchKeyword}
loading={searching}
onChange={handleKeywordChange}
@@ -186,7 +186,7 @@ const UsersTable = () => {
sortUser('username');
}}
>
- 用户名
+ Username
{
sortUser('group');
}}
>
- 分组
+ Group
{
sortUser('quota');
}}
>
- 统计信息
+ Statistics
{
sortUser('role');
}}
>
- 用户角色
+ User Role
{
sortUser('status');
}}
>
- 状态
+ Status
- 操作
+ Operation
@@ -237,7 +237,7 @@ const UsersTable = () => {
{user.id}
{renderText(user.username, 15)}}
@@ -246,12 +246,12 @@ const UsersTable = () => {
{renderGroup(user.group)}
{/**/}
- {/* {user.email ? {renderText(user.email, 24)}} /> : '无'}*/}
+ {/* {user.email ? {renderText(user.email, 24)}} /> : 'None'}*/}
{/* */}
- {renderQuota(user.quota)}} />
- {renderQuota(user.used_quota)}} />
- {renderNumber(user.request_count)}} />
+ {renderQuota(user.quota)}} />
+ {renderQuota(user.used_quota)}} />
+ {renderNumber(user.request_count)}} />
{renderRole(user.role)}
{renderStatus(user.status)}
@@ -265,7 +265,7 @@ const UsersTable = () => {
}}
disabled={user.role === 100}
>
- 提升
+ Promote
{
}}
disabled={user.role === 100}
>
- 降级
+ Demote
- 删除
+ Delete
}
on='click'
@@ -293,7 +293,7 @@ const UsersTable = () => {
manageUser(user.username, 'delete', idx);
}}
>
- 删除用户 {user.username}
+ Delete User {user.username}
{
}}
disabled={user.role === 100}
>
- {user.status === 1 ? '禁用' : '启用'}
+ {user.status === 1 ? 'Disable' : 'Enable'}
- 编辑
+ Edit
@@ -327,16 +327,16 @@ const UsersTable = () => {
- 添加新的用户
+ Add New User
{
localStorage.setItem('about', aboutContent);
} else {
showError(message);
- setAbout('加载关于内容失败...');
+ setAbout('Failed to load the About content...');
}
setAboutLoaded(true);
};
@@ -34,9 +34,9 @@ const About = () => {
{
aboutLoaded && about === '' ? <>
-
- 可在设置页面设置关于内容，支持 HTML & Markdown
- 项目仓库地址：
+
+ You can set the content about in the settings page, support HTML & Markdown
+ Project Repository Address：
https://github.com/songquanpeng/one-api
diff --git a/web/default/src/pages/Channel/EditChannel.js b/web/default/src/pages/Channel/EditChannel.js
index f10658c3..cd109e04 100644
--- a/web/default/src/pages/Channel/EditChannel.js
+++ b/web/default/src/pages/Channel/EditChannel.js
@@ -11,18 +11,18 @@ const MODEL_MAPPING_EXAMPLE = {
};
function type2secretPrompt(type) {
- // inputs.type === 15 ? '按照如下格式输入：APIKey|SecretKey' : (inputs.type === 18 ? '按照如下格式输入：APPID|APISecret|APIKey' : '请输入渠道对应的鉴权密钥')
+ // inputs.type === 15 ? 'Enter in the following format:APIKey|SecretKey' : (inputs.type === 18 ? 'Enter in the following format:APPID|APISecret|APIKey' : 'Please enter the authentication key corresponding to the channel')
switch (type) {
case 15:
- return '按照如下格式输入：APIKey|SecretKey';
+ return 'Enter in the following format:APIKey|SecretKey';
case 18:
- return '按照如下格式输入：APPID|APISecret|APIKey';
+ return 'Enter in the following format:APPID|APISecret|APIKey';
case 22:
- return '按照如下格式输入：APIKey-AppId，例如：fastgpt-0sp2gtvfdgyi4k30jwlgwf1i-64f335d84283f05518e9e041';
+ return 'Enter in the following format:APIKey-AppId，For example：fastgpt-0sp2gtvfdgyi4k30jwlgwf1i-64f335d84283f05518e9e041';
case 23:
- return '按照如下格式输入：AppId|SecretId|SecretKey';
+ return 'Enter in the following format:AppId|SecretId|SecretKey';
default:
- return '请输入渠道对应的鉴权密钥';
+ return 'Please enter the authentication key corresponding to the channel';
}
}
@@ -168,15 +168,15 @@ const EditChannel = () => {
}
}
if (!isEdit && (inputs.name === '' || inputs.key === '')) {
- showInfo('请填写渠道名称和渠道密钥！');
+ showInfo('Please fill in the ChannelName and ChannelKey!');
return;
}
if (inputs.type !== 43 && inputs.models.length === 0) {
- showInfo('请至少选择一个模型！');
+ showInfo('Please select at least one Model!');
return;
}
if (inputs.model_mapping !== '' && !verifyJSON(inputs.model_mapping)) {
- showInfo('模型映射必须是合法的 JSON 格式！');
+ showInfo('Model mapping must be in valid JSON format!');
return;
}
let localInputs = {...inputs};
@@ -198,9 +198,9 @@ const EditChannel = () => {
const { success, message } = res.data;
if (success) {
if (isEdit) {
- showSuccess('渠道更新成功！');
+ showSuccess('Channel updated successfully!');
} else {
- showSuccess('渠道创建成功！');
+ showSuccess('Channel created successfully!');
setInputs(originInputs);
}
} else {
@@ -229,11 +229,11 @@ const EditChannel = () => {
return (
<>
- {isEdit ? '更新渠道信息' : '创建新的渠道'}
+ {isEdit ? 'Update Channel Information' : 'Create New Channel'}
-
