kkyy
/
tgbot_misaka_5882f7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: message not cached correctly

This commit is contained in:
Yiyang Kang 2023-03-20 19:49:59 +08:00
parent dcb251d2ad
commit 08985f6936
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
assistant.go
View File

@ -31,6 +31,12 @@ func matchAssistantConversation(botUsr *tele.User, msg *tele.Message) []*tele.Me
} }
for _, msg := range thread { for _, msg := range thread {
for _, ent := range msg.Entities {
if ent.Type == tele.EntityCommand {
return nil
}
}
from := msg.Sender from := msg.Sender
chat := msg.Chat chat := msg.Chat
if from == nil || chat == nil { if from == nil || chat == nil {
@ -84,7 +90,7 @@ func matchAssistantConversation(botUsr *tele.User, msg *tele.Message) []*tele.Me
type assistantStreamedResponseCb func(text string, finished bool) (*tele.Message, error) type assistantStreamedResponseCb func(text string, finished bool) (*tele.Message, error)
func assistantStreamedResponse(request openai.ChatRequest, cb assistantStreamedResponseCb) error { func assistantStreamedResponse(request openai.ChatRequest, cb assistantStreamedResponseCb) error {
logger.Debugf("Openai chat request: %#+v", request) logger.Debugw("Openai chat request", "req", request)
ai := openai.NewClient(config.OpenAIApiKey) ai := openai.NewClient(config.OpenAIApiKey)
resp, err := ai.ChatCompletionStream(request) resp, err := ai.ChatCompletionStream(request)
@ -188,7 +194,7 @@ func handleAssistantConversation(c tele.Context, thread []*tele.Message) error {
role := openai.ChatRoleUser role := openai.ChatRoleUser
from := thread[l].Sender from := thread[l].Sender
if from != nil && from.ID == me.ID { if from != nil && from.ID == me.ID {
role = openai.ChatRoleSystem role = openai.ChatRoleAssistant
} }
convMsgs = append(convMsgs, openai.ChatMessage{ convMsgs = append(convMsgs, openai.ChatMessage{
@ -221,11 +227,12 @@ func handleAssistantConversation(c tele.Context, thread []*tele.Message) error {
var err error var err error
if replyMsg == nil { if replyMsg == nil {
<-typingNotifyCh <-typingNotifyCh
replyMsg, err = c.Bot().Reply(c.Message(), text, tele.Silent) replyMsg, err = c.Bot().Reply(lastMsg, text, tele.Silent)
} else { } else {
replyMsg, err = c.Bot().Edit(replyMsg, text) replyMsg, err = c.Bot().Edit(replyMsg, text)
} }
if finished && err == nil { if finished && err == nil {
replyMsg.ReplyTo = lastMsg // nasty bug
if err := cacheMessage(replyMsg); err != nil { if err := cacheMessage(replyMsg); err != nil {
logger.Warnw("failed to cache message", "error", err) logger.Warnw("failed to cache message", "error", err)
} }