mirror of
				https://github.com/songquanpeng/one-api.git
				synced 2025-11-04 15:53:42 +08:00 
			
		
		
		
	Revert "[Upstream] fix: update deepseek's price"
This commit is contained in:
		@@ -19,8 +19,9 @@ import (
 | 
				
			|||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func ConvertCompletionsRequest(textRequest model.GeneralOpenAIRequest) *Request {
 | 
					func ConvertCompletionsRequest(textRequest model.GeneralOpenAIRequest) *Request {
 | 
				
			||||||
 | 
						p, _ := textRequest.Prompt.(string)
 | 
				
			||||||
	return &Request{
 | 
						return &Request{
 | 
				
			||||||
		Prompt:      textRequest.Prompt,
 | 
							Prompt:      p,
 | 
				
			||||||
		MaxTokens:   textRequest.MaxTokens,
 | 
							MaxTokens:   textRequest.MaxTokens,
 | 
				
			||||||
		Stream:      textRequest.Stream,
 | 
							Stream:      textRequest.Stream,
 | 
				
			||||||
		Temperature: textRequest.Temperature,
 | 
							Temperature: textRequest.Temperature,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -337,7 +337,7 @@ var ModelRatio = map[string]float64{
 | 
				
			|||||||
	"command-r":             0.5 / 1000 * USD,
 | 
						"command-r":             0.5 / 1000 * USD,
 | 
				
			||||||
	"command-r-plus":        3.0 / 1000 * USD,
 | 
						"command-r-plus":        3.0 / 1000 * USD,
 | 
				
			||||||
	// https://platform.deepseek.com/api-docs/pricing/
 | 
						// https://platform.deepseek.com/api-docs/pricing/
 | 
				
			||||||
	"deepseek-chat":     0.27 * MILLI_USD,
 | 
						"deepseek-chat":     0.14 * MILLI_USD,
 | 
				
			||||||
	"deepseek-reasoner": 0.55 * MILLI_USD,
 | 
						"deepseek-reasoner": 0.55 * MILLI_USD,
 | 
				
			||||||
	// https://www.deepl.com/pro?cta=header-prices
 | 
						// https://www.deepl.com/pro?cta=header-prices
 | 
				
			||||||
	"deepl-zh": 25.0 / 1000 * USD,
 | 
						"deepl-zh": 25.0 / 1000 * USD,
 | 
				
			||||||
@@ -630,7 +630,7 @@ var CompletionRatio = map[string]float64{
 | 
				
			|||||||
	// whisper
 | 
						// whisper
 | 
				
			||||||
	"whisper-1": 0, // only count input tokens
 | 
						"whisper-1": 0, // only count input tokens
 | 
				
			||||||
	// deepseek
 | 
						// deepseek
 | 
				
			||||||
	"deepseek-chat":     1.1 / 0.27,
 | 
						"deepseek-chat":     0.28 / 0.14,
 | 
				
			||||||
	"deepseek-reasoner": 2.19 / 0.55,
 | 
						"deepseek-reasoner": 2.19 / 0.55,
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -784,6 +784,9 @@ func GetCompletionRatio(name string, channelType int) float64 {
 | 
				
			|||||||
	if strings.HasPrefix(name, "gemini-") {
 | 
						if strings.HasPrefix(name, "gemini-") {
 | 
				
			||||||
		return 3
 | 
							return 3
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
						if strings.HasPrefix(name, "deepseek-") {
 | 
				
			||||||
 | 
							return 2
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	switch name {
 | 
						switch name {
 | 
				
			||||||
	case "llama2-70b-4096":
 | 
						case "llama2-70b-4096":
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -33,10 +33,6 @@ func RelayTextHelper(c *gin.Context) *model.ErrorWithStatusCode {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
	meta.IsStream = textRequest.Stream
 | 
						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
 | 
						// map model name
 | 
				
			||||||
	meta.OriginModelName = textRequest.Model
 | 
						meta.OriginModelName = textRequest.Model
 | 
				
			||||||
	textRequest.Model, _ = getMappedModelName(textRequest.Model, meta.ModelMapping)
 | 
						textRequest.Model, _ = getMappedModelName(textRequest.Model, meta.ModelMapping)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -61,7 +61,7 @@ type GeneralOpenAIRequest struct {
 | 
				
			|||||||
	EncodingFormat string `json:"encoding_format,omitempty"`
 | 
						EncodingFormat string `json:"encoding_format,omitempty"`
 | 
				
			||||||
	Dimensions     int    `json:"dimensions,omitempty"`
 | 
						Dimensions     int    `json:"dimensions,omitempty"`
 | 
				
			||||||
	// https://platform.openai.com/docs/api-reference/images/create
 | 
						// https://platform.openai.com/docs/api-reference/images/create
 | 
				
			||||||
	Prompt  string  `json:"prompt,omitempty"`
 | 
						Prompt  any     `json:"prompt,omitempty"`
 | 
				
			||||||
	Quality *string `json:"quality,omitempty"`
 | 
						Quality *string `json:"quality,omitempty"`
 | 
				
			||||||
	Size    string  `json:"size,omitempty"`
 | 
						Size    string  `json:"size,omitempty"`
 | 
				
			||||||
	Style   *string `json:"style,omitempty"`
 | 
						Style   *string `json:"style,omitempty"`
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user