ScuroNeko/YaeMikoBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
ScuroNeko
2026-01-19 21:56:41 +03:00
parent ad6e52890b
commit 65acbab94e
9 changed files with 88 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
plugins/rp.go
View File

@@ -144,14 +144,17 @@ func generate(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) {
red.RPGetChatPrompt(db, ctx.FromID, waifuId),
),
}
afterHistory := ai.Message{
Role: "system",
Content: ai.FormatPrompt(preset.PostHistory, waifu.Name, ctx.Msg.From.FirstName),
}
index := red.RPGetIndex(db, ctx.FromID, waifuId)
history, err := mdb.GetChatHistory(db, chatId, index)
history, err := mdb.GetChatHistory(db, chatId)
if err != nil {
ctx.Error(err)
return
}
messages := make([]ai.Message, 0)
messages := []ai.Message{beforeHistory}
for _, m := range history {
messages = append(messages, ai.Message{
Role: m.Role,
@@ -159,26 +162,21 @@ func generate(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) {
})
}
//os.Getenv("PAWAN_KEY")
userMessage := strings.Join(ctx.Args, " ")
messages = append(messages, ai.Message{
Role: "system", Content: ai.FormatPrompt(preset.PostHistory, waifu.Name, ctx.Msg.From.FirstName),
}, ai.Message{
Role: "user", Content: userMessage,
messages = append(messages, afterHistory, ai.Message{
Role: "user",
Content: userMessage,
})
if index == 0 {
index += 1
}
err = mdb.UpdateChatHistory(db, chatId, "user", userMessage, index)
err = mdb.UpdateChatHistory(db, chatId, "user", userMessage)
if err != nil {
ctx.Error(err)
return
}
m := ctx.Answer("Генерация запущена...")
m := ctx.Answer("Генерация запущена...")
api := ai.NewOpenAIAPI(ai.GPTBaseUrl, "", "deepseek-ai/deepseek-v3.1-terminus")
res, err := api.CreateCompletion(ai.CreateCompletionReq{
Messages: append([]ai.Message{beforeHistory}, messages...),
Messages: messages,
Verbosity: "low",
Temperature: 1.0,
})
@@ -186,15 +184,13 @@ func generate(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) {
ctx.Error(err)
return
}
response := make([]string, 0)
for _, choice := range res.Choices {
m := choice.Message
messages = append(messages, m)
response = append(response, m.Content)
index += 1
err = mdb.UpdateChatHistory(db, chatId, m.Role, m.Content, index)
if len(res.Choices) == 0 {
m.Edit("Не удалось сгенерировать ответ. Попробуйте снова позже")
return
}
err = red.RPSetIndex(db, ctx.FromID, waifuId, index)
agentAnswer := res.Choices[0].Message
err = mdb.UpdateChatHistory(db, chatId, agentAnswer.Role, agentAnswer.Content)
if err != nil {
ctx.Error(err)
}
@@ -205,19 +201,19 @@ func generate(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) {
return
}
m.Delete()
ctx.Answer(laniakea.EscapeMarkdown(strings.Join(response, "\n")))
ctx.Answer(laniakea.EscapeMarkdown(agentAnswer.Content))
counter := red.RPGetCounter(db, ctx.FromID, waifuId) + 1
if counter == 5 {
if counter == 8 {
m := ctx.Answer("Запущено сжатие чата.")
history, err = mdb.GetChatHistory(db, chatId, index)
history, err = mdb.GetChatHistory(db, chatId)
if err != nil {
ctx.Error(err)
return
}
messages = make([]ai.Message, 0)
for _, m := range history {
messages = make([]ai.Message, 0)
for _, m := range history[:len(history)-2] {
messages = append(messages, ai.Message{
Role: m.Role,
Content: m.Message,
@@ -227,25 +223,35 @@ func generate(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) {
if err != nil {
ctx.Error(err)
}
if len(res.Choices) == 0 {
m.Edit("Не удалось сжать диалог")
return
}
compressedHistory := res.Choices[0].Message.Content
m.Edit("\\[DEBUG] Compressed History:\n" + laniakea.EscapeMarkdown(compressedHistory))
err = mdb.UpdateChatHistory(db, chatId, "assistant", compressedHistory)
if err != nil {
ctx.Error(err)
return
}
err = mdb.UpdateChatHistory(db, chatId, agentAnswer.Role, agentAnswer.Content)
if err != nil {
ctx.Error(err)
return
}
counter = 0
chatId = uuid.New().String()
err := red.RPSetChatId(db, ctx.FromID, waifuId, chatId)
if err != nil {
ctx.Error(err)
return
}
compressedHistory := res.Choices[0].Message.Content
m.Edit("\\[DEBUG] Compressed History:\n" + laniakea.EscapeMarkdown(compressedHistory))
err = mdb.UpdateChatHistory(db, chatId, "assistant", compressedHistory, 0)
err = red.RPSetCounter(db, ctx.FromID, waifuId, 0)
if err != nil {
ctx.Error(err)
return
}
} else {
err = red.RPSetCounter(db, ctx.FromID, waifuId, counter)
if err != nil {
ctx.Error(err)
}
}
err = red.RPSetCounter(db, ctx.FromID, waifuId, counter)
if err != nil {
ctx.Error(err)
}
}