fix: response format

fix bug
feat: support gpt-4o-2024-08-06
2025-11-25 14:36:47 +08:00 · 2024-08-07 15:43:01 +08:00 · 2024-08-07 02:50:22 +08:00 · 2024-08-07 02:49:02 +08:00
5 changed files with 48 additions and 47 deletions
--- a/common/model-ratio.go
+++ b/common/model-ratio.go
@@ -32,13 +32,14 @@ var defaultModelRatio = map[string]float64{
 	"gpt-4-32k":  30,
 	//"gpt-4-32k-0314":               30, //deprecated
 	"gpt-4-32k-0613":            30,
-	"gpt-4-1106-preview":        5,   // $0.01 / 1K tokens
-	"gpt-4-0125-preview":        5,   // $0.01 / 1K tokens
-	"gpt-4-turbo-preview":       5,   // $0.01 / 1K tokens
-	"gpt-4-vision-preview":      5,   // $0.01 / 1K tokens
-	"gpt-4-1106-vision-preview": 5,   // $0.01 / 1K tokens
-	"gpt-4o":                    2.5, // $0.01 / 1K tokens
-	"gpt-4o-2024-05-13":         2.5, // $0.01 / 1K tokens
+	"gpt-4-1106-preview":        5,    // $0.01 / 1K tokens
+	"gpt-4-0125-preview":        5,    // $0.01 / 1K tokens
+	"gpt-4-turbo-preview":       5,    // $0.01 / 1K tokens
+	"gpt-4-vision-preview":      5,    // $0.01 / 1K tokens
+	"gpt-4-1106-vision-preview": 5,    // $0.01 / 1K tokens
+	"gpt-4o":                    2.5,  // $0.01 / 1K tokens
+	"gpt-4o-2024-05-13":         2.5,  // $0.01 / 1K tokens
+	"gpt-4o-2024-08-06":         1.25, // $0.01 / 1K tokens
 	"gpt-4o-mini":               0.075,
 	"gpt-4o-mini-2024-07-18":    0.075,
 	"gpt-4-turbo":               5,    // $0.01 / 1K tokens
@@ -326,7 +327,7 @@ func GetCompletionRatio(name string) float64 {
 			return 3
 		}
 		if strings.HasPrefix(name, "gpt-4o") {
-			if strings.Contains(name, "mini") {
+			if strings.HasPrefix(name, "gpt-4o-mini") || name == "gpt-4o-2024-08-06" {
 				return 4
 			}
 			return 3
--- a/dto/text_request.go
+++ b/dto/text_request.go
@@ -7,31 +7,31 @@ type ResponseFormat struct {
 }

 type GeneralOpenAIRequest struct {
-	Model            string          `json:"model,omitempty"`
-	Messages         []Message       `json:"messages,omitempty"`
-	Prompt           any             `json:"prompt,omitempty"`
-	Stream           bool            `json:"stream,omitempty"`
-	StreamOptions    *StreamOptions  `json:"stream_options,omitempty"`
-	MaxTokens        uint            `json:"max_tokens,omitempty"`
-	Temperature      float64         `json:"temperature,omitempty"`
-	TopP             float64         `json:"top_p,omitempty"`
-	TopK             int             `json:"top_k,omitempty"`
-	Stop             any             `json:"stop,omitempty"`
-	N                int             `json:"n,omitempty"`
-	Input            any             `json:"input,omitempty"`
-	Instruction      string          `json:"instruction,omitempty"`
-	Size             string          `json:"size,omitempty"`
-	Functions        any             `json:"functions,omitempty"`
-	FrequencyPenalty float64         `json:"frequency_penalty,omitempty"`
-	PresencePenalty  float64         `json:"presence_penalty,omitempty"`
-	ResponseFormat   *ResponseFormat `json:"response_format,omitempty"`
-	Seed             float64         `json:"seed,omitempty"`
-	Tools            []ToolCall      `json:"tools,omitempty"`
-	ToolChoice       any             `json:"tool_choice,omitempty"`
-	User             string          `json:"user,omitempty"`
-	LogProbs         bool            `json:"logprobs,omitempty"`
-	TopLogProbs      int             `json:"top_logprobs,omitempty"`
-	Dimensions       int             `json:"dimensions,omitempty"`
+	Model            string         `json:"model,omitempty"`
+	Messages         []Message      `json:"messages,omitempty"`
+	Prompt           any            `json:"prompt,omitempty"`
+	Stream           bool           `json:"stream,omitempty"`
+	StreamOptions    *StreamOptions `json:"stream_options,omitempty"`
+	MaxTokens        uint           `json:"max_tokens,omitempty"`
+	Temperature      float64        `json:"temperature,omitempty"`
+	TopP             float64        `json:"top_p,omitempty"`
+	TopK             int            `json:"top_k,omitempty"`
+	Stop             any            `json:"stop,omitempty"`
+	N                int            `json:"n,omitempty"`
+	Input            any            `json:"input,omitempty"`
+	Instruction      string         `json:"instruction,omitempty"`
+	Size             string         `json:"size,omitempty"`
+	Functions        any            `json:"functions,omitempty"`
+	FrequencyPenalty float64        `json:"frequency_penalty,omitempty"`
+	PresencePenalty  float64        `json:"presence_penalty,omitempty"`
+	ResponseFormat   any            `json:"response_format,omitempty"`
+	Seed             float64        `json:"seed,omitempty"`
+	Tools            []ToolCall     `json:"tools,omitempty"`
+	ToolChoice       any            `json:"tool_choice,omitempty"`
+	User             string         `json:"user,omitempty"`
+	LogProbs         bool           `json:"logprobs,omitempty"`
+	TopLogProbs      int            `json:"top_logprobs,omitempty"`
+	Dimensions       int            `json:"dimensions,omitempty"`
 }

 type OpenAITools struct {
--- a/middleware/auth.go
+++ b/middleware/auth.go
@@ -146,7 +146,7 @@ func TokenAuth() func(c *gin.Context) {
 		if token != nil {
 			id := c.GetInt("id")
 			if id == 0 {
-				c.Set("id", token.Id)
+				c.Set("id", token.UserId)
 			}
 		}
 		if err != nil {
--- a/relay/channel/ollama/dto.go
+++ b/relay/channel/ollama/dto.go
@@ -3,18 +3,18 @@ package ollama
 import "one-api/dto"

 type OllamaRequest struct {
-	Model            string              `json:"model,omitempty"`
-	Messages         []dto.Message       `json:"messages,omitempty"`
-	Stream           bool                `json:"stream,omitempty"`
-	Temperature      float64             `json:"temperature,omitempty"`
-	Seed             float64             `json:"seed,omitempty"`
-	Topp             float64             `json:"top_p,omitempty"`
-	TopK             int                 `json:"top_k,omitempty"`
-	Stop             any                 `json:"stop,omitempty"`
-	Tools            []dto.ToolCall      `json:"tools,omitempty"`
-	ResponseFormat   *dto.ResponseFormat `json:"response_format,omitempty"`
-	FrequencyPenalty float64             `json:"frequency_penalty,omitempty"`
-	PresencePenalty  float64             `json:"presence_penalty,omitempty"`
+	Model            string         `json:"model,omitempty"`
+	Messages         []dto.Message  `json:"messages,omitempty"`
+	Stream           bool           `json:"stream,omitempty"`
+	Temperature      float64        `json:"temperature,omitempty"`
+	Seed             float64        `json:"seed,omitempty"`
+	Topp             float64        `json:"top_p,omitempty"`
+	TopK             int            `json:"top_k,omitempty"`
+	Stop             any            `json:"stop,omitempty"`
+	Tools            []dto.ToolCall `json:"tools,omitempty"`
+	ResponseFormat   any            `json:"response_format,omitempty"`
+	FrequencyPenalty float64        `json:"frequency_penalty,omitempty"`
+	PresencePenalty  float64        `json:"presence_penalty,omitempty"`
 }

 type OllamaEmbeddingRequest struct {
--- a/relay/channel/openai/constant.go
+++ b/relay/channel/openai/constant.go
@@ -8,7 +8,7 @@ var ModelList = []string{
 	"gpt-4-32k", "gpt-4-32k-0613",
 	"gpt-4-turbo-preview", "gpt-4-turbo", "gpt-4-turbo-2024-04-09",
 	"gpt-4-vision-preview",
-	"gpt-4o", "gpt-4o-2024-05-13",
+	"gpt-4o", "gpt-4o-2024-05-13", "gpt-4o-2024-08-06",
 	"gpt-4o-mini", "gpt-4o-mini-2024-07-18",
 	"text-embedding-ada-002", "text-embedding-3-small", "text-embedding-3-large",
 	"text-curie-001", "text-babbage-001", "text-ada-001",
Author	SHA1	Message	Date
CalciumIon	2e3c266bd6	fix: response format	2024-08-07 15:43:01 +08:00
CalciumIon	4490258104	fix bug	2024-08-07 02:50:22 +08:00
CalciumIon	93c6d765c7	feat: support gpt-4o-2024-08-06	2024-08-07 02:49:02 +08:00