From 325adf891192545bc22d367cf83598799e4e0242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sat, 22 Feb 2025 01:50:19 +0900 Subject: [PATCH] feat(aichat): more compatibility --- go.mod | 4 ++-- go.sum | 8 ++++---- plugin/aichat/main.go | 11 ++++++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index fb4efae8..c3092d14 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/FloatTech/sqlite v1.7.1 github.com/FloatTech/ttl v0.0.0-20240716161252-965925764562 github.com/FloatTech/zbpctrl v1.7.0 - github.com/FloatTech/zbputils v1.7.2-0.20250218141621-395d42447fcd + github.com/FloatTech/zbputils v1.7.2-0.20250221161059-26d1b9f9608b github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7 github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5 github.com/antchfx/htmlquery v1.3.4 @@ -21,7 +21,7 @@ require ( github.com/disintegration/imaging v1.6.2 github.com/fumiama/ahsai v0.1.0 github.com/fumiama/cron v1.3.0 - github.com/fumiama/deepinfra v0.0.0-20250214082557-71569e85d503 + github.com/fumiama/deepinfra v0.0.0-20250221162358-7c01751fe680 github.com/fumiama/go-base16384 v1.7.0 github.com/fumiama/go-registry v0.2.7 github.com/fumiama/gotracemoe v0.0.3 diff --git a/go.sum b/go.sum index 3498610f..95a61c82 100644 --- a/go.sum +++ b/go.sum @@ -17,8 +17,8 @@ github.com/FloatTech/ttl v0.0.0-20240716161252-965925764562 h1:snfw7FNFym1eNnLrQ github.com/FloatTech/ttl v0.0.0-20240716161252-965925764562/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs= github.com/FloatTech/zbpctrl v1.7.0 h1:Hxo6EIhJo+pHjcQP9QgIJgluaT1pHH99zkk3njqTNMo= github.com/FloatTech/zbpctrl v1.7.0/go.mod h1:xmM4dSwHA02Gei3ogCRiG+RTrw/7Z69PfrN5NYf8BPE= -github.com/FloatTech/zbputils v1.7.2-0.20250218141621-395d42447fcd h1:wjRlIqtCV1EQi46hmVaFEo5vgXqrN26b0xynoDtuYNY= -github.com/FloatTech/zbputils v1.7.2-0.20250218141621-395d42447fcd/go.mod h1:PIkhkUIfc5fQUGEi3IKewAD+bR1z0DS8rMwY6CyVLPY= +github.com/FloatTech/zbputils v1.7.2-0.20250221161059-26d1b9f9608b h1:LzqY2elIEv/jT3WJX8RyCQ/9CK3l2MCTWSayvg02jKc= +github.com/FloatTech/zbputils v1.7.2-0.20250221161059-26d1b9f9608b/go.mod h1:ghztbSfXzUBfQXpRa/Mm8x4G+g6FNtEX4enrsxGDM3Y= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7 h1:S/ferNiehVjNaBMNNBxUjLtVmP/YWD6Yh79RfPv4ehU= github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w= @@ -57,8 +57,8 @@ github.com/fumiama/ahsai v0.1.0 h1:LXD61Kaj6kJHa3AEGsLIfKNzcgaVxg7JB72OR4yNNZ4= github.com/fumiama/ahsai v0.1.0/go.mod h1:fFeNnqgo44i8FIaguK659aQryuZeFy+4klYLQu/rfdk= github.com/fumiama/cron v1.3.0 h1:ZWlwuexF+HQHl3cYytEE5HNwD99q+3vNZF1GrEiXCFo= github.com/fumiama/cron v1.3.0/go.mod h1:bz5Izvgi/xEUI8tlBN8BI2jr9Moo8N4or0KV8xXuPDY= -github.com/fumiama/deepinfra v0.0.0-20250214082557-71569e85d503 h1:ToU4IyLhSW0QXeBcshd9ARAA/bGt3PGTBcyxUzqaJwg= -github.com/fumiama/deepinfra v0.0.0-20250214082557-71569e85d503/go.mod h1:wW05PQSn8mo1mZIoa6LBUE+3xIBjkoONvnfPTV5ZOhY= +github.com/fumiama/deepinfra v0.0.0-20250221162358-7c01751fe680 h1:wLRr5CO/Fy7znrORi0NxxIAMdiG8ItA9pfQ7/7ip8r8= +github.com/fumiama/deepinfra v0.0.0-20250221162358-7c01751fe680/go.mod h1:wW05PQSn8mo1mZIoa6LBUE+3xIBjkoONvnfPTV5ZOhY= github.com/fumiama/go-base16384 v1.7.0 h1:6fep7XPQWxRlh4Hu+KsdH+6+YdUp+w6CwRXtMWSsXCA= github.com/fumiama/go-base16384 v1.7.0/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM= github.com/fumiama/go-registry v0.2.7 h1:tLEqgEpsiybQMqBv0dLHm5leia/z1DhajMupwnOHeNs= diff --git a/plugin/aichat/main.go b/plugin/aichat/main.go index c9ed38f6..a295edb3 100644 --- a/plugin/aichat/main.go +++ b/plugin/aichat/main.go @@ -10,6 +10,7 @@ import ( "unsafe" "github.com/fumiama/deepinfra" + "github.com/fumiama/deepinfra/model" "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" @@ -40,7 +41,7 @@ var ( ) var ( - modelname = "deepseek-ai/DeepSeek-R1" + modelname = model.ModelDeepDeek systemprompt = "你正在QQ群与用户聊天，你将收到不同的用户发送的一至多条消息，每条消息以【】包裹的用户名开始，随后是消息内容。按自己的心情简短思考后条理清晰地回复。" sepstr = "" noreplyat = false @@ -121,14 +122,18 @@ func init() { if temp > 100 { temp = 100 } - data, err := y.Request(chat.Ask(ctx, float32(temp)/100, modelname, systemprompt, sepstr)) + + data, err := y.Request(chat.Ask(model.NewOpenAI( + modelname, sepstr, + float32(temp)/100, 0.9, 4096, + ), gid, systemprompt)) if err != nil { logrus.Warnln("[niniqun] post err:", err) return } txt := strings.Trim(data, "\n 　") if len(txt) > 0 { - chat.Reply(ctx, txt) + chat.Reply(gid, txt) nick := zero.BotConfig.NickName[rand.Intn(len(zero.BotConfig.NickName))] txt = strings.ReplaceAll(txt, "{name}", ctx.CardOrNickName(ctx.Event.UserID)) txt = strings.ReplaceAll(txt, "{me}", nick)