Beta164

applogic/gensokyo.go

@@ -1214,7 +1214,7 @@ func processMessage(response string, conversationid string, newmesssage string,
 
 	for _, char := range response {
 		AppendRune(conversationid, char)
-		if utils.ContainsRune(punctuations, char, userinfo.GroupID, promptstr) {
+		if utils.ContainsRune(punctuations, char, userinfo.GroupID, userinfo.UserID, promptstr) {
 			// 达到标点符号，发送累积的整个消息
 			if GetMessageLength(conversationid) > 0 {
 				accumulatedMessage, _ := GetCurrentMessage(conversationid)

config/config.go

@@ -3484,3 +3484,37 @@ func GetModelInterceptor() bool {
 	}
 	return false
 }
+
+// 获取 MdPromptKeyboardAtGroupCmds
+func GetMdPromptKeyboardAtGroupCmds(options ...string) []string {
+	mu.Lock()
+	defer mu.Unlock()
+	return getMdPromptKeyboardAtGroupCmdsInternal(options...)
+}
+
+// 内部逻辑执行函数，不处理锁，可以安全地递归调用
+func getMdPromptKeyboardAtGroupCmdsInternal(options ...string) []string {
+	// 检查是否有参数传递进来，以及是否为空字符串
+	if len(options) == 0 || options[0] == "" {
+		if instance != nil {
+			return instance.Settings.MdPromptKeyboardAtGroupCmds
+		}
+		return nil // 如果实例或设置未定义，返回nil
+	}
+
+	// 使用传入的 basename
+	basename := options[0]
+	MdPromptKeyboardAtGroupCmdsInterface, err := prompt.GetSettingFromFilename(basename, "MdPromptKeyboardAtGroupCmds")
+	if err != nil {
+		log.Println("Error retrieving MdPromptKeyboardAtGroupCmds:", err)
+		return getMdPromptKeyboardAtGroupCmdsInternal() // 递归调用内部函数，不传递任何参数
+	}
+
+	envContents, ok := MdPromptKeyboardAtGroupCmdsInterface.([]string)
+	if !ok { // 检查是否断言失败
+		log.Println("Type assertion failed for MdPromptKeyboardAtGroupCmds, fetching default")
+		return getMdPromptKeyboardAtGroupCmdsInternal() // 递归调用内部函数，不传递任何参数
+	}
+
+	return envContents
+}

promptkb/promptkb.go

@@ -11,6 +11,7 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/hoshinonyaruko/gensokyo-llm/acnode"
 	"github.com/hoshinonyaruko/gensokyo-llm/config"
 	"github.com/hoshinonyaruko/gensokyo-llm/fmtf"
 )
@@ -48,6 +49,9 @@ func GetPromptKeyboardAI(msg string, promptstr string) []string {
 	// 按提示词区分的细化替换 这里主要不是为了安全和敏感词,而是细化效果,也就没有使用acnode提高效率
 	msg = ReplaceTextIn(msg, keyboardprompt)
 
+	//然后再过一层安全!
+	msg = acnode.CheckWordIN(msg)
+
 	requestBody, err := json.Marshal(map[string]interface{}{
 		"message":         msg,
 		"conversationId":  "",

structs/struct.go

@@ -258,37 +258,38 @@ type ReplacementNamePair struct {
 }
 
 type Settings struct {
-	AllApi                  bool                  `yaml:"allApi"`
-	SecretId                string                `yaml:"secretId"`
-	SecretKey               string                `yaml:"secretKey"`
-	Region                  string                `yaml:"region"`
-	UseSse                  int                   `yaml:"useSse"` // 0 false 1 false 2 true
-	Port                    int                   `yaml:"port"`
-	SelfPath                string                `yaml:"selfPath"`
-	HttpPath                string                `yaml:"path"`
-	HttpPaths               []string              `yaml:"paths"`
-	ConversationPath        string                `yaml:"conversationPath"`
-	Lotus                   string                `yaml:"lotus"`
-	PathToken               string                `yaml:"pathToken"`
-	SystemPrompt            []string              `yaml:"systemPrompt"`
-	IPWhiteList             []string              `yaml:"iPWhiteList"`
-	AccessKey               string                `yaml:"accessKey"`
-	ApiType                 int                   `yaml:"apiType"`
-	OneApi                  bool                  `yaml:"oneApi"`
-	OneApiPort              int                   `yaml:"oneApiPort"`
-	ModelInterceptor        bool                  `yaml:"modelInterceptor"`
-	Proxy                   string                `yaml:"proxy"`
-	UrlSendPics             bool                  `yaml:"urlSendPics"`             // 自己构造图床加速图片发送
-	MdPromptKeyboardAtGroup bool                  `yaml:"mdPromptKeyboardAtGroup"` // 群内使用md能力模拟PromptKeyboard
-	GroupHintWords          []string              `yaml:"groupHintWords"`
-	GroupHintChance         int                   `yaml:"groupHintChance"`
-	GroupContext            int                   `yaml:"groupContext"` // 0 false 1 false 2 true
-	ReplacementPairsIn      []ReplacementPair     `yaml:"replacementPairsIn"`
-	ReplacementPairsOut     []ReplacementPair     `yaml:"replacementPairsOut"`
-	GroupAddNicknameToQ     int                   `yaml:"groupAddNicknameToQ"`
-	GroupAddCardToQ         int                   `yaml:"groupAddCardToQ"`
-	SpecialNameToQ          []ReplacementNamePair `yaml:"specialNameToQ"`
-	NoEmoji                 int                   `yaml:"noEmoji"` // 0 false 1 false 2 true
+	AllApi                      bool                  `yaml:"allApi"`
+	SecretId                    string                `yaml:"secretId"`
+	SecretKey                   string                `yaml:"secretKey"`
+	Region                      string                `yaml:"region"`
+	UseSse                      int                   `yaml:"useSse"` // 0 false 1 false 2 true
+	Port                        int                   `yaml:"port"`
+	SelfPath                    string                `yaml:"selfPath"`
+	HttpPath                    string                `yaml:"path"`
+	HttpPaths                   []string              `yaml:"paths"`
+	ConversationPath            string                `yaml:"conversationPath"`
+	Lotus                       string                `yaml:"lotus"`
+	PathToken                   string                `yaml:"pathToken"`
+	SystemPrompt                []string              `yaml:"systemPrompt"`
+	IPWhiteList                 []string              `yaml:"iPWhiteList"`
+	AccessKey                   string                `yaml:"accessKey"`
+	ApiType                     int                   `yaml:"apiType"`
+	OneApi                      bool                  `yaml:"oneApi"`
+	OneApiPort                  int                   `yaml:"oneApiPort"`
+	ModelInterceptor            bool                  `yaml:"modelInterceptor"`
+	Proxy                       string                `yaml:"proxy"`
+	UrlSendPics                 bool                  `yaml:"urlSendPics"`             // 自己构造图床加速图片发送
+	MdPromptKeyboardAtGroup     bool                  `yaml:"mdPromptKeyboardAtGroup"` // 群内使用md能力模拟PromptKeyboard
+	MdPromptKeyboardAtGroupCmds []string              `yaml:"mdPromptKeyboardAtGroupCMDs"`
+	GroupHintWords              []string              `yaml:"groupHintWords"`
+	GroupHintChance             int                   `yaml:"groupHintChance"`
+	GroupContext                int                   `yaml:"groupContext"` // 0 false 1 false 2 true
+	ReplacementPairsIn          []ReplacementPair     `yaml:"replacementPairsIn"`
+	ReplacementPairsOut         []ReplacementPair     `yaml:"replacementPairsOut"`
+	GroupAddNicknameToQ         int                   `yaml:"groupAddNicknameToQ"`
+	GroupAddCardToQ             int                   `yaml:"groupAddCardToQ"`
+	SpecialNameToQ              []ReplacementNamePair `yaml:"specialNameToQ"`
+	NoEmoji                     int                   `yaml:"noEmoji"` // 0 false 1 false 2 true
 
 	HunyuanType             int     `yaml:"hunyuanType"`
 	MaxTokensHunyuan        int     `yaml:"maxTokensHunyuan"`

template/config_template.go

@@ -84,9 +84,8 @@ settings:
 
   AIPromptkeyboardPath : ""                     #调用另一个(可以是自身,规则,当使用中间件指定prompt参数时,配置位于prompts文件夹,其格式xxx-keyboard.yml,若未使用中间件,请在path中指定prompts参数,并将相应的xxx.yml放在prompts文件夹下)设置系统提示词的gsk-llm联合工作的/conversation地址,约定系统提示词需返回文本json数组(3个).
   useAIPromptkeyboard : false                   #使用ai生成气泡.
-  #systemPrompt: [
-  #  "你要扮演一个json生成器,根据我下一句提交的QA内容,推断我可能会继续问的问题,生成json数组格式的结果,如:输入Q我好累啊A要休息一下吗,返回[\"嗯，我想要休息\",\"我想喝杯咖啡\",\"你平时怎么休息呢\"]，返回需要是[\"\",\"\",\"\"]需要2-3个结果"
-  #]
+  mdPromptKeyboardAtGroup : false               #QQ智能体 群内mdPromptKeyboard
+  mdPromptKeyboardAtGroupCMDs : []               #QQ智能体 固定指令
 
   #语言过滤
   allowedLanguages : ["cmn"]                    #根据自身安全实力,酌情过滤,cmn代表中文,小写字母,[]空数组代表不限制. /gensokyo api 可传参数skip_lang_check=true让某些信息跳过检查

utils/utils.go

@@ -149,13 +149,13 @@ func GetKey(groupid int64, userid int64) string {
 }
 
 // 随机的分布发送
-func ContainsRune(slice []rune, value rune, groupid int64, promptstr string) bool {
+func ContainsRune(slice []rune, value rune, groupid int64, userid int64, promptstr string) bool {
 	var probability int
-	if groupid == 0 {
-		// 获取概率百分比
+	if groupid == userid {
+		// 获取私聊百分比
 		probability = config.GetSplitByPuntuations(promptstr)
 	} else {
-		// 获取概率百分比
+		// 获取群聊百分比
 		probability = config.GetSplitByPuntuationsGroup(promptstr)
 	}
 
@@ -387,8 +387,13 @@ func SendGroupMessageMdPromptKeyboard(groupID int64, userID int64, message strin
 	if !config.GetUseAIPromptkeyboard() {
 		promptkeyboard = config.GetPromptkeyboard()
 	} else {
-		fmtf.Printf("ai生成气泡:%v", "Q"+newmsg+"A"+response)
-		promptkeyboard = promptkb.GetPromptKeyboardAI("Q"+newmsg+"A"+response, promptstr)
+		mdCMDs := config.GetMdPromptKeyboardAtGroupCmds(promptstr)
+		if len(mdCMDs) > 0 {
+			promptkeyboard = mdCMDs
+		} else {
+			fmtf.Printf("ai生成气泡:%v", "Q"+newmsg+"A"+response)
+			promptkeyboard = promptkb.GetPromptKeyboardAI("Q"+newmsg+"A"+response, promptstr)
+		}
 	}
 
 	// 使用acnode.CheckWordOUT()过滤promptkeyboard中的每个字符串