Skip to content

Commit

Permalink
Merge pull request #92 from whatwewant/feat/add-tip-and-timeout-messa…
Browse files Browse the repository at this point in the history
…ge-when-ask

feat: add tip and timeout message when ask
  • Loading branch information
whatwewant authored Feb 6, 2024
2 parents 9429eb6 + bc9e9bb commit fce74d3
Showing 1 changed file with 55 additions and 3 deletions.
58 changes: 55 additions & 3 deletions commands/message.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,61 @@ func CreateMessageCommand(
}

go func() {
var err error

logger.Debugf("%s 问 ChatGPT:%s", user.User.Name, question)
msgType, content, err := mc.
NewContent().
Post(&mc.ContentTypePost{
ZhCN: &mc.ContentTypePostBody{
Content: [][]mc.ContentTypePostBodyItem{
{
{
Tag: "text",
UnEscape: true,
Text: "正在思考中,请稍等...",
},
},
},
},
}).
Build()
if err != nil {
logger.Errorf("failed to build content: %v", err)
return
}
if err := reply(string(content), msgType); err != nil {
logger.Errorf("failed to reply: %v", err)
return
}

var err error
// too long to answer
answerTimeout := time.AfterFunc(3*time.Minute, func() {
msgType, content, err := mc.
NewContent().
Post(&mc.ContentTypePost{
ZhCN: &mc.ContentTypePostBody{
Content: [][]mc.ContentTypePostBodyItem{
{
{
Tag: "text",
UnEscape: true,
Text: "(思考有点慢,可能是网络或者模型等原因,请稍等 ...)",
},
},
},
},
}).
Build()
if err != nil {
logger.Errorf("failed to build content: %v", err)
return
}
if err := reply(string(content), msgType); err != nil {
logger.Errorf("failed to reply: %v", err)
return
}
})

conversation, err := chatgptClient.GetOrCreateConversation(request.ChatID(), &chatgpt.ConversationConfig{
MaxMessages: 50,
Expand All @@ -98,7 +150,6 @@ func CreateMessageCommand(

var answer []byte
err = retry.Retry(func() error {

answer, err = conversation.Ask([]byte(question), &chatgpt.ConversationAskConfig{
ID: request.Event.Message.MessageID,
User: user.User.Name,
Expand Down Expand Up @@ -128,6 +179,7 @@ func CreateMessageCommand(
}
return
}
answerTimeout.Stop()

logger.Debugf("ChatGPT 答 %s:%s", user.User.Name, answer)

Expand All @@ -136,7 +188,7 @@ func CreateMessageCommand(
// responseMessage = fmt.Sprintf("%s\n-------------\n%s", question, answer)
// }

msgType, content, err := mc.
msgType, content, err = mc.
NewContent().
Post(&mc.ContentTypePost{
ZhCN: &mc.ContentTypePostBody{
Expand Down

0 comments on commit fce74d3

Please sign in to comment.