From 09998ae144500b19b7363d5a4be7beec9942f769 Mon Sep 17 00:00:00 2001 From: WqyJh <781345688@qq.com> Date: Fri, 17 Jan 2025 15:12:14 +0800 Subject: [PATCH] fix: whisper model --- common/ctxkey/key.go | 1 - common/gin.go | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/common/ctxkey/key.go b/common/ctxkey/key.go index 115558a5..681e2344 100644 --- a/common/ctxkey/key.go +++ b/common/ctxkey/key.go @@ -19,6 +19,5 @@ const ( TokenName = "token_name" BaseURL = "base_url" AvailableModels = "available_models" - KeyRequestBody = "key_request_body" SystemPrompt = "system_prompt" ) diff --git a/common/gin.go b/common/gin.go index 815b4ee5..1f5849b2 100644 --- a/common/gin.go +++ b/common/gin.go @@ -3,14 +3,14 @@ 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" ) func GetRequestBody(c *gin.Context) ([]byte, error) { - requestBody, _ := c.Get(ctxkey.KeyRequestBody) + requestBody, _ := c.Get(gin.BodyBytesKey) if requestBody != nil { return requestBody.([]byte), nil } @@ -19,7 +19,7 @@ func GetRequestBody(c *gin.Context) ([]byte, error) { return nil, err } _ = c.Request.Body.Close() - c.Set(ctxkey.KeyRequestBody, requestBody) + c.Set(gin.BodyBytesKey, requestBody) return requestBody.([]byte), nil } @@ -31,7 +31,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 +39,7 @@ func UnmarshalBodyReusable(c *gin.Context, v any) error { return err } // Reset request body + c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody)) return nil }