fix: update Prompt type in GeneralOpenAIRequest and adjust related logic in ConvertCompletionsRequest

This commit is contained in:
Laisky.Cai
2025-02-10 02:11:53 +00:00
parent 4fb8501833
commit 33f3400c12
4 changed files with 8 additions and 8 deletions

View File

@@ -19,9 +19,8 @@ import (
)
func ConvertCompletionsRequest(textRequest model.GeneralOpenAIRequest) *Request {
p, _ := textRequest.Prompt.(string)
return &Request{
Prompt: p,
Prompt: textRequest.Prompt,
MaxTokens: textRequest.MaxTokens,
Stream: textRequest.Stream,
Temperature: textRequest.Temperature,

View File

@@ -328,7 +328,7 @@ var ModelRatio = map[string]float64{
"command-r": 0.5 / 1000 * USD,
"command-r-plus": 3.0 / 1000 * USD,
// https://platform.deepseek.com/api-docs/pricing/
"deepseek-chat": 0.14 * MILLI_USD,
"deepseek-chat": 0.27 * MILLI_USD,
"deepseek-reasoner": 0.55 * MILLI_USD,
// https://www.deepl.com/pro?cta=header-prices
"deepl-zh": 25.0 / 1000 * USD,
@@ -462,7 +462,7 @@ var CompletionRatio = map[string]float64{
// whisper
"whisper-1": 0, // only count input tokens
// deepseek
"deepseek-chat": 0.28 / 0.14,
"deepseek-chat": 1.1 / 0.27,
"deepseek-reasoner": 2.19 / 0.55,
}
@@ -620,9 +620,6 @@ func GetCompletionRatio(name string, channelType int) float64 {
if strings.HasPrefix(name, "gemini-") {
return 4
}
if strings.HasPrefix(name, "deepseek-") {
return 2
}
switch name {
case "llama2-70b-4096":

View File

@@ -36,6 +36,10 @@ func RelayTextHelper(c *gin.Context) *relaymodel.ErrorWithStatusCode {
}
meta.IsStream = textRequest.Stream
if reqBody, ok := c.Get(ctxkey.KeyRequestBody); ok {
logger.Debugf(c.Request.Context(), "get text request: %s\n", string(reqBody.([]byte)))
}
// map model name
meta.OriginModelName = textRequest.Model
textRequest.Model = meta.ActualModelName

View File

@@ -61,7 +61,7 @@ type GeneralOpenAIRequest struct {
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"`
Prompt string `json:"prompt,omitempty"`
Quality *string `json:"quality,omitempty"`
Size string `json:"size,omitempty"`
Style *string `json:"style,omitempty"`