Sfoglia il codice sorgente

fix: the prompt field can be array type now (close #166, #167)

* fix: the prompt field can be array type now (close #166)

* fix: fix prompt type

---------

Co-authored-by: JustSong <songquanpeng@foxmail.com>
张城铭 2 anni fa
parent
commit
630156dc0a
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      controller/relay.go

+ 2 - 2
controller/relay.go

@@ -32,7 +32,7 @@ const (
 type GeneralOpenAIRequest struct {
 type GeneralOpenAIRequest struct {
 	Model       string    `json:"model"`
 	Model       string    `json:"model"`
 	Messages    []Message `json:"messages"`
 	Messages    []Message `json:"messages"`
-	Prompt      string    `json:"prompt"`
+	Prompt      any       `json:"prompt"`
 	Stream      bool      `json:"stream"`
 	Stream      bool      `json:"stream"`
 	MaxTokens   int       `json:"max_tokens"`
 	MaxTokens   int       `json:"max_tokens"`
 	Temperature float64   `json:"temperature"`
 	Temperature float64   `json:"temperature"`
@@ -188,7 +188,7 @@ func relayHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 	case RelayModeChatCompletions:
 	case RelayModeChatCompletions:
 		promptTokens = countTokenMessages(textRequest.Messages, textRequest.Model)
 		promptTokens = countTokenMessages(textRequest.Messages, textRequest.Model)
 	case RelayModeCompletions:
 	case RelayModeCompletions:
-		promptTokens = countTokenText(textRequest.Prompt, textRequest.Model)
+		promptTokens = countTokenInput(textRequest.Prompt, textRequest.Model)
 	case RelayModeModeration:
 	case RelayModeModeration:
 		promptTokens = countTokenInput(textRequest.Input, textRequest.Model)
 		promptTokens = countTokenInput(textRequest.Input, textRequest.Model)
 	}
 	}