Merge 761ee32d19 into 8df4a2670b

- Update pricing ratios and calculations for AI models in the billing system.
- Introduce new constants and enhance error handling for audio token rates.
- Comment out outdated pricing entries and include additional models in calculations.

.github/workflows/docker-image.yml

@@ -32,10 +32,10 @@ jobs:
           git describe --tags > VERSION 
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -62,8 +62,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          #          platforms: linux/amd64,linux/arm64
-          platforms: linux/amd64 # TODO disable arm64 for now, because it cause error
+          platforms: ${{ contains(github.ref, 'alpha') && 'linux/amd64' || 'linux/amd64' }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/linux-release.yml

@@ -7,6 +7,7 @@ on:
     tags:
       - 'v*.*.*'
       - '!*-alpha*'
+      - '!*-preview*'
   workflow_dispatch:
     inputs:
       name:

.github/workflows/macos-release.yml

@@ -7,6 +7,7 @@ on:
     tags:
       - 'v*.*.*'
       - '!*-alpha*'
+      - '!*-preview*'
   workflow_dispatch:
     inputs:
       name:

.github/workflows/windows-release.yml

@@ -7,6 +7,7 @@ on:
     tags:
       - 'v*.*.*'
       - '!*-alpha*'
+      - '!*-preview*'
   workflow_dispatch:
     inputs:
       name:

.gitignore

@@ -12,4 +12,5 @@ cmd.md
 .env
 /one-api
 temp
-.DS_Store
+.DS_Store
+/__debug_bin*

Dockerfile

@@ -9,23 +9,22 @@ RUN npm install --prefix /web/default & \
     npm install --prefix /web/air & \
     wait
 
-RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat /web/default/VERSION) npm run build --prefix /web/default & \
-    DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat /web/berry/VERSION) npm run build --prefix /web/berry & \
-    DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat /web/air/VERSION) npm run build --prefix /web/air & \
+RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat ./VERSION) npm run build --prefix /web/default & \
+    DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat ./VERSION) npm run build --prefix /web/berry & \
+    DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat ./VERSION) npm run build --prefix /web/air & \
     wait
 
-FROM golang AS builder2
+FROM golang:alpine AS builder2
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    build-essential \
-    sqlite3 libsqlite3-dev \
-    && rm -rf /var/lib/apt/lists/*
+RUN apk add --no-cache \
+    gcc \
+    musl-dev \
+    sqlite-dev \
+    build-base
 
 ENV GO111MODULE=on \
     CGO_ENABLED=1 \
-    GOOS=linux \
-    CGO_CFLAGS="-I/usr/include" \
-    CGO_LDFLAGS="-L/usr/lib"
+    GOOS=linux
 
 WORKDIR /build
 
@@ -35,17 +34,14 @@ RUN go mod download
 COPY . .
 COPY --from=builder /web/build ./web/build
 
-RUN go build -trimpath -ldflags "-s -w -X 'github.com/songquanpeng/one-api/common.Version=$(cat VERSION)'" -o one-api
+RUN go build -trimpath -ldflags "-s -w -X 'github.com/songquanpeng/one-api/common.Version=$(cat VERSION)' -linkmode external -extldflags '-static'" -o one-api
 
-# Final runtime image
-FROM ubuntu:22.04
+FROM alpine:latest
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    ca-certificates tzdata bash \
-    && rm -rf /var/lib/apt/lists/*
+RUN apk add --no-cache ca-certificates tzdata
 
 COPY --from=builder2 /build/one-api /
 
 EXPOSE 3000
 WORKDIR /data
-ENTRYPOINT ["/one-api"]
+ENTRYPOINT ["/one-api"]

README.en.md

@@ -315,6 +315,7 @@ If the channel ID is not provided, load balancing will be used to distribute the
 * [FastGPT](https://github.com/labring/FastGPT): Knowledge question answering system based on the LLM
 * [VChart](https://github.com/VisActor/VChart):  More than just a cross-platform charting library, but also an expressive data storyteller.
 * [VMind](https://github.com/VisActor/VMind):  Not just automatic, but also fantastic. Open-source solution for intelligent visualization.
+* * [CherryStudio](https://github.com/CherryHQ/cherry-studio):  A cross-platform AI client that integrates multiple service providers and supports local knowledge base management.
 
 ## Note
 This project is an open-source project. Please use it in compliance with OpenAI's [Terms of Use](https://openai.com/policies/terms-of-use) and **applicable laws and regulations**. It must not be used for illegal purposes.

README.ja.md

@@ -287,8 +287,8 @@ graph LR
     + インターフェイスアドレスと API Key が正しいか再確認してください。
 
 ## 関連プロジェクト
-[FastGPT](https://github.com/labring/FastGPT): LLM に基づく知識質問応答システム
-
+* [FastGPT](https://github.com/labring/FastGPT): LLM に基づく知識質問応答システム
+* [CherryStudio](https://github.com/CherryHQ/cherry-studio):  マルチプラットフォーム対応のAIクライアント。複数のサービスプロバイダーを統合管理し、ローカル知識ベースをサポートします。
 ## 注
 本プロジェクトはオープンソースプロジェクトです。OpenAI の[利用規約](https://openai.com/policies/terms-of-use)および**適用される法令**を遵守してご利用ください。違法な目的での利用はご遠慮ください。
 

README.md

@@ -57,10 +57,10 @@ _✨ 通过标准的 OpenAI API 格式访问所有的大模型，开箱即用
 > 根据[《生成式人工智能服务管理暂行办法》](http://www.cac.gov.cn/2023-07/13/c_1690898327029107.htm)的要求，请勿对中国地区公众提供一切未经备案的生成式人工智能服务。
 
 > [!NOTE]
-> 稳定版镜像地址：[justsong/one-api](https://hub.docker.com/repository/docker/justsong/one-api)
+> 稳定版 / 预览版镜像地址：[justsong/one-api](https://hub.docker.com/repository/docker/justsong/one-api)
 > 或者 [ghcr.io/songquanpeng/one-api](https://github.com/songquanpeng/one-api/pkgs/container/one-api)
 >
-> 预览版镜像地址：[justsong/one-api-alpha](https://hub.docker.com/repository/docker/justsong/one-api-alpha)
+> alpha 版镜像地址：[justsong/one-api-alpha](https://hub.docker.com/repository/docker/justsong/one-api-alpha)
 > 或者 [ghcr.io/songquanpeng/one-api-alpha](https://github.com/songquanpeng/one-api/pkgs/container/one-api-alpha)
 
 > [!WARNING]
@@ -72,7 +72,7 @@ _✨ 通过标准的 OpenAI API 格式访问所有的大模型，开箱即用
    + [x] [Anthropic Claude 系列模型](https://anthropic.com) (支持 AWS Claude)
    + [x] [Google PaLM2/Gemini 系列模型](https://developers.generativeai.google)
    + [x] [Mistral 系列模型](https://mistral.ai/)
-   + [x] [字节跳动豆包大模型](https://console.volcengine.com/ark/region:ark+cn-beijing/model)
+   + [x] [字节跳动豆包大模型（火山引擎）](https://www.volcengine.com/experience/ark?utm_term=202502dsinvite&ac=DSASUQY5&rc=2QXCA1VI)
    + [x] [百度文心一言系列模型](https://cloud.baidu.com/doc/WENXINWORKSHOP/index.html)
    + [x] [阿里通义千问系列模型](https://help.aliyun.com/document_detail/2400395.html)
    + [x] [讯飞星火认知大模型](https://www.xfyun.cn/doc/spark/Web.html)
@@ -93,7 +93,7 @@ _✨ 通过标准的 OpenAI API 格式访问所有的大模型，开箱即用
    + [x] [DeepL](https://www.deepl.com/)
    + [x] [together.ai](https://www.together.ai/)
    + [x] [novita.ai](https://www.novita.ai/)
-   + [x] [硅基流动 SiliconCloud](https://siliconflow.cn/siliconcloud)
+   + [x] [硅基流动 SiliconCloud](https://cloud.siliconflow.cn/i/rKXmRobW)
    + [x] [xAI](https://x.ai/)
 2. 支持配置镜像以及众多[第三方代理服务](https://iamazing.cn/page/openai-api-third-party-services)。
 3. 支持通过**负载均衡**的方式访问多个渠道。
@@ -115,7 +115,7 @@ _✨ 通过标准的 OpenAI API 格式访问所有的大模型，开箱即用
 19. 支持丰富的**自定义**设置，
     1. 支持自定义系统名称，logo 以及页脚。
     2. 支持自定义首页和关于页面，可以选择使用 HTML & Markdown 代码进行自定义，或者使用一个单独的网页通过 iframe 嵌入。
-20. 支持通过系统访问令牌调用管理 API，进而**在无需二开的情况下扩展和自定义** One API 的功能，详情请参考此处 [API 文档](./docs/API.md)。。
+20. 支持通过系统访问令牌调用管理 API，进而**在无需二开的情况下扩展和自定义** One API 的功能，详情请参考此处 [API 文档](./docs/API.md)。
 21. 支持 Cloudflare Turnstile 用户校验。
 22. 支持用户管理，支持**多种用户登录注册方式**：
     + 邮箱登录注册（支持注册邮箱白名单）以及通过邮箱进行密码重置。
@@ -385,7 +385,7 @@ graph LR
    + 例子：`NODE_TYPE=slave`
 9. `CHANNEL_UPDATE_FREQUENCY`：设置之后将定期更新渠道余额，单位为分钟，未设置则不进行更新。
    + 例子：`CHANNEL_UPDATE_FREQUENCY=1440`
-10. `CHANNEL_TEST_FREQUENCY`：设置之后将定期检查渠道，单位为分钟，未设置则不进行检查。 
+10. `CHANNEL_TEST_FREQUENCY`：设置之后将定期检查渠道，单位为分钟，未设置则不进行检查。
    +例子：`CHANNEL_TEST_FREQUENCY=1440`
 11. `POLLING_INTERVAL`：批量更新渠道余额以及测试可用性时的请求间隔，单位为秒，默认无间隔。
     + 例子：`POLLING_INTERVAL=5`
@@ -469,6 +469,7 @@ https://openai.justsong.cn
 * [ChatGPT Next Web](https://github.com/Yidadaa/ChatGPT-Next-Web):  一键拥有你自己的跨平台 ChatGPT 应用
 * [VChart](https://github.com/VisActor/VChart):  不只是开箱即用的多端图表库，更是生动灵活的数据故事讲述者。
 * [VMind](https://github.com/VisActor/VMind):  不仅自动，还很智能。开源智能可视化解决方案。
+* [CherryStudio](https://github.com/CherryHQ/cherry-studio):  全平台支持的AI客户端, 多服务商集成管理、本地知识库支持。
 
 ## 注意
 

common/config/config.go

@@ -126,10 +126,10 @@ var ValidThemes = map[string]bool{
 // All duration's unit is seconds
 // Shouldn't larger then RateLimitKeyExpirationDuration
 var (
-	GlobalApiRateLimitNum            = env.Int("GLOBAL_API_RATE_LIMIT", 240)
+	GlobalApiRateLimitNum            = env.Int("GLOBAL_API_RATE_LIMIT", 480)
 	GlobalApiRateLimitDuration int64 = 3 * 60
 
-	GlobalWebRateLimitNum            = env.Int("GLOBAL_WEB_RATE_LIMIT", 120)
+	GlobalWebRateLimitNum            = env.Int("GLOBAL_WEB_RATE_LIMIT", 240)
 	GlobalWebRateLimitDuration int64 = 3 * 60
 
 	UploadRateLimitNum            = 10
@@ -163,4 +163,7 @@ var UserContentRequestProxy = env.String("USER_CONTENT_REQUEST_PROXY", "")
 var UserContentRequestTimeout = env.Int("USER_CONTENT_REQUEST_TIMEOUT", 30)
 
 var EnforceIncludeUsage = env.Bool("ENFORCE_INCLUDE_USAGE", false)
-var TestPrompt = env.String("TEST_PROMPT", "Print your model name exactly and do not output without any other text.")
+var TestPrompt = env.String("TEST_PROMPT", "Output only your specific model name with no additional text.")
+
+// OpenrouterProviderSort is used to determine the order of the providers in the openrouter
+var OpenrouterProviderSort = env.String("OPENROUTER_PROVIDER_SORT", "")

common/conv/any.go

@@ -1,6 +1,9 @@
 package conv
 
 func AsString(v any) string {
-	str, _ := v.(string)
-	return str
+	if str, ok := v.(string); ok {
+		return str
+	}
+
+	return ""
 }

common/gin.go

@@ -3,10 +3,11 @@ package common
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/gin-gonic/gin"
-	"github.com/songquanpeng/one-api/common/ctxkey"
 	"io"
 	"strings"
+
+	"github.com/gin-gonic/gin"
+	"github.com/songquanpeng/one-api/common/ctxkey"
 )
 
 func GetRequestBody(c *gin.Context) ([]byte, error) {
@@ -31,7 +32,6 @@ func UnmarshalBodyReusable(c *gin.Context, v any) error {
 	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))
 	} else {
 		c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))
 		err = c.ShouldBind(&v)
@@ -40,6 +40,7 @@ func UnmarshalBodyReusable(c *gin.Context, v any) error {
 		return err
 	}
 	// Reset request body
+	c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))
 	return nil
 }
 

common/logger/logger.go

@@ -93,6 +93,9 @@ func Error(ctx context.Context, msg string) {
 }
 
 func Debugf(ctx context.Context, format string, a ...any) {
+	if !config.DebugEnabled {
+		return
+	}
 	logHelper(ctx, loggerDEBUG, fmt.Sprintf(format, a...))
 }
 

common/utils/array.go

@@ -0,0 +1,13 @@
+package utils
+
+func DeDuplication(slice []string) []string {
+	m := make(map[string]bool)
+	for _, v := range slice {
+		m[v] = true
+	}
+	result := make([]string, 0, len(m))
+	for v := range m {
+		result = append(result, v)
+	}
+	return result
+}

controller/channel-billing.go

@@ -112,6 +112,13 @@ type DeepSeekUsageResponse struct {
 	} `json:"balance_infos"`
 }
 
+type OpenRouterResponse struct {
+	Data struct {
+		TotalCredits float64 `json:"total_credits"`
+		TotalUsage   float64 `json:"total_usage"`
+	} `json:"data"`
+}
+
 // GetAuthHeader get auth header
 func GetAuthHeader(token string) http.Header {
 	h := http.Header{}
@@ -285,6 +292,22 @@ func updateChannelDeepSeekBalance(channel *model.Channel) (float64, error) {
 	return balance, nil
 }
 
+func updateChannelOpenRouterBalance(channel *model.Channel) (float64, error) {
+	url := "https://openrouter.ai/api/v1/credits"
+	body, err := GetResponseBody("GET", url, channel, GetAuthHeader(channel.Key))
+	if err != nil {
+		return 0, err
+	}
+	response := OpenRouterResponse{}
+	err = json.Unmarshal(body, &response)
+	if err != nil {
+		return 0, err
+	}
+	balance := response.Data.TotalCredits - response.Data.TotalUsage
+	channel.UpdateBalance(balance)
+	return balance, nil
+}
+
 func updateChannelBalance(channel *model.Channel) (float64, error) {
 	baseURL := channeltype.ChannelBaseURLs[channel.Type]
 	if channel.GetBaseURL() == "" {
@@ -313,6 +336,8 @@ func updateChannelBalance(channel *model.Channel) (float64, error) {
 		return updateChannelSiliconFlowBalance(channel)
 	case channeltype.DeepSeek:
 		return updateChannelDeepSeekBalance(channel)
+	case channeltype.OpenRouter:
+		return updateChannelOpenRouterBalance(channel)
 	default:
 		return 0, errors.New("尚未实现")
 	}

controller/channel-test.go

@@ -106,6 +106,8 @@ func testChannel(ctx context.Context, channel *model.Channel, request *relaymode
 	if err != nil {
 		return "", err, nil
 	}
+	c.Set(ctxkey.ConvertedRequest, convertedRequest)
+
 	jsonData, err := json.Marshal(convertedRequest)
 	if err != nil {
 		return "", err, nil
@@ -153,6 +155,7 @@ func testChannel(ctx context.Context, channel *model.Channel, request *relaymode
 	rawResponse := w.Body.String()
 	_, responseMessage, err = parseTestResponse(rawResponse)
 	if err != nil {
+		logger.SysError(fmt.Sprintf("failed to parse error: %s, \nresponse: %s", err.Error(), rawResponse))
 		return "", err, nil
 	}
 	result := w.Result()

model/ability.go

@@ -2,10 +2,14 @@ package model
 
 import (
 	"context"
-	"github.com/songquanpeng/one-api/common"
-	"gorm.io/gorm"
 	"sort"
 	"strings"
+
+	"gorm.io/gorm"
+
+	"github.com/pkg/errors"
+	"github.com/songquanpeng/one-api/common"
+	"github.com/songquanpeng/one-api/common/utils"
 )
 
 type Ability struct {
@@ -39,7 +43,7 @@ func GetRandomSatisfiedChannel(group string, model string, ignoreFirstPriority b
 		err = channelQuery.Order("RAND()").First(&ability).Error
 	}
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "get random satisfied channel")
 	}
 	channel := Channel{}
 	channel.Id = ability.ChannelId
@@ -49,6 +53,7 @@ func GetRandomSatisfiedChannel(group string, model string, ignoreFirstPriority b
 
 func (channel *Channel) AddAbilities() error {
 	models_ := strings.Split(channel.Models, ",")
+	models_ = utils.DeDuplication(models_)
 	groups_ := strings.Split(channel.Group, ",")
 	abilities := make([]Ability, 0, len(models_))
 	for _, model := range models_ {

monitor/manage.go

@@ -35,6 +35,8 @@ func ShouldDisableChannel(err *model.Error, statusCode int) bool {
 		strings.Contains(lowerMessage, "balance") ||
 		strings.Contains(lowerMessage, "permission denied") ||
 		strings.Contains(lowerMessage, "organization has been restricted") || // groq
+		strings.Contains(lowerMessage, "api key not valid") || // gemini
+		strings.Contains(lowerMessage, "api key expired") || // gemini
 		strings.Contains(lowerMessage, "已欠费") {
 		return true
 	}

relay/adaptor/ali/constants.go

@@ -14,10 +14,14 @@ var ModelList = []string{
 	"qwen2-72b-instruct", "qwen2-57b-a14b-instruct", "qwen2-7b-instruct", "qwen2-1.5b-instruct", "qwen2-0.5b-instruct",
 	"qwen1.5-110b-chat", "qwen1.5-72b-chat", "qwen1.5-32b-chat", "qwen1.5-14b-chat", "qwen1.5-7b-chat", "qwen1.5-1.8b-chat", "qwen1.5-0.5b-chat",
 	"qwen-72b-chat", "qwen-14b-chat", "qwen-7b-chat", "qwen-1.8b-chat", "qwen-1.8b-longcontext-chat",
+	"qvq-72b-preview",
+	"qwen2.5-vl-72b-instruct", "qwen2.5-vl-7b-instruct", "qwen2.5-vl-2b-instruct", "qwen2.5-vl-1b-instruct", "qwen2.5-vl-0.5b-instruct",
 	"qwen2-vl-7b-instruct", "qwen2-vl-2b-instruct", "qwen-vl-v1", "qwen-vl-chat-v1",
 	"qwen2-audio-instruct", "qwen-audio-chat",
 	"qwen2.5-math-72b-instruct", "qwen2.5-math-7b-instruct", "qwen2.5-math-1.5b-instruct", "qwen2-math-72b-instruct", "qwen2-math-7b-instruct", "qwen2-math-1.5b-instruct",
 	"qwen2.5-coder-32b-instruct", "qwen2.5-coder-14b-instruct", "qwen2.5-coder-7b-instruct", "qwen2.5-coder-3b-instruct", "qwen2.5-coder-1.5b-instruct", "qwen2.5-coder-0.5b-instruct",
 	"text-embedding-v1", "text-embedding-v3", "text-embedding-v2", "text-embedding-async-v2", "text-embedding-async-v1",
 	"ali-stable-diffusion-xl", "ali-stable-diffusion-v1.5", "wanx-v1",
+	"qwen-mt-plus", "qwen-mt-turbo",
+	"deepseek-r1", "deepseek-v3", "deepseek-r1-distill-qwen-1.5b", "deepseek-r1-distill-qwen-7b", "deepseek-r1-distill-qwen-14b", "deepseek-r1-distill-qwen-32b", "deepseek-r1-distill-llama-8b", "deepseek-r1-distill-llama-70b",
 }

relay/adaptor/alibailian/constants.go

@@ -0,0 +1,20 @@
+package alibailian
+
+// https://help.aliyun.com/zh/model-studio/getting-started/models
+
+var ModelList = []string{
+	"qwen-turbo",
+	"qwen-plus",
+	"qwen-long",
+	"qwen-max",
+	"qwen-coder-plus",
+	"qwen-coder-plus-latest",
+	"qwen-coder-turbo",
+	"qwen-coder-turbo-latest",
+	"qwen-mt-plus",
+	"qwen-mt-turbo",
+	"qwq-32b-preview",
+
+	"deepseek-r1",
+	"deepseek-v3",
+}

relay/adaptor/alibailian/main.go

@@ -0,0 +1,19 @@
+package alibailian
+
+import (
+	"fmt"
+
+	"github.com/songquanpeng/one-api/relay/meta"
+	"github.com/songquanpeng/one-api/relay/relaymode"
+)
+
+func GetRequestURL(meta *meta.Meta) (string, error) {
+	switch meta.Mode {
+	case relaymode.ChatCompletions:
+		return fmt.Sprintf("%s/compatible-mode/v1/chat/completions", meta.BaseURL), nil
+	case relaymode.Embeddings:
+		return fmt.Sprintf("%s/compatible-mode/v1/embeddings", meta.BaseURL), nil
+	default:
+	}
+	return "", fmt.Errorf("unsupported relay mode %d for ali bailian", meta.Mode)
+}

relay/adaptor/anthropic/adaptor.go

@@ -36,8 +36,8 @@ func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, meta *me
 
 	// https://x.com/alexalbert__/status/1812921642143900036
 	// claude-3-5-sonnet can support 8k context
-	if strings.HasPrefix(meta.ActualModelName, "claude-3-5-sonnet") {
-		req.Header.Set("anthropic-beta", "max-tokens-3-5-sonnet-2024-07-15")
+	if strings.HasPrefix(meta.ActualModelName, "claude-3-7-sonnet") {
+		req.Header.Set("anthropic-beta", "output-128k-2025-02-19")
 	}
 
 	return nil
@@ -47,7 +47,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
 	if request == nil {
 		return nil, errors.New("request is nil")
 	}
-	return ConvertRequest(*request), nil
+	return ConvertRequest(c, *request)
 }
 
 func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {

relay/adaptor/anthropic/constants.go

@@ -3,10 +3,13 @@ package anthropic
 var ModelList = []string{
 	"claude-instant-1.2", "claude-2.0", "claude-2.1",
 	"claude-3-haiku-20240307",
+	"claude-3-5-haiku-latest",
 	"claude-3-5-haiku-20241022",
 	"claude-3-sonnet-20240229",
 	"claude-3-opus-20240229",
+	"claude-3-5-sonnet-latest",
 	"claude-3-5-sonnet-20240620",
 	"claude-3-5-sonnet-20241022",
-	"claude-3-5-sonnet-latest",
+	"claude-3-7-sonnet-latest",
+	"claude-3-7-sonnet-20250219",
 }

relay/adaptor/anthropic/main.go

@@ -2,18 +2,21 @@ package anthropic
 
 import (
 	"bufio"
+	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/songquanpeng/one-api/common/render"
 	"io"
+	"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/helper"
 	"github.com/songquanpeng/one-api/common/image"
 	"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"
 )
@@ -36,7 +39,16 @@ func stopReasonClaude2OpenAI(reason *string) string {
 	}
 }
 
-func ConvertRequest(textRequest model.GeneralOpenAIRequest) *Request {
+// isModelSupportThinking is used to check if the model supports extended thinking
+func isModelSupportThinking(model string) bool {
+	if strings.Contains(model, "claude-3-7-sonnet") {
+		return true
+	}
+
+	return false
+}
+
+func ConvertRequest(c *gin.Context, textRequest model.GeneralOpenAIRequest) (*Request, error) {
 	claudeTools := make([]Tool, 0, len(textRequest.Tools))
 
 	for _, tool := range textRequest.Tools {
@@ -61,7 +73,27 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *Request {
 		TopK:        textRequest.TopK,
 		Stream:      textRequest.Stream,
 		Tools:       claudeTools,
+		Thinking:    textRequest.Thinking,
 	}
+
+	if isModelSupportThinking(textRequest.Model) &&
+		c.Request.URL.Query().Has("thinking") && claudeRequest.Thinking == nil {
+		claudeRequest.Thinking = &model.Thinking{
+			Type:         "enabled",
+			BudgetTokens: int(math.Min(1024, float64(claudeRequest.MaxTokens/2))),
+		}
+	}
+
+	if isModelSupportThinking(textRequest.Model) &&
+		claudeRequest.Thinking != nil {
+		if claudeRequest.MaxTokens <= 1024 {
+			return nil, errors.New("max_tokens must be greater than 1024 when using extended thinking")
+		}
+
+		// top_p must be nil when using extended thinking
+		claudeRequest.TopP = nil
+	}
+
 	if len(claudeTools) > 0 {
 		claudeToolChoice := struct {
 			Type string `json:"type"`
@@ -127,7 +159,9 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *Request {
 			var content Content
 			if part.Type == model.ContentTypeText {
 				content.Type = "text"
-				content.Text = part.Text
+				if part.Text != nil {
+					content.Text = *part.Text
+				}
 			} else if part.Type == model.ContentTypeImageURL {
 				content.Type = "image"
 				content.Source = &ImageSource{
@@ -142,13 +176,14 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *Request {
 		claudeMessage.Content = contents
 		claudeRequest.Messages = append(claudeRequest.Messages, claudeMessage)
 	}
-	return &claudeRequest
+	return &claudeRequest, nil
 }
 
 // https://docs.anthropic.com/claude/reference/messages-streaming
 func StreamResponseClaude2OpenAI(claudeResponse *StreamResponse) (*openai.ChatCompletionsStreamResponse, *Response) {
 	var response *Response
 	var responseText string
+	var reasoningText string
 	var stopReason string
 	tools := make([]model.Tool, 0)
 
@@ -158,6 +193,10 @@ func StreamResponseClaude2OpenAI(claudeResponse *StreamResponse) (*openai.ChatCo
 	case "content_block_start":
 		if claudeResponse.ContentBlock != nil {
 			responseText = claudeResponse.ContentBlock.Text
+			if claudeResponse.ContentBlock.Thinking != nil {
+				reasoningText = *claudeResponse.ContentBlock.Thinking
+			}
+
 			if claudeResponse.ContentBlock.Type == "tool_use" {
 				tools = append(tools, model.Tool{
 					Id:   claudeResponse.ContentBlock.Id,
@@ -172,6 +211,10 @@ func StreamResponseClaude2OpenAI(claudeResponse *StreamResponse) (*openai.ChatCo
 	case "content_block_delta":
 		if claudeResponse.Delta != nil {
 			responseText = claudeResponse.Delta.Text
+			if claudeResponse.Delta.Thinking != nil {
+				reasoningText = *claudeResponse.Delta.Thinking
+			}
+
 			if claudeResponse.Delta.Type == "input_json_delta" {
 				tools = append(tools, model.Tool{
 					Function: model.Function{
@@ -189,9 +232,20 @@ func StreamResponseClaude2OpenAI(claudeResponse *StreamResponse) (*openai.ChatCo
 		if claudeResponse.Delta != nil && claudeResponse.Delta.StopReason != nil {
 			stopReason = *claudeResponse.Delta.StopReason
 		}
+	case "thinking_delta":
+		if claudeResponse.Delta != nil && claudeResponse.Delta.Thinking != nil {
+			reasoningText = *claudeResponse.Delta.Thinking
+		}
+	case "ping",
+		"message_stop",
+		"content_block_stop":
+	default:
+		logger.SysErrorf("unknown stream response type %q", claudeResponse.Type)
 	}
+
 	var choice openai.ChatCompletionsStreamResponseChoice
 	choice.Delta.Content = responseText
+	choice.Delta.Reasoning = &reasoningText
 	if len(tools) > 0 {
 		choice.Delta.Content = nil // compatible with other OpenAI derivative applications, like LobeOpenAICompatibleFactory ...
 		choice.Delta.ToolCalls = tools
@@ -209,11 +263,23 @@ func StreamResponseClaude2OpenAI(claudeResponse *StreamResponse) (*openai.ChatCo
 
 func ResponseClaude2OpenAI(claudeResponse *Response) *openai.TextResponse {
 	var responseText string
-	if len(claudeResponse.Content) > 0 {
-		responseText = claudeResponse.Content[0].Text
-	}
+	var reasoningText string
+
 	tools := make([]model.Tool, 0)
 	for _, v := range claudeResponse.Content {
+		switch v.Type {
+		case "thinking":
+			if v.Thinking != nil {
+				reasoningText += *v.Thinking
+			} else {
+				logger.Errorf(context.Background(), "thinking is nil in response")
+			}
+		case "text":
+			responseText += v.Text
+		default:
+			logger.Warnf(context.Background(), "unknown response type %q", v.Type)
+		}
+
 		if v.Type == "tool_use" {
 			args, _ := json.Marshal(v.Input)
 			tools = append(tools, model.Tool{
@@ -226,11 +292,13 @@ func ResponseClaude2OpenAI(claudeResponse *Response) *openai.TextResponse {
 			})
 		}
 	}
+
 	choice := openai.TextResponseChoice{
 		Index: 0,
 		Message: model.Message{
 			Role:      "assistant",
 			Content:   responseText,
+			Reasoning: &reasoningText,
 			Name:      nil,
 			ToolCalls: tools,
 		},
@@ -277,6 +345,8 @@ func StreamHandler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusC
 		data = strings.TrimPrefix(data, "data:")
 		data = strings.TrimSpace(data)
 
+		logger.Debugf(c.Request.Context(), "stream <- %q\n", data)
+
 		var claudeResponse StreamResponse
 		err := json.Unmarshal([]byte(data), &claudeResponse)
 		if err != nil {
@@ -344,6 +414,9 @@ func Handler(c *gin.Context, resp *http.Response, promptTokens int, modelName st
 	if err != nil {
 		return openai.ErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
 	}
+
+	logger.Debugf(c.Request.Context(), "response <- %s\n", string(responseBody))
+
 	var claudeResponse Response
 	err = json.Unmarshal(responseBody, &claudeResponse)
 	if err != nil {

relay/adaptor/anthropic/model.go

@@ -1,5 +1,7 @@
 package anthropic
 
+import "github.com/songquanpeng/one-api/relay/model"
+
 // https://docs.anthropic.com/claude/reference/messages_post
 
 type Metadata struct {
@@ -22,6 +24,9 @@ type Content struct {
 	Input     any    `json:"input,omitempty"`
 	Content   string `json:"content,omitempty"`
 	ToolUseId string `json:"tool_use_id,omitempty"`
+	// https://docs.anthropic.com/en/docs/build-with-claude/extended-thinking#implementing-extended-thinking
+	Thinking  *string `json:"thinking,omitempty"`
+	Signature *string `json:"signature,omitempty"`
 }
 
 type Message struct {
@@ -54,6 +59,7 @@ type Request struct {
 	Tools         []Tool    `json:"tools,omitempty"`
 	ToolChoice    any       `json:"tool_choice,omitempty"`
 	//Metadata    `json:"metadata,omitempty"`
+	Thinking *model.Thinking `json:"thinking,omitempty"`
 }
 
 type Usage struct {
@@ -84,6 +90,8 @@ type Delta struct {
 	PartialJson  string  `json:"partial_json,omitempty"`
 	StopReason   *string `json:"stop_reason"`
 	StopSequence *string `json:"stop_sequence"`
+	Thinking     *string `json:"thinking,omitempty"`
+	Signature    *string `json:"signature,omitempty"`
 }
 
 type StreamResponse struct {

relay/adaptor/aws/claude/adapter.go

@@ -21,7 +21,11 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
 		return nil, errors.New("request is nil")
 	}
 
-	claudeReq := anthropic.ConvertRequest(*request)
+	claudeReq, err := anthropic.ConvertRequest(c, *request)
+	if err != nil {
+		return nil, errors.Wrap(err, "convert request")
+	}
+
 	c.Set(ctxkey.RequestModel, request.Model)
 	c.Set(ctxkey.ConvertedRequest, claudeReq)
 	return claudeReq, nil

relay/adaptor/aws/claude/main.go

@@ -36,6 +36,8 @@ var AwsModelIDMap = map[string]string{
 	"claude-3-5-sonnet-20241022": "anthropic.claude-3-5-sonnet-20241022-v2:0",
 	"claude-3-5-sonnet-latest":   "anthropic.claude-3-5-sonnet-20241022-v2:0",
 	"claude-3-5-haiku-20241022":  "anthropic.claude-3-5-haiku-20241022-v1:0",
+	"claude-3-7-sonnet-latest":   "anthropic.claude-3-7-sonnet-20250219-v1:0",
+	"claude-3-7-sonnet-20250219": "anthropic.claude-3-7-sonnet-20250219-v1:0",
 }
 
 func awsModelID(requestModel string) (string, error) {
@@ -47,13 +49,14 @@ func awsModelID(requestModel string) (string, error) {
 }
 
 func Handler(c *gin.Context, awsCli *bedrockruntime.Client, modelName string) (*relaymodel.ErrorWithStatusCode, *relaymodel.Usage) {
-	awsModelId, err := awsModelID(c.GetString(ctxkey.RequestModel))
+	awsModelID, err := awsModelID(c.GetString(ctxkey.RequestModel))
 	if err != nil {
 		return utils.WrapErr(errors.Wrap(err, "awsModelID")), nil
 	}
 
+	awsModelID = utils.ConvertModelID2CrossRegionProfile(awsModelID, awsCli.Options().Region)
 	awsReq := &bedrockruntime.InvokeModelInput{
-		ModelId:     aws.String(awsModelId),
+		ModelId:     aws.String(awsModelID),
 		Accept:      aws.String("application/json"),
 		ContentType: aws.String("application/json"),
 	}
@@ -101,13 +104,14 @@ func Handler(c *gin.Context, awsCli *bedrockruntime.Client, modelName string) (*
 
 func StreamHandler(c *gin.Context, awsCli *bedrockruntime.Client) (*relaymodel.ErrorWithStatusCode, *relaymodel.Usage) {
 	createdTime := helper.GetTimestamp()
-	awsModelId, err := awsModelID(c.GetString(ctxkey.RequestModel))
+	awsModelID, err := awsModelID(c.GetString(ctxkey.RequestModel))
 	if err != nil {
 		return utils.WrapErr(errors.Wrap(err, "awsModelID")), nil
 	}
 
+	awsModelID = utils.ConvertModelID2CrossRegionProfile(awsModelID, awsCli.Options().Region)
 	awsReq := &bedrockruntime.InvokeModelWithResponseStreamInput{
-		ModelId:     aws.String(awsModelId),
+		ModelId:     aws.String(awsModelID),
 		Accept:      aws.String("application/json"),
 		ContentType: aws.String("application/json"),
 	}

relay/adaptor/aws/claude/model.go

@@ -1,6 +1,9 @@
 package aws
 
-import "github.com/songquanpeng/one-api/relay/adaptor/anthropic"
+import (
+	"github.com/songquanpeng/one-api/relay/adaptor/anthropic"
+	"github.com/songquanpeng/one-api/relay/model"
+)
 
 // Request is the request to AWS Claude
 //
@@ -17,4 +20,5 @@ type Request struct {
 	StopSequences    []string            `json:"stop_sequences,omitempty"`
 	Tools            []anthropic.Tool    `json:"tools,omitempty"`
 	ToolChoice       any                 `json:"tool_choice,omitempty"`
+	Thinking         *model.Thinking     `json:"thinking,omitempty"`
 }

relay/adaptor/aws/llama3/main.go

@@ -70,13 +70,14 @@ func ConvertRequest(textRequest relaymodel.GeneralOpenAIRequest) *Request {
 }
 
 func Handler(c *gin.Context, awsCli *bedrockruntime.Client, modelName string) (*relaymodel.ErrorWithStatusCode, *relaymodel.Usage) {
-	awsModelId, err := awsModelID(c.GetString(ctxkey.RequestModel))
+	awsModelID, err := awsModelID(c.GetString(ctxkey.RequestModel))
 	if err != nil {
 		return utils.WrapErr(errors.Wrap(err, "awsModelID")), nil
 	}
 
+	awsModelID = utils.ConvertModelID2CrossRegionProfile(awsModelID, awsCli.Options().Region)
 	awsReq := &bedrockruntime.InvokeModelInput{
-		ModelId:     aws.String(awsModelId),
+		ModelId:     aws.String(awsModelID),
 		Accept:      aws.String("application/json"),
 		ContentType: aws.String("application/json"),
 	}
@@ -140,13 +141,14 @@ func ResponseLlama2OpenAI(llamaResponse *Response) *openai.TextResponse {
 
 func StreamHandler(c *gin.Context, awsCli *bedrockruntime.Client) (*relaymodel.ErrorWithStatusCode, *relaymodel.Usage) {
 	createdTime := helper.GetTimestamp()
-	awsModelId, err := awsModelID(c.GetString(ctxkey.RequestModel))
+	awsModelID, err := awsModelID(c.GetString(ctxkey.RequestModel))
 	if err != nil {
 		return utils.WrapErr(errors.Wrap(err, "awsModelID")), nil
 	}
 
+	awsModelID = utils.ConvertModelID2CrossRegionProfile(awsModelID, awsCli.Options().Region)
 	awsReq := &bedrockruntime.InvokeModelWithResponseStreamInput{
-		ModelId:     aws.String(awsModelId),
+		ModelId:     aws.String(awsModelID),
 		Accept:      aws.String("application/json"),
 		ContentType: aws.String("application/json"),
 	}

relay/adaptor/aws/utils/consts.go

@@ -0,0 +1,75 @@
+package utils
+
+import (
+	"context"
+	"slices"
+	"strings"
+
+	"github.com/songquanpeng/one-api/common/logger"
+)
+
+// CrossRegionInferences is a list of model IDs that support cross-region inference.
+//
+// https://docs.aws.amazon.com/bedrock/latest/userguide/inference-profiles-support.html
+//
+// document.querySelectorAll('pre.programlisting code').forEach((e) => {console.log(e.innerHTML)})
+var CrossRegionInferences = []string{
+	"us.amazon.nova-lite-v1:0",
+	"us.amazon.nova-micro-v1:0",
+	"us.amazon.nova-pro-v1:0",
+	"us.anthropic.claude-3-5-haiku-20241022-v1:0",
+	"us.anthropic.claude-3-5-sonnet-20240620-v1:0",
+	"us.anthropic.claude-3-5-sonnet-20241022-v2:0",
+	"us.anthropic.claude-3-7-sonnet-20250219-v1:0",
+	"us.anthropic.claude-3-haiku-20240307-v1:0",
+	"us.anthropic.claude-3-opus-20240229-v1:0",
+	"us.anthropic.claude-3-sonnet-20240229-v1:0",
+	"us.meta.llama3-1-405b-instruct-v1:0",
+	"us.meta.llama3-1-70b-instruct-v1:0",
+	"us.meta.llama3-1-8b-instruct-v1:0",
+	"us.meta.llama3-2-11b-instruct-v1:0",
+	"us.meta.llama3-2-1b-instruct-v1:0",
+	"us.meta.llama3-2-3b-instruct-v1:0",
+	"us.meta.llama3-2-90b-instruct-v1:0",
+	"us.meta.llama3-3-70b-instruct-v1:0",
+	"us-gov.anthropic.claude-3-5-sonnet-20240620-v1:0",
+	"us-gov.anthropic.claude-3-haiku-20240307-v1:0",
+	"eu.amazon.nova-lite-v1:0",
+	"eu.amazon.nova-micro-v1:0",
+	"eu.amazon.nova-pro-v1:0",
+	"eu.anthropic.claude-3-5-sonnet-20240620-v1:0",
+	"eu.anthropic.claude-3-haiku-20240307-v1:0",
+	"eu.anthropic.claude-3-sonnet-20240229-v1:0",
+	"eu.meta.llama3-2-1b-instruct-v1:0",
+	"eu.meta.llama3-2-3b-instruct-v1:0",
+	"apac.amazon.nova-lite-v1:0",
+	"apac.amazon.nova-micro-v1:0",
+	"apac.amazon.nova-pro-v1:0",
+	"apac.anthropic.claude-3-5-sonnet-20240620-v1:0",
+	"apac.anthropic.claude-3-5-sonnet-20241022-v2:0",
+	"apac.anthropic.claude-3-haiku-20240307-v1:0",
+	"apac.anthropic.claude-3-sonnet-20240229-v1:0",
+}
+
+// ConvertModelID2CrossRegionProfile converts the model ID to a cross-region profile ID.
+func ConvertModelID2CrossRegionProfile(model, region string) string {
+	var regionPrefix string
+	switch prefix := strings.Split(region, "-")[0]; prefix {
+	case "us", "eu":
+		regionPrefix = prefix
+	case "ap":
+		regionPrefix = "apac"
+	default:
+		// not supported, return original model
+		return model
+	}
+
+	newModelID := regionPrefix + "." + model
+	if slices.Contains(CrossRegionInferences, newModelID) {
+		logger.Debugf(context.TODO(), "convert model %s to cross-region profile %s", model, newModelID)
+		return newModelID
+	}
+
+	// not found, return original model
+	return model
+}

relay/adaptor/baiduv2/constants.go

@@ -0,0 +1,30 @@
+package baiduv2
+
+// https://console.bce.baidu.com/support/?_=1692863460488&timestamp=1739074632076#/api?product=QIANFAN&project=%E5%8D%83%E5%B8%86ModelBuilder&parent=%E5%AF%B9%E8%AF%9DChat%20V2&api=v2%2Fchat%2Fcompletions&method=post
+// https://cloud.baidu.com/doc/WENXINWORKSHOP/s/Fm2vrveyu#%E6%94%AF%E6%8C%81%E6%A8%A1%E5%9E%8B%E5%88%97%E8%A1%A8
+
+var ModelList = []string{
+	"ernie-4.0-8k-latest",
+	"ernie-4.0-8k-preview",
+	"ernie-4.0-8k",
+	"ernie-4.0-turbo-8k-latest",
+	"ernie-4.0-turbo-8k-preview",
+	"ernie-4.0-turbo-8k",
+	"ernie-4.0-turbo-128k",
+	"ernie-3.5-8k-preview",
+	"ernie-3.5-8k",
+	"ernie-3.5-128k",
+	"ernie-speed-8k",
+	"ernie-speed-128k",
+	"ernie-speed-pro-128k",
+	"ernie-lite-8k",
+	"ernie-lite-pro-128k",
+	"ernie-tiny-8k",
+	"ernie-char-8k",
+	"ernie-char-fiction-8k",
+	"ernie-novel-8k",
+	"deepseek-v3",
+	"deepseek-r1",
+	"deepseek-r1-distill-qwen-32b",
+	"deepseek-r1-distill-qwen-14b",
+}

relay/adaptor/baiduv2/main.go

@@ -0,0 +1,17 @@
+package baiduv2
+
+import (
+	"fmt"
+
+	"github.com/songquanpeng/one-api/relay/meta"
+	"github.com/songquanpeng/one-api/relay/relaymode"
+)
+
+func GetRequestURL(meta *meta.Meta) (string, error) {
+	switch meta.Mode {
+	case relaymode.ChatCompletions:
+		return fmt.Sprintf("%s/v2/chat/completions", meta.BaseURL), nil
+	default:
+	}
+	return "", fmt.Errorf("unsupported relay mode %d for baidu v2", meta.Mode)
+}

relay/adaptor/cloudflare/main.go

@@ -19,9 +19,8 @@ import (
 )
 
 func ConvertCompletionsRequest(textRequest model.GeneralOpenAIRequest) *Request {
-	p, _ := textRequest.Prompt.(string)
 	return &Request{
-		Prompt:      p,
+		Prompt:      textRequest.Prompt,
 		MaxTokens:   textRequest.MaxTokens,
 		Stream:      textRequest.Stream,
 		Temperature: textRequest.Temperature,

relay/adaptor/deepseek/constants.go

@@ -2,5 +2,5 @@ package deepseek
 
 var ModelList = []string{
 	"deepseek-chat",
-	"deepseek-coder",
+	"deepseek-reasoner",
 }

relay/adaptor/gemini/adaptor.go

@@ -5,8 +5,10 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"strings"
 
 	"github.com/gin-gonic/gin"
+	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/helper"
 	channelhelper "github.com/songquanpeng/one-api/relay/adaptor"
 	"github.com/songquanpeng/one-api/relay/adaptor/openai"
@@ -19,15 +21,12 @@ type Adaptor struct {
 }
 
 func (a *Adaptor) Init(meta *meta.Meta) {
-
 }
 
 func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
-	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 := config.GeminiVersion
+	if strings.Contains(meta.ActualModelName, "gemini-2.0") ||
+		strings.Contains(meta.ActualModelName, "gemini-1.5") {
 		defaultVersion = "v1beta"
 	}
 

relay/adaptor/gemini/constants.go

@@ -1,11 +1,38 @@
 package gemini
 
+import (
+	"github.com/songquanpeng/one-api/relay/adaptor/geminiv2"
+)
+
 // https://ai.google.dev/models/gemini
 
-var ModelList = []string{
-	"gemini-pro", "gemini-1.0-pro",
-	"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-01-21",
+var ModelList = geminiv2.ModelList
+
+// ModelsSupportSystemInstruction is the list of models that support system instruction.
+//
+// https://cloud.google.com/vertex-ai/generative-ai/docs/learn/prompts/system-instructions
+var ModelsSupportSystemInstruction = []string{
+	// "gemini-1.0-pro-002",
+	// "gemini-1.5-flash", "gemini-1.5-flash-001", "gemini-1.5-flash-002",
+	// "gemini-1.5-flash-8b",
+	// "gemini-1.5-pro", "gemini-1.5-pro-001", "gemini-1.5-pro-002",
+	// "gemini-1.5-pro-experimental",
+	"gemini-2.0-flash", "gemini-2.0-flash-exp",
+	"gemini-2.0-flash-thinking-exp-01-21",
+	"gemini-2.0-flash-lite",
+	// "gemini-2.0-flash-exp-image-generation",
+	"gemini-2.0-pro-exp-02-05",
+}
+
+// IsModelSupportSystemInstruction check if the model support system instruction.
+//
+// Because the main version of Go is 1.20, slice.Contains cannot be used
+func IsModelSupportSystemInstruction(model string) bool {
+	for _, m := range ModelsSupportSystemInstruction {
+		if m == model {
+			return true
+		}
+	}
+
+	return false
 }

relay/adaptor/gemini/main.go

@@ -8,19 +8,18 @@ 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"
 	"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/geminiv2"
 	"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
@@ -61,9 +60,10 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *ChatRequest {
 			},
 		},
 		GenerationConfig: ChatGenerationConfig{
-			Temperature:     textRequest.Temperature,
-			TopP:            textRequest.TopP,
-			MaxOutputTokens: textRequest.MaxTokens,
+			Temperature:        textRequest.Temperature,
+			TopP:               textRequest.TopP,
+			MaxOutputTokens:    textRequest.MaxTokens,
+			ResponseModalities: geminiv2.GetModelModalities(textRequest.Model),
 		},
 	}
 	if textRequest.ResponseFormat != nil {
@@ -106,9 +106,9 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *ChatRequest {
 		var parts []Part
 		imageNum := 0
 		for _, part := range openaiContent {
-			if part.Type == model.ContentTypeText {
+			if part.Type == model.ContentTypeText && part.Text != nil && *part.Text != "" {
 				parts = append(parts, Part{
-					Text: part.Text,
+					Text: *part.Text,
 				})
 			} else if part.Type == model.ContentTypeImageURL {
 				imageNum += 1
@@ -132,9 +132,16 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *ChatRequest {
 		}
 		// Converting system prompt to prompt from user for the same reason
 		if content.Role == "system" {
-			content.Role = "user"
 			shouldAddDummyModelMessage = true
+			if IsModelSupportSystemInstruction(textRequest.Model) {
+				geminiRequest.SystemInstruction = &content
+				geminiRequest.SystemInstruction.Role = ""
+				continue
+			} else {
+				content.Role = "user"
+			}
 		}
+
 		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
@@ -251,19 +258,52 @@ func responseGeminiChat2OpenAI(response *ChatResponse) *openai.TextResponse {
 			if candidate.Content.Parts[0].FunctionCall != nil {
 				choice.Message.ToolCalls = getToolCalls(&candidate)
 			} else {
+				// Handle text and image content
 				var builder strings.Builder
+				var contentItems []model.MessageContent
+
 				for _, part := range candidate.Content.Parts {
-					if i > 0 {
-						builder.WriteString("\n")
+					if part.Text != "" {
+						// For text parts
+						if i > 0 {
+							builder.WriteString("\n")
+						}
+						builder.WriteString(part.Text)
+
+						// Add to content items
+						contentItems = append(contentItems, model.MessageContent{
+							Type: model.ContentTypeText,
+							Text: &part.Text,
+						})
+					}
+
+					if part.InlineData != nil && part.InlineData.MimeType != "" && part.InlineData.Data != "" {
+						// For inline image data
+						imageURL := &model.ImageURL{
+							// The data is already base64 encoded
+							Url: fmt.Sprintf("data:%s;base64,%s", part.InlineData.MimeType, part.InlineData.Data),
+						}
+
+						contentItems = append(contentItems, model.MessageContent{
+							Type:     model.ContentTypeImageURL,
+							ImageURL: imageURL,
+						})
 					}
-					builder.WriteString(part.Text)
 				}
-				choice.Message.Content = builder.String()
+
+				// If we have multiple content types, use structured content format
+				if len(contentItems) > 1 || (len(contentItems) == 1 && contentItems[0].Type != model.ContentTypeText) {
+					choice.Message.Content = contentItems
+				} else {
+					// Otherwise use the simple string content format
+					choice.Message.Content = builder.String()
+				}
 			}
 		} else {
 			choice.Message.Content = ""
 			choice.FinishReason = candidate.FinishReason
 		}
+
 		fullTextResponse.Choices = append(fullTextResponse.Choices, choice)
 	}
 	return &fullTextResponse
@@ -271,14 +311,78 @@ func responseGeminiChat2OpenAI(response *ChatResponse) *openai.TextResponse {
 
 func streamResponseGeminiChat2OpenAI(geminiResponse *ChatResponse) *openai.ChatCompletionsStreamResponse {
 	var choice openai.ChatCompletionsStreamResponseChoice
-	choice.Delta.Content = geminiResponse.GetResponseText()
-	//choice.FinishReason = &constant.StopFinishReason
+	choice.Delta.Role = "assistant"
+
+	// Check if we have any candidates
+	if len(geminiResponse.Candidates) == 0 {
+		return nil
+	}
+
+	// Get the first candidate
+	candidate := geminiResponse.Candidates[0]
+
+	// Check if there are parts in the content
+	if len(candidate.Content.Parts) == 0 {
+		return nil
+	}
+
+	// Handle different content types in the parts
+	for _, part := range candidate.Content.Parts {
+		// Handle text content
+		if part.Text != "" {
+			// Store as string for simple text responses
+			textContent := part.Text
+			choice.Delta.Content = textContent
+		}
+
+		// Handle image content
+		if part.InlineData != nil && part.InlineData.MimeType != "" && part.InlineData.Data != "" {
+			// Create a structured response for image content
+			imageUrl := fmt.Sprintf("data:%s;base64,%s", part.InlineData.MimeType, part.InlineData.Data)
+
+			// If we already have text content, create a mixed content response
+			if strContent, ok := choice.Delta.Content.(string); ok && strContent != "" {
+				// Convert the existing text content and add the image
+				messageContents := []model.MessageContent{
+					{
+						Type: model.ContentTypeText,
+						Text: &strContent,
+					},
+					{
+						Type: model.ContentTypeImageURL,
+						ImageURL: &model.ImageURL{
+							Url: imageUrl,
+						},
+					},
+				}
+				choice.Delta.Content = messageContents
+			} else {
+				// Only have image content
+				choice.Delta.Content = []model.MessageContent{
+					{
+						Type: model.ContentTypeImageURL,
+						ImageURL: &model.ImageURL{
+							Url: imageUrl,
+						},
+					},
+				}
+			}
+		}
+
+		// Handle function calls (if present)
+		if part.FunctionCall != nil {
+			choice.Delta.ToolCalls = getToolCalls(&candidate)
+		}
+	}
+
+	// Create response
 	var response openai.ChatCompletionsStreamResponse
 	response.Id = fmt.Sprintf("chatcmpl-%s", random.GetUUID())
 	response.Created = helper.GetTimestamp()
 	response.Object = "chat.completion.chunk"
 	response.Model = "gemini"
 	response.Choices = []openai.ChatCompletionsStreamResponseChoice{choice}
+
 	return &response
 }
 
@@ -304,17 +408,23 @@ func StreamHandler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusC
 	scanner := bufio.NewScanner(resp.Body)
 	scanner.Split(bufio.ScanLines)
 
+	buffer := make([]byte, 1024*1024) // 1MB buffer
+	scanner.Buffer(buffer, len(buffer))
+
 	common.SetEventStreamHeaders(c)
 
 	for scanner.Scan() {
 		data := scanner.Text()
 		data = strings.TrimSpace(data)
+
 		if !strings.HasPrefix(data, "data: ") {
 			continue
 		}
 		data = strings.TrimPrefix(data, "data: ")
 		data = strings.TrimSuffix(data, "\"")
 
+		fmt.Printf(">> gemini response: %s\n", data)
+
 		var geminiResponse ChatResponse
 		err := json.Unmarshal([]byte(data), &geminiResponse)
 		if err != nil {
@@ -354,6 +464,7 @@ func Handler(c *gin.Context, resp *http.Response, promptTokens int, modelName st
 	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

relay/adaptor/gemini/model.go

@@ -1,10 +1,24 @@
 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"`
+	SafetySettings    []ChatSafetySettings `json:"safety_settings,omitempty"`
+	GenerationConfig  ChatGenerationConfig `json:"generation_config,omitempty"`
+	Tools             []ChatTools          `json:"tools,omitempty"`
+	SystemInstruction *ChatContent         `json:"system_instruction,omitempty"`
+	ModelVersion      string               `json:"model_version,omitempty"`
+	UsageMetadata     *UsageMetadata       `json:"usage_metadata,omitempty"`
+}
+
+type UsageMetadata struct {
+	PromptTokenCount    int                   `json:"promptTokenCount,omitempty"`
+	TotalTokenCount     int                   `json:"totalTokenCount,omitempty"`
+	PromptTokensDetails []PromptTokensDetails `json:"promptTokensDetails,omitempty"`
+}
+
+type PromptTokensDetails struct {
+	Modality   string `json:"modality,omitempty"`
+	TokenCount int    `json:"tokenCount,omitempty"`
 }
 
 type EmbeddingRequest struct {
@@ -65,12 +79,13 @@ type ChatTools struct {
 }
 
 type ChatGenerationConfig struct {
-	ResponseMimeType string   `json:"responseMimeType,omitempty"`
-	ResponseSchema   any      `json:"responseSchema,omitempty"`
-	Temperature      *float64 `json:"temperature,omitempty"`
-	TopP             *float64 `json:"topP,omitempty"`
-	TopK             float64  `json:"topK,omitempty"`
-	MaxOutputTokens  int      `json:"maxOutputTokens,omitempty"`
-	CandidateCount   int      `json:"candidateCount,omitempty"`
-	StopSequences    []string `json:"stopSequences,omitempty"`
+	ResponseMimeType   string   `json:"responseMimeType,omitempty"`
+	ResponseSchema     any      `json:"responseSchema,omitempty"`
+	Temperature        *float64 `json:"temperature,omitempty"`
+	TopP               *float64 `json:"topP,omitempty"`
+	TopK               float64  `json:"topK,omitempty"`
+	MaxOutputTokens    int      `json:"maxOutputTokens,omitempty"`
+	CandidateCount     int      `json:"candidateCount,omitempty"`
+	StopSequences      []string `json:"stopSequences,omitempty"`
+	ResponseModalities []string `json:"responseModalities,omitempty"`
 }

relay/adaptor/geminiv2/constants.go

@@ -0,0 +1,32 @@
+package geminiv2
+
+import "strings"
+
+// https://ai.google.dev/models/gemini
+
+var ModelList = []string{
+	"gemini-pro", "gemini-1.0-pro",
+	// "gemma-2-2b-it", "gemma-2-9b-it", "gemma-2-27b-it",
+	"gemini-1.5-flash", "gemini-1.5-flash-8b",
+	"gemini-1.5-pro", "gemini-1.5-pro-experimental",
+	"text-embedding-004", "aqa",
+	"gemini-2.0-flash", "gemini-2.0-flash-exp",
+	"gemini-2.0-flash-lite-preview-02-05",
+	"gemini-2.0-flash-thinking-exp-01-21",
+	"gemini-2.0-pro-exp-02-05",
+	"gemini-2.0-flash-exp-image-generation",
+}
+
+const (
+	ModalityText  = "TEXT"
+	ModalityImage = "IMAGE"
+)
+
+// GetModelModalities returns the modalities of the model.
+func GetModelModalities(model string) []string {
+	if strings.Contains(model, "-image-generation") {
+		return []string{ModalityText, ModalityImage}
+	}
+
+	return []string{ModalityText}
+}

relay/adaptor/geminiv2/main.go

@@ -0,0 +1,14 @@
+package geminiv2
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/songquanpeng/one-api/relay/meta"
+)
+
+func GetRequestURL(meta *meta.Meta) (string, error) {
+	baseURL := strings.TrimSuffix(meta.BaseURL, "/")
+	requestPath := strings.TrimPrefix(meta.RequestURLPath, "/v1")
+	return fmt.Sprintf("%s%s", baseURL, requestPath), nil
+}

relay/adaptor/groq/constants.go

@@ -1,27 +1,32 @@
 package groq
 
+// ModelList is a list of models that can be used with Groq.
+//
 // https://console.groq.com/docs/models
-
 var ModelList = []string{
-	"gemma-7b-it",
+	// Regular Models
+	"distil-whisper-large-v3-en",
 	"gemma2-9b-it",
-	"llama-3.1-70b-versatile",
+	"llama-3.3-70b-versatile",
 	"llama-3.1-8b-instant",
-	"llama-3.2-11b-text-preview",
-	"llama-3.2-11b-vision-preview",
-	"llama-3.2-1b-preview",
-	"llama-3.2-3b-preview",
-	"llama-3.2-11b-vision-preview",
-	"llama-3.2-90b-text-preview",
-	"llama-3.2-90b-vision-preview",
 	"llama-guard-3-8b",
 	"llama3-70b-8192",
 	"llama3-8b-8192",
-	"llama3-groq-70b-8192-tool-use-preview",
-	"llama3-groq-8b-8192-tool-use-preview",
-	"llava-v1.5-7b-4096-preview",
 	"mixtral-8x7b-32768",
-	"distil-whisper-large-v3-en",
 	"whisper-large-v3",
 	"whisper-large-v3-turbo",
+
+	// Preview Models
+	"qwen-qwq-32b",
+	"mistral-saba-24b",
+	"qwen-2.5-coder-32b",
+	"qwen-2.5-32b",
+	"deepseek-r1-distill-qwen-32b",
+	"deepseek-r1-distill-llama-70b-specdec",
+	"deepseek-r1-distill-llama-70b",
+	"llama-3.2-1b-preview",
+	"llama-3.2-3b-preview",
+	"llama-3.2-11b-vision-preview",
+	"llama-3.2-90b-vision-preview",
+	"llama-3.3-70b-specdec",
 }

relay/adaptor/minimax/constants.go

@@ -8,4 +8,6 @@ var ModelList = []string{
 	"abab6-chat",
 	"abab5.5-chat",
 	"abab5.5s-chat",
+	"MiniMax-VL-01",
+	"MiniMax-Text-01",
 }

relay/adaptor/ollama/main.go

@@ -43,7 +43,9 @@ func ConvertRequest(request model.GeneralOpenAIRequest) *ChatRequest {
 		for _, part := range openaiContent {
 			switch part.Type {
 			case model.ContentTypeText:
-				contentText = part.Text
+				if part.Text != nil {
+					contentText = *part.Text
+				}
 			case model.ContentTypeImageURL:
 				_, data, _ := image.GetImageFromUrl(part.ImageURL.Url)
 				imageUrls = append(imageUrls, data)

relay/adaptor/openai/adaptor.go

@@ -1,17 +1,27 @@
 package openai
 
 import (
-	"errors"
 	"fmt"
 	"io"
+	"math"
 	"net/http"
 	"strings"
 
 	"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/relay/adaptor"
+	"github.com/songquanpeng/one-api/relay/adaptor/alibailian"
+	"github.com/songquanpeng/one-api/relay/adaptor/baiduv2"
 	"github.com/songquanpeng/one-api/relay/adaptor/doubao"
+	"github.com/songquanpeng/one-api/relay/adaptor/geminiv2"
 	"github.com/songquanpeng/one-api/relay/adaptor/minimax"
 	"github.com/songquanpeng/one-api/relay/adaptor/novita"
+	"github.com/songquanpeng/one-api/relay/adaptor/openrouter"
+	"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"
@@ -52,6 +62,12 @@ func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
 		return doubao.GetRequestURL(meta)
 	case channeltype.Novita:
 		return novita.GetRequestURL(meta)
+	case channeltype.BaiduV2:
+		return baiduv2.GetRequestURL(meta)
+	case channeltype.AliBailian:
+		return alibailian.GetRequestURL(meta)
+	case channeltype.GeminiOpenAICompatible:
+		return geminiv2.GetRequestURL(meta)
 	default:
 		return GetFullRequestURL(meta.BaseURL, meta.RequestURLPath, meta.ChannelType), nil
 	}
@@ -75,13 +91,72 @@ 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 {
+
+	meta := meta.GetByContext(c)
+	switch meta.ChannelType {
+	case channeltype.OpenRouter:
+		includeReasoning := true
+		request.IncludeReasoning = &includeReasoning
+		if request.Provider == nil || request.Provider.Sort == "" &&
+			config.OpenrouterProviderSort != "" {
+			if request.Provider == nil {
+				request.Provider = &openrouter.RequestProvider{}
+			}
+
+			request.Provider.Sort = config.OpenrouterProviderSort
+		}
+	default:
+	}
+
+	if request.Stream && !config.EnforceIncludeUsage {
+		logger.Warn(c.Request.Context(),
+			"please set ENFORCE_INCLUDE_USAGE=true to ensure accurate billing in stream mode")
+	}
+
+	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/max_tokens/temperature
+	if strings.HasPrefix(meta.ActualModelName, "o1") ||
+		strings.HasPrefix(meta.ActualModelName, "o3") {
+		temperature := float64(1)
+		request.Temperature = &temperature // Only the default (1) value is supported
+
+		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)
+	}
+
+	// web search do not support system prompt/max_tokens/temperature
+	if strings.HasPrefix(meta.ActualModelName, "gpt-4o-search") ||
+		strings.HasPrefix(meta.ActualModelName, "gpt-4o-mini-search") {
+		request.Temperature = nil
+		request.TopP = nil
+		request.PresencePenalty = nil
+		request.N = nil
+		request.FrequencyPenalty = nil
+	}
+
+	if request.Stream && !config.EnforceIncludeUsage &&
+		(strings.HasPrefix(request.Model, "gpt-4o-audio") ||
+			strings.HasPrefix(request.Model, "gpt-4o-mini-audio")) {
+		// TODO: Since it is not clear how to implement billing in stream mode,
+		// it is temporarily not supported
+		return nil, errors.New("set ENFORCE_INCLUDE_USAGE=true to enable stream mode for gpt-4o-audio")
+	}
+
 	return request, nil
 }
 
@@ -92,11 +167,16 @@ func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error)
 	return request, nil
 }
 
-func (a *Adaptor) DoRequest(c *gin.Context, meta *meta.Meta, requestBody io.Reader) (*http.Response, error) {
+func (a *Adaptor) DoRequest(c *gin.Context,
+	meta *meta.Meta,
+	requestBody io.Reader) (*http.Response, error) {
 	return adaptor.DoRequestHelper(a, c, meta, requestBody)
 }
 
-func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *meta.Meta) (usage *model.Usage, err *model.ErrorWithStatusCode) {
+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
 		err, responseText, usage = StreamHandler(c, resp, meta.Mode)
@@ -115,6 +195,55 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *meta.Met
 			err, usage = Handler(c, resp, meta.PromptTokens, meta.ActualModelName)
 		}
 	}
+
+	// -------------------------------------
+	// calculate web-search tool cost
+	// -------------------------------------
+	if usage != nil {
+		searchContextSize := "medium"
+		var req *model.GeneralOpenAIRequest
+		if vi, ok := c.Get(ctxkey.ConvertedRequest); ok {
+			if req, ok = vi.(*model.GeneralOpenAIRequest); ok {
+				if req != nil &&
+					req.WebSearchOptions != nil &&
+					req.WebSearchOptions.SearchContextSize != nil {
+					searchContextSize = *req.WebSearchOptions.SearchContextSize
+				}
+
+				switch {
+				case strings.HasPrefix(meta.ActualModelName, "gpt-4o-search"):
+					switch searchContextSize {
+					case "low":
+						usage.ToolsCost += int64(math.Ceil(30 / 1000 * ratio.QuotaPerUsd))
+					case "medium":
+						usage.ToolsCost += int64(math.Ceil(35 / 1000 * ratio.QuotaPerUsd))
+					case "high":
+						usage.ToolsCost += int64(math.Ceil(40 / 1000 * ratio.QuotaPerUsd))
+					default:
+						return nil, ErrorWrapper(
+							errors.Errorf("invalid search context size %q", searchContextSize),
+							"invalid search context size: "+searchContextSize,
+							http.StatusBadRequest)
+					}
+				case strings.HasPrefix(meta.ActualModelName, "gpt-4o-mini-search"):
+					switch searchContextSize {
+					case "low":
+						usage.ToolsCost += int64(math.Ceil(25 / 1000 * ratio.QuotaPerUsd))
+					case "medium":
+						usage.ToolsCost += int64(math.Ceil(27.5 / 1000 * ratio.QuotaPerUsd))
+					case "high":
+						usage.ToolsCost += int64(math.Ceil(30 / 1000 * ratio.QuotaPerUsd))
+					default:
+						return nil, ErrorWrapper(
+							errors.Errorf("invalid search context size %q", searchContextSize),
+							"invalid search context size: "+searchContextSize,
+							http.StatusBadRequest)
+					}
+				}
+			}
+		}
+	}
+
 	return
 }
 

relay/adaptor/openai/compatible.go

@@ -2,19 +2,24 @@ package openai
 
 import (
 	"github.com/songquanpeng/one-api/relay/adaptor/ai360"
+	"github.com/songquanpeng/one-api/relay/adaptor/alibailian"
 	"github.com/songquanpeng/one-api/relay/adaptor/baichuan"
+	"github.com/songquanpeng/one-api/relay/adaptor/baiduv2"
 	"github.com/songquanpeng/one-api/relay/adaptor/deepseek"
 	"github.com/songquanpeng/one-api/relay/adaptor/doubao"
+	"github.com/songquanpeng/one-api/relay/adaptor/geminiv2"
 	"github.com/songquanpeng/one-api/relay/adaptor/groq"
 	"github.com/songquanpeng/one-api/relay/adaptor/lingyiwanwu"
 	"github.com/songquanpeng/one-api/relay/adaptor/minimax"
 	"github.com/songquanpeng/one-api/relay/adaptor/mistral"
 	"github.com/songquanpeng/one-api/relay/adaptor/moonshot"
 	"github.com/songquanpeng/one-api/relay/adaptor/novita"
+	"github.com/songquanpeng/one-api/relay/adaptor/openrouter"
 	"github.com/songquanpeng/one-api/relay/adaptor/siliconflow"
 	"github.com/songquanpeng/one-api/relay/adaptor/stepfun"
 	"github.com/songquanpeng/one-api/relay/adaptor/togetherai"
 	"github.com/songquanpeng/one-api/relay/adaptor/xai"
+	"github.com/songquanpeng/one-api/relay/adaptor/xunfeiv2"
 	"github.com/songquanpeng/one-api/relay/channeltype"
 )
 
@@ -34,6 +39,8 @@ var CompatibleChannels = []int{
 	channeltype.Novita,
 	channeltype.SiliconFlow,
 	channeltype.XAI,
+	channeltype.BaiduV2,
+	channeltype.XunfeiV2,
 }
 
 func GetCompatibleChannelMeta(channelType int) (string, []string) {
@@ -68,6 +75,16 @@ func GetCompatibleChannelMeta(channelType int) (string, []string) {
 		return "siliconflow", siliconflow.ModelList
 	case channeltype.XAI:
 		return "xai", xai.ModelList
+	case channeltype.BaiduV2:
+		return "baiduv2", baiduv2.ModelList
+	case channeltype.XunfeiV2:
+		return "xunfeiv2", xunfeiv2.ModelList
+	case channeltype.OpenRouter:
+		return "openrouter", openrouter.ModelList
+	case channeltype.AliBailian:
+		return "alibailian", alibailian.ModelList
+	case channeltype.GeminiOpenAICompatible:
+		return "geminiv2", geminiv2.ModelList
 	default:
 		return "openai", ModelList
 	}

relay/adaptor/openai/constants.go

@@ -24,4 +24,8 @@ var ModelList = []string{
 	"o1", "o1-2024-12-17",
 	"o1-preview", "o1-preview-2024-09-12",
 	"o1-mini", "o1-mini-2024-09-12",
+	"o3-mini", "o3-mini-2025-01-31",
+	"gpt-4.5-preview", "gpt-4.5-preview-2025-02-27",
+	// https://platform.openai.com/docs/guides/tools-web-search?api-mode=chat
+	"gpt-4o-search-preview", "gpt-4o-mini-search-preview",
 }

relay/adaptor/openai/helper.go

@@ -17,6 +17,9 @@ func ResponseText2Usage(responseText string, modelName string, promptTokens int)
 }
 
 func GetFullRequestURL(baseURL string, requestURL string, channelType int) string {
+	if channelType == channeltype.OpenAICompatible {
+		return fmt.Sprintf("%s%s", strings.TrimSuffix(baseURL, "/"), strings.TrimPrefix(requestURL, "/v1"))
+	}
 	fullRequestURL := fmt.Sprintf("%s%s", baseURL, requestURL)
 
 	if strings.HasPrefix(baseURL, "https://gateway.ai.cloudflare.com") {

relay/adaptor/openai/main.go

@@ -8,12 +8,11 @@ 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/conv"
 	"github.com/songquanpeng/one-api/common/logger"
+	"github.com/songquanpeng/one-api/common/render"
 	"github.com/songquanpeng/one-api/relay/model"
 	"github.com/songquanpeng/one-api/relay/relaymode"
 )
@@ -26,6 +25,7 @@ const (
 
 func StreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*model.ErrorWithStatusCode, string, *model.Usage) {
 	responseText := ""
+	reasoningText := ""
 	scanner := bufio.NewScanner(resp.Body)
 	scanner.Split(bufio.ScanLines)
 	var usage *model.Usage
@@ -61,6 +61,13 @@ func StreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*model.E
 			}
 			render.StringData(c, data)
 			for _, choice := range streamResponse.Choices {
+				if choice.Delta.Reasoning != nil {
+					reasoningText += *choice.Delta.Reasoning
+				}
+				if choice.Delta.ReasoningContent != nil {
+					reasoningText += *choice.Delta.ReasoningContent
+				}
+
 				responseText += conv.AsString(choice.Delta.Content)
 			}
 			if streamResponse.Usage != nil {
@@ -93,7 +100,7 @@ func StreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*model.E
 		return ErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), "", nil
 	}
 
-	return nil, responseText, usage
+	return nil, reasoningText + responseText, usage
 }
 
 func Handler(c *gin.Context, resp *http.Response, promptTokens int, modelName string) (*model.ErrorWithStatusCode, *model.Usage) {
@@ -136,10 +143,17 @@ func Handler(c *gin.Context, resp *http.Response, promptTokens int, modelName st
 		return ErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
 	}
 
-	if textResponse.Usage.TotalTokens == 0 || (textResponse.Usage.PromptTokens == 0 && textResponse.Usage.CompletionTokens == 0) {
+	if textResponse.Usage.TotalTokens == 0 ||
+		(textResponse.Usage.PromptTokens == 0 && textResponse.Usage.CompletionTokens == 0) {
 		completionTokens := 0
 		for _, choice := range textResponse.Choices {
 			completionTokens += CountTokenText(choice.Message.StringContent(), modelName)
+			if choice.Message.Reasoning != nil {
+				completionTokens += CountToken(*choice.Message.Reasoning)
+			}
+			if choice.ReasoningContent != nil {
+				completionTokens += CountToken(*choice.ReasoningContent)
+			}
 		}
 		textResponse.Usage = model.Usage{
 			PromptTokens:     promptTokens,
@@ -147,5 +161,6 @@ func Handler(c *gin.Context, resp *http.Response, promptTokens int, modelName st
 			TotalTokens:      promptTokens + completionTokens,
 		}
 	}
+
 	return nil, &textResponse.Usage
 }

relay/adaptor/openrouter/constants.go

@@ -0,0 +1,235 @@
+package openrouter
+
+var ModelList = []string{
+	"01-ai/yi-large",
+	"aetherwiing/mn-starcannon-12b",
+	"ai21/jamba-1-5-large",
+	"ai21/jamba-1-5-mini",
+	"ai21/jamba-instruct",
+	"aion-labs/aion-1.0",
+	"aion-labs/aion-1.0-mini",
+	"aion-labs/aion-rp-llama-3.1-8b",
+	"allenai/llama-3.1-tulu-3-405b",
+	"alpindale/goliath-120b",
+	"alpindale/magnum-72b",
+	"amazon/nova-lite-v1",
+	"amazon/nova-micro-v1",
+	"amazon/nova-pro-v1",
+	"anthracite-org/magnum-v2-72b",
+	"anthracite-org/magnum-v4-72b",
+	"anthropic/claude-2",
+	"anthropic/claude-2.0",
+	"anthropic/claude-2.0:beta",
+	"anthropic/claude-2.1",
+	"anthropic/claude-2.1:beta",
+	"anthropic/claude-2:beta",
+	"anthropic/claude-3-haiku",
+	"anthropic/claude-3-haiku:beta",
+	"anthropic/claude-3-opus",
+	"anthropic/claude-3-opus:beta",
+	"anthropic/claude-3-sonnet",
+	"anthropic/claude-3-sonnet:beta",
+	"anthropic/claude-3.5-haiku",
+	"anthropic/claude-3.5-haiku-20241022",
+	"anthropic/claude-3.5-haiku-20241022:beta",
+	"anthropic/claude-3.5-haiku:beta",
+	"anthropic/claude-3.5-sonnet",
+	"anthropic/claude-3.5-sonnet-20240620",
+	"anthropic/claude-3.5-sonnet-20240620:beta",
+	"anthropic/claude-3.5-sonnet:beta",
+	"cognitivecomputations/dolphin-mixtral-8x22b",
+	"cognitivecomputations/dolphin-mixtral-8x7b",
+	"cohere/command",
+	"cohere/command-r",
+	"cohere/command-r-03-2024",
+	"cohere/command-r-08-2024",
+	"cohere/command-r-plus",
+	"cohere/command-r-plus-04-2024",
+	"cohere/command-r-plus-08-2024",
+	"cohere/command-r7b-12-2024",
+	"databricks/dbrx-instruct",
+	"deepseek/deepseek-chat",
+	"deepseek/deepseek-chat-v2.5",
+	"deepseek/deepseek-chat:free",
+	"deepseek/deepseek-r1",
+	"deepseek/deepseek-r1-distill-llama-70b",
+	"deepseek/deepseek-r1-distill-llama-70b:free",
+	"deepseek/deepseek-r1-distill-llama-8b",
+	"deepseek/deepseek-r1-distill-qwen-1.5b",
+	"deepseek/deepseek-r1-distill-qwen-14b",
+	"deepseek/deepseek-r1-distill-qwen-32b",
+	"deepseek/deepseek-r1:free",
+	"eva-unit-01/eva-llama-3.33-70b",
+	"eva-unit-01/eva-qwen-2.5-32b",
+	"eva-unit-01/eva-qwen-2.5-72b",
+	"google/gemini-2.0-flash-001",
+	"google/gemini-2.0-flash-exp:free",
+	"google/gemini-2.0-flash-lite-preview-02-05:free",
+	"google/gemini-2.0-flash-thinking-exp-1219:free",
+	"google/gemini-2.0-flash-thinking-exp:free",
+	"google/gemini-2.0-pro-exp-02-05:free",
+	"google/gemini-exp-1206:free",
+	"google/gemini-flash-1.5",
+	"google/gemini-flash-1.5-8b",
+	"google/gemini-flash-1.5-8b-exp",
+	"google/gemini-pro",
+	"google/gemini-pro-1.5",
+	"google/gemini-pro-vision",
+	"google/gemma-2-27b-it",
+	"google/gemma-2-9b-it",
+	"google/gemma-2-9b-it:free",
+	"google/gemma-7b-it",
+	"google/learnlm-1.5-pro-experimental:free",
+	"google/palm-2-chat-bison",
+	"google/palm-2-chat-bison-32k",
+	"google/palm-2-codechat-bison",
+	"google/palm-2-codechat-bison-32k",
+	"gryphe/mythomax-l2-13b",
+	"gryphe/mythomax-l2-13b:free",
+	"huggingfaceh4/zephyr-7b-beta:free",
+	"infermatic/mn-inferor-12b",
+	"inflection/inflection-3-pi",
+	"inflection/inflection-3-productivity",
+	"jondurbin/airoboros-l2-70b",
+	"liquid/lfm-3b",
+	"liquid/lfm-40b",
+	"liquid/lfm-7b",
+	"mancer/weaver",
+	"meta-llama/llama-2-13b-chat",
+	"meta-llama/llama-2-70b-chat",
+	"meta-llama/llama-3-70b-instruct",
+	"meta-llama/llama-3-8b-instruct",
+	"meta-llama/llama-3-8b-instruct:free",
+	"meta-llama/llama-3.1-405b",
+	"meta-llama/llama-3.1-405b-instruct",
+	"meta-llama/llama-3.1-70b-instruct",
+	"meta-llama/llama-3.1-8b-instruct",
+	"meta-llama/llama-3.2-11b-vision-instruct",
+	"meta-llama/llama-3.2-11b-vision-instruct:free",
+	"meta-llama/llama-3.2-1b-instruct",
+	"meta-llama/llama-3.2-3b-instruct",
+	"meta-llama/llama-3.2-90b-vision-instruct",
+	"meta-llama/llama-3.3-70b-instruct",
+	"meta-llama/llama-3.3-70b-instruct:free",
+	"meta-llama/llama-guard-2-8b",
+	"microsoft/phi-3-medium-128k-instruct",
+	"microsoft/phi-3-medium-128k-instruct:free",
+	"microsoft/phi-3-mini-128k-instruct",
+	"microsoft/phi-3-mini-128k-instruct:free",
+	"microsoft/phi-3.5-mini-128k-instruct",
+	"microsoft/phi-4",
+	"microsoft/wizardlm-2-7b",
+	"microsoft/wizardlm-2-8x22b",
+	"minimax/minimax-01",
+	"mistralai/codestral-2501",
+	"mistralai/codestral-mamba",
+	"mistralai/ministral-3b",
+	"mistralai/ministral-8b",
+	"mistralai/mistral-7b-instruct",
+	"mistralai/mistral-7b-instruct-v0.1",
+	"mistralai/mistral-7b-instruct-v0.3",
+	"mistralai/mistral-7b-instruct:free",
+	"mistralai/mistral-large",
+	"mistralai/mistral-large-2407",
+	"mistralai/mistral-large-2411",
+	"mistralai/mistral-medium",
+	"mistralai/mistral-nemo",
+	"mistralai/mistral-nemo:free",
+	"mistralai/mistral-small",
+	"mistralai/mistral-small-24b-instruct-2501",
+	"mistralai/mistral-small-24b-instruct-2501:free",
+	"mistralai/mistral-tiny",
+	"mistralai/mixtral-8x22b-instruct",
+	"mistralai/mixtral-8x7b",
+	"mistralai/mixtral-8x7b-instruct",
+	"mistralai/pixtral-12b",
+	"mistralai/pixtral-large-2411",
+	"neversleep/llama-3-lumimaid-70b",
+	"neversleep/llama-3-lumimaid-8b",
+	"neversleep/llama-3-lumimaid-8b:extended",
+	"neversleep/llama-3.1-lumimaid-70b",
+	"neversleep/llama-3.1-lumimaid-8b",
+	"neversleep/noromaid-20b",
+	"nothingiisreal/mn-celeste-12b",
+	"nousresearch/hermes-2-pro-llama-3-8b",
+	"nousresearch/hermes-3-llama-3.1-405b",
+	"nousresearch/hermes-3-llama-3.1-70b",
+	"nousresearch/nous-hermes-2-mixtral-8x7b-dpo",
+	"nousresearch/nous-hermes-llama2-13b",
+	"nvidia/llama-3.1-nemotron-70b-instruct",
+	"nvidia/llama-3.1-nemotron-70b-instruct:free",
+	"openai/chatgpt-4o-latest",
+	"openai/gpt-3.5-turbo",
+	"openai/gpt-3.5-turbo-0125",
+	"openai/gpt-3.5-turbo-0613",
+	"openai/gpt-3.5-turbo-1106",
+	"openai/gpt-3.5-turbo-16k",
+	"openai/gpt-3.5-turbo-instruct",
+	"openai/gpt-4",
+	"openai/gpt-4-0314",
+	"openai/gpt-4-1106-preview",
+	"openai/gpt-4-32k",
+	"openai/gpt-4-32k-0314",
+	"openai/gpt-4-turbo",
+	"openai/gpt-4-turbo-preview",
+	"openai/gpt-4o",
+	"openai/gpt-4o-2024-05-13",
+	"openai/gpt-4o-2024-08-06",
+	"openai/gpt-4o-2024-11-20",
+	"openai/gpt-4o-mini",
+	"openai/gpt-4o-mini-2024-07-18",
+	"openai/gpt-4o:extended",
+	"openai/o1",
+	"openai/o1-mini",
+	"openai/o1-mini-2024-09-12",
+	"openai/o1-preview",
+	"openai/o1-preview-2024-09-12",
+	"openai/o3-mini",
+	"openai/o3-mini-high",
+	"openchat/openchat-7b",
+	"openchat/openchat-7b:free",
+	"openrouter/auto",
+	"perplexity/llama-3.1-sonar-huge-128k-online",
+	"perplexity/llama-3.1-sonar-large-128k-chat",
+	"perplexity/llama-3.1-sonar-large-128k-online",
+	"perplexity/llama-3.1-sonar-small-128k-chat",
+	"perplexity/llama-3.1-sonar-small-128k-online",
+	"perplexity/sonar",
+	"perplexity/sonar-reasoning",
+	"pygmalionai/mythalion-13b",
+	"qwen/qvq-72b-preview",
+	"qwen/qwen-2-72b-instruct",
+	"qwen/qwen-2-7b-instruct",
+	"qwen/qwen-2-7b-instruct:free",
+	"qwen/qwen-2-vl-72b-instruct",
+	"qwen/qwen-2-vl-7b-instruct",
+	"qwen/qwen-2.5-72b-instruct",
+	"qwen/qwen-2.5-7b-instruct",
+	"qwen/qwen-2.5-coder-32b-instruct",
+	"qwen/qwen-max",
+	"qwen/qwen-plus",
+	"qwen/qwen-turbo",
+	"qwen/qwen-vl-plus:free",
+	"qwen/qwen2.5-vl-72b-instruct:free",
+	"qwen/qwq-32b-preview",
+	"raifle/sorcererlm-8x22b",
+	"sao10k/fimbulvetr-11b-v2",
+	"sao10k/l3-euryale-70b",
+	"sao10k/l3-lunaris-8b",
+	"sao10k/l3.1-70b-hanami-x1",
+	"sao10k/l3.1-euryale-70b",
+	"sao10k/l3.3-euryale-70b",
+	"sophosympatheia/midnight-rose-70b",
+	"sophosympatheia/rogue-rose-103b-v0.2:free",
+	"teknium/openhermes-2.5-mistral-7b",
+	"thedrummer/rocinante-12b",
+	"thedrummer/unslopnemo-12b",
+	"undi95/remm-slerp-l2-13b",
+	"undi95/toppy-m-7b",
+	"undi95/toppy-m-7b:free",
+	"x-ai/grok-2-1212",
+	"x-ai/grok-2-vision-1212",
+	"x-ai/grok-beta",
+	"x-ai/grok-vision-beta",
+	"xwin-lm/xwin-lm-70b",
+}

relay/adaptor/openrouter/model.go

@@ -0,0 +1,22 @@
+package openrouter
+
+// RequestProvider customize how your requests are routed using the provider object
+// in the request body for Chat Completions and Completions.
+//
+// https://openrouter.ai/docs/features/provider-routing
+type RequestProvider struct {
+	// Order is list of provider names to try in order (e.g. ["Anthropic", "OpenAI"]). Default: empty
+	Order []string `json:"order,omitempty"`
+	// AllowFallbacks is whether to allow backup providers when the primary is unavailable. Default: true
+	AllowFallbacks bool `json:"allow_fallbacks,omitempty"`
+	// RequireParameters is only use providers that support all parameters in your request. Default: false
+	RequireParameters bool `json:"require_parameters,omitempty"`
+	// DataCollection is control whether to use providers that may store data ("allow" or "deny"). Default: "allow"
+	DataCollection string `json:"data_collection,omitempty" binding:"omitempty,oneof=allow deny"`
+	// Ignore is list of provider names to skip for this request. Default: empty
+	Ignore []string `json:"ignore,omitempty"`
+	// Quantizations is list of quantization levels to filter by (e.g. ["int4", "int8"]). Default: empty
+	Quantizations []string `json:"quantizations,omitempty"`
+	// Sort is sort providers by price or throughput (e.g. "price" or "throughput"). Default: empty
+	Sort string `json:"sort,omitempty" binding:"omitempty,oneof=price throughput latency"`
+}

relay/adaptor/palm/palm.go

@@ -25,11 +25,17 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *ChatRequest {
 		Prompt: Prompt{
 			Messages: make([]ChatMessage, 0, len(textRequest.Messages)),
 		},
-		Temperature:    textRequest.Temperature,
-		CandidateCount: textRequest.N,
-		TopP:           textRequest.TopP,
-		TopK:           textRequest.MaxTokens,
+		Temperature: textRequest.Temperature,
+		TopP:        textRequest.TopP,
+		TopK:        textRequest.MaxTokens,
 	}
+
+	if textRequest.N != nil {
+		palmRequest.CandidateCount = *textRequest.N
+	} else {
+		palmRequest.CandidateCount = 1
+	}
+
 	for _, message := range textRequest.Messages {
 		palmMessage := ChatMessage{
 			Content: message.StringContent(),

relay/adaptor/replicate/constant.go

@@ -33,9 +33,16 @@ var ModelList = []string{
 	// -------------------------------------
 	// language model
 	// -------------------------------------
+	"anthropic/claude-3.5-haiku",
+	"anthropic/claude-3.5-sonnet",
+	"anthropic/claude-3.7-sonnet",
+	"deepseek-ai/deepseek-r1",
 	"ibm-granite/granite-20b-code-instruct-8k",
 	"ibm-granite/granite-3.0-2b-instruct",
 	"ibm-granite/granite-3.0-8b-instruct",
+	"ibm-granite/granite-3.1-2b-instruct",
+	"ibm-granite/granite-3.1-8b-instruct",
+	"ibm-granite/granite-3.2-8b-instruct",
 	"ibm-granite/granite-8b-code-instruct-128k",
 	"meta/llama-2-13b",
 	"meta/llama-2-13b-chat",
@@ -50,7 +57,6 @@ var ModelList = []string{
 	"meta/meta-llama-3-8b-instruct",
 	"mistralai/mistral-7b-instruct-v0.2",
 	"mistralai/mistral-7b-v0.1",
-	"mistralai/mixtral-8x7b-instruct-v0.1",
 	// -------------------------------------
 	// video model
 	// -------------------------------------

relay/adaptor/vertexai/claude/adapter.go

@@ -19,6 +19,7 @@ var ModelList = []string{
 	"claude-3-5-sonnet@20240620",
 	"claude-3-5-sonnet-v2@20241022",
 	"claude-3-5-haiku@20241022",
+	"claude-3-7-sonnet@20250219",
 }
 
 const anthropicVersion = "vertex-2023-10-16"
@@ -31,7 +32,11 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
 		return nil, errors.New("request is nil")
 	}
 
-	claudeReq := anthropic.ConvertRequest(*request)
+	claudeReq, err := anthropic.ConvertRequest(c, *request)
+	if err != nil {
+		return nil, errors.Wrap(err, "convert request")
+	}
+
 	req := Request{
 		AnthropicVersion: anthropicVersion,
 		// Model:            claudeReq.Model,

relay/adaptor/vertexai/gemini/adapter.go

@@ -16,10 +16,12 @@ import (
 
 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-thinking-exp-01-21",
+	"gemini-exp-1206",
+	"gemini-1.5-pro-001", "gemini-1.5-pro-002",
+	"gemini-1.5-flash-001", "gemini-1.5-flash-002",
+	"gemini-2.0-flash-exp", "gemini-2.0-flash-001",
+	"gemini-2.0-flash-lite-preview-02-05",
+	"gemini-2.0-flash-thinking-exp-01-21",
 }
 
 type Adaptor struct {

relay/adaptor/xai/constants.go

@@ -1,5 +1,14 @@
 package xai
 
+//https://console.x.ai/
+
 var ModelList = []string{
+	"grok-2",
+	"grok-vision-beta",
+	"grok-2-vision-1212",
+	"grok-2-vision",
+	"grok-2-vision-latest",
+	"grok-2-1212",
+	"grok-2-latest",
 	"grok-beta",
 }

relay/adaptor/xunfei/constants.go

@@ -1,12 +1,10 @@
 package xunfei
 
 var ModelList = []string{
-	"SparkDesk",
-	"SparkDesk-v1.1",
-	"SparkDesk-v2.1",
-	"SparkDesk-v3.1",
-	"SparkDesk-v3.1-128K",
-	"SparkDesk-v3.5",
-	"SparkDesk-v3.5-32K",
-	"SparkDesk-v4.0",
+	"Spark-Lite",
+	"Spark-Pro",
+	"Spark-Pro-128K",
+	"Spark-Max",
+	"Spark-Max-32K",
+	"Spark-4.0-Ultra",
 }

relay/adaptor/xunfei/domain.go

@@ -0,0 +1,97 @@
+package xunfei
+
+import (
+	"fmt"
+	"strings"
+)
+
+// https://www.xfyun.cn/doc/spark/Web.html#_1-%E6%8E%A5%E5%8F%A3%E8%AF%B4%E6%98%8E
+
+//Spark4.0 Ultra 请求地址，对应的domain参数为4.0Ultra：
+//
+//wss://spark-api.xf-yun.com/v4.0/chat
+//Spark Max-32K请求地址，对应的domain参数为max-32k
+//
+//wss://spark-api.xf-yun.com/chat/max-32k
+//Spark Max请求地址，对应的domain参数为generalv3.5
+//
+//wss://spark-api.xf-yun.com/v3.5/chat
+//Spark Pro-128K请求地址，对应的domain参数为pro-128k：
+//
+// wss://spark-api.xf-yun.com/chat/pro-128k
+//Spark Pro请求地址，对应的domain参数为generalv3：
+//
+//wss://spark-api.xf-yun.com/v3.1/chat
+//Spark Lite请求地址，对应的domain参数为lite：
+//
+//wss://spark-api.xf-yun.com/v1.1/chat
+
+// Lite、Pro、Pro-128K、Max、Max-32K和4.0 Ultra
+
+func parseAPIVersionByModelName(modelName string) string {
+	apiVersion := modelName2APIVersion(modelName)
+	if apiVersion != "" {
+		return apiVersion
+	}
+
+	index := strings.IndexAny(modelName, "-")
+	if index != -1 {
+		return modelName[index+1:]
+	}
+	return ""
+}
+
+func modelName2APIVersion(modelName string) string {
+	switch modelName {
+	case "Spark-Lite":
+		return "v1.1"
+	case "Spark-Pro":
+		return "v3.1"
+	case "Spark-Pro-128K":
+		return "v3.1-128K"
+	case "Spark-Max":
+		return "v3.5"
+	case "Spark-Max-32K":
+		return "v3.5-32K"
+	case "Spark-4.0-Ultra":
+		return "v4.0"
+	}
+	return ""
+}
+
+// https://www.xfyun.cn/doc/spark/Web.html#_1-%E6%8E%A5%E5%8F%A3%E8%AF%B4%E6%98%8E
+func apiVersion2domain(apiVersion string) string {
+	switch apiVersion {
+	case "v1.1":
+		return "lite"
+	case "v2.1":
+		return "generalv2"
+	case "v3.1":
+		return "generalv3"
+	case "v3.1-128K":
+		return "pro-128k"
+	case "v3.5":
+		return "generalv3.5"
+	case "v3.5-32K":
+		return "max-32k"
+	case "v4.0":
+		return "4.0Ultra"
+	}
+	return "general" + apiVersion
+}
+
+func getXunfeiAuthUrl(apiVersion string, apiKey string, apiSecret string) (string, string) {
+	var authUrl string
+	domain := apiVersion2domain(apiVersion)
+	switch apiVersion {
+	case "v3.1-128K":
+		authUrl = buildXunfeiAuthUrl(fmt.Sprintf("wss://spark-api.xf-yun.com/chat/pro-128k"), apiKey, apiSecret)
+		break
+	case "v3.5-32K":
+		authUrl = buildXunfeiAuthUrl(fmt.Sprintf("wss://spark-api.xf-yun.com/chat/max-32k"), apiKey, apiSecret)
+		break
+	default:
+		authUrl = buildXunfeiAuthUrl(fmt.Sprintf("wss://spark-api.xf-yun.com/%s/chat", apiVersion), apiKey, apiSecret)
+	}
+	return domain, authUrl
+}

relay/adaptor/xunfei/main.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
+
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/helper"
 	"github.com/songquanpeng/one-api/common/logger"
@@ -40,10 +41,15 @@ func requestOpenAI2Xunfei(request model.GeneralOpenAIRequest, xunfeiAppId string
 	xunfeiRequest.Header.AppId = xunfeiAppId
 	xunfeiRequest.Parameter.Chat.Domain = domain
 	xunfeiRequest.Parameter.Chat.Temperature = request.Temperature
-	xunfeiRequest.Parameter.Chat.TopK = request.N
 	xunfeiRequest.Parameter.Chat.MaxTokens = request.MaxTokens
 	xunfeiRequest.Payload.Message.Text = messages
 
+	if request.N != nil {
+		xunfeiRequest.Parameter.Chat.TopK = *request.N
+	} else {
+		xunfeiRequest.Parameter.Chat.TopK = 1
+	}
+
 	if strings.HasPrefix(domain, "generalv3") || domain == "4.0Ultra" {
 		functions := make([]model.Function, len(request.Tools))
 		for i, tool := range request.Tools {
@@ -270,48 +276,3 @@ func xunfeiMakeRequest(textRequest model.GeneralOpenAIRequest, domain, authUrl,
 
 	return dataChan, stopChan, nil
 }
-
-func parseAPIVersionByModelName(modelName string) string {
-	index := strings.IndexAny(modelName, "-")
-	if index != -1 {
-		return modelName[index+1:]
-	}
-	return ""
-}
-
-// https://www.xfyun.cn/doc/spark/Web.html#_1-%E6%8E%A5%E5%8F%A3%E8%AF%B4%E6%98%8E
-func apiVersion2domain(apiVersion string) string {
-	switch apiVersion {
-	case "v1.1":
-		return "lite"
-	case "v2.1":
-		return "generalv2"
-	case "v3.1":
-		return "generalv3"
-	case "v3.1-128K":
-		return "pro-128k"
-	case "v3.5":
-		return "generalv3.5"
-	case "v3.5-32K":
-		return "max-32k"
-	case "v4.0":
-		return "4.0Ultra"
-	}
-	return "general" + apiVersion
-}
-
-func getXunfeiAuthUrl(apiVersion string, apiKey string, apiSecret string) (string, string) {
-	var authUrl string
-	domain := apiVersion2domain(apiVersion)
-	switch apiVersion {
-	case "v3.1-128K":
-		authUrl = buildXunfeiAuthUrl(fmt.Sprintf("wss://spark-api.xf-yun.com/chat/pro-128k"), apiKey, apiSecret)
-		break
-	case "v3.5-32K":
-		authUrl = buildXunfeiAuthUrl(fmt.Sprintf("wss://spark-api.xf-yun.com/chat/max-32k"), apiKey, apiSecret)
-		break
-	default:
-		authUrl = buildXunfeiAuthUrl(fmt.Sprintf("wss://spark-api.xf-yun.com/%s/chat", apiVersion), apiKey, apiSecret)
-	}
-	return domain, authUrl
-}

relay/adaptor/xunfeiv2/constants.go

@@ -0,0 +1,12 @@
+package xunfeiv2
+
+// https://www.xfyun.cn/doc/spark/HTTP%E8%B0%83%E7%94%A8%E6%96%87%E6%A1%A3.html#_3-%E8%AF%B7%E6%B1%82%E8%AF%B4%E6%98%8E
+
+var ModelList = []string{
+	"lite",
+	"generalv3",
+	"pro-128k",
+	"generalv3.5",
+	"max-32k",
+	"4.0Ultra",
+}

relay/adaptor/zhipu/constants.go

@@ -1,7 +1,14 @@
 package zhipu
 
+// https://open.bigmodel.cn/pricing
+
 var ModelList = []string{
-	"chatglm_turbo", "chatglm_pro", "chatglm_std", "chatglm_lite",
-	"glm-4", "glm-4v", "glm-3-turbo", "embedding-2",
-	"cogview-3",
+	"glm-zero-preview", "glm-4-plus", "glm-4-0520", "glm-4-airx",
+	"glm-4-air", "glm-4-long", "glm-4-flashx", "glm-4-flash",
+	"glm-4", "glm-3-turbo",
+	"glm-4v-plus", "glm-4v", "glm-4v-flash",
+	"cogview-3-plus", "cogview-3", "cogview-3-flash",
+	"cogviewx", "cogviewx-flash",
+	"charglm-4", "emohaa", "codegeex-4",
+	"embedding-2", "embedding-3",
 }

relay/billing/ratio/group.go

@@ -3,8 +3,10 @@ package ratio
 import (
 	"encoding/json"
 	"github.com/songquanpeng/one-api/common/logger"
+	"sync"
 )
 
+var groupRatioLock sync.RWMutex
 var GroupRatio = map[string]float64{
 	"default": 1,
 	"vip":     1,
@@ -20,11 +22,15 @@ func GroupRatio2JSONString() string {
 }
 
 func UpdateGroupRatioByJSONString(jsonStr string) error {
+	groupRatioLock.Lock()
+	defer groupRatioLock.Unlock()
 	GroupRatio = make(map[string]float64)
 	return json.Unmarshal([]byte(jsonStr), &GroupRatio)
 }
 
 func GetGroupRatio(name string) float64 {
+	groupRatioLock.RLock()
+	defer groupRatioLock.RUnlock()
 	ratio, ok := GroupRatio[name]
 	if !ok {
 		logger.SysError("group ratio not found: " + name)

relay/channeltype/define.go

@@ -48,5 +48,10 @@ const (
 	SiliconFlow
 	XAI
 	Replicate
+	BaiduV2
+	XunfeiV2
+	AliBailian
+	OpenAICompatible
+	GeminiOpenAICompatible
 	Dummy
 )

relay/channeltype/url.go

@@ -48,6 +48,12 @@ var ChannelBaseURLs = []string{
 	"https://api.siliconflow.cn",                // 44
 	"https://api.x.ai",                          // 45
 	"https://api.replicate.com/v1/models/",      // 46
+	"https://qianfan.baidubce.com",              // 47
+	"https://spark-api-open.xf-yun.com",         // 48
+	"https://dashscope.aliyuncs.com",            // 49
+	"",                                          // 50
+
+	"https://generativelanguage.googleapis.com/v1beta/openai/", // 51
 }
 
 func init() {

relay/controller/helper.go

@@ -8,18 +8,16 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/songquanpeng/one-api/common/helper"
-	"github.com/songquanpeng/one-api/relay/constant/role"
-
 	"github.com/gin-gonic/gin"
-
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/config"
+	"github.com/songquanpeng/one-api/common/helper"
 	"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"
@@ -94,19 +92,30 @@ 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
+	// It appears that DeepSeek's official service automatically merges ReasoningTokens into CompletionTokens,
+	// but the behavior of third-party providers may differ, so for now we do not add them manually.
+	// completionTokens := usage.CompletionTokens + usage.CompletionTokensDetails.ReasoningTokens
 	completionTokens := usage.CompletionTokens
-	quota = int64(math.Ceil((float64(promptTokens) + float64(completionTokens)*completionRatio) * ratio))
+	quota = int64(math.Ceil((float64(promptTokens)+float64(completionTokens)*completionRatio)*ratio)) + usage.ToolsCost
 	if ratio != 0 && quota <= 0 {
 		quota = 1
 	}
+
 	totalTokens := promptTokens + completionTokens
 	if totalTokens == 0 {
 		// in this case, must be some error happened
@@ -122,7 +131,13 @@ func postConsumeQuota(ctx context.Context, usage *relaymodel.Usage, meta *meta.M
 	if err != nil {
 		logger.Error(ctx, "error update user quota cache: "+err.Error())
 	}
-	logContent := fmt.Sprintf("倍率：%.2f × %.2f × %.2f", modelRatio, groupRatio, completionRatio)
+
+	var logContent string
+	if usage.ToolsCost == 0 {
+		logContent = fmt.Sprintf("倍率：%.2f × %.2f × %.2f", modelRatio, groupRatio, completionRatio)
+	} else {
+		logContent = fmt.Sprintf("倍率：%.2f × %.2f × %.2f, tools cost %d", modelRatio, groupRatio, completionRatio, usage.ToolsCost)
+	}
 	model.RecordConsumeLog(ctx, &model.Log{
 		UserId:            meta.UserId,
 		ChannelId:         meta.ChannelId,
@@ -138,6 +153,8 @@ func postConsumeQuota(ctx context.Context, usage *relaymodel.Usage, meta *meta.M
 	})
 	model.UpdateUserUsedQuotaAndRequestCount(meta.UserId, quota)
 	model.UpdateChannelUsedQuota(meta.ChannelId, quota)
+
+	return quota
 }
 
 func getMappedModelName(modelName string, mapping map[string]string) (string, bool) {

relay/controller/text.go

@@ -10,6 +10,7 @@ import (
 	"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/logger"
 	"github.com/songquanpeng/one-api/relay"
 	"github.com/songquanpeng/one-api/relay/adaptor"
@@ -38,7 +39,7 @@ func RelayTextHelper(c *gin.Context) *model.ErrorWithStatusCode {
 	textRequest.Model, _ = getMappedModelName(textRequest.Model, meta.ModelMapping)
 	meta.ActualModelName = textRequest.Model
 	// set system prompt if not empty
-	systemPromptReset := setSystemPrompt(ctx, textRequest, meta.SystemPrompt)
+	systemPromptReset := setSystemPrompt(ctx, textRequest, meta.ForcedSystemPrompt)
 	// get model ratio & group ratio
 	modelRatio := billingratio.GetModelRatio(textRequest.Model, meta.ChannelType)
 	groupRatio := billingratio.GetGroupRatio(meta.Group)
@@ -88,7 +89,11 @@ func RelayTextHelper(c *gin.Context) *model.ErrorWithStatusCode {
 }
 
 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 {
+	if !config.EnforceIncludeUsage &&
+		meta.APIType == apitype.OpenAI &&
+		meta.OriginModelName == meta.ActualModelName &&
+		meta.ChannelType != channeltype.Baichuan &&
+		meta.ForcedSystemPrompt == "" {
 		// no need to convert request for openai
 		return c.Request.Body, nil
 	}
@@ -100,6 +105,8 @@ func getRequestBody(c *gin.Context, meta *meta.Meta, textRequest *model.GeneralO
 		logger.Debugf(c.Request.Context(), "converted request failed: %s\n", err.Error())
 		return nil, err
 	}
+	c.Set(ctxkey.ConvertedRequest, convertedRequest)
+
 	jsonData, err := json.Marshal(convertedRequest)
 	if err != nil {
 		logger.Debugf(c.Request.Context(), "converted request json_marshal_failed: %s\n", err.Error())

relay/meta/relay_meta.go

@@ -30,29 +30,29 @@ type Meta struct {
 	// OriginModelName is the model name from the raw user request
 	OriginModelName string
 	// ActualModelName is the model name after mapping
-	ActualModelName string
-	RequestURLPath  string
-	PromptTokens    int // only for DoResponse
-	SystemPrompt    string
-	StartTime       time.Time
+	ActualModelName    string
+	RequestURLPath     string
+	PromptTokens       int // only for DoResponse
+	ForcedSystemPrompt string
+	StartTime          time.Time
 }
 
 func GetByContext(c *gin.Context) *Meta {
 	meta := Meta{
-		Mode:            relaymode.GetByPath(c.Request.URL.Path),
-		ChannelType:     c.GetInt(ctxkey.Channel),
-		ChannelId:       c.GetInt(ctxkey.ChannelId),
-		TokenId:         c.GetInt(ctxkey.TokenId),
-		TokenName:       c.GetString(ctxkey.TokenName),
-		UserId:          c.GetInt(ctxkey.Id),
-		Group:           c.GetString(ctxkey.Group),
-		ModelMapping:    c.GetStringMapString(ctxkey.ModelMapping),
-		OriginModelName: c.GetString(ctxkey.RequestModel),
-		BaseURL:         c.GetString(ctxkey.BaseURL),
-		APIKey:          strings.TrimPrefix(c.Request.Header.Get("Authorization"), "Bearer "),
-		RequestURLPath:  c.Request.URL.String(),
-		SystemPrompt:    c.GetString(ctxkey.SystemPrompt),
-		StartTime:       time.Now(),
+		Mode:               relaymode.GetByPath(c.Request.URL.Path),
+		ChannelType:        c.GetInt(ctxkey.Channel),
+		ChannelId:          c.GetInt(ctxkey.ChannelId),
+		TokenId:            c.GetInt(ctxkey.TokenId),
+		TokenName:          c.GetString(ctxkey.TokenName),
+		UserId:             c.GetInt(ctxkey.Id),
+		Group:              c.GetString(ctxkey.Group),
+		ModelMapping:       c.GetStringMapString(ctxkey.ModelMapping),
+		OriginModelName:    c.GetString(ctxkey.RequestModel),
+		BaseURL:            c.GetString(ctxkey.BaseURL),
+		APIKey:             strings.TrimPrefix(c.Request.Header.Get("Authorization"), "Bearer "),
+		RequestURLPath:     c.Request.URL.String(),
+		ForcedSystemPrompt: c.GetString(ctxkey.SystemPrompt),
+		StartTime:          time.Now(),
 	}
 	cfg, ok := c.Get(ctxkey.Config)
 	if ok {

relay/model/general.go

@@ -1,5 +1,7 @@
 package model
 
+import "github.com/songquanpeng/one-api/relay/adaptor/openrouter"
+
 type ResponseFormat struct {
 	Type       string      `json:"type,omitempty"`
 	JsonSchema *JSONSchema `json:"json_schema,omitempty"`
@@ -23,48 +25,103 @@ 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 is a number between -2.0 and 2.0 that penalizes
+	// new tokens based on their existing frequency in the text so far,
+	// default is 0.
+	FrequencyPenalty    *float64 `json:"frequency_penalty,omitempty" binding:"omitempty,min=-2,max=2"`
+	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 is how many chat completion choices to generate for each input message,
+	// default to 1.
+	N *int `json:"n,omitempty" binding:"omitempty,min=0"`
+	// ReasoningEffort constrains effort on reasoning for reasoning models, reasoning models only.
+	ReasoningEffort *string `json:"reasoning_effort,omitempty" binding:"omitempty,oneof=low medium high"`
+	// 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 is a number between -2.0 and 2.0 that penalizes
+	// new tokens based on whether they appear in the text so far, default is 0.
+	PresencePenalty  *float64        `json:"presence_penalty,omitempty" binding:"omitempty,min=-2,max=2"`
+	ResponseFormat   *ResponseFormat `json:"response_format,omitempty"`
+	Seed             float64         `json:"seed,omitempty"`
+	ServiceTier      *string         `json:"service_tier,omitempty" binding:"omitempty,oneof=default auto"`
+	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"`
 	Dimensions     int    `json:"dimensions,omitempty"`
 	// https://platform.openai.com/docs/api-reference/images/create
-	Prompt  any     `json:"prompt,omitempty"`
-	Quality *string `json:"quality,omitempty"`
-	Size    string  `json:"size,omitempty"`
-	Style   *string `json:"style,omitempty"`
+	Prompt           string            `json:"prompt,omitempty"`
+	Quality          *string           `json:"quality,omitempty"`
+	Size             string            `json:"size,omitempty"`
+	Style            *string           `json:"style,omitempty"`
+	WebSearchOptions *WebSearchOptions `json:"web_search_options,omitempty"`
+
 	// Others
 	Instruction string `json:"instruction,omitempty"`
 	NumCtx      int    `json:"num_ctx,omitempty"`
+	// -------------------------------------
+	// Openrouter
+	// -------------------------------------
+	Provider         *openrouter.RequestProvider `json:"provider,omitempty"`
+	IncludeReasoning *bool                       `json:"include_reasoning,omitempty"`
+	// -------------------------------------
+	// Anthropic
+	// -------------------------------------
+	Thinking *Thinking `json:"thinking,omitempty"`
+}
+
+// WebSearchOptions is the tool searches the web for relevant results to use in a response.
+type WebSearchOptions struct {
+	// SearchContextSize is the high level guidance for the amount of context window space to use for the search,
+	// default is "medium".
+	SearchContextSize *string       `json:"search_context_size,omitempty" binding:"omitempty,oneof=low medium high"`
+	UserLocation      *UserLocation `json:"user_location,omitempty"`
+}
+
+// UserLocation is a struct that contains the location of the user.
+type UserLocation struct {
+	// Approximate is the approximate location parameters for the search.
+	Approximate UserLocationApproximate `json:"approximate" binding:"required"`
+	// Type is the type of location approximation.
+	Type string `json:"type" binding:"required,oneof=approximate"`
+}
+
+// UserLocationApproximate is a struct that contains the approximate location of the user.
+type UserLocationApproximate struct {
+	// City is the city of the user, e.g. San Francisco.
+	City *string `json:"city,omitempty"`
+	// Country is the country of the user, e.g. US.
+	Country *string `json:"country,omitempty"`
+	// Region is the region of the user, e.g. California.
+	Region *string `json:"region,omitempty"`
+	// Timezone is the IANA timezone of the user, e.g. America/Los_Angeles.
+	Timezone *string `json:"timezone,omitempty"`
+}
+
+// https://docs.anthropic.com/en/docs/build-with-claude/extended-thinking#implementing-extended-thinking
+type Thinking struct {
+	Type         string `json:"type"`
+	BudgetTokens int    `json:"budget_tokens" binding:"omitempty,min=1024"`
 }
 
 func (r GeneralOpenAIRequest) ParseInput() []string {

relay/model/message.go

@@ -1,11 +1,106 @@
 package model
 
+import (
+	"context"
+	"strings"
+
+	"github.com/songquanpeng/one-api/common/logger"
+)
+
+// ReasoningFormat is the format of reasoning content,
+// can be set by the reasoning_format parameter in the request url.
+type ReasoningFormat string
+
+const (
+	ReasoningFormatUnspecified ReasoningFormat = ""
+	// ReasoningFormatReasoningContent is the reasoning format used by deepseek official API
+	ReasoningFormatReasoningContent ReasoningFormat = "reasoning_content"
+	// ReasoningFormatReasoning is the reasoning format used by openrouter
+	ReasoningFormatReasoning ReasoningFormat = "reasoning"
+
+	// ReasoningFormatThinkTag is the reasoning format used by 3rd party deepseek-r1 providers.
+	//
+	// Deprecated: I believe <think> is a very poor format, especially in stream mode, it is difficult to extract and convert.
+	// Considering that only a few deepseek-r1 third-party providers use this format, it has been decided to no longer support it.
+	// ReasoningFormatThinkTag ReasoningFormat = "think-tag"
+
+	// ReasoningFormatThinking is the reasoning format used by anthropic
+	ReasoningFormatThinking ReasoningFormat = "thinking"
+)
+
 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"`
+	Annotation []AnnotationItem `json:"annotation,omitempty"`
+
+	// -------------------------------------
+	// Deepseek 专有的一些字段
+	// https://api-docs.deepseek.com/api/create-chat-completion
+	// -------------------------------------
+	// Prefix forces the model to begin its answer with the supplied prefix in the assistant message.
+	// To enable this feature, set base_url to "https://api.deepseek.com/beta".
+	Prefix *bool `json:"prefix,omitempty"` // ReasoningContent is Used for the deepseek-reasoner model in the Chat
+	// Prefix Completion feature as the input for the CoT in the last assistant message.
+	// When using this feature, the prefix parameter must be set to true.
+	ReasoningContent *string `json:"reasoning_content,omitempty"`
+
+	// -------------------------------------
+	// Openrouter
+	// -------------------------------------
+	Reasoning *string `json:"reasoning,omitempty"`
+	Refusal   *bool   `json:"refusal,omitempty"`
+
+	// -------------------------------------
+	// Anthropic
+	// -------------------------------------
+	Thinking  *string `json:"thinking,omitempty"`
+	Signature *string `json:"signature,omitempty"`
+}
+
+type AnnotationItem struct {
+	Type        string      `json:"type" binding:"oneof=url_citation"`
+	UrlCitation UrlCitation `json:"url_citation"`
+}
+
+// UrlCitation is a URL citation when using web search.
+type UrlCitation struct {
+	// Endpoint is the index of the last character of the URL citation in the message.
+	EndIndex int `json:"end_index"`
+	// StartIndex is the index of the first character of the URL citation in the message.
+	StartIndex int `json:"start_index"`
+	// Title is the title of the web resource.
+	Title string `json:"title"`
+	// Url is the URL of the web resource.
+	Url string `json:"url"`
+}
+
+// SetReasoningContent sets the reasoning content based on the format
+func (m *Message) SetReasoningContent(format string, reasoningContent string) {
+	switch ReasoningFormat(strings.ToLower(strings.TrimSpace(format))) {
+	case ReasoningFormatReasoningContent:
+		m.ReasoningContent = &reasoningContent
+		// case ReasoningFormatThinkTag:
+		// 	m.Content = fmt.Sprintf("<think>%s</think>%s", reasoningContent, m.Content)
+	case ReasoningFormatThinking:
+		m.Thinking = &reasoningContent
+	case ReasoningFormatReasoning,
+		ReasoningFormatUnspecified:
+		m.Reasoning = &reasoningContent
+	default:
+		logger.Warnf(context.TODO(), "unknown reasoning format: %q", format)
+	}
+}
+
+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 +121,7 @@ func (m Message) StringContent() string {
 			if !ok {
 				continue
 			}
+
 			if contentMap["type"] == ContentTypeText {
 				if subStr, ok := contentMap["text"].(string); ok {
 					contentStr += subStr
@@ -34,6 +130,7 @@ func (m Message) StringContent() string {
 		}
 		return contentStr
 	}
+
 	return ""
 }
 
@@ -43,10 +140,11 @@ func (m Message) ParseContent() []MessageContent {
 	if ok {
 		contentList = append(contentList, MessageContent{
 			Type: ContentTypeText,
-			Text: content,
+			Text: &content,
 		})
 		return contentList
 	}
+
 	anyList, ok := m.Content.([]any)
 	if ok {
 		for _, contentItem := range anyList {
@@ -59,7 +157,7 @@ func (m Message) ParseContent() []MessageContent {
 				if subStr, ok := contentMap["text"].(string); ok {
 					contentList = append(contentList, MessageContent{
 						Type: ContentTypeText,
-						Text: subStr,
+						Text: &subStr,
 					})
 				}
 			case ContentTypeImageURL:
@@ -71,8 +169,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 +195,23 @@ 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,omitempty"`
+	ImageURL   *ImageURL   `json:"image_url,omitempty"`
+	InputAudio *InputAudio `json:"input_audio,omitempty"`
+	// -------------------------------------
+	// Anthropic
+	// -------------------------------------
+	Thinking  *string `json:"thinking,omitempty"`
+	Signature *string `json:"signature,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"`
 }

relay/model/misc.go

@@ -1,9 +1,22 @@
 package model
 
+// Usage is the token usage information returned by OpenAI API.
 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 `json:"prompt_tokens_details,omitempty"`
+	// CompletionTokensDetails may be empty for some models
+	CompletionTokensDetails *usageCompletionTokensDetails `json:"completion_tokens_details,omitempty"`
+	ServiceTier             string                        `json:"service_tier,omitempty"`
+	SystemFingerprint       string                        `json:"system_fingerprint,omitempty"`
+
+	// -------------------------------------
+	// Custom fields
+	// -------------------------------------
+	// ToolsCost is the cost of using tools, in quota.
+	ToolsCost int64 `json:"tools_cost,omitempty"`
 }
 
 type Error struct {
@@ -17,3 +30,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"`
+}

web/air/src/constants/channel.constants.js

@@ -7,7 +7,7 @@ export const CHANNEL_OPTIONS = [
   { key: 24, text: 'Google Gemini', value: 24, color: 'orange' },
   { key: 28, text: 'Mistral AI', value: 28, color: 'orange' },
   { key: 41, text: 'Novita', value: 41, color: 'purple' },
-  { key: 40, text: '字节跳动豆包', value: 40, color: 'blue' },
+  {key: 40, text: '字节火山引擎', value: 40, color: 'blue'},
   { key: 15, text: '百度文心千帆', value: 15, color: 'blue' },
   { key: 17, text: '阿里通义千问', value: 17, color: 'orange' },
   { key: 18, text: '讯飞星火认知', value: 18, color: 'blue' },
@@ -35,7 +35,7 @@ export const CHANNEL_OPTIONS = [
   { key: 8, text: '自定义渠道', value: 8, color: 'pink' },
   { key: 22, text: '知识库：FastGPT', value: 22, color: 'blue' },
   { key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple' },
-  { key: 20, text: '代理：OpenRouter', value: 20, color: 'black' },
+  {key: 20, text: 'OpenRouter', value: 20, color: 'black'},
   { key: 2, text: '代理：API2D', value: 2, color: 'blue' },
   { key: 5, text: '代理：OpenAI-SB', value: 5, color: 'brown' },
   { key: 7, text: '代理：OhMyGPT', value: 7, color: 'purple' },

web/berry/src/constants/ChannelConstants.js

@@ -49,7 +49,7 @@ export const CHANNEL_OPTIONS = {
   },
   40: {
     key: 40,
-    text: '字节跳动豆包',
+    text: '字节火山引擎',
     value: 40,
     color: 'primary'
   },
@@ -217,7 +217,7 @@ export const CHANNEL_OPTIONS = {
   },
   20: {
     key: 20,
-    text: '代理：OpenRouter',
+      text: 'OpenRouter',
     value: 20,
     color: 'success'
   },

web/default/src/components/ChannelsTable.js

@@ -1,17 +1,7 @@
-import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  Button,
-  Dropdown,
-  Form,
-  Input,
-  Label,
-  Message,
-  Pagination,
-  Popup,
-  Table,
-} from 'semantic-ui-react';
-import { Link } from 'react-router-dom';
+import React, {useEffect, useState} from 'react';
+import {useTranslation} from 'react-i18next';
+import {Button, Dropdown, Form, Input, Label, Message, Pagination, Popup, Table,} from 'semantic-ui-react';
+import {Link} from 'react-router-dom';
 import {
   API,
   loadChannelModels,
@@ -23,8 +13,8 @@ import {
   timestamp2string,
 } from '../helpers';
 
-import { CHANNEL_OPTIONS, ITEMS_PER_PAGE } from '../constants';
-import { renderGroup, renderNumber } from '../helpers/render';
+import {CHANNEL_OPTIONS, ITEMS_PER_PAGE} from '../constants';
+import {renderGroup, renderNumber} from '../helpers/render';
 
 function renderTimestamp(timestamp) {
   return <>{timestamp2string(timestamp)}</>;
@@ -54,6 +44,9 @@ function renderType(type, t) {
 function renderBalance(type, balance, t) {
   switch (type) {
     case 1: // OpenAI
+        if (balance === 0) {
+            return <span>{t('channel.table.balance_not_supported')}</span>;
+        }
       return <span>${balance.toFixed(2)}</span>;
     case 4: // CloseAI
       return <span>¥{balance.toFixed(2)}</span>;
@@ -67,6 +60,8 @@ function renderBalance(type, balance, t) {
       return <span>¥{balance.toFixed(2)}</span>;
     case 13: // AIGC2D
       return <span>{renderNumber(balance)}</span>;
+    case 20: // OpenRouter
+      return <span>${balance.toFixed(2)}</span>;
     case 36: // DeepSeek
       return <span>¥{balance.toFixed(2)}</span>;
     case 44: // SiliconFlow
@@ -93,30 +88,32 @@ const ChannelsTable = () => {
   const [showPrompt, setShowPrompt] = useState(shouldShowPrompt(promptID));
   const [showDetail, setShowDetail] = useState(isShowDetail());
 
+  const processChannelData = (channel) => {
+    if (channel.models === '') {
+      channel.models = [];
+      channel.test_model = '';
+    } else {
+      channel.models = channel.models.split(',');
+      if (channel.models.length > 0) {
+        channel.test_model = channel.models[0];
+      }
+      channel.model_options = channel.models.map((model) => {
+        return {
+          key: model,
+          text: model,
+          value: model,
+        };
+      });
+      console.log('channel', channel);
+    }
+    return channel;
+  };
+
   const loadChannels = async (startIdx) => {
     const res = await API.get(`/api/channel/?p=${startIdx}`);
     const { success, message, data } = res.data;
     if (success) {
-      let localChannels = data.map((channel) => {
-        if (channel.models === '') {
-          channel.models = [];
-          channel.test_model = '';
-        } else {
-          channel.models = channel.models.split(',');
-          if (channel.models.length > 0) {
-            channel.test_model = channel.models[0];
-          }
-          channel.model_options = channel.models.map((model) => {
-            return {
-              key: model,
-              text: model,
-              value: model,
-            };
-          });
-          console.log('channel', channel);
-        }
-        return channel;
-      });
+      let localChannels = data.map(processChannelData);
       if (startIdx === 0) {
         setChannels(localChannels);
       } else {
@@ -301,7 +298,8 @@ const ChannelsTable = () => {
     const res = await API.get(`/api/channel/search?keyword=${searchKeyword}`);
     const { success, message, data } = res.data;
     if (success) {
-      setChannels(data);
+      let localChannels = data.map(processChannelData);
+      setChannels(localChannels);
       setActivePage(1);
     } else {
       showError(message);
@@ -495,7 +493,6 @@ const ChannelsTable = () => {
               onClick={() => {
                 sortChannel('balance');
               }}
-              hidden={!showDetail}
             >
               {t('channel.table.balance')}
             </Table.HeaderCell>
@@ -504,6 +501,7 @@ const ChannelsTable = () => {
               onClick={() => {
                 sortChannel('priority');
               }}
+              hidden={!showDetail}
             >
               {t('channel.table.priority')}
             </Table.HeaderCell>
@@ -543,7 +541,7 @@ const ChannelsTable = () => {
                       basic
                     />
                   </Table.Cell>
-                  <Table.Cell hidden={!showDetail}>
+                  <Table.Cell>
                     <Popup
                       trigger={
                         <span
@@ -559,7 +557,7 @@ const ChannelsTable = () => {
                       basic
                     />
                   </Table.Cell>
-                  <Table.Cell>
+                  <Table.Cell hidden={!showDetail}>
                     <Popup
                       trigger={
                         <Input
@@ -593,7 +591,15 @@ const ChannelsTable = () => {
                     />
                   </Table.Cell>
                   <Table.Cell>
-                    <div>
+                    <div
+                      style={{
+                        display: 'flex',
+                        alignItems: 'center',
+                        flexWrap: 'wrap',
+                        gap: '2px',
+                        rowGap: '6px',
+                      }}
+                    >
                       <Button
                         size={'tiny'}
                         positive

web/default/src/constants/channel.constants.js

@@ -1,48 +1,108 @@
 export const CHANNEL_OPTIONS = [
-    { key: 1, text: 'OpenAI', value: 1, color: 'green' },
-    { key: 14, text: 'Anthropic Claude', value: 14, color: 'black' },
-    { key: 33, text: 'AWS', value: 33, color: 'black' },
-    { key: 3, text: 'Azure OpenAI', value: 3, color: 'olive' },
-    { key: 11, text: 'Google PaLM2', value: 11, color: 'orange' },
-    { key: 24, text: 'Google Gemini', value: 24, color: 'orange' },
-    { key: 28, text: 'Mistral AI', value: 28, color: 'orange' },
-    { key: 41, text: 'Novita', value: 41, color: 'purple' },
-    { key: 40, text: '字节跳动豆包', value: 40, color: 'blue' },
-    { key: 15, text: '百度文心千帆', value: 15, color: 'blue' },
-    { key: 17, text: '阿里通义千问', value: 17, color: 'orange' },
-    { key: 18, text: '讯飞星火认知', value: 18, color: 'blue' },
-    { key: 16, text: '智谱 ChatGLM', value: 16, color: 'violet' },
-    { key: 19, text: '360 智脑', value: 19, color: 'blue' },
-    { key: 25, text: 'Moonshot AI', value: 25, color: 'black' },
-    { key: 23, text: '腾讯混元', value: 23, color: 'teal' },
-    { key: 26, text: '百川大模型', value: 26, color: 'orange' },
-    { key: 27, text: 'MiniMax', value: 27, color: 'red' },
-    { key: 29, text: 'Groq', value: 29, color: 'orange' },
-    { key: 30, text: 'Ollama', value: 30, color: 'black' },
-    { key: 31, text: '零一万物', value: 31, color: 'green' },
-    { key: 32, text: '阶跃星辰', value: 32, color: 'blue' },
-    { key: 34, text: 'Coze', value: 34, color: 'blue' },
-    { key: 35, text: 'Cohere', value: 35, color: 'blue' },
-    { key: 36, text: 'DeepSeek', value: 36, color: 'black' },
-    { key: 37, text: 'Cloudflare', value: 37, color: 'orange' },
-    { key: 38, text: 'DeepL', value: 38, color: 'black' },
-    { key: 39, text: 'together.ai', value: 39, color: 'blue' },
-    { key: 42, text: 'VertexAI', value: 42, color: 'blue' },
-    { key: 43, text: 'Proxy', value: 43, color: 'blue' },
-    { key: 44, text: 'SiliconFlow', value: 44, color: 'blue' },
-    { key: 45, text: 'xAI', value: 45, color: 'blue' },
-    { key: 46, text: 'Replicate', value: 46, color: 'blue' },
-    { key: 8, text: '自定义渠道', value: 8, color: 'pink' },
-    { key: 22, text: '知识库：FastGPT', value: 22, color: 'blue' },
-    { key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple' },
-    { key: 20, text: '代理：OpenRouter', value: 20, color: 'black' },
-    { key: 2, text: '代理：API2D', value: 2, color: 'blue' },
-    { key: 5, text: '代理：OpenAI-SB', value: 5, color: 'brown' },
-    { key: 7, text: '代理：OhMyGPT', value: 7, color: 'purple' },
-    { key: 10, text: '代理：AI Proxy', value: 10, color: 'purple' },
-    { key: 4, text: '代理：CloseAI', value: 4, color: 'teal' },
-    { key: 6, text: '代理：OpenAI Max', value: 6, color: 'violet' },
-    { key: 9, text: '代理：AI.LS', value: 9, color: 'yellow' },
-    { key: 12, text: '代理：API2GPT', value: 12, color: 'blue' },
-    { key: 13, text: '代理：AIGC2D', value: 13, color: 'purple' }
+  { key: 1, text: 'OpenAI', value: 1, color: 'green' },
+  {
+    key: 50,
+    text: 'OpenAI 兼容',
+    value: 50,
+    color: 'olive',
+    description: 'OpenAI 兼容渠道，支持设置 Base URL',
+  },
+  {key: 14, text: 'Anthropic', value: 14, color: 'black'},
+  { key: 33, text: 'AWS', value: 33, color: 'black' },
+  {key: 3, text: 'Azure', value: 3, color: 'olive'},
+  {key: 11, text: 'PaLM2', value: 11, color: 'orange'},
+  {key: 24, text: 'Gemini', value: 24, color: 'orange'},
+  {
+    key: 51,
+    text: 'Gemini (OpenAI)',
+    value: 51,
+    color: 'orange',
+    description: 'Gemini OpenAI 兼容格式',
+  },
+  { key: 28, text: 'Mistral AI', value: 28, color: 'orange' },
+  { key: 41, text: 'Novita', value: 41, color: 'purple' },
+  {
+    key: 40,
+    text: '字节火山引擎',
+    value: 40,
+    color: 'blue',
+    description: '原字节跳动豆包',
+  },
+  {
+    key: 15,
+    text: '百度文心千帆',
+    value: 15,
+    color: 'blue',
+    tip: '请前往<a href="https://console.bce.baidu.com/qianfan/ais/console/applicationConsole/application/v1" target="_blank">此处</a>获取 AK（API Key）以及 SK（Secret Key），注意，V2 版本接口请使用 <strong>百度文心千帆 V2 </strong>渠道类型',
+  },
+  {
+    key: 47,
+    text: '百度文心千帆 V2',
+    value: 47,
+    color: 'blue',
+    tip: '请前往<a href="https://console.bce.baidu.com/iam/#/iam/apikey/list" target="_blank">此处</a>获取 API Key，注意本渠道仅支持<a target="_blank" href="https://cloud.baidu.com/doc/WENXINWORKSHOP/s/em4tsqo3v">推理服务 V2</a>相关模型',
+  },
+  {
+    key: 17,
+    text: '阿里通义千问',
+    value: 17,
+    color: 'orange',
+    tip: '如需使用阿里云百炼，请使用<strong>阿里云百炼</strong>渠道',
+  },
+  { key: 49, text: '阿里云百炼', value: 49, color: 'orange' },
+  {
+    key: 18,
+    text: '讯飞星火认知',
+    value: 18,
+    color: 'blue',
+    tip: '本渠道基于讯飞 WebSocket 版本 API，如需 HTTP 版本，请使用<strong>讯飞星火认知 V2</strong>渠道',
+  },
+  {
+    key: 48,
+    text: '讯飞星火认知 V2',
+    value: 48,
+    color: 'blue',
+    tip: 'HTTP 版本的讯飞接口，前往<a href="https://console.xfyun.cn/services/cbm" target="_blank">此处</a>获取 HTTP 服务接口认证密钥',
+  },
+  { key: 16, text: '智谱 ChatGLM', value: 16, color: 'violet' },
+  { key: 19, text: '360 智脑', value: 19, color: 'blue' },
+  { key: 25, text: 'Moonshot AI', value: 25, color: 'black' },
+  { key: 23, text: '腾讯混元', value: 23, color: 'teal' },
+  { key: 26, text: '百川大模型', value: 26, color: 'orange' },
+  { key: 27, text: 'MiniMax', value: 27, color: 'red' },
+  { key: 29, text: 'Groq', value: 29, color: 'orange' },
+  { key: 30, text: 'Ollama', value: 30, color: 'black' },
+  { key: 31, text: '零一万物', value: 31, color: 'green' },
+  { key: 32, text: '阶跃星辰', value: 32, color: 'blue' },
+  { key: 34, text: 'Coze', value: 34, color: 'blue' },
+  { key: 35, text: 'Cohere', value: 35, color: 'blue' },
+  { key: 36, text: 'DeepSeek', value: 36, color: 'black' },
+  { key: 37, text: 'Cloudflare', value: 37, color: 'orange' },
+  { key: 38, text: 'DeepL', value: 38, color: 'black' },
+  { key: 39, text: 'together.ai', value: 39, color: 'blue' },
+  { key: 42, text: 'VertexAI', value: 42, color: 'blue' },
+  { key: 43, text: 'Proxy', value: 43, color: 'blue' },
+  { key: 44, text: 'SiliconFlow', value: 44, color: 'blue' },
+  { key: 45, text: 'xAI', value: 45, color: 'blue' },
+  { key: 46, text: 'Replicate', value: 46, color: 'blue' },
+  {
+    key: 8,
+    text: '自定义渠道',
+    value: 8,
+    color: 'pink',
+    tip: '不推荐使用，请使用 <strong>OpenAI 兼容</strong>渠道类型。注意，这里所需要填入的代理地址仅会在实际请求时替换域名部分，如果你想填入 OpenAI SDK 中所要求的 Base URL，请使用 OpenAI 兼容渠道类型',
+    description: '不推荐使用，请使用 OpenAI 兼容渠道类型',
+  },
+  { key: 22, text: '知识库：FastGPT', value: 22, color: 'blue' },
+  { key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple' },
+  { key: 20, text: 'OpenRouter', value: 20, color: 'black' },
+  { key: 2, text: '代理：API2D', value: 2, color: 'blue' },
+  { key: 5, text: '代理：OpenAI-SB', value: 5, color: 'brown' },
+  { key: 7, text: '代理：OhMyGPT', value: 7, color: 'purple' },
+  { key: 10, text: '代理：AI Proxy', value: 10, color: 'purple' },
+  { key: 4, text: '代理：CloseAI', value: 4, color: 'teal' },
+  { key: 6, text: '代理：OpenAI Max', value: 6, color: 'violet' },
+  { key: 9, text: '代理：AI.LS', value: 9, color: 'yellow' },
+  { key: 12, text: '代理：API2GPT', value: 12, color: 'blue' },
+  { key: 13, text: '代理：AIGC2D', value: 13, color: 'purple' },
 ];

web/default/src/constants/toast.constants.js

@@ -1,7 +1,7 @@
 export const toastConstants = {
-  SUCCESS_TIMEOUT: 1500,
-  INFO_TIMEOUT: 3000,
-  ERROR_TIMEOUT: 5000,
+  SUCCESS_TIMEOUT: 5000,
+  INFO_TIMEOUT: 8000,
+  ERROR_TIMEOUT: 10000,
   WARNING_TIMEOUT: 10000,
-  NOTICE_TIMEOUT: 20000
+  NOTICE_TIMEOUT: 20000,
 };

web/default/src/helpers/helper.js

@@ -0,0 +1,13 @@
+import {CHANNEL_OPTIONS} from '../constants';
+
+let channelMap = undefined;
+
+export function getChannelOption(channelId) {
+    if (channelMap === undefined) {
+        channelMap = {};
+        CHANNEL_OPTIONS.forEach((option) => {
+            channelMap[option.key] = option;
+        });
+    }
+    return channelMap[channelId];
+}

web/default/src/helpers/render.js

@@ -1,5 +1,6 @@
-import { Label } from 'semantic-ui-react';
-import { useTranslation } from 'react-i18next';
+import { Label, Message } from 'semantic-ui-react';
+import { getChannelOption } from './helper';
+import React from 'react';
 
 export function renderText(text, limit) {
   if (text.length > limit) {
@@ -15,7 +16,15 @@ export function renderGroup(group) {
   let groups = group.split(',');
   groups.sort();
   return (
-    <>
+    <div
+      style={{
+        display: 'flex',
+        alignItems: 'center',
+        flexWrap: 'wrap',
+        gap: '2px',
+        rowGap: '6px',
+      }}
+    >
       {groups.map((group) => {
         if (group === 'vip' || group === 'pro') {
           return <Label color='yellow'>{group}</Label>;
@@ -24,7 +33,7 @@ export function renderGroup(group) {
         }
         return <Label>{group}</Label>;
       })}
-    </>
+    </div>
   );
 }
 
@@ -98,3 +107,15 @@ export function renderColorLabel(text) {
     </Label>
   );
 }
+
+export function renderChannelTip(channelId) {
+  let channel = getChannelOption(channelId);
+  if (channel === undefined || channel.tip === undefined) {
+    return <></>;
+  }
+  return (
+    <Message>
+      <div dangerouslySetInnerHTML={{ __html: channel.tip }}></div>
+    </Message>
+  );
+}

web/default/src/helpers/utils.js

@@ -1,7 +1,7 @@
-import { toast } from 'react-toastify';
-import { toastConstants } from '../constants';
+import {toast} from 'react-toastify';
+import {toastConstants} from '../constants';
 import React from 'react';
-import { API } from './api';
+import {API} from './api';
 
 const HTMLToastContent = ({ htmlContent }) => {
   return <div dangerouslySetInnerHTML={{ __html: htmlContent }} />;
@@ -74,6 +74,7 @@ if (isMobile()) {
 }
 
 export function showError(error) {
+  if (!error) return;
   console.error(error);
   if (error.message) {
     if (error.name === 'AxiosError') {
@@ -158,17 +159,7 @@ export function timestamp2string(timestamp) {
     second = '0' + second;
   }
   return (
-    year +
-    '-' +
-    month +
-    '-' +
-    day +
-    ' ' +
-    hour +
-    ':' +
-    minute +
-    ':' +
-    second
+      year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
   );
 }
 
@@ -193,7 +184,6 @@ export const verifyJSON = (str) => {
 export function shouldShowPrompt(id) {
   let prompt = localStorage.getItem(`prompt-${id}`);
   return !prompt;
-
 }
 
 export function setPromptShown(id) {
@@ -224,4 +214,4 @@ export function getChannelModels(type) {
     return channelModels[type];
   }
   return [];
-}
+}

web/default/src/locales/en/translation.json

@@ -62,7 +62,8 @@
       "not_tested": "Not Tested",
       "priority_tip": "Channel selection priority, higher is preferred",
       "select_test_model": "Please select test model",
-      "click_to_update": "Click to update"
+      "click_to_update": "Click to update",
+      "balance_not_supported": "-"
     },
     "buttons": {
       "test": "Test",
@@ -85,7 +86,8 @@
       "test_all_started": "Channel testing started successfully, please refresh page to see results.",
       "delete_disabled_success": "Deleted all disabled channels, total: {{count}}",
       "balance_update_success": "Channel {{name}} balance updated successfully!",
-      "all_balance_updated": "All enabled channel balances have been updated!"
+      "all_balance_updated": "All enabled channel balances have been updated!",
+      "operation_success": "Operation completed successfully!"
     },
     "edit": {
       "title_edit": "Update Channel Information",
@@ -102,8 +104,10 @@
       "model_mapping_placeholder": "Optional, used to modify model names in request body. A JSON string where keys are request model names and values are target model names",
       "system_prompt": "System Prompt",
       "system_prompt_placeholder": "Optional, used to force set system prompt. Use with custom model & model mapping. First create a unique custom model name above, then map it to a natively supported model",
-      "base_url": "Proxy",
-      "base_url_placeholder": "Optional, used for API calls through proxy. Enter proxy address in format: https://domain.com",
+      "proxy_url": "Proxy",
+      "proxy_url_placeholder": "This is optional and used for API calls via a proxy. Please enter the proxy URL, formatted as: https://domain.com",
+      "base_url": "Base URL",
+      "base_url_placeholder": "The Base URL required by the OpenAPI SDK",
       "key": "Key",
       "key_placeholder": "Please enter key",
       "batch": "Batch Create",

web/default/src/locales/zh/translation.json

@@ -62,7 +62,8 @@
       "not_tested": "未测试",
       "priority_tip": "渠道选择优先级，越高越优先",
       "select_test_model": "请选择测试模型",
-      "click_to_update": "点击更新"
+      "click_to_update": "点击更新",
+      "balance_not_supported": "-"
     },
     "buttons": {
       "test": "测试",
@@ -85,7 +86,8 @@
       "test_all_started": "已成功开始测试渠道，请刷新页面查看结果。",
       "delete_disabled_success": "已删除所有禁用渠道，共计 {{count}} 个",
       "balance_update_success": "渠道 {{name}} 余额更新成功！",
-      "all_balance_updated": "已更新完毕所有已启用渠道余额！"
+      "all_balance_updated": "已更新完毕所有已启用渠道余额！",
+      "operation_success": "操作成功完成！"
     },
     "edit": {
       "title_edit": "更新渠道信息",
@@ -102,8 +104,10 @@
       "model_mapping_placeholder": "此项可选，用于修改请求体中的模型名称，为一个 JSON 字符串，键为请求中模型名称，值为要替换的模型名称",
       "system_prompt": "系统提示词",
       "system_prompt_placeholder": "此项可选，用于强制设置给定的系统提示词，请配合自定义模型 & 模型重定向使用，首先创建一个唯一的自定义模型名称并在上面填入，之后将该自定义模型重定向映射到该渠道一个原生支持的模型",
-      "base_url": "代理",
-      "base_url_placeholder": "此项可选，用于通过代理站来进行 API 调用，请输入代理站地址，格式为：https://domain.com",
+      "proxy_url": "代理",
+      "proxy_url_placeholder": "此项可选，用于通过代理站来进行 API 调用，请输入代理站地址，格式为：https://domain.com。注意，这里所需要填入的代理地址仅会在实际请求时替换域名部分，如果你想填入 OpenAI SDK 中所要求的 Base URL，请使用 OpenAI 兼容渠道类型",
+      "base_url": "Base URL",
+      "base_url_placeholder": "OpenAPI SDK 中所要求的 Base URL",
       "key": "密钥",
       "key_placeholder": "请输入密钥",
       "batch": "批量创建",
@@ -133,7 +137,7 @@
       "coze_notice": "对于 Coze 而言，模型名称即 Bot ID，你可以添加一个前缀 `bot-`，例如：`bot-123456`。",
       "douban_notice": "对于豆包而言，需要手动去",
       "douban_notice_link": "模型推理页面",
-      "douban_notice_2": "创建推理接入点，以接入点名称作为模型名称，例如：`ep-20240608051426-tkxvl`。",
+      "douban_notice_2": "创建推理接入点，以接入点名称作为模型名称，例如：`ep-20240608051426-tkxvl`。你可以结合模型重定向功能将其转换为常规的模型名称，例如：doubao-lite-4k -> ep-20240608051426-tkxvl（前者作为 JSON 的 key，后者作为 value）。注意，doubao-lite-4k 和 ep-20240608051426-tkxvl 都需要通过自定义模型的方式填入到本渠道的模型列表中。",
       "aws_region_placeholder": "region，例如：us-west-2",
       "aws_ak_placeholder": "AWS IAM Access Key",
       "aws_sk_placeholder": "AWS IAM Secret Key",

web/default/src/pages/Channel/EditChannel.js

@@ -1,25 +1,10 @@
-import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  Button,
-  Form,
-  Header,
-  Input,
-  Message,
-  Segment,
-  Card,
-} from 'semantic-ui-react';
-import { useNavigate, useParams } from 'react-router-dom';
-import {
-  API,
-  copy,
-  getChannelModels,
-  showError,
-  showInfo,
-  showSuccess,
-  verifyJSON,
-} from '../../helpers';
-import { CHANNEL_OPTIONS } from '../../constants';
+import React, {useEffect, useState} from 'react';
+import {useTranslation} from 'react-i18next';
+import {Button, Card, Form, Input, Message} from 'semantic-ui-react';
+import {useNavigate, useParams} from 'react-router-dom';
+import {API, copy, getChannelModels, showError, showInfo, showSuccess, verifyJSON,} from '../../helpers';
+import {CHANNEL_OPTIONS} from '../../constants';
+import {renderChannelTip} from '../../helpers/render';
 
 const MODEL_MAPPING_EXAMPLE = {
   'gpt-3.5-turbo-0301': 'gpt-3.5-turbo',
@@ -207,6 +192,9 @@ const EditChannel = () => {
       return;
     }
     let localInputs = { ...inputs };
+    if (localInputs.key === 'undefined|undefined|undefined') {
+      localInputs.key = ''; // prevent potential bug
+    }
     if (localInputs.base_url && localInputs.base_url.endsWith('/')) {
       localInputs.base_url = localInputs.base_url.slice(
         0,
@@ -307,6 +295,7 @@ const EditChannel = () => {
                 options={groupOptions}
               />
             </Form.Field>
+            {renderChannelTip(inputs.type)}
 
             {/* Azure OpenAI specific fields */}
             {inputs.type === 3 && (
@@ -350,6 +339,20 @@ const EditChannel = () => {
             {inputs.type === 8 && (
               <Form.Field>
                 <Form.Input
+                    required
+                    label={t('channel.edit.proxy_url')}
+                    name='base_url'
+                    placeholder={t('channel.edit.proxy_url_placeholder')}
+                    onChange={handleInputChange}
+                    value={inputs.base_url}
+                    autoComplete='new-password'
+                />
+              </Form.Field>
+            )}
+            {inputs.type === 50 && (
+                <Form.Field>
+                  <Form.Input
+                      required
                   label={t('channel.edit.base_url')}
                   name='base_url'
                   placeholder={t('channel.edit.base_url_placeholder')}
@@ -622,6 +625,21 @@ const EditChannel = () => {
                   />
                 </Form.Field>
               ))}
+            {inputs.type === 37 && (
+              <Form.Field>
+                <Form.Input
+                  label='Account ID'
+                  name='user_id'
+                  required
+                  placeholder={
+                    '请输入 Account ID，例如：d8d7c61dbc334c32d3ced580e4bf42b4'
+                  }
+                  onChange={handleConfigChange}
+                  value={config.user_id}
+                  autoComplete=''
+                />
+              </Form.Field>
+            )}
             {inputs.type !== 33 && !isEdit && (
               <Form.Checkbox
                 checked={batch}
@@ -633,12 +651,13 @@ const EditChannel = () => {
             {inputs.type !== 3 &&
               inputs.type !== 33 &&
               inputs.type !== 8 &&
+                inputs.type !== 50 &&
               inputs.type !== 22 && (
                 <Form.Field>
                   <Form.Input
-                    label={t('channel.edit.base_url')}
+                      label={t('channel.edit.proxy_url')}
                     name='base_url'
-                    placeholder={t('channel.edit.base_url_placeholder')}
+                      placeholder={t('channel.edit.proxy_url_placeholder')}
                     onChange={handleInputChange}
                     value={inputs.base_url}
                     autoComplete='new-password'

web/default/src/pages/Dashboard/Dashboard.css

@@ -91,15 +91,15 @@
 }
 
 .settings-tab .item {
-    color: #2B3674 !important;
+    color: #000 !important;
     font-weight: 500 !important;
     padding: 0.8rem 1.2rem !important;
 }
 
 .settings-tab .active.item {
-    color: #4318FF !important;
+    color: #000 !important;
     font-weight: 600 !important;
-    border-color: #4318FF !important;
+    border-color: #000 !important;
 }
 
 .ui.tab.segment {

web/default/src/pages/Dashboard/index.js

@@ -1,19 +1,17 @@
-import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Card, Grid, Header, Segment, Statistic } from 'semantic-ui-react';
-import { API, showError } from '../../helpers';
-import moment from 'moment';
+import React, {useEffect, useState} from 'react';
+import {useTranslation} from 'react-i18next';
+import {Card, Grid} from 'semantic-ui-react';
 import {
-  LineChart,
+  Bar,
+  BarChart,
+  CartesianGrid,
+  Legend,
   Line,
+  LineChart,
+  ResponsiveContainer,
+  Tooltip,
   XAxis,
   YAxis,
-  CartesianGrid,
-  Tooltip,
-  ResponsiveContainer,
-  BarChart,
-  Bar,
-  Legend,
 } from 'recharts';
 import axios from 'axios';
 import './Dashboard.css';
@@ -124,11 +122,11 @@ const Dashboard = () => {
         ? new Date(Math.min(...dates.map((d) => new Date(d))))
         : new Date();
 
-    // 确保至少显示5天的数据
-    const fiveDaysAgo = new Date();
-    fiveDaysAgo.setDate(fiveDaysAgo.getDate() - 4); // -4是因为包含今天
-    if (minDate > fiveDaysAgo) {
-      minDate = fiveDaysAgo;
+    // 确保至少显示7天的数据
+    const sevenDaysAgo = new Date();
+    sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 6); // -6是因为包含今天
+    if (minDate > sevenDaysAgo) {
+      minDate = sevenDaysAgo;
     }
 
     // 生成所有日期
@@ -166,11 +164,11 @@ const Dashboard = () => {
         ? new Date(Math.min(...dates.map((d) => new Date(d))))
         : new Date();
 
-    // 确保至少显示5天的数据
-    const fiveDaysAgo = new Date();
-    fiveDaysAgo.setDate(fiveDaysAgo.getDate() - 4); // -4是因为包含今天
-    if (minDate > fiveDaysAgo) {
-      minDate = fiveDaysAgo;
+    // 确保至少显示7天的数据
+    const sevenDaysAgo = new Date();
+    sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 6); // -6是因为包含今天
+    if (minDate > sevenDaysAgo) {
+      minDate = sevenDaysAgo;
     }
 
     // 生成所有日期
@@ -244,7 +242,7 @@ const Dashboard = () => {
             <Card.Content>
               <Card.Header>
                 {t('dashboard.charts.requests.title')}
-                <span className='stat-value'>{summaryData.todayRequests}</span>
+                {/* <span className='stat-value'>{summaryData.todayRequests}</span> */}
               </Card.Header>
               <div className='chart-container'>
                 <ResponsiveContainer
@@ -273,7 +271,9 @@ const Dashboard = () => {
                         t('dashboard.charts.requests.tooltip'),
                       ]}
                       labelFormatter={(label) =>
-                        `${t('dashboard.tooltip.date')}: ${formatDate(label)}`
+                        `${t(
+                          'dashboard.statistics.tooltip.date'
+                        )}: ${formatDate(label)}`
                       }
                     />
                     <Line
@@ -296,9 +296,9 @@ const Dashboard = () => {
             <Card.Content>
               <Card.Header>
                 {t('dashboard.charts.quota.title')}
-                <span className='stat-value'>
+                {/* <span className='stat-value'>
                   ${summaryData.todayQuota.toFixed(3)}
-                </span>
+                </span> */}
               </Card.Header>
               <div className='chart-container'>
                 <ResponsiveContainer
@@ -323,11 +323,13 @@ const Dashboard = () => {
                         boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
                       }}
                       formatter={(value) => [
-                        value,
+                        value.toFixed(6),
                         t('dashboard.charts.quota.tooltip'),
                       ]}
                       labelFormatter={(label) =>
-                        `${t('dashboard.tooltip.date')}: ${formatDate(label)}`
+                        `${t(
+                          'dashboard.statistics.tooltip.date'
+                        )}: ${formatDate(label)}`
                       }
                     />
                     <Line
@@ -350,7 +352,7 @@ const Dashboard = () => {
             <Card.Content>
               <Card.Header>
                 {t('dashboard.charts.tokens.title')}
-                <span className='stat-value'>{summaryData.todayTokens}</span>
+                {/* <span className='stat-value'>{summaryData.todayTokens}</span> */}
               </Card.Header>
               <div className='chart-container'>
                 <ResponsiveContainer
@@ -379,7 +381,9 @@ const Dashboard = () => {
                         t('dashboard.charts.tokens.tooltip'),
                       ]}
                       labelFormatter={(label) =>
-                        `${t('dashboard.tooltip.date')}: ${formatDate(label)}`
+                        `${t(
+                          'dashboard.statistics.tooltip.date'
+                        )}: ${formatDate(label)}`
                       }
                     />
                     <Line
@@ -424,7 +428,9 @@ const Dashboard = () => {
                     boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
                   }}
                   labelFormatter={(label) =>
-                    `${t('dashboard.tooltip.date')}: ${formatDate(label)}`
+                    `${t('dashboard.statistics.tooltip.date')}: ${formatDate(
+                      label
+                    )}`
                   }
                 />
                 <Legend