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

chore: optimize variable name

Browse Source
This commit is contained in:
RockYang
2024-01-19 11:26:22 +08:00
parent d7c002890c
commit c9cd082855
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,7 +267,7 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
req.Temperature = h.App.ChatConfig.XunFei.Temperature
req.MaxTokens = h.App.ChatConfig.XunFei.MaxTokens
break
case types.Ali:
case types.QWen:
req.Input = map[string]interface{}{"messages": []map[string]string{{"role": "system", "content": "You are a helpful assistant."}, {"role": "user", "content": prompt}}}
req.Parameters = map[string]interface{}{}
break
@@ -344,8 +344,8 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
return h.sendBaiduMessage(chatCtx, req, userVo, ctx, session, role, prompt, ws)
case types.XunFei:
return h.sendXunFeiMessage(chatCtx, req, userVo, ctx, session, role, prompt, ws)
case types.Ali:
return h.sendQwenMessage(chatCtx, req, userVo, ctx, session, role, prompt, ws)
case types.QWen:
return h.sendQWenMessage(chatCtx, req, userVo, ctx, session, role, prompt, ws)
}
utils.ReplyChunkMessage(ws, types.WsMessage{
Type: types.WsMiddle,
@@ -439,7 +439,7 @@ func (h *ChatHandler) doRequest(ctx context.Context, req types.ApiRequest, platf
case types.Baidu:
apiURL = strings.Replace(apiKey.ApiURL, "{model}", req.Model, 1)
break
case types.Ali:
case types.QWen:
apiURL = apiKey.ApiURL
req.Messages = nil
break
@@ -506,7 +506,7 @@ func (h *ChatHandler) doRequest(ctx context.Context, req types.ApiRequest, platf
case types.OpenAI:
request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", apiKey.Value))
break
case types.Ali:
case types.QWen:
request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", apiKey.Value))
request.Header.Set("X-DashScope-SSE", "enable")
break

13
api/handler/chatimpl/qwen_handler.go
View File

@@ -16,7 +16,7 @@ import (
"unicode/utf8"
)
type qwenResp struct {
type qWenResp struct {
Output struct {
FinishReason string `json:"finish_reason"`
Text string `json:"text"`
@@ -30,7 +30,7 @@ type qwenResp struct {
}
// 通义千问消息发送实现
func (h *ChatHandler) sendQwenMessage(
func (h *ChatHandler) sendQWenMessage(
chatCtx []interface{},
req types.ApiRequest,
userVo vo.User,
@@ -85,14 +85,15 @@ func (h *ChatHandler) sendQwenMessage(
content = "\n"
}
var resp qwenResp
var resp qWenResp
err := utils.JsonDecode(content, &resp)
if err != nil {
logger.Error("error with parse data line: ", err)
utils.ReplyMessage(ws, fmt.Sprintf("**解析数据行失败：%s**", err))
break
}
if len(contents) == 0 {
if len(contents) == 0 { // 发送消息头
utils.ReplyChunkMessage(ws, types.WsMessage{Type: types.WsStart})
}
@@ -101,12 +102,12 @@ func (h *ChatHandler) sendQwenMessage(
//每次循环结束后，lastText 会更新为当前的完整文本，以便于下一次循环进行比较。
currentText := resp.Output.Text
if currentText != lastText {
// 找出新增的文本部分并发送
// 提取新增文本
newText = strings.Replace(currentText, lastText, "", 1)
utils.ReplyChunkMessage(ws, types.WsMessage{
Type: types.WsMiddle,
Content: utils.InterfaceToString(newText),
}) // 发送新增的文本部分到客户端
})
lastText = currentText // 更新 lastText
}
contents = append(contents, newText)