feat: support embedding encoding_format param

README.md

@@ -124,10 +124,11 @@ docker run --name new-api -d --restart always -p 3000:3000 -e SQL_DSN="root:1234
 [对接文档](Suno.md)
 
 ## 界面截图
+![796df8d287b7b7bd7853b2497e7df511](https://github.com/user-attachments/assets/255b5e97-2d3a-4434-b4fa-e922ad88ff5a)
+
 ![image](https://github.com/Calcium-Ion/new-api/assets/61247483/ad0e7aae-0203-471c-9716-2d83768927d4)
 
 ![image](https://github.com/Calcium-Ion/new-api/assets/61247483/3ca0b282-00ff-4c96-bf9d-e29ef615c605)
-![image](https://github.com/Calcium-Ion/new-api/assets/61247483/90d7d763-6a77-4b36-9f76-2bb30f18583d)
 夜间模式  
 ![image](https://github.com/Calcium-Ion/new-api/assets/61247483/1c66b593-bb9e-4757-9720-ff2759539242)
 ![image](https://github.com/Calcium-Ion/new-api/assets/61247483/af9a07ee-5101-4b3d-8bd9-ae21a4fd7e9e)

common/model-ratio.go

@@ -340,10 +340,10 @@ func GetCompletionRatio(name string) float64 {
 			return 3
 		}
 		if strings.HasPrefix(name, "gpt-4o") {
-			if strings.HasPrefix(name, "gpt-4o-mini") || name == "gpt-4o-2024-08-06" {
-				return 4
+			if name == "gpt-4o-2024-05-13" {
+				return 3
 			}
-			return 3
+			return 4
 		}
 		return 2
 	}
@@ -351,7 +351,7 @@ func GetCompletionRatio(name string) float64 {
 		return 4
 	}
 	if name == "chatgpt-4o-latest" {
-		return 3
+		return 4
 	}
 	if strings.Contains(name, "claude-instant-1") {
 		return 3
@@ -375,10 +375,7 @@ func GetCompletionRatio(name string) float64 {
 		return 3
 	}
 	if strings.HasPrefix(name, "gemini-") {
-		if strings.Contains(name, "flash") {
-			return 4
-		}
-		return 3
+		return 4
 	}
 	if strings.HasPrefix(name, "command") {
 		switch name {

controller/relay.go

@@ -49,6 +49,12 @@ func Playground(c *gin.Context) {
 		}
 	}()
 
+	useAccessToken := c.GetBool("use_access_token")
+	if useAccessToken {
+		openaiErr = service.OpenAIErrorWrapperLocal(errors.New("暂不支持使用 access token"), "access_token_not_supported", http.StatusBadRequest)
+		return
+	}
+
 	playgroundRequest := &dto.PlayGroundRequest{}
 	err := common.UnmarshalBodyReusable(c, playgroundRequest)
 	if err != nil {
@@ -67,11 +73,10 @@ func Playground(c *gin.Context) {
 	} else {
 		c.Set("group", group)
 	}
-	log.Printf("group: %s", group)
-	log.Printf("model: %s", playgroundRequest.Model)
 	channel, err := model.CacheGetRandomSatisfiedChannel(group, playgroundRequest.Model, 0)
 	if err != nil {
-		openaiErr = service.OpenAIErrorWrapperLocal(err, "get_playground_channel_failed", http.StatusInternalServerError)
+		message := fmt.Sprintf("当前分组 %s 下对于模型 %s 无可用渠道", group, playgroundRequest.Model)
+		openaiErr = service.OpenAIErrorWrapperLocal(errors.New(message), "get_playground_channel_failed", http.StatusInternalServerError)
 		return
 	}
 	middleware.SetupContextForSelectedChannel(c, channel, playgroundRequest.Model)

dto/text_request.go

@@ -26,6 +26,7 @@ type GeneralOpenAIRequest struct {
 	FrequencyPenalty    float64        `json:"frequency_penalty,omitempty"`
 	PresencePenalty     float64        `json:"presence_penalty,omitempty"`
 	ResponseFormat      any            `json:"response_format,omitempty"`
+	EncodingFormat      any            `json:"encoding_format,omitempty"`
 	Seed                float64        `json:"seed,omitempty"`
 	Tools               []ToolCall     `json:"tools,omitempty"`
 	ToolChoice          any            `json:"tool_choice,omitempty"`

middleware/auth.go

@@ -122,6 +122,7 @@ func authHelper(c *gin.Context, minRole int) {
 	c.Set("role", role)
 	c.Set("id", id)
 	c.Set("group", session.Get("group"))
+	c.Set("use_access_token", useAccessToken)
 	c.Next()
 }
 

relay/channel/aws/adaptor.go

@@ -8,7 +8,6 @@ import (
 	"one-api/dto"
 	"one-api/relay/channel/claude"
 	relaycommon "one-api/relay/common"
-	"strings"
 )
 
 const (
@@ -31,11 +30,7 @@ func (a *Adaptor) ConvertImageRequest(c *gin.Context, info *relaycommon.RelayInf
 }
 
 func (a *Adaptor) Init(info *relaycommon.RelayInfo) {
-	if strings.HasPrefix(info.UpstreamModelName, "claude-3") {
-		a.RequestMode = RequestModeMessage
-	} else {
-		a.RequestMode = RequestModeCompletion
-	}
+	a.RequestMode = RequestModeMessage
 }
 
 func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
@@ -53,11 +48,8 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, info *relaycommon.RelayInfo, re
 
 	var claudeReq *claude.ClaudeRequest
 	var err error
-	if a.RequestMode == RequestModeCompletion {
-		claudeReq = claude.RequestOpenAI2ClaudeComplete(*request)
-	} else {
-		claudeReq, err = claude.RequestOpenAI2ClaudeMessage(*request)
-	}
+	claudeReq, err = claude.RequestOpenAI2ClaudeMessage(*request)
+
 	c.Set("request_model", request.Model)
 	c.Set("converted_request", claudeReq)
 	return claudeReq, err

service/channel.go

@@ -73,6 +73,15 @@ func ShouldDisableChannel(channelType int, err *relaymodel.OpenAIErrorWithStatus
 	} else if strings.HasPrefix(err.Error.Message, "Permission denied") {
 		return true
 	}
+
+	if strings.Contains(err.Error.Message, "The security token included in the request is invalid") { // anthropic
+		return true
+	} else if strings.Contains(err.Error.Message, "Operation not allowed") {
+		return true
+	} else if strings.Contains(err.Error.Message, "Your account is not authorized") {
+		return true
+	}
+
 	return false
 }
 

web/src/components/Playground.js

@@ -133,7 +133,9 @@ const Playground = () => {
           completeMessage();
         } else {
           let text = payload.choices[0].delta.content;
-          generateMockResponse(text);
+          if (text) {
+            generateMockResponse(text);
+          }
         }
       } else {
         completeMessage();
@@ -142,7 +144,7 @@ const Playground = () => {
 
     source.addEventListener("error", (e) => {
       generateMockResponse(e.data)
-      completeMessage();
+      completeMessage('error')
     });
 
     source.addEventListener("readystatechange", (e) => {
@@ -186,7 +188,7 @@ const Playground = () => {
           stream: true,
           model: inputs.model,
           group: inputs.group,
-          max_tokens: inputs.max_tokens,
+          max_tokens: parseInt(inputs.max_tokens),
           temperature: inputs.temperature,
         };
       };
@@ -204,12 +206,17 @@ const Playground = () => {
     });
   }, [getSystemMessage]);
 
-  const completeMessage = useCallback(() => {
+  const completeMessage = useCallback((status = 'complete') => {
+    // console.log("Complete Message: ", status)
     setMessage((prevMessage) => {
       const lastMessage = prevMessage[prevMessage.length - 1];
+      // only change the status if the last message is not complete and not error
+      if (lastMessage.status === 'complete' || lastMessage.status === 'error') {
+        return prevMessage;
+      }
       return [
         ...prevMessage.slice(0, -1),
-        { ...lastMessage, status: 'complete' }
+        { ...lastMessage, status: status }
       ];
     });
   }, [])

web/src/index.css

@@ -65,6 +65,11 @@ body {
   height: 100%;
 }
 
+.semi-chat-chatBox-content {
+  min-width: auto;
+  word-break: break-word;
+}
+
 .tableHiddle {
   display: none !important;
 }