Skip to content

Commit 1dd94c2

Browse files
committed
fix(aichat): concurrent map write
1 parent f693470 commit 1dd94c2

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/FloatTech/sqlite v1.7.2
1313
github.com/FloatTech/ttl v0.0.0-20250224045156-012b1463287d
1414
github.com/FloatTech/zbpctrl v1.7.1
15-
github.com/FloatTech/zbputils v1.7.2-0.20260128132210-62a44be0a2b5
15+
github.com/FloatTech/zbputils v1.7.2-0.20260131163621-618685d53380
1616
github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7
1717
github.com/RomiChan/websocket v1.4.3-0.20251002072000-d3eb41798438
1818
github.com/Tnze/go-mc v1.20.2

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ github.com/FloatTech/ttl v0.0.0-20250224045156-012b1463287d h1:mUQ/c3wXKsUGa4Sg9
1616
github.com/FloatTech/ttl v0.0.0-20250224045156-012b1463287d/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs=
1717
github.com/FloatTech/zbpctrl v1.7.1 h1:0yPEmCForhyMbnhTckmjDUFFDZgQp1RjO2bVF4ZVqOs=
1818
github.com/FloatTech/zbpctrl v1.7.1/go.mod h1:xmM4dSwHA02Gei3ogCRiG+RTrw/7Z69PfrN5NYf8BPE=
19-
github.com/FloatTech/zbputils v1.7.2-0.20260128132210-62a44be0a2b5 h1:EF3ZDWQUR+drINwMtEhDKAp1qPWC3iJqtigX2CjWqSo=
20-
github.com/FloatTech/zbputils v1.7.2-0.20260128132210-62a44be0a2b5/go.mod h1:W2kaR/A5oUtEb7DnveXCc0T374VjI+f3KmOWH9FE5vU=
19+
github.com/FloatTech/zbputils v1.7.2-0.20260131163621-618685d53380 h1:M/rYDnNv3zvF6ZOSzxlgYZdNOmmJPR6BrEBlJGknn2A=
20+
github.com/FloatTech/zbputils v1.7.2-0.20260131163621-618685d53380/go.mod h1:W2kaR/A5oUtEb7DnveXCc0T374VjI+f3KmOWH9FE5vU=
2121
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
2222
github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U=
2323
github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI=

plugin/aichat/main.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"math/rand"
77
"strings"
88

9+
"github.com/RomiChan/syncx"
910
"github.com/fumiama/deepinfra"
1011
goba "github.com/fumiama/go-onebot-agent"
1112
"github.com/sirupsen/logrus"
@@ -52,7 +53,8 @@ func init() {
5253
logrus.Warnln("ERROR: cannot get stor")
5354
return false
5455
}
55-
if _, ok := ctx.State[zero.StateKeyPrefixKeep+"_chat_ag_hooked__"]; !ok && !stor.NoAgent() {
56+
mp := ctx.State[control.StateKeySyncxState].(*syncx.Map[string, any])
57+
if _, ok := mp.Load(chat.StateKeyAgentHooked); !ok && !stor.NoAgent() {
5658
logrus.Infoln("[aichat] skip agent for ctx has not been hooked by agent")
5759
return false
5860
}
@@ -76,6 +78,7 @@ func init() {
7678
stor := ctx.State[zero.StateKeyPrefixKeep+"aichatcfg_stor__"].(chat.Storage)
7779
temperature := stor.Temp()
7880
topp, maxn := chat.AC.MParams()
81+
mp := ctx.State[control.StateKeySyncxState].(*syncx.Map[string, any])
7982

8083
logrus.Debugln("[aichat] agent mode test: noagent", stor.NoAgent(), "hasapi", chat.AC.AgentAPI != "", "hasmodel", chat.AC.AgentModelName != "")
8184
if !stor.NoAgent() && chat.AC.AgentAPI != "" && chat.AC.AgentModelName != "" && chat.AC.Key != "" {
@@ -120,7 +123,7 @@ func init() {
120123
break
121124
}
122125
hasresp = true
123-
ctx.State[zero.StateKeyPrefixKeep+"_chat_ag_triggered__"] = struct{}{}
126+
mp.Store(chat.StateKeyAgentTriggered, struct{}{})
124127
for _, req := range reqs {
125128
if req.Action == goba.SVM { // is a fake action
126129
/*if hassavemem {

0 commit comments

Comments
 (0)