fix record usage
This commit is contained in:
@@ -10,12 +10,17 @@ import (
|
||||
"opencatd-open/llm/google/v2"
|
||||
"opencatd-open/llm/openai_compatible"
|
||||
"opencatd-open/pkg/tokenizer"
|
||||
"strconv"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
func (h *Proxy) ChatHandler(c *gin.Context) {
|
||||
user := c.MustGet("user").(*model.User)
|
||||
if user == nil {
|
||||
dto.WrapErrorAsOpenAI(c, 401, "Unauthorized")
|
||||
return
|
||||
}
|
||||
|
||||
var chatreq llm.ChatRequest
|
||||
if err := c.ShouldBindJSON(&chatreq); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
@@ -38,10 +43,10 @@ func (h *Proxy) ChatHandler(c *gin.Context) {
|
||||
fallthrough
|
||||
default:
|
||||
llm, err = openai_compatible.NewOpenAICompatible(h.apikey)
|
||||
if err != nil {
|
||||
dto.WrapErrorAsOpenAI(c, 500, fmt.Errorf("create llm client error: %w", err).Error())
|
||||
return
|
||||
}
|
||||
}
|
||||
if err != nil {
|
||||
dto.WrapErrorAsOpenAI(c, 500, fmt.Errorf("create llm client error: %w", err).Error())
|
||||
return
|
||||
}
|
||||
|
||||
if !chatreq.Stream {
|
||||
@@ -62,19 +67,11 @@ func (h *Proxy) ChatHandler(c *gin.Context) {
|
||||
}
|
||||
|
||||
llmusage := llm.GetTokenUsage()
|
||||
|
||||
llmusage.User = user
|
||||
llmusage.TokenID = c.GetInt64("token_id")
|
||||
cost := tokenizer.Cost(llmusage.Model, llmusage.PromptTokens+llmusage.ToolsTokens, llmusage.CompletionTokens)
|
||||
userid, _ := strconv.ParseInt(c.GetString("user_id"), 10, 64)
|
||||
usage := model.Usage{
|
||||
UserID: userid,
|
||||
Model: llmusage.Model,
|
||||
Stream: chatreq.Stream,
|
||||
PromptTokens: llmusage.PromptTokens + llmusage.ToolsTokens,
|
||||
CompletionTokens: llmusage.CompletionTokens,
|
||||
TotalTokens: llmusage.TotalTokens,
|
||||
Cost: fmt.Sprintf("%f", cost),
|
||||
}
|
||||
h.SendUsage(&usage)
|
||||
|
||||
h.SendUsage(llmusage)
|
||||
defer fmt.Println("cost:", cost, "prompt_tokens:", llmusage.PromptTokens, "completion_tokens:", llmusage.CompletionTokens, "total_tokens:", llmusage.TotalTokens)
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user