xinyin025/geekai
1
0
Fork 0
mirror of https://github.com/yangjian102621/geekai.git synced 2025-11-08 18:23:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
RockYang
2025-02-11 09:53:41 +08:00
parent cebf8497a4 cded4bdcc7
commit fa6bb5e46a
7 changed files with 74 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/handler/chat_handler.go
View File

@@ -274,17 +274,17 @@ func (h *ChatHandler) Tokens(c *gin.Context) {
}
// 如果没有传入 text 字段，则说明是获取当前 reply 总的 token 消耗（带上下文）
if data.Text == "" && data.ChatId != "" {
var item model.ChatMessage
userId, _ := c.Get(types.LoginUserID)
res := h.DB.Where("user_id = ?", userId).Where("chat_id = ?", data.ChatId).Last(&item)
if res.Error != nil {
resp.ERROR(c, res.Error.Error())
return
}
resp.SUCCESS(c, item.Tokens)
return
}
//if data.Text == "" && data.ChatId != "" {
// var item model.ChatMessage
// userId, _ := c.Get(types.LoginUserID)
// res := h.DB.Where("user_id = ?", userId).Where("chat_id = ?", data.ChatId).Last(&item)
// if res.Error != nil {
// resp.ERROR(c, res.Error.Error())
// return
// }
// resp.SUCCESS(c, item.Tokens)
// return
//}
tokens, err := utils.CalcTokens(data.Text, data.Model)
if err != nil {