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

opt:update mj api version, wrapper chat api error message as a constant

Browse Source
This commit is contained in:
RockYang 2023-11-06 15:03:56 +08:00
parent 22ae7dd1f3
commit daaca822ac
7 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
# 更新日志
## v3.1.7
1. Bug修复：修复 MidJourney API 参数版本更新导致调用失败的 Bug
2. 功能优化：将聊天报错信息定义为统一常量，方便修改
## v3.1.7
1. 功能新增：支持文心4.0 AI 模型
2. 功能新增：可以在管理后台为用户绑定指定的 AI 模型，如只给某个用户使用 GPT-4 模型

6
api/handler/chatimpl/azure_handler.go
View File

@ -44,7 +44,7 @@ func (h *ChatHandler) sendAzureMessage(
}
utils.ReplyMessage(ws, ErrorMsg)
utils.ReplyMessage(ws, "![](/images/wx.png)")
utils.ReplyMessage(ws, ErrImg)
return err
} else {
defer response.Body.Close()
@ -71,7 +71,7 @@ func (h *ChatHandler) sendAzureMessage(
if err != nil || len(responseBody.Choices) == 0 { // 数据解析出错
logger.Error(err, line)
utils.ReplyMessage(ws, ErrorMsg)
utils.ReplyMessage(ws, "![](/images/wx.png)")
utils.ReplyMessage(ws, ErrImg)
break
}
@ -129,7 +129,7 @@ func (h *ChatHandler) sendAzureMessage(
// for creating image, check if the user's img_calls > 0
if functionName == types.FuncMidJourney && userVo.ImgCalls <= 0 {
utils.ReplyMessage(ws, "**当前用户剩余绘图次数已用尽，请扫描下面二维码联系管理员！**")
utils.ReplyMessage(ws, "![](/images/wx.png)")
utils.ReplyMessage(ws, ErrImg)
} else {
f := h.App.Functions[functionName]
if functionName == types.FuncMidJourney {

2
api/handler/chatimpl/baidu_handler.go
View File

@ -61,7 +61,7 @@ func (h *ChatHandler) sendBaiduMessage(
}
utils.ReplyMessage(ws, ErrorMsg)
utils.ReplyMessage(ws, "![](/images/wx.png)")
utils.ReplyMessage(ws, ErrImg)
return err
} else {
defer response.Body.Close()

9
api/handler/chatimpl/chat_handler.go
View File

@ -27,6 +27,7 @@ import (
)
const ErrorMsg = "抱歉，AI 助手开小差了，请稍后再试。"
const ErrImg = "![](/images/wx.png)"
var logger = logger2.GetLogger()
@ -182,19 +183,19 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
if userVo.Status == false {
utils.ReplyMessage(ws, "您的账号已经被禁用，如果疑问，请联系管理员！")
utils.ReplyMessage(ws, "![](/images/wx.png)")
utils.ReplyMessage(ws, ErrImg)
return nil
}
if userVo.Calls <= 0 && userVo.ChatConfig.ApiKeys[session.Model.Platform] == "" {
utils.ReplyMessage(ws, "您的对话次数已经用尽，请联系管理员或者点击左下角菜单加入众筹获得100次对话！")
utils.ReplyMessage(ws, "![](/images/wx.png)")
utils.ReplyMessage(ws, ErrImg)
return nil
}
if userVo.ExpiredTime > 0 && userVo.ExpiredTime <= time.Now().Unix() {
utils.ReplyMessage(ws, "您的账号已经过期，请联系管理员！")
utils.ReplyMessage(ws, "![](/images/wx.png)")
utils.ReplyMessage(ws, ErrImg)
return nil
}
var req = types.ApiRequest{
@ -232,7 +233,7 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
req.MaxTokens = h.App.ChatConfig.XunFei.MaxTokens
default:
utils.ReplyMessage(ws, "不支持的平台："+session.Model.Platform+"，请联系管理员！")
utils.ReplyMessage(ws, "![](/images/wx.png)")
utils.ReplyMessage(ws, ErrImg)
return nil
}

2
api/handler/chatimpl/chatglm_handler.go
View File

@ -45,7 +45,7 @@ func (h *ChatHandler) sendChatGLMMessage(
}
utils.ReplyMessage(ws, ErrorMsg)
utils.ReplyMessage(ws, "![](/images/wx.png)")
utils.ReplyMessage(ws, ErrImg)
return err
} else {
defer response.Body.Close()

6
api/handler/chatimpl/openai_handler.go
View File

@ -43,7 +43,7 @@ func (h *ChatHandler) sendOpenAiMessage(
}
utils.ReplyMessage(ws, ErrorMsg)
utils.ReplyMessage(ws, "![](/images/wx.png)")
utils.ReplyMessage(ws, ErrImg)
return err
} else {
defer response.Body.Close()
@ -70,7 +70,7 @@ func (h *ChatHandler) sendOpenAiMessage(
if err != nil || len(responseBody.Choices) == 0 { // 数据解析出错
logger.Error(err, line)
utils.ReplyMessage(ws, ErrorMsg)
utils.ReplyMessage(ws, "![](/images/wx.png)")
utils.ReplyMessage(ws, ErrImg)
break
}
@ -128,7 +128,7 @@ func (h *ChatHandler) sendOpenAiMessage(
// for creating image, check if the user's img_calls > 0
if functionName == types.FuncMidJourney && userVo.ImgCalls <= 0 {
utils.ReplyMessage(ws, "**当前用户剩余绘图次数已用尽，请扫描下面二维码联系管理员！**")
utils.ReplyMessage(ws, "![](/images/wx.png)")
utils.ReplyMessage(ws, ErrImg)
} else {
f := h.App.Functions[functionName]
if functionName == types.FuncMidJourney {

2
api/service/mj/client.go
View File

@ -31,7 +31,7 @@ func (c *Client) Imagine(prompt string) error {
ChannelID: c.config.ChanelId,
SessionID: SessionID,
Data: map[string]any{
"version": "1118961510123847772",
"version": "1166847114203123795",
"id": "938956540159881230",
"name": "imagine",
"type": "1",