Merge 83453d57f2 into 99c8c77504

Dockerfile

@@ -6,15 +6,15 @@ COPY ./web .
 
 WORKDIR /web/default
 RUN npm install
-RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat VERSION) npm run build
+RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat ../VERSION) npm run build
 
 WORKDIR /web/berry
 RUN npm install
-RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat VERSION) npm run build
+RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat ../VERSION) npm run build
 
 WORKDIR /web/air
 RUN npm install
-RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat VERSION) npm run build
+RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat ../VERSION) npm run build
 
 FROM golang:alpine AS builder2
 

README.md

@@ -90,7 +90,6 @@ _✨ 通过标准的 OpenAI API 格式访问所有的大模型，开箱即用
    + [x] [together.ai](https://www.together.ai/)
    + [x] [novita.ai](https://www.novita.ai/)
    + [x] [硅基流动 SiliconCloud](https://siliconflow.cn/siliconcloud)
-   + [x] [xAI](https://x.ai/)
 2. 支持配置镜像以及众多[第三方代理服务](https://iamazing.cn/page/openai-api-third-party-services)。
 3. 支持通过**负载均衡**的方式访问多个渠道。
 4. 支持 **stream 模式**，可以通过流式传输实现打字机效果。
@@ -400,7 +399,6 @@ graph LR
 26. `METRIC_SUCCESS_RATE_THRESHOLD`：请求成功率阈值，默认为 `0.8`。
 27. `INITIAL_ROOT_TOKEN`：如果设置了该值，则在系统首次启动时会自动创建一个值为该环境变量值的 root 用户令牌。
 28. `INITIAL_ROOT_ACCESS_TOKEN`：如果设置了该值，则在系统首次启动时会自动创建一个值为该环境变量的 root 用户创建系统管理令牌。
-29. `ENFORCE_INCLUDE_USAGE`：是否强制在 stream 模型下返回 usage，默认不开启，可选值为 `true` 和 `false`。
 
 ### 命令行参数
 1. `--port <port_number>`: 指定服务器监听的端口号，默认为 `3000`。

common/config/config.go

@@ -160,5 +160,3 @@ var OnlyOneLogFile = env.Bool("ONLY_ONE_LOG_FILE", false)
 var RelayProxy = env.String("RELAY_PROXY", "")
 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)

common/ctxkey/key.go

@@ -20,5 +20,4 @@ const (
 	BaseURL           = "base_url"
 	AvailableModels   = "available_models"
 	KeyRequestBody    = "key_request_body"
-	SystemPrompt      = "system_prompt"
 )

common/gin.go

@@ -31,15 +31,15 @@ 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))
+		// skip for now
-		err = c.ShouldBind(&v)
+		// TODO: someday non json request have variant model, we will need to implementation this
 	}
 	if err != nil {
 		return err
 	}
 	// Reset request body
+	c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))
 	return nil
 }
 

common/helper/helper.go

@@ -137,23 +137,3 @@ func String2Int(str string) int {
 	}
 	return num
 }
-
-func Float64PtrMax(p *float64, maxValue float64) *float64 {
-	if p == nil {
-		return nil
-	}
-	if *p > maxValue {
-		return &maxValue
-	}
-	return p
-}
-
-func Float64PtrMin(p *float64, minValue float64) *float64 {
-	if p == nil {
-		return nil
-	}
-	if *p < minValue {
-		return &minValue
-	}
-	return p
-}

controller/channel-billing.go

@@ -81,26 +81,6 @@ type APGC2DGPTUsageResponse struct {
 	TotalUsed      float64 `json:"total_used"`
 }
 
-type SiliconFlowUsageResponse struct {
-	Code    int    `json:"code"`
-	Message string `json:"message"`
-	Status  bool   `json:"status"`
-	Data    struct {
-		ID            string `json:"id"`
-		Name          string `json:"name"`
-		Image         string `json:"image"`
-		Email         string `json:"email"`
-		IsAdmin       bool   `json:"isAdmin"`
-		Balance       string `json:"balance"`
-		Status        string `json:"status"`
-		Introduction  string `json:"introduction"`
-		Role          string `json:"role"`
-		ChargeBalance string `json:"chargeBalance"`
-		TotalBalance  string `json:"totalBalance"`
-		Category      string `json:"category"`
-	} `json:"data"`
-}
-
 // GetAuthHeader get auth header
 func GetAuthHeader(token string) http.Header {
 	h := http.Header{}
@@ -223,28 +203,6 @@ func updateChannelAIGC2DBalance(channel *model.Channel) (float64, error) {
 	return response.TotalAvailable, nil
 }
 
-func updateChannelSiliconFlowBalance(channel *model.Channel) (float64, error) {
-	url := "https://api.siliconflow.cn/v1/user/info"
-	body, err := GetResponseBody("GET", url, channel, GetAuthHeader(channel.Key))
-	if err != nil {
-		return 0, err
-	}
-	response := SiliconFlowUsageResponse{}
-	err = json.Unmarshal(body, &response)
-	if err != nil {
-		return 0, err
-	}
-	if response.Code != 20000 {
-		return 0, fmt.Errorf("code: %d, message: %s", response.Code, response.Message)
-	}
-	balance, err := strconv.ParseFloat(response.Data.Balance, 64)
-	if err != nil {
-		return 0, err
-	}
-	channel.UpdateBalance(balance)
-	return balance, nil
-}
-
 func updateChannelBalance(channel *model.Channel) (float64, error) {
 	baseURL := channeltype.ChannelBaseURLs[channel.Type]
 	if channel.GetBaseURL() == "" {
@@ -269,8 +227,6 @@ func updateChannelBalance(channel *model.Channel) (float64, error) {
 		return updateChannelAPI2GPTBalance(channel)
 	case channeltype.AIGC2D:
 		return updateChannelAIGC2DBalance(channel)
-	case channeltype.SiliconFlow:
-		return updateChannelSiliconFlowBalance(channel)
 	default:
 		return 0, errors.New("尚未实现")
 	}

controller/channel-test.go

@@ -76,9 +76,9 @@ func testChannel(channel *model.Channel, request *relaymodel.GeneralOpenAIReques
 		if len(modelNames) > 0 {
 			modelName = modelNames[0]
 		}
-	}
+		if modelMap != nil && modelMap[modelName] != "" {
-	if modelMap != nil && modelMap[modelName] != "" {
+			modelName = modelMap[modelName]
-		modelName = modelMap[modelName]
+		}
 	}
 	meta.OriginModelName, meta.ActualModelName = request.Model, modelName
 	request.Model = modelName

middleware/distributor.go

@@ -12,7 +12,7 @@ import (
 )
 
 type ModelRequest struct {
-	Model string `json:"model" form:"model"`
+	Model string `json:"model"`
 }
 
 func Distribute() func(c *gin.Context) {
@@ -61,9 +61,6 @@ func SetupContextForSelectedChannel(c *gin.Context, channel *model.Channel, mode
 	c.Set(ctxkey.Channel, channel.Type)
 	c.Set(ctxkey.ChannelId, channel.Id)
 	c.Set(ctxkey.ChannelName, channel.Name)
-	if channel.SystemPrompt != nil && *channel.SystemPrompt != "" {
-		c.Set(ctxkey.SystemPrompt, *channel.SystemPrompt)
-	}
 	c.Set(ctxkey.ModelMapping, channel.GetModelMapping())
 	c.Set(ctxkey.OriginalModel, modelName) // for retry
 	c.Request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", channel.Key))

model/channel.go

@@ -37,7 +37,6 @@ type Channel struct {
 	ModelMapping       *string `json:"model_mapping" gorm:"type:varchar(1024);default:''"`
 	Priority           *int64  `json:"priority" gorm:"bigint;default:0"`
 	Config             string  `json:"config"`
-	SystemPrompt       *string `json:"system_prompt" gorm:"type:text"`
 }
 
 type ChannelConfig struct {

model/token.go

@@ -30,7 +30,7 @@ type Token struct {
 	RemainQuota    int64   `json:"remain_quota" gorm:"bigint;default:0"`
 	UnlimitedQuota bool    `json:"unlimited_quota" gorm:"default:false"`
 	UsedQuota      int64   `json:"used_quota" gorm:"bigint;default:0"` // used quota
-	Models         *string `json:"models" gorm:"type:text"`            // allowed models
+	Models         *string `json:"models" gorm:"default:''"`           // allowed models
 	Subnet         *string `json:"subnet" gorm:"default:''"`           // allowed subnet
 }
 
@@ -121,40 +121,30 @@ func GetTokenById(id int) (*Token, error) {
 	return &token, err
 }
 
-func (t *Token) Insert() error {
+func (token *Token) Insert() error {
 	var err error
-	err = DB.Create(t).Error
+	err = DB.Create(token).Error
 	return err
 }
 
 // Update Make sure your token's fields is completed, because this will update non-zero values
-func (t *Token) Update() error {
+func (token *Token) Update() error {
 	var err error
-	err = DB.Model(t).Select("name", "status", "expired_time", "remain_quota", "unlimited_quota", "models", "subnet").Updates(t).Error
+	err = DB.Model(token).Select("name", "status", "expired_time", "remain_quota", "unlimited_quota", "models", "subnet").Updates(token).Error
 	return err
 }
 
-func (t *Token) SelectUpdate() error {
+func (token *Token) SelectUpdate() error {
 	// This can update zero values
-	return DB.Model(t).Select("accessed_time", "status").Updates(t).Error
+	return DB.Model(token).Select("accessed_time", "status").Updates(token).Error
 }
 
-func (t *Token) Delete() error {
+func (token *Token) Delete() error {
 	var err error
-	err = DB.Delete(t).Error
+	err = DB.Delete(token).Error
 	return err
 }
 
-func (t *Token) GetModels() string {
-	if t == nil {
-		return ""
-	}
-	if t.Models == nil {
-		return ""
-	}
-	return *t.Models
-}
-
 func DeleteTokenById(id int, userId int) (err error) {
 	// Why we need userId here? In case user want to delete other's token.
 	if id == 0 || userId == 0 {

relay/adaptor/ali/main.go

@@ -36,7 +36,9 @@ func ConvertRequest(request model.GeneralOpenAIRequest) *ChatRequest {
 		enableSearch = true
 		aliModel = strings.TrimSuffix(aliModel, EnableSearchModelSuffix)
 	}
-	request.TopP = helper.Float64PtrMax(request.TopP, 0.9999)
+	if request.TopP >= 1 {
+		request.TopP = 0.9999
+	}
 	return &ChatRequest{
 		Model: aliModel,
 		Input: Input{

relay/adaptor/ali/model.go

@@ -16,13 +16,13 @@ type Input struct {
 }
 
 type Parameters struct {
-	TopP              *float64     `json:"top_p,omitempty"`
+	TopP              float64      `json:"top_p,omitempty"`
 	TopK              int          `json:"top_k,omitempty"`
 	Seed              uint64       `json:"seed,omitempty"`
 	EnableSearch      bool         `json:"enable_search,omitempty"`
 	IncrementalOutput bool         `json:"incremental_output,omitempty"`
 	MaxTokens         int          `json:"max_tokens,omitempty"`
-	Temperature       *float64     `json:"temperature,omitempty"`
+	Temperature       float64      `json:"temperature,omitempty"`
 	ResultFormat      string       `json:"result_format,omitempty"`
 	Tools             []model.Tool `json:"tools,omitempty"`
 }

relay/adaptor/anthropic/constants.go

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

relay/adaptor/anthropic/model.go

@@ -48,8 +48,8 @@ type Request struct {
 	MaxTokens     int       `json:"max_tokens,omitempty"`
 	StopSequences []string  `json:"stop_sequences,omitempty"`
 	Stream        bool      `json:"stream,omitempty"`
-	Temperature   *float64  `json:"temperature,omitempty"`
+	Temperature   float64   `json:"temperature,omitempty"`
-	TopP          *float64  `json:"top_p,omitempty"`
+	TopP          float64   `json:"top_p,omitempty"`
 	TopK          int       `json:"top_k,omitempty"`
 	Tools         []Tool    `json:"tools,omitempty"`
 	ToolChoice    any       `json:"tool_choice,omitempty"`

relay/adaptor/aws/claude/main.go

@@ -29,13 +29,10 @@ var AwsModelIDMap = map[string]string{
 	"claude-instant-1.2":         "anthropic.claude-instant-v1",
 	"claude-2.0":                 "anthropic.claude-v2",
 	"claude-2.1":                 "anthropic.claude-v2:1",
-	"claude-3-haiku-20240307":    "anthropic.claude-3-haiku-20240307-v1:0",
 	"claude-3-sonnet-20240229":   "anthropic.claude-3-sonnet-20240229-v1:0",
-	"claude-3-opus-20240229":     "anthropic.claude-3-opus-20240229-v1:0",
 	"claude-3-5-sonnet-20240620": "anthropic.claude-3-5-sonnet-20240620-v1:0",
-	"claude-3-5-sonnet-20241022": "anthropic.claude-3-5-sonnet-20241022-v2:0",
+	"claude-3-opus-20240229":     "anthropic.claude-3-opus-20240229-v1:0",
-	"claude-3-5-sonnet-latest":   "anthropic.claude-3-5-sonnet-20241022-v2:0",
+	"claude-3-haiku-20240307":    "anthropic.claude-3-haiku-20240307-v1:0",
-	"claude-3-5-haiku-20241022":  "anthropic.claude-3-5-haiku-20241022-v1:0",
 }
 
 func awsModelID(requestModel string) (string, error) {

relay/adaptor/aws/claude/model.go

@@ -11,8 +11,8 @@ type Request struct {
 	Messages         []anthropic.Message `json:"messages"`
 	System           string              `json:"system,omitempty"`
 	MaxTokens        int                 `json:"max_tokens,omitempty"`
-	Temperature      *float64            `json:"temperature,omitempty"`
+	Temperature      float64             `json:"temperature,omitempty"`
-	TopP             *float64            `json:"top_p,omitempty"`
+	TopP             float64             `json:"top_p,omitempty"`
 	TopK             int                 `json:"top_k,omitempty"`
 	StopSequences    []string            `json:"stop_sequences,omitempty"`
 	Tools            []anthropic.Tool    `json:"tools,omitempty"`

relay/adaptor/aws/llama3/model.go

@@ -4,10 +4,10 @@ package aws
 //
 // https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters-meta.html
 type Request struct {
-	Prompt      string   `json:"prompt"`
+	Prompt      string  `json:"prompt"`
-	MaxGenLen   int      `json:"max_gen_len,omitempty"`
+	MaxGenLen   int     `json:"max_gen_len,omitempty"`
-	Temperature *float64 `json:"temperature,omitempty"`
+	Temperature float64 `json:"temperature,omitempty"`
-	TopP        *float64 `json:"top_p,omitempty"`
+	TopP        float64 `json:"top_p,omitempty"`
 }
 
 // Response is the response from AWS Llama3

relay/adaptor/baidu/main.go

@@ -35,9 +35,9 @@ type Message struct {
 
 type ChatRequest struct {
 	Messages        []Message `json:"messages"`
-	Temperature     *float64  `json:"temperature,omitempty"`
+	Temperature     float64   `json:"temperature,omitempty"`
-	TopP            *float64  `json:"top_p,omitempty"`
+	TopP            float64   `json:"top_p,omitempty"`
-	PenaltyScore    *float64  `json:"penalty_score,omitempty"`
+	PenaltyScore    float64   `json:"penalty_score,omitempty"`
 	Stream          bool      `json:"stream,omitempty"`
 	System          string    `json:"system,omitempty"`
 	DisableSearch   bool      `json:"disable_search,omitempty"`

relay/adaptor/cloudflare/model.go

@@ -9,5 +9,5 @@ type Request struct {
 	Prompt      string          `json:"prompt,omitempty"`
 	Raw         bool            `json:"raw,omitempty"`
 	Stream      bool            `json:"stream,omitempty"`
-	Temperature *float64        `json:"temperature,omitempty"`
+	Temperature float64         `json:"temperature,omitempty"`
 }

relay/adaptor/cohere/main.go

@@ -43,7 +43,7 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *Request {
 		K:                textRequest.TopK,
 		Stream:           textRequest.Stream,
 		FrequencyPenalty: textRequest.FrequencyPenalty,
-		PresencePenalty:  textRequest.PresencePenalty,
+		PresencePenalty:  textRequest.FrequencyPenalty,
 		Seed:             int(textRequest.Seed),
 	}
 	if cohereRequest.Model == "" {

relay/adaptor/cohere/model.go

@@ -10,15 +10,15 @@ type Request struct {
 	PromptTruncation string        `json:"prompt_truncation,omitempty"` // 默认值为"AUTO"
 	Connectors       []Connector   `json:"connectors,omitempty"`
 	Documents        []Document    `json:"documents,omitempty"`
-	Temperature      *float64      `json:"temperature,omitempty"` // 默认值为0.3
+	Temperature      float64       `json:"temperature,omitempty"` // 默认值为0.3
 	MaxTokens        int           `json:"max_tokens,omitempty"`
 	MaxInputTokens   int           `json:"max_input_tokens,omitempty"`
 	K                int           `json:"k,omitempty"` // 默认值为0
-	P                *float64      `json:"p,omitempty"` // 默认值为0.75
+	P                float64       `json:"p,omitempty"` // 默认值为0.75
 	Seed             int           `json:"seed,omitempty"`
 	StopSequences    []string      `json:"stop_sequences,omitempty"`
-	FrequencyPenalty *float64      `json:"frequency_penalty,omitempty"` // 默认值为0.0
+	FrequencyPenalty float64       `json:"frequency_penalty,omitempty"` // 默认值为0.0
-	PresencePenalty  *float64      `json:"presence_penalty,omitempty"`  // 默认值为0.0
+	PresencePenalty  float64       `json:"presence_penalty,omitempty"`  // 默认值为0.0
 	Tools            []Tool        `json:"tools,omitempty"`
 	ToolResults      []ToolResult  `json:"tool_results,omitempty"`
 }

relay/adaptor/gemini/main.go

@@ -4,12 +4,11 @@ import (
 	"bufio"
 	"encoding/json"
 	"fmt"
+	"github.com/songquanpeng/one-api/common/render"
 	"io"
 	"net/http"
 	"strings"
 
-	"github.com/songquanpeng/one-api/common/render"
-
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/helper"
@@ -29,11 +28,6 @@ const (
 	VisionMaxImageNum = 16
 )
 
-var mimeTypeMap = map[string]string{
-	"json_object": "application/json",
-	"text":        "text/plain",
-}
-
 // Setting safety to the lowest possible values since Gemini is already powerless enough
 func ConvertRequest(textRequest model.GeneralOpenAIRequest) *ChatRequest {
 	geminiRequest := ChatRequest{
@@ -62,15 +56,6 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *ChatRequest {
 			MaxOutputTokens: textRequest.MaxTokens,
 		},
 	}
-	if textRequest.ResponseFormat != nil {
-		if mimeType, ok := mimeTypeMap[textRequest.ResponseFormat.Type]; ok {
-			geminiRequest.GenerationConfig.ResponseMimeType = mimeType
-		}
-		if textRequest.ResponseFormat.JsonSchema != nil {
-			geminiRequest.GenerationConfig.ResponseSchema = textRequest.ResponseFormat.JsonSchema.Schema
-			geminiRequest.GenerationConfig.ResponseMimeType = mimeTypeMap["json_object"]
-		}
-	}
 	if textRequest.Tools != nil {
 		functions := make([]model.Function, 0, len(textRequest.Tools))
 		for _, tool := range textRequest.Tools {

relay/adaptor/gemini/model.go

@@ -65,12 +65,10 @@ type ChatTools struct {
 }
 
 type ChatGenerationConfig struct {
-	ResponseMimeType string   `json:"responseMimeType,omitempty"`
+	Temperature     float64  `json:"temperature,omitempty"`
-	ResponseSchema   any      `json:"responseSchema,omitempty"`
+	TopP            float64  `json:"topP,omitempty"`
-	Temperature      *float64 `json:"temperature,omitempty"`
+	TopK            float64  `json:"topK,omitempty"`
-	TopP             *float64 `json:"topP,omitempty"`
+	MaxOutputTokens int      `json:"maxOutputTokens,omitempty"`
-	TopK             float64  `json:"topK,omitempty"`
+	CandidateCount  int      `json:"candidateCount,omitempty"`
-	MaxOutputTokens  int      `json:"maxOutputTokens,omitempty"`
+	StopSequences   []string `json:"stopSequences,omitempty"`
-	CandidateCount   int      `json:"candidateCount,omitempty"`
-	StopSequences    []string `json:"stopSequences,omitempty"`
 }

relay/adaptor/groq/constants.go

@@ -4,24 +4,14 @@ package groq
 
 var ModelList = []string{
 	"gemma-7b-it",
+	"mixtral-8x7b-32768",
+	"llama3-8b-8192",
+	"llama3-70b-8192",
 	"gemma2-9b-it",
+	"llama-3.1-405b-reasoning",
 	"llama-3.1-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",
 }

relay/adaptor/ollama/model.go

@@ -1,14 +1,14 @@
 package ollama
 
 type Options struct {
-	Seed             int      `json:"seed,omitempty"`
+	Seed             int     `json:"seed,omitempty"`
-	Temperature      *float64 `json:"temperature,omitempty"`
+	Temperature      float64 `json:"temperature,omitempty"`
-	TopK             int      `json:"top_k,omitempty"`
+	TopK             int     `json:"top_k,omitempty"`
-	TopP             *float64 `json:"top_p,omitempty"`
+	TopP             float64 `json:"top_p,omitempty"`
-	FrequencyPenalty *float64 `json:"frequency_penalty,omitempty"`
+	FrequencyPenalty float64 `json:"frequency_penalty,omitempty"`
-	PresencePenalty  *float64 `json:"presence_penalty,omitempty"`
+	PresencePenalty  float64 `json:"presence_penalty,omitempty"`
-	NumPredict       int      `json:"num_predict,omitempty"`
+	NumPredict  	 int 	 `json:"num_predict,omitempty"`
-	NumCtx           int      `json:"num_ctx,omitempty"`
+	NumCtx  	 int 	 `json:"num_ctx,omitempty"`
 }
 
 type Message struct {

relay/adaptor/openai/adaptor.go

@@ -75,13 +75,6 @@ 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 {
-		// always return usage in stream mode
-		if request.StreamOptions == nil {
-			request.StreamOptions = &model.StreamOptions{}
-		}
-		request.StreamOptions.IncludeUsage = true
-	}
 	return request, nil
 }
 

relay/adaptor/openai/compatible.go

@@ -11,10 +11,9 @@ import (
 	"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/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/siliconflow"
 	"github.com/songquanpeng/one-api/relay/channeltype"
 )
 
@@ -33,7 +32,6 @@ var CompatibleChannels = []int{
 	channeltype.TogetherAI,
 	channeltype.Novita,
 	channeltype.SiliconFlow,
-	channeltype.XAI,
 }
 
 func GetCompatibleChannelMeta(channelType int) (string, []string) {
@@ -66,8 +64,6 @@ func GetCompatibleChannelMeta(channelType int) (string, []string) {
 		return "novita", novita.ModelList
 	case channeltype.SiliconFlow:
 		return "siliconflow", siliconflow.ModelList
-	case channeltype.XAI:
-		return "xai", xai.ModelList
 	default:
 		return "openai", ModelList
 	}

relay/adaptor/openai/main.go

@@ -55,8 +55,8 @@ func StreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*model.E
 				render.StringData(c, data) // if error happened, pass the data to client
 				continue                   // just ignore the error
 			}
-			if len(streamResponse.Choices) == 0 && streamResponse.Usage == nil {
+			if len(streamResponse.Choices) == 0 {
-				// but for empty choice and no usage, we should not pass it to client, this is for azure
+				// but for empty choice, we should not pass it to client, this is for azure
 				continue // just ignore empty choice
 			}
 			render.StringData(c, data)

relay/adaptor/palm/model.go

@@ -19,11 +19,11 @@ type Prompt struct {
 }
 
 type ChatRequest struct {
-	Prompt         Prompt   `json:"prompt"`
+	Prompt         Prompt  `json:"prompt"`
-	Temperature    *float64 `json:"temperature,omitempty"`
+	Temperature    float64 `json:"temperature,omitempty"`
-	CandidateCount int      `json:"candidateCount,omitempty"`
+	CandidateCount int     `json:"candidateCount,omitempty"`
-	TopP           *float64 `json:"topP,omitempty"`
+	TopP           float64 `json:"topP,omitempty"`
-	TopK           int      `json:"topK,omitempty"`
+	TopK           int     `json:"topK,omitempty"`
 }
 
 type Error struct {

relay/adaptor/tencent/constants.go

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

relay/adaptor/tencent/main.go

@@ -39,8 +39,8 @@ func ConvertRequest(request model.GeneralOpenAIRequest) *ChatRequest {
 		Model:       &request.Model,
 		Stream:      &request.Stream,
 		Messages:    messages,
-		TopP:        request.TopP,
+		TopP:        &request.TopP,
-		Temperature: request.Temperature,
+		Temperature: &request.Temperature,
 	}
 }
 

relay/adaptor/vertexai/claude/adapter.go

@@ -13,12 +13,7 @@ import (
 )
 
 var ModelList = []string{
-	"claude-3-haiku@20240307",
+	"claude-3-haiku@20240307", "claude-3-opus@20240229", "claude-3-5-sonnet@20240620", "claude-3-sonnet@20240229",
-	"claude-3-sonnet@20240229",
-	"claude-3-opus@20240229",
-	"claude-3-5-sonnet@20240620",
-	"claude-3-5-sonnet-v2@20241022",
-	"claude-3-5-haiku@20241022",
 }
 
 const anthropicVersion = "vertex-2023-10-16"

relay/adaptor/vertexai/claude/model.go

@@ -11,8 +11,8 @@ type Request struct {
 	MaxTokens     int                 `json:"max_tokens,omitempty"`
 	StopSequences []string            `json:"stop_sequences,omitempty"`
 	Stream        bool                `json:"stream,omitempty"`
-	Temperature   *float64            `json:"temperature,omitempty"`
+	Temperature   float64             `json:"temperature,omitempty"`
-	TopP          *float64            `json:"top_p,omitempty"`
+	TopP          float64             `json:"top_p,omitempty"`
 	TopK          int                 `json:"top_k,omitempty"`
 	Tools         []anthropic.Tool    `json:"tools,omitempty"`
 	ToolChoice    any                 `json:"tool_choice,omitempty"`

relay/adaptor/vertexai/gemini/adapter.go

@@ -15,7 +15,7 @@ import (
 )
 
 var ModelList = []string{
-	"gemini-1.5-pro-001", "gemini-1.5-flash-001", "gemini-pro", "gemini-pro-vision", "gemini-1.5-pro-002", "gemini-1.5-flash-002", 
+	"gemini-1.5-pro-001", "gemini-1.5-flash-001", "gemini-pro", "gemini-pro-vision",
 }
 
 type Adaptor struct {

relay/adaptor/xai/constants.go

@@ -1,5 +0,0 @@
-package xai
-
-var ModelList = []string{
-	"grok-beta",
-}

relay/adaptor/xunfei/constants.go

@@ -5,8 +5,6 @@ var ModelList = []string{
 	"SparkDesk-v1.1",
 	"SparkDesk-v2.1",
 	"SparkDesk-v3.1",
-	"SparkDesk-v3.1-128K",
 	"SparkDesk-v3.5",
-	"SparkDesk-v3.5-32K",
 	"SparkDesk-v4.0",
 }

relay/adaptor/xunfei/main.go

@@ -272,9 +272,9 @@ func xunfeiMakeRequest(textRequest model.GeneralOpenAIRequest, domain, authUrl,
 }
 
 func parseAPIVersionByModelName(modelName string) string {
-	index := strings.IndexAny(modelName, "-")
+	parts := strings.Split(modelName, "-")
-	if index != -1 {
+	if len(parts) == 2 {
-		return modelName[index+1:]
+		return parts[1]
 	}
 	return ""
 }
@@ -283,17 +283,13 @@ func parseAPIVersionByModelName(modelName string) string {
 func apiVersion2domain(apiVersion string) string {
 	switch apiVersion {
 	case "v1.1":
-		return "lite"
+		return "general"
 	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"
 	}
@@ -301,17 +297,7 @@ func apiVersion2domain(apiVersion string) string {
 }
 
 func getXunfeiAuthUrl(apiVersion string, apiKey string, apiSecret string) (string, string) {
-	var authUrl string
 	domain := apiVersion2domain(apiVersion)
-	switch apiVersion {
+	authUrl := buildXunfeiAuthUrl(fmt.Sprintf("wss://spark-api.xf-yun.com/%s/chat", apiVersion), apiKey, apiSecret)
-	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/model.go

@@ -19,11 +19,11 @@ type ChatRequest struct {
 	} `json:"header"`
 	Parameter struct {
 		Chat struct {
-			Domain      string   `json:"domain,omitempty"`
+			Domain      string  `json:"domain,omitempty"`
-			Temperature *float64 `json:"temperature,omitempty"`
+			Temperature float64 `json:"temperature,omitempty"`
-			TopK        int      `json:"top_k,omitempty"`
+			TopK        int     `json:"top_k,omitempty"`
-			MaxTokens   int      `json:"max_tokens,omitempty"`
+			MaxTokens   int     `json:"max_tokens,omitempty"`
-			Auditing    bool     `json:"auditing,omitempty"`
+			Auditing    bool    `json:"auditing,omitempty"`
 		} `json:"chat"`
 	} `json:"parameter"`
 	Payload struct {

relay/adaptor/zhipu/adaptor.go

@@ -4,13 +4,13 @@ import (
 	"errors"
 	"fmt"
 	"github.com/gin-gonic/gin"
-	"github.com/songquanpeng/one-api/common/helper"
 	"github.com/songquanpeng/one-api/relay/adaptor"
 	"github.com/songquanpeng/one-api/relay/adaptor/openai"
 	"github.com/songquanpeng/one-api/relay/meta"
 	"github.com/songquanpeng/one-api/relay/model"
 	"github.com/songquanpeng/one-api/relay/relaymode"
 	"io"
+	"math"
 	"net/http"
 	"strings"
 )
@@ -65,13 +65,13 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
 		baiduEmbeddingRequest, err := ConvertEmbeddingRequest(*request)
 		return baiduEmbeddingRequest, err
 	default:
-		// TopP [0.0, 1.0]
+		// TopP (0.0, 1.0)
-		request.TopP = helper.Float64PtrMax(request.TopP, 1)
+		request.TopP = math.Min(0.99, request.TopP)
-		request.TopP = helper.Float64PtrMin(request.TopP, 0)
+		request.TopP = math.Max(0.01, request.TopP)
 
-		// Temperature [0.0, 1.0]
+		// Temperature (0.0, 1.0)
-		request.Temperature = helper.Float64PtrMax(request.Temperature, 1)
+		request.Temperature = math.Min(0.99, request.Temperature)
-		request.Temperature = helper.Float64PtrMin(request.Temperature, 0)
+		request.Temperature = math.Max(0.01, request.Temperature)
 		a.SetVersionByModeName(request.Model)
 		if a.APIVersion == "v4" {
 			return request, nil

relay/adaptor/zhipu/model.go

@@ -12,8 +12,8 @@ type Message struct {
 
 type Request struct {
 	Prompt      []Message `json:"prompt"`
-	Temperature *float64  `json:"temperature,omitempty"`
+	Temperature float64   `json:"temperature,omitempty"`
-	TopP        *float64  `json:"top_p,omitempty"`
+	TopP        float64   `json:"top_p,omitempty"`
 	RequestId   string    `json:"request_id,omitempty"`
 	Incremental bool      `json:"incremental,omitempty"`
 }

relay/billing/ratio/model.go

@@ -79,10 +79,8 @@ var ModelRatio = map[string]float64{
 	"claude-2.0":                 8.0 / 1000 * USD,
 	"claude-2.1":                 8.0 / 1000 * USD,
 	"claude-3-haiku-20240307":    0.25 / 1000 * USD,
-	"claude-3-5-haiku-20241022":  1.0 / 1000 * USD,
 	"claude-3-sonnet-20240229":   3.0 / 1000 * USD,
 	"claude-3-5-sonnet-20240620": 3.0 / 1000 * USD,
-	"claude-3-5-sonnet-20241022": 3.0 / 1000 * USD,
 	"claude-3-opus-20240229":     15.0 / 1000 * USD,
 	// https://cloud.baidu.com/doc/WENXINWORKSHOP/s/hlrk4akp7
 	"ERNIE-4.0-8K":       0.120 * RMB,
@@ -130,9 +128,7 @@ var ModelRatio = map[string]float64{
 	"SparkDesk-v1.1":            1.2858, // ￥0.018 / 1k tokens
 	"SparkDesk-v2.1":            1.2858, // ￥0.018 / 1k tokens
 	"SparkDesk-v3.1":            1.2858, // ￥0.018 / 1k tokens
-	"SparkDesk-v3.1-128K":       1.2858, // ￥0.018 / 1k tokens
 	"SparkDesk-v3.5":            1.2858, // ￥0.018 / 1k tokens
-	"SparkDesk-v3.5-32K":        1.2858, // ￥0.018 / 1k tokens
 	"SparkDesk-v4.0":            1.2858, // ￥0.018 / 1k tokens
 	"360GPT_S2_V9":              0.8572, // ¥0.012 / 1k tokens
 	"embedding-bert-512-v1":     0.0715, // ¥0.001 / 1k tokens
@@ -164,21 +160,15 @@ var ModelRatio = map[string]float64{
 	"mistral-embed":         0.1 / 1000 * USD,
 	// https://wow.groq.com/#:~:text=inquiries%C2%A0here.-,Model,-Current%20Speed
 	"gemma-7b-it":                           0.07 / 1000000 * USD,
+	"mixtral-8x7b-32768":                    0.24 / 1000000 * USD,
+	"llama3-8b-8192":                        0.05 / 1000000 * USD,
+	"llama3-70b-8192":                       0.59 / 1000000 * USD,
 	"gemma2-9b-it":                          0.20 / 1000000 * USD,
+	"llama-3.1-405b-reasoning":              0.89 / 1000000 * USD,
 	"llama-3.1-70b-versatile":               0.59 / 1000000 * USD,
 	"llama-3.1-8b-instant":                  0.05 / 1000000 * USD,
-	"llama-3.2-11b-text-preview":            0.05 / 1000000 * USD,
-	"llama-3.2-11b-vision-preview":          0.05 / 1000000 * USD,
-	"llama-3.2-1b-preview":                  0.05 / 1000000 * USD,
-	"llama-3.2-3b-preview":                  0.05 / 1000000 * USD,
-	"llama-3.2-90b-text-preview":            0.59 / 1000000 * USD,
-	"llama-guard-3-8b":                      0.05 / 1000000 * USD,
-	"llama3-70b-8192":                       0.59 / 1000000 * USD,
-	"llama3-8b-8192":                        0.05 / 1000000 * USD,
 	"llama3-groq-70b-8192-tool-use-preview": 0.89 / 1000000 * USD,
 	"llama3-groq-8b-8192-tool-use-preview":  0.19 / 1000000 * USD,
-	"mixtral-8x7b-32768":                    0.24 / 1000000 * USD,
-
 	// https://platform.lingyiwanwu.com/docs#-计费单元
 	"yi-34b-chat-0205": 2.5 / 1000 * RMB,
 	"yi-34b-chat-200k": 12.0 / 1000 * RMB,
@@ -209,8 +199,6 @@ var ModelRatio = map[string]float64{
 	"deepl-zh": 25.0 / 1000 * USD,
 	"deepl-en": 25.0 / 1000 * USD,
 	"deepl-ja": 25.0 / 1000 * USD,
-	// https://console.x.ai/
-	"grok-beta": 5.0 / 1000 * USD,
 }
 
 var CompletionRatio = map[string]float64{
@@ -375,8 +363,6 @@ func GetCompletionRatio(name string, channelType int) float64 {
 		return 3
 	case "command-r-plus":
 		return 5
-	case "grok-beta":
-		return 3
 	}
 	return 1
 }

relay/channeltype/define.go

@@ -46,6 +46,5 @@ const (
 	VertextAI
 	Proxy
 	SiliconFlow
-	XAI
 	Dummy
 )

relay/channeltype/url.go

@@ -45,8 +45,7 @@ var ChannelBaseURLs = []string{
 	"https://api.novita.ai/v3/openai",           // 41
 	"",                                          // 42
 	"",                                          // 43
-	"https://api.siliconflow.cn",                // 44
+	"https://api.siliconflow.cn",                 // 44
-	"https://api.x.ai",                          // 45
 }
 
 func init() {

relay/constant/role/define.go

@@ -1,6 +1,5 @@
 package role
 
 const (
-	System    = "system"
 	Assistant = "assistant"
 )

relay/controller/helper.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/songquanpeng/one-api/relay/constant/role"
 	"math"
 	"net/http"
 	"strings"
@@ -155,22 +154,3 @@ func isErrorHappened(meta *meta.Meta, resp *http.Response) bool {
 	}
 	return false
 }
-
-func setSystemPrompt(ctx context.Context, request *relaymodel.GeneralOpenAIRequest, prompt string) {
-	if prompt == "" {
-		return
-	}
-	if len(request.Messages) == 0 {
-		return
-	}
-	if request.Messages[0].Role == role.System {
-		request.Messages[0].Content = prompt
-		logger.Infof(ctx, "rewrite system prompt")
-		return
-	}
-	request.Messages = append([]relaymodel.Message{{
-		Role:    role.System,
-		Content: prompt,
-	}}, request.Messages...)
-	logger.Infof(ctx, "add system prompt")
-}

relay/controller/text.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/songquanpeng/one-api/common/config"
 	"io"
 	"net/http"
 
@@ -36,8 +35,6 @@ func RelayTextHelper(c *gin.Context) *model.ErrorWithStatusCode {
 	meta.OriginModelName = textRequest.Model
 	textRequest.Model, _ = getMappedModelName(textRequest.Model, meta.ModelMapping)
 	meta.ActualModelName = textRequest.Model
-	// set system prompt if not empty
-	setSystemPrompt(ctx, textRequest, meta.SystemPrompt)
 	// get model ratio & group ratio
 	modelRatio := billingratio.GetModelRatio(textRequest.Model, meta.ChannelType)
 	groupRatio := billingratio.GetGroupRatio(meta.Group)
@@ -87,7 +84,7 @@ 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 meta.APIType == apitype.OpenAI && meta.OriginModelName == meta.ActualModelName && meta.ChannelType != channeltype.Baichuan {
 		// no need to convert request for openai
 		return c.Request.Body, nil
 	}

relay/meta/relay_meta.go

@@ -30,7 +30,6 @@ type Meta struct {
 	ActualModelName string
 	RequestURLPath  string
 	PromptTokens    int // only for DoResponse
-	SystemPrompt    string
 }
 
 func GetByContext(c *gin.Context) *Meta {
@@ -47,7 +46,6 @@ func GetByContext(c *gin.Context) *Meta {
 		BaseURL:         c.GetString(ctxkey.BaseURL),
 		APIKey:          strings.TrimPrefix(c.Request.Header.Get("Authorization"), "Bearer "),
 		RequestURLPath:  c.Request.URL.String(),
-		SystemPrompt:    c.GetString(ctxkey.SystemPrompt),
 	}
 	cfg, ok := c.Get(ctxkey.Config)
 	if ok {

relay/model/constant.go

@@ -1,7 +1,6 @@
 package model
 
 const (
-	ContentTypeText       = "text"
+	ContentTypeText     = "text"
-	ContentTypeImageURL   = "image_url"
+	ContentTypeImageURL = "image_url"
-	ContentTypeInputAudio = "input_audio"
 )

relay/model/general.go

@@ -12,59 +12,32 @@ type JSONSchema struct {
 	Strict      *bool                  `json:"strict,omitempty"`
 }
 
-type Audio struct {
-	Voice  string `json:"voice,omitempty"`
-	Format string `json:"format,omitempty"`
-}
-
-type StreamOptions struct {
-	IncludeUsage bool `json:"include_usage,omitempty"`
-}
-
 type GeneralOpenAIRequest struct {
-	// https://platform.openai.com/docs/api-reference/chat/create
+	Messages         []Message       `json:"messages,omitempty"`
-	Messages            []Message       `json:"messages,omitempty"`
+	Model            string          `json:"model,omitempty"`
-	Model               string          `json:"model,omitempty"`
+	FrequencyPenalty float64         `json:"frequency_penalty,omitempty"`
-	Store               *bool           `json:"store,omitempty"`
+	MaxTokens        int             `json:"max_tokens,omitempty"`
-	Metadata            any             `json:"metadata,omitempty"`
+	N                int             `json:"n,omitempty"`
-	FrequencyPenalty    *float64        `json:"frequency_penalty,omitempty"`
+	PresencePenalty  float64         `json:"presence_penalty,omitempty"`
-	LogitBias           any             `json:"logit_bias,omitempty"`
+	ResponseFormat   *ResponseFormat `json:"response_format,omitempty"`
-	Logprobs            *bool           `json:"logprobs,omitempty"`
+	Seed             float64         `json:"seed,omitempty"`
-	TopLogprobs         *int            `json:"top_logprobs,omitempty"`
+	Stop             any             `json:"stop,omitempty"`
-	MaxTokens           int             `json:"max_tokens,omitempty"`
+	Stream           bool            `json:"stream,omitempty"`
-	MaxCompletionTokens *int            `json:"max_completion_tokens,omitempty"`
+	Temperature      float64         `json:"temperature,omitempty"`
-	N                   int             `json:"n,omitempty"`
+	TopP             float64         `json:"top_p,omitempty"`
-	Modalities          []string        `json:"modalities,omitempty"`
+	TopK             int             `json:"top_k,omitempty"`
-	Prediction          any             `json:"prediction,omitempty"`
+	Tools            []Tool          `json:"tools,omitempty"`
-	Audio               *Audio          `json:"audio,omitempty"`
+	ToolChoice       any             `json:"tool_choice,omitempty"`
-	PresencePenalty     *float64        `json:"presence_penalty,omitempty"`
+	FunctionCall     any             `json:"function_call,omitempty"`
-	ResponseFormat      *ResponseFormat `json:"response_format,omitempty"`
+	Functions        any             `json:"functions,omitempty"`
-	Seed                float64         `json:"seed,omitempty"`
+	User             string          `json:"user,omitempty"`
-	ServiceTier         *string         `json:"service_tier,omitempty"`
+	Prompt           any             `json:"prompt,omitempty"`
-	Stop                any             `json:"stop,omitempty"`
+	Input            any             `json:"input,omitempty"`
-	Stream              bool            `json:"stream,omitempty"`
+	EncodingFormat   string          `json:"encoding_format,omitempty"`
-	StreamOptions       *StreamOptions  `json:"stream_options,omitempty"`
+	Dimensions       int             `json:"dimensions,omitempty"`
-	Temperature         *float64        `json:"temperature,omitempty"`
+	Instruction      string          `json:"instruction,omitempty"`
-	TopP                *float64        `json:"top_p,omitempty"`
+	Size             string          `json:"size,omitempty"`
-	TopK                int             `json:"top_k,omitempty"`
+	NumCtx           int         	 `json:"num_ctx,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"`
-	// Others
-	Instruction string `json:"instruction,omitempty"`
-	NumCtx      int    `json:"num_ctx,omitempty"`
 }
 
 func (r GeneralOpenAIRequest) ParseInput() []string {

web/air/src/components/TokensTable.js

@@ -395,7 +395,7 @@ const TokensTable = () => {
         url = mjLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
         break;
       case 'lobechat':
-        url = chatLink + `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}/v1"}}}`;
+        url = chatLink + `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}"/v1"}}}`;
         break;
       default:
         if (!chatLink) {

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

@@ -30,7 +30,6 @@ export const CHANNEL_OPTIONS = [
   { 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: 8, text: '自定义渠道', value: 8, color: 'pink' },
   { key: 22, text: '知识库：FastGPT', value: 22, color: 'blue' },
   { key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple' },

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

@@ -43,7 +43,6 @@ const EditChannel = (props) => {
         base_url: '',
         other: '',
         model_mapping: '',
-        system_prompt: '',
         models: [],
         auto_ban: 1,
         groups: ['default']
@@ -64,7 +63,7 @@ const EditChannel = (props) => {
             let localModels = [];
             switch (value) {
                 case 14:
-                    localModels = ["claude-instant-1.2", "claude-2", "claude-2.0", "claude-2.1", "claude-3-opus-20240229", "claude-3-sonnet-20240229", "claude-3-haiku-20240307", "claude-3-5-haiku-20241022", "claude-3-5-sonnet-20240620", "claude-3-5-sonnet-20241022"];
+                    localModels = ["claude-instant-1.2", "claude-2", "claude-2.0", "claude-2.1", "claude-3-opus-20240229", "claude-3-sonnet-20240229", "claude-3-haiku-20240307", "claude-3-5-sonnet-20240620"];
                     break;
                 case 11:
                     localModels = ['PaLM-2'];
@@ -79,7 +78,7 @@ const EditChannel = (props) => {
                     localModels = ['chatglm_pro', 'chatglm_std', 'chatglm_lite'];
                     break;
                 case 18:
-                    localModels = ['SparkDesk', 'SparkDesk-v1.1', 'SparkDesk-v2.1', 'SparkDesk-v3.1', 'SparkDesk-v3.1-128K', 'SparkDesk-v3.5', 'SparkDesk-v3.5-32K', 'SparkDesk-v4.0'];
+                    localModels = ['SparkDesk', 'SparkDesk-v1.1', 'SparkDesk-v2.1', 'SparkDesk-v3.1', 'SparkDesk-v3.5', 'SparkDesk-v4.0'];
                     break;
                 case 19:
                     localModels = ['360GPT_S2_V9', 'embedding-bert-512-v1', 'embedding_s1_v1', 'semantic_similarity_s1_v1'];
@@ -305,163 +304,163 @@ const EditChannel = (props) => {
                 width={isMobile() ? '100%' : 600}
             >
                 <Spin spinning={loading}>
-                    <div style={{ marginTop: 10 }}>
+                    <div style={{marginTop: 10}}>
                         <Typography.Text strong>类型：</Typography.Text>
                     </div>
                     <Select
-                      name='type'
+                        name='type'
-                      required
+                        required
-                      optionList={CHANNEL_OPTIONS}
+                        optionList={CHANNEL_OPTIONS}
-                      value={inputs.type}
+                        value={inputs.type}
-                      onChange={value => handleInputChange('type', value)}
+                        onChange={value => handleInputChange('type', value)}
-                      style={{ width: '50%' }}
+                        style={{width: '50%'}}
                     />
                     {
-                      inputs.type === 3 && (
+                        inputs.type === 3 && (
-                        <>
+                            <>
-                            <div style={{ marginTop: 10 }}>
+                                <div style={{marginTop: 10}}>
-                                <Banner type={"warning"} description={
+                                    <Banner type={"warning"} description={
-                                    <>
+                                        <>
-                                        注意，<strong>模型部署名称必须和模型名称保持一致</strong>，因为 One API 会把请求体中的
+                                            注意，<strong>模型部署名称必须和模型名称保持一致</strong>，因为 One API 会把请求体中的
-                                        model
+                                            model
-                                        参数替换为你的部署名称（模型名称中的点会被剔除），<a target='_blank'
+                                            参数替换为你的部署名称（模型名称中的点会被剔除），<a target='_blank'
-                                                                                          href='https://github.com/songquanpeng/one-api/issues/133?notification_referrer_id=NT_kwDOAmJSYrM2NjIwMzI3NDgyOjM5OTk4MDUw#issuecomment-1571602271'>图片演示</a>。
+                                                                                              href='https://github.com/songquanpeng/one-api/issues/133?notification_referrer_id=NT_kwDOAmJSYrM2NjIwMzI3NDgyOjM5OTk4MDUw#issuecomment-1571602271'>图片演示</a>。
-                                    </>
+                                        </>
-                                }>
+                                    }>
-                                </Banner>
+                                    </Banner>
-                            </div>
+                                </div>
-                            <div style={{ marginTop: 10 }}>
+                                <div style={{marginTop: 10}}>
-                                <Typography.Text strong>AZURE_OPENAI_ENDPOINT：</Typography.Text>
+                                    <Typography.Text strong>AZURE_OPENAI_ENDPOINT：</Typography.Text>
-                            </div>
+                                </div>
-                            <Input
+                                <Input
-                              label='AZURE_OPENAI_ENDPOINT'
+                                    label='AZURE_OPENAI_ENDPOINT'
-                              name='azure_base_url'
+                                    name='azure_base_url'
-                              placeholder={'请输入 AZURE_OPENAI_ENDPOINT，例如：https://docs-test-001.openai.azure.com'}
+                                    placeholder={'请输入 AZURE_OPENAI_ENDPOINT，例如：https://docs-test-001.openai.azure.com'}
-                              onChange={value => {
+                                    onChange={value => {
-                                  handleInputChange('base_url', value)
+                                        handleInputChange('base_url', value)
-                              }}
+                                    }}
-                              value={inputs.base_url}
+                                    value={inputs.base_url}
-                              autoComplete='new-password'
+                                    autoComplete='new-password'
-                            />
+                                />
-                            <div style={{ marginTop: 10 }}>
+                                <div style={{marginTop: 10}}>
-                                <Typography.Text strong>默认 API 版本：</Typography.Text>
+                                    <Typography.Text strong>默认 API 版本：</Typography.Text>
-                            </div>
+                                </div>
-                            <Input
+                                <Input
-                              label='默认 API 版本'
+                                    label='默认 API 版本'
-                              name='azure_other'
+                                    name='azure_other'
-                              placeholder={'请输入默认 API 版本，例如：2024-03-01-preview，该配置可以被实际的请求查询参数所覆盖'}
+                                    placeholder={'请输入默认 API 版本，例如：2024-03-01-preview，该配置可以被实际的请求查询参数所覆盖'}
-                              onChange={value => {
+                                    onChange={value => {
-                                  handleInputChange('other', value)
+                                        handleInputChange('other', value)
-                              }}
+                                    }}
-                              value={inputs.other}
+                                    value={inputs.other}
-                              autoComplete='new-password'
+                                    autoComplete='new-password'
-                            />
+                                />
-                        </>
+                            </>
-                      )
+                        )
                     }
                     {
-                      inputs.type === 8 && (
+                        inputs.type === 8 && (
-                        <>
+                            <>
-                            <div style={{ marginTop: 10 }}>
+                                <div style={{marginTop: 10}}>
-                                <Typography.Text strong>Base URL：</Typography.Text>
+                                    <Typography.Text strong>Base URL：</Typography.Text>
-                            </div>
+                                </div>
-                            <Input
+                                <Input
-                              name='base_url'
+                                    name='base_url'
-                              placeholder={'请输入自定义渠道的 Base URL'}
+                                    placeholder={'请输入自定义渠道的 Base URL'}
-                              onChange={value => {
+                                    onChange={value => {
-                                  handleInputChange('base_url', value)
+                                        handleInputChange('base_url', value)
-                              }}
+                                    }}
-                              value={inputs.base_url}
+                                    value={inputs.base_url}
-                              autoComplete='new-password'
+                                    autoComplete='new-password'
-                            />
+                                />
-                        </>
+                            </>
-                      )
+                        )
                     }
-                    <div style={{ marginTop: 10 }}>
+                    <div style={{marginTop: 10}}>
                         <Typography.Text strong>名称：</Typography.Text>
                     </div>
                     <Input
-                      required
+                        required
-                      name='name'
+                        name='name'
-                      placeholder={'请为渠道命名'}
+                        placeholder={'请为渠道命名'}
-                      onChange={value => {
+                        onChange={value => {
-                          handleInputChange('name', value)
+                            handleInputChange('name', value)
-                      }}
+                        }}
-                      value={inputs.name}
+                        value={inputs.name}
-                      autoComplete='new-password'
+                        autoComplete='new-password'
                     />
-                    <div style={{ marginTop: 10 }}>
+                    <div style={{marginTop: 10}}>
                         <Typography.Text strong>分组：</Typography.Text>
                     </div>
                     <Select
-                      placeholder={'请选择可以使用该渠道的分组'}
+                        placeholder={'请选择可以使用该渠道的分组'}
-                      name='groups'
+                        name='groups'
-                      required
+                        required
-                      multiple
+                        multiple
-                      selection
+                        selection
-                      allowAdditions
+                        allowAdditions
-                      additionLabel={'请在系统设置页面编辑分组倍率以添加新的分组：'}
+                        additionLabel={'请在系统设置页面编辑分组倍率以添加新的分组：'}
-                      onChange={value => {
+                        onChange={value => {
-                          handleInputChange('groups', value)
+                            handleInputChange('groups', value)
-                      }}
+                        }}
-                      value={inputs.groups}
+                        value={inputs.groups}
-                      autoComplete='new-password'
+                        autoComplete='new-password'
-                      optionList={groupOptions}
+                        optionList={groupOptions}
                     />
                     {
-                      inputs.type === 18 && (
+                        inputs.type === 18 && (
-                        <>
+                            <>
-                            <div style={{ marginTop: 10 }}>
+                                <div style={{marginTop: 10}}>
-                                <Typography.Text strong>模型版本：</Typography.Text>
+                                    <Typography.Text strong>模型版本：</Typography.Text>
-                            </div>
+                                </div>
-                            <Input
+                                <Input
-                              name='other'
+                                    name='other'
-                              placeholder={'请输入星火大模型版本，注意是接口地址中的版本号，例如：v2.1'}
+                                    placeholder={'请输入星火大模型版本，注意是接口地址中的版本号，例如：v2.1'}
-                              onChange={value => {
+                                    onChange={value => {
-                                  handleInputChange('other', value)
+                                        handleInputChange('other', value)
-                              }}
+                                    }}
-                              value={inputs.other}
+                                    value={inputs.other}
-                              autoComplete='new-password'
+                                    autoComplete='new-password'
-                            />
+                                />
-                        </>
+                            </>
-                      )
+                        )
                     }
                     {
-                      inputs.type === 21 && (
+                        inputs.type === 21 && (
-                        <>
+                            <>
-                            <div style={{ marginTop: 10 }}>
+                                <div style={{marginTop: 10}}>
-                                <Typography.Text strong>知识库 ID：</Typography.Text>
+                                    <Typography.Text strong>知识库 ID：</Typography.Text>
-                            </div>
+                                </div>
-                            <Input
+                                <Input
-                              label='知识库 ID'
+                                    label='知识库 ID'
-                              name='other'
+                                    name='other'
-                              placeholder={'请输入知识库 ID，例如：123456'}
+                                    placeholder={'请输入知识库 ID，例如：123456'}
-                              onChange={value => {
+                                    onChange={value => {
-                                  handleInputChange('other', value)
+                                        handleInputChange('other', value)
-                              }}
+                                    }}
-                              value={inputs.other}
+                                    value={inputs.other}
-                              autoComplete='new-password'
+                                    autoComplete='new-password'
-                            />
+                                />
-                        </>
+                            </>
-                      )
+                        )
                     }
-                    <div style={{ marginTop: 10 }}>
+                    <div style={{marginTop: 10}}>
                         <Typography.Text strong>模型：</Typography.Text>
                     </div>
                     <Select
-                      placeholder={'请选择该渠道所支持的模型'}
+                        placeholder={'请选择该渠道所支持的模型'}
-                      name='models'
+                        name='models'
-                      required
+                        required
-                      multiple
+                        multiple
-                      selection
+                        selection
-                      onChange={value => {
+                        onChange={value => {
-                          handleInputChange('models', value)
+                            handleInputChange('models', value)
-                      }}
+                        }}
-                      value={inputs.models}
+                        value={inputs.models}
-                      autoComplete='new-password'
+                        autoComplete='new-password'
-                      optionList={modelOptions}
+                        optionList={modelOptions}
                     />
-                    <div style={{ lineHeight: '40px', marginBottom: '12px' }}>
+                    <div style={{lineHeight: '40px', marginBottom: '12px'}}>
                         <Space>
                             <Button type='primary' onClick={() => {
                                 handleInputChange('models', basicModels);
@@ -474,41 +473,28 @@ const EditChannel = (props) => {
                             }}>清除所有模型</Button>
                         </Space>
                         <Input
-                          addonAfter={
+                            addonAfter={
-                              <Button type='primary' onClick={addCustomModel}>填入</Button>
+                                <Button type='primary' onClick={addCustomModel}>填入</Button>
-                          }
+                            }
-                          placeholder='输入自定义模型名称'
+                            placeholder='输入自定义模型名称'
-                          value={customModel}
+                            value={customModel}
-                          onChange={(value) => {
+                            onChange={(value) => {
-                              setCustomModel(value.trim());
+                                setCustomModel(value.trim());
-                          }}
+                            }}
                         />
                     </div>
-                    <div style={{ marginTop: 10 }}>
+                    <div style={{marginTop: 10}}>
                         <Typography.Text strong>模型重定向：</Typography.Text>
                     </div>
                     <TextArea
-                      placeholder={`此项可选，用于修改请求体中的模型名称，为一个 JSON 字符串，键为请求中模型名称，值为要替换的模型名称，例如：\n${JSON.stringify(MODEL_MAPPING_EXAMPLE, null, 2)}`}
+                        placeholder={`此项可选，用于修改请求体中的模型名称，为一个 JSON 字符串，键为请求中模型名称，值为要替换的模型名称，例如：\n${JSON.stringify(MODEL_MAPPING_EXAMPLE, null, 2)}`}
-                      name='model_mapping'
+                        name='model_mapping'
-                      onChange={value => {
+                        onChange={value => {
-                          handleInputChange('model_mapping', value)
+                            handleInputChange('model_mapping', value)
-                      }}
+                        }}
-                      autosize
+                        autosize
-                      value={inputs.model_mapping}
+                        value={inputs.model_mapping}
-                      autoComplete='new-password'
+                        autoComplete='new-password'
-                    />
-                    <div style={{ marginTop: 10 }}>
-                        <Typography.Text strong>系统提示词：</Typography.Text>
-                    </div>
-                    <TextArea
-                      placeholder={`此项可选，用于强制设置给定的系统提示词，请配合自定义模型 & 模型重定向使用，首先创建一个唯一的自定义模型名称并在上面填入，之后将该自定义模型重定向映射到该渠道一个原生支持的模型`}
-                      name='system_prompt'
-                      onChange={value => {
-                          handleInputChange('system_prompt', value)
-                      }}
-                      autosize
-                      value={inputs.system_prompt}
-                      autoComplete='new-password'
                     />
                     <Typography.Text style={{
                         color: 'rgba(var(--semi-blue-5), 1)',
@@ -521,116 +507,116 @@ const EditChannel = (props) => {
                     }>
                         填入模板
                     </Typography.Text>
-                    <div style={{ marginTop: 10 }}>
+                    <div style={{marginTop: 10}}>
                         <Typography.Text strong>密钥：</Typography.Text>
                     </div>
                     {
                         batch ?
-                          <TextArea
+                            <TextArea
-                            label='密钥'
+                                label='密钥'
-                            name='key'
+                                name='key'
-                            required
+                                required
-                            placeholder={'请输入密钥，一行一个'}
+                                placeholder={'请输入密钥，一行一个'}
-                            onChange={value => {
+                                onChange={value => {
-                                handleInputChange('key', value)
+                                    handleInputChange('key', value)
-                            }}
+                                }}
-                            value={inputs.key}
+                                value={inputs.key}
-                            style={{ minHeight: 150, fontFamily: 'JetBrains Mono, Consolas' }}
+                                style={{minHeight: 150, fontFamily: 'JetBrains Mono, Consolas'}}
-                            autoComplete='new-password'
+                                autoComplete='new-password'
-                          />
+                            />
-                          :
+                            :
-                          <Input
+                            <Input
-                            label='密钥'
+                                label='密钥'
-                            name='key'
+                                name='key'
-                            required
+                                required
-                            placeholder={type2secretPrompt(inputs.type)}
+                                placeholder={type2secretPrompt(inputs.type)}
-                            onChange={value => {
+                                onChange={value => {
-                                handleInputChange('key', value)
+                                    handleInputChange('key', value)
-                            }}
+                                }}
-                            value={inputs.key}
+                                value={inputs.key}
-                            autoComplete='new-password'
+                                autoComplete='new-password'
-                          />
+                            />
                     }
-                    <div style={{ marginTop: 10 }}>
+                    <div style={{marginTop: 10}}>
                         <Typography.Text strong>组织：</Typography.Text>
                     </div>
                     <Input
-                      label='组织，可选，不填则为默认组织'
+                        label='组织，可选，不填则为默认组织'
-                      name='openai_organization'
+                        name='openai_organization'
-                      placeholder='请输入组织org-xxx'
+                        placeholder='请输入组织org-xxx'
-                      onChange={value => {
+                        onChange={value => {
-                          handleInputChange('openai_organization', value)
+                            handleInputChange('openai_organization', value)
-                      }}
+                        }}
-                      value={inputs.openai_organization}
+                        value={inputs.openai_organization}
                     />
-                    <div style={{ marginTop: 10, display: 'flex' }}>
+                    <div style={{marginTop: 10, display: 'flex'}}>
                         <Space>
                             <Checkbox
-                              name='auto_ban'
+                                name='auto_ban'
-                              checked={autoBan}
+                                checked={autoBan}
-                              onChange={
+                                onChange={
-                                  () => {
+                                    () => {
-                                      setAutoBan(!autoBan);
+                                        setAutoBan(!autoBan);
-                                  }
+                                    }
-                              }
+                                }
-                              // onChange={handleInputChange}
+                                // onChange={handleInputChange}
                             />
                             <Typography.Text
-                              strong>是否自动禁用（仅当自动禁用开启时有效），关闭后不会自动禁用该渠道：</Typography.Text>
+                                strong>是否自动禁用（仅当自动禁用开启时有效），关闭后不会自动禁用该渠道：</Typography.Text>
                         </Space>
                     </div>
 
                     {
-                      !isEdit && (
+                        !isEdit && (
-                        <div style={{ marginTop: 10, display: 'flex' }}>
+                            <div style={{marginTop: 10, display: 'flex'}}>
-                            <Space>
+                                <Space>
-                                <Checkbox
+                                    <Checkbox
-                                  checked={batch}
+                                        checked={batch}
-                                  label='批量创建'
+                                        label='批量创建'
-                                  name='batch'
+                                        name='batch'
-                                  onChange={() => setBatch(!batch)}
+                                        onChange={() => setBatch(!batch)}
+                                    />
+                                    <Typography.Text strong>批量创建</Typography.Text>
+                                </Space>
+                            </div>
+                        )
+                    }
+                    {
+                        inputs.type !== 3 && inputs.type !== 8 && inputs.type !== 22 && (
+                            <>
+                                <div style={{marginTop: 10}}>
+                                    <Typography.Text strong>代理：</Typography.Text>
+                                </div>
+                                <Input
+                                    label='代理'
+                                    name='base_url'
+                                    placeholder={'此项可选，用于通过代理站来进行 API 调用'}
+                                    onChange={value => {
+                                        handleInputChange('base_url', value)
+                                    }}
+                                    value={inputs.base_url}
+                                    autoComplete='new-password'
                                 />
-                                <Typography.Text strong>批量创建</Typography.Text>
+                            </>
-                            </Space>
+                        )
-                        </div>
-                      )
                     }
                     {
-                      inputs.type !== 3 && inputs.type !== 8 && inputs.type !== 22 && (
+                        inputs.type === 22 && (
-                        <>
+                            <>
-                            <div style={{ marginTop: 10 }}>
+                                <div style={{marginTop: 10}}>
-                                <Typography.Text strong>代理：</Typography.Text>
+                                    <Typography.Text strong>私有部署地址：</Typography.Text>
-                            </div>
+                                </div>
-                            <Input
+                                <Input
-                              label='代理'
+                                    name='base_url'
-                              name='base_url'
+                                    placeholder={'请输入私有部署地址，格式为：https://fastgpt.run/api/openapi'}
-                              placeholder={'此项可选，用于通过代理站来进行 API 调用'}
+                                    onChange={value => {
-                              onChange={value => {
+                                        handleInputChange('base_url', value)
-                                  handleInputChange('base_url', value)
+                                    }}
-                              }}
+                                    value={inputs.base_url}
-                              value={inputs.base_url}
+                                    autoComplete='new-password'
-                              autoComplete='new-password'
+                                />
-                            />
+                            </>
-                        </>
+                        )
-                      )
-                    }
-                    {
-                      inputs.type === 22 && (
-                        <>
-                            <div style={{ marginTop: 10 }}>
-                                <Typography.Text strong>私有部署地址：</Typography.Text>
-                            </div>
-                            <Input
-                              name='base_url'
-                              placeholder={'请输入私有部署地址，格式为：https://fastgpt.run/api/openapi'}
-                              onChange={value => {
-                                  handleInputChange('base_url', value)
-                              }}
-                              value={inputs.base_url}
-                              autoComplete='new-password'
-                            />
-                        </>
-                      )
                     }
 
                 </Spin>

web/berry/src/constants/ChannelConstants.js

@@ -179,12 +179,6 @@ export const CHANNEL_OPTIONS = {
     value: 44,
     color: 'primary'
   },
-  45: {
-    key: 45,
-    text: 'xAI',
-    value: 45,
-    color: 'primary'
-  },
   41: {
     key: 41,
     text: 'Novita',

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

@@ -595,28 +595,6 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
                   <FormHelperText id="helper-tex-channel-model_mapping-label"> {inputPrompt.model_mapping} </FormHelperText>
                 )}
               </FormControl>
-              <FormControl fullWidth error={Boolean(touched.system_prompt && errors.system_prompt)} sx={{ ...theme.typography.otherInput }}>
-                {/* <InputLabel htmlFor="channel-model_mapping-label">{inputLabel.model_mapping}</InputLabel> */}
-                <TextField
-                  multiline
-                  id="channel-system_prompt-label"
-                  label={inputLabel.system_prompt}
-                  value={values.system_prompt}
-                  name="system_prompt"
-                  onBlur={handleBlur}
-                  onChange={handleChange}
-                  aria-describedby="helper-text-channel-system_prompt-label"
-                  minRows={5}
-                  placeholder={inputPrompt.system_prompt}
-                />
-                {touched.system_prompt && errors.system_prompt ? (
-                  <FormHelperText error id="helper-tex-channel-system_prompt-label">
-                    {errors.system_prompt}
-                  </FormHelperText>
-                ) : (
-                  <FormHelperText id="helper-tex-channel-system_prompt-label"> {inputPrompt.system_prompt} </FormHelperText>
-                )}
-              </FormControl>
               <DialogActions>
                 <Button onClick={onCancel}>取消</Button>
                 <Button disableElevation disabled={isSubmitting} type="submit" variant="contained" color="primary">

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

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

web/berry/src/views/Channel/type/Config.js

@@ -18,7 +18,6 @@ const defaultConfig = {
     other: '其他参数',
     models: '模型',
     model_mapping: '模型映射关系',
-    system_prompt: '系统提示词',
     groups: '用户组',
     config: null
   },
@@ -31,7 +30,6 @@ const defaultConfig = {
     models: '请选择该渠道所支持的模型',
     model_mapping:
       '请输入要修改的模型映射关系，格式为：api请求模型ID:实际转发给渠道的模型ID，使用JSON数组表示，例如：{"gpt-3.5": "gpt-35"}',
-    system_prompt:"此项可选，用于强制设置给定的系统提示词，请配合自定义模型 & 模型重定向使用，首先创建一个唯一的自定义模型名称并在上面填入，之后将该自定义模型重定向映射到该渠道一个原生支持的模型此项可选，用于强制设置给定的系统提示词，请配合自定义模型 & 模型重定向使用，首先创建一个唯一的自定义模型名称并在上面填入，之后将该自定义模型重定向映射到该渠道一个原生支持的模型",
     groups: '请选择该渠道所支持的用户组',
     config: null
   },
@@ -93,7 +91,7 @@ const typeConfig = {
       other: '版本号'
     },
     input: {
-      models: ['SparkDesk', 'SparkDesk-v1.1', 'SparkDesk-v2.1', 'SparkDesk-v3.1', 'SparkDesk-v3.1-128K', 'SparkDesk-v3.5', 'SparkDesk-v3.5-32K', 'SparkDesk-v4.0']
+      models: ['SparkDesk', 'SparkDesk-v1.1', 'SparkDesk-v2.1', 'SparkDesk-v3.1', 'SparkDesk-v3.5', 'SparkDesk-v4.0']
     },
     prompt: {
       key: '按照如下格式输入：APPID|APISecret|APIKey',
@@ -225,9 +223,6 @@ const typeConfig = {
     },
     modelGroup: 'anthropic'
   },
-  45: {
-    modelGroup: 'xai'
-  },
 };
 
 export { defaultConfig, typeConfig };

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

@@ -33,7 +33,7 @@ const COPY_OPTIONS = [
   },
   { key: 'ama', text: 'BotGem', url: 'ama://set-api-key?server={serverAddress}&key=sk-{key}', encode: true },
   { key: 'opencat', text: 'OpenCat', url: 'opencat://team/join?domain={serverAddress}&token=sk-{key}', encode: true },
-  { key: 'lobechat', text: 'LobeChat', url: 'https://lobehub.com/?settings={"keyVaults":{"openai":{"apiKey":"sk-{key}","baseURL":"{serverAddress}"}}}', encode: true }
+  { key: 'lobechat', text: 'LobeChat', url: 'https://lobehub.com/?settings={"keyVaults":{"openai":{"apiKey":"user-key","baseURL":"https://your-proxy.com/v1"}}}', encode: true }
 ];
 
 function replacePlaceholders(text, key, serverAddress) {

web/default/src/components/ChannelsTable.js

@@ -52,19 +52,11 @@ function renderBalance(type, balance) {
       return <span>¥{balance.toFixed(2)}</span>;
     case 13: // AIGC2D
       return <span>{renderNumber(balance)}</span>;
-    case 44: // SiliconFlow
-      return <span>¥{balance.toFixed(2)}</span>;
     default:
       return <span>不支持</span>;
   }
 }
 
-function isShowDetail() {
-  return localStorage.getItem("show_detail") === "true";
-}
-
-const promptID = "detail"
-
 const ChannelsTable = () => {
   const [channels, setChannels] = useState([]);
   const [loading, setLoading] = useState(true);
@@ -72,8 +64,7 @@ const ChannelsTable = () => {
   const [searchKeyword, setSearchKeyword] = useState('');
   const [searching, setSearching] = useState(false);
   const [updatingBalance, setUpdatingBalance] = useState(false);
-  const [showPrompt, setShowPrompt] = useState(shouldShowPrompt(promptID));
+  const [showPrompt, setShowPrompt] = useState(shouldShowPrompt("channel-test"));
-  const [showDetail, setShowDetail] = useState(isShowDetail());
 
   const loadChannels = async (startIdx) => {
     const res = await API.get(`/api/channel/?p=${startIdx}`);
@@ -127,11 +118,6 @@ const ChannelsTable = () => {
     await loadChannels(activePage - 1);
   };
 
-  const toggleShowDetail = () => {
-    setShowDetail(!showDetail);
-    localStorage.setItem("show_detail", (!showDetail).toString());
-  }
-
   useEffect(() => {
     loadChannels(0)
       .then()
@@ -376,13 +362,11 @@ const ChannelsTable = () => {
         showPrompt && (
           <Message onDismiss={() => {
             setShowPrompt(false);
-            setPromptShown(promptID);
+            setPromptShown("channel-test");
           }}>
             OpenAI 渠道已经不再支持通过 key 获取余额，因此余额显示为 0。对于支持的渠道类型，请点击余额进行刷新。
             <br/>
             渠道测试仅支持 chat 模型，优先使用 gpt-3.5-turbo，如果该模型不可用则使用你所配置的模型列表中的第一个模型。
-            <br/>
-            点击下方详情按钮可以显示余额以及设置额外的测试模型。
           </Message>
         )
       }
@@ -442,7 +426,6 @@ const ChannelsTable = () => {
               onClick={() => {
                 sortChannel('balance');
               }}
-              hidden={!showDetail}
             >
               余额
             </Table.HeaderCell>
@@ -454,7 +437,7 @@ const ChannelsTable = () => {
             >
               优先级
             </Table.HeaderCell>
-            <Table.HeaderCell hidden={!showDetail}>测试模型</Table.HeaderCell>
+            <Table.HeaderCell>测试模型</Table.HeaderCell>
             <Table.HeaderCell>操作</Table.HeaderCell>
           </Table.Row>
         </Table.Header>
@@ -482,7 +465,7 @@ const ChannelsTable = () => {
                       basic
                     />
                   </Table.Cell>
-                  <Table.Cell hidden={!showDetail}>
+                  <Table.Cell>
                     <Popup
                       trigger={<span onClick={() => {
                         updateChannelBalance(channel.id, channel.name, idx);
@@ -509,7 +492,7 @@ const ChannelsTable = () => {
                       basic
                     />
                   </Table.Cell>
-                  <Table.Cell hidden={!showDetail}>
+                  <Table.Cell>
                     <Dropdown
                       placeholder='请选择测试模型'
                       selection
@@ -588,7 +571,7 @@ const ChannelsTable = () => {
 
         <Table.Footer>
           <Table.Row>
-            <Table.HeaderCell colSpan={showDetail ? "10" : "8"}>
+            <Table.HeaderCell colSpan='9'>
               <Button size='small' as={Link} to='/channel/add' loading={loading}>
                 添加新的渠道
               </Button>
@@ -626,7 +609,6 @@ const ChannelsTable = () => {
                 }
               />
               <Button size='small' onClick={refresh} loading={loading}>刷新</Button>
-              <Button size='small' onClick={toggleShowDetail}>{showDetail ? "隐藏详情" : "详情"}</Button>
             </Table.HeaderCell>
           </Table.Row>
         </Table.Footer>

web/default/src/components/TokensTable.js

@@ -117,7 +117,7 @@ const TokensTable = () => {
         url = nextUrl;
         break;
       case 'lobechat':
-        url = nextLink + `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}/v1"}}}`;
+        url = nextLink + `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}"/v1"}}}`;
         break;
       default:
         url = `sk-${key}`;
@@ -160,7 +160,7 @@ const TokensTable = () => {
         break;
 
       case 'lobechat':
-        url = chatLink + `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}/v1"}}}`;
+        url = chatLink + `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}"/v1"}}}`;
         break;
 
       default:

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

@@ -30,7 +30,6 @@ export const CHANNEL_OPTIONS = [
     { 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: 8, text: '自定义渠道', value: 8, color: 'pink' },
     { key: 22, text: '知识库：FastGPT', value: 22, color: 'blue' },
     { key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple' },

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

@@ -43,7 +43,6 @@ const EditChannel = () => {
     base_url: '',
     other: '',
     model_mapping: '',
-    system_prompt: '',
     models: [],
     groups: ['default']
   };
@@ -426,7 +425,7 @@ const EditChannel = () => {
             )
           }
           {
-          inputs.type !== 43 && (<>
+          inputs.type !== 43 && (
               <Form.Field>
                 <Form.TextArea
                   label='模型重定向'
@@ -438,18 +437,6 @@ const EditChannel = () => {
                   autoComplete='new-password'
                 />
               </Form.Field>
-            <Form.Field>
-                <Form.TextArea
-                  label='系统提示词'
-                  placeholder={`此项可选，用于强制设置给定的系统提示词，请配合自定义模型 & 模型重定向使用，首先创建一个唯一的自定义模型名称并在上面填入，之后将该自定义模型重定向映射到该渠道一个原生支持的模型`}
-                  name='system_prompt'
-                  onChange={handleInputChange}
-                  value={inputs.system_prompt}
-                  style={{ minHeight: 150, fontFamily: 'JetBrains Mono, Consolas' }}
-                  autoComplete='new-password'
-                />
-              </Form.Field>
-              </>
             )
           }
           {

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { Header, Segment } from 'semantic-ui-react';
 import ChannelsTable from '../../components/ChannelsTable';
 
-const Channel = () => (
+const File = () => (
   <>
     <Segment>
       <Header as='h3'>管理渠道</Header>
@@ -11,4 +11,4 @@ const Channel = () => (
   </>
 );
 
-export default Channel;
+export default File;