diff --git a/llmapi/main.go b/llmapi/main.go index 78a8c1f..a3e5a2d 100644 --- a/llmapi/main.go +++ b/llmapi/main.go @@ -14,6 +14,7 @@ import ( "os" "strconv" "strings" + "sync" "time" ) @@ -22,6 +23,7 @@ var ( repo = repos.RP SignalChanMap = make(map[string]chan bool) DoneChanMap = make(map[string]chan bool) + mapMutex = &sync.RWMutex{} // got prompt: control character (\\u0000-\\u001F) found while parsing a string at line 4 column 0 // MimePrompt = `we are playing alias;\nyou are a mime (player who gives a clue of one noun word and number of cards you expect them to open) of the %s team (people who would guess by your clue want open the %s cards);\nplease return your clue, number of cards to open and what words you mean them to find using that clue in json like:\n{\n\"clue\": \"one-word-noun\",\n\"number\": \"number-from-0-to-9\",\n\"words_I_mean_my_team_to_open\": [\"this\", \"that\", ...]\n}\nthe team who openes all their cards first wins.\nplease return json only.\nunopen Blue cards left: %d;\nunopen Red cards left: %d;\nhere is the game info in json:\n%s` // GuesserPrompt = `we are playing alias;\nyou are to guess words of the %s team (you want open %s cards) by given clue and a number of meant guesses;\nplease return your guesses and words that could be meant by the clue, but you do not wish to open yet, in json like:\n{\n\"guesses\": [\"word1\", \"word2\", ...],\n\"could_be\": [\"this\", \"that\", ...]\n}\nthe team who openes all their cards first wins.\nplease return json only.\nunopen Blue cards left: %d;\nunopen Red cards left: %d;\nhere is the cards (and other info), you need to choose revealed==false words:\n%s` @@ -202,7 +204,11 @@ func (b *Bot) BotMove() { } if botName := room.WhichBotToMove(); botName != "" { b.log.Debug("notifying bot", "name", botName) - SignalChanMap[botName] <- true + mapMutex.RLock() + if sigChan, ok := SignalChanMap[botName]; ok { + sigChan <- true + } + mapMutex.RUnlock() b.log.Debug("after sending the signal", "name", botName) } broker.Notifier.Notifier <- broker.NotificationEvent{ @@ -327,11 +333,21 @@ func (b *Bot) BotMove() { // StartBot func (b *Bot) StartBot() { + mapMutex.Lock() + signalChan, sOk := SignalChanMap[b.BotName] + doneChan, dOk := DoneChanMap[b.BotName] + mapMutex.Unlock() + + if !sOk || !dOk { + b.log.Error("bot channels not found in map", "bot-name", b.BotName) + return + } + for { select { - case <-SignalChanMap[b.BotName]: + case <-signalChan: b.BotMove() - case <-DoneChanMap[b.BotName]: + case <-doneChan: b.log.Debug("got done signal", "bot-name", b.BotName) return } @@ -339,14 +355,21 @@ func (b *Bot) StartBot() { } func RemoveBot(botName string, room *models.Room) error { + mapMutex.Lock() // channels - DoneChanMap[botName] <- true - close(DoneChanMap[botName]) - close(SignalChanMap[botName]) + if doneChan, ok := DoneChanMap[botName]; ok { + doneChan <- true + close(doneChan) + } + if signalChan, ok := SignalChanMap[botName]; ok { + close(signalChan) + } // maps - delete(room.BotMap, botName) delete(DoneChanMap, botName) delete(SignalChanMap, botName) + mapMutex.Unlock() + + delete(room.BotMap, botName) // remove role from room room.RemovePlayer(botName) slog.Debug("removing bot player", "name", botName, "room_id", room.ID, "room", room) @@ -358,6 +381,7 @@ func RemoveBot(botName string, room *models.Room) error { } func RemoveBotNoRoom(botName string) error { + mapMutex.Lock() // channels dc, ok := DoneChanMap[botName] if ok { @@ -371,6 +395,7 @@ func RemoveBotNoRoom(botName string) error { // maps delete(DoneChanMap, botName) delete(SignalChanMap, botName) + mapMutex.Unlock() // remove role from room return repo.PlayerDelete(context.Background(), botName) } @@ -449,8 +474,10 @@ func NewBot(role, team, name, roomID string, cfg *config.Config, recovery bool) } bot.log.Debug("before adding to ch map", "name", bot.BotName) // buffered channel to send to it in the same goroutine + mapMutex.Lock() SignalChanMap[bot.BotName] = make(chan bool, 1) DoneChanMap[bot.BotName] = make(chan bool, 1) + mapMutex.Unlock() bot.log.Debug("after adding to ch map", "name", bot.BotName) go bot.StartBot() // run bot routine return bot, nil @@ -544,7 +571,7 @@ func (b *Bot) BuildPrompt(room *models.Room) string { // return "" // } // Escape the JSON string for inclusion in another JSON field - // escapedData := strings.ReplaceAll(string(data), `"`, `\"`) + // escapedData := strings.ReplaceAll(string(data), `"`, `\\"`) if b.Role == models.UserRoleMime { // return fmt.Sprintf(MimeSimplePrompt, b.Team, b.Team, room.BlueCounter, room.RedCounter, escapedData) // return fmt.Sprintf(MimePrompt, b.Team, b.Team, room.BlueCounter, room.RedCounter, escapedData) @@ -620,3 +647,4 @@ func (b *Bot) CallLLM(prompt string) ([]byte, error) { // This line should not be reached because each error path returns in the loop. return nil, errors.New("unknown error in retry loop") } +