Beta134

applogic/app.go

@@ -288,6 +288,18 @@ func (app *App) updateUserContext(userID int64, parentMessageID string) error {
 	return nil
 }
 
+func (app *App) updateUserContextPro(userID int64, conversationID, parentMessageID string) error {
+	updateQuery := `
+    UPDATE user_context
+    SET conversation_id = ?, parent_message_id = ?
+    WHERE user_id = ?;`
+	_, err := app.DB.Exec(updateQuery, conversationID, parentMessageID, userID)
+	if err != nil {
+		return fmt.Errorf("error updating user context: %w", err)
+	}
+	return nil
+}
+
 func (app *App) getHistory(conversationID, parentMessageID string) ([]structs.Message, error) {
 	// 如果不开启上下文
 	if config.GetNoContext() {
@@ -327,3 +339,122 @@ func (app *App) getHistory(conversationID, parentMessageID string) ([]structs.Me
 	}
 	return history, nil
 }
+
+// 记忆表
+func (app *App) EnsureUserMemoriesTableExists() error {
+	createTableSQL := `
+    CREATE TABLE IF NOT EXISTS user_memories (
+        memory_id INTEGER PRIMARY KEY AUTOINCREMENT,
+        user_id INTEGER NOT NULL,
+        conversation_id TEXT NOT NULL,
+        parent_message_id TEXT,
+        conversation_title TEXT NOT NULL
+    );`
+
+	_, err := app.DB.Exec(createTableSQL)
+	if err != nil {
+		return fmt.Errorf("error creating user_memories table: %w", err)
+	}
+
+	createUserIDIndexSQL := `CREATE INDEX IF NOT EXISTS idx_user_memories_user_id ON user_memories(user_id);`
+	_, err = app.DB.Exec(createUserIDIndexSQL)
+	if err != nil {
+		return fmt.Errorf("error creating index on user_memories(user_id): %w", err)
+	}
+
+	createConvDetailsIndexSQL := `CREATE INDEX IF NOT EXISTS idx_user_memories_conversation_details ON user_memories(conversation_id, parent_message_id);`
+	_, err = app.DB.Exec(createConvDetailsIndexSQL)
+	if err != nil {
+		return fmt.Errorf("error creating index on user_memories(conversation_id, parent_message_id): %w", err)
+	}
+
+	return nil
+}
+
+func (app *App) AddUserMemory(userID int64, conversationID, parentMessageID, conversationTitle string) error {
+	// 插入新的记忆
+	insertMemorySQL := `
+    INSERT INTO user_memories (user_id, conversation_id, parent_message_id, conversation_title)
+    VALUES (?, ?, ?, ?);`
+	_, err := app.DB.Exec(insertMemorySQL, userID, conversationID, parentMessageID, conversationTitle)
+	if err != nil {
+		return fmt.Errorf("error inserting new memory: %w", err)
+	}
+
+	// 检查并保持记忆数量不超过10条
+	return app.ensureMemoryLimit(userID)
+}
+
+func (app *App) updateConversationTitle(userID int64, conversationID, parentMessageID, newTitle string) error {
+	// 定义SQL更新语句
+	updateQuery := `
+    UPDATE user_memories
+    SET conversation_title = ?
+    WHERE user_id = ? AND conversation_id = ? AND parent_message_id = ?;`
+
+	// 执行SQL更新操作
+	_, err := app.DB.Exec(updateQuery, newTitle, userID, conversationID, parentMessageID)
+	if err != nil {
+		return fmt.Errorf("error updating conversation title: %w", err)
+	}
+
+	return nil
+}
+
+func (app *App) ensureMemoryLimit(userID int64) error {
+	// 查询当前记忆总数
+	countQuerySQL := `SELECT COUNT(*) FROM user_memories WHERE user_id = ?;`
+	var count int
+	row := app.DB.QueryRow(countQuerySQL, userID)
+	err := row.Scan(&count)
+	if err != nil {
+		return fmt.Errorf("error counting memories: %w", err)
+	}
+
+	// 如果记忆超过5条，则删除最旧的记忆
+	if count > 5 {
+		deleteOldestMemorySQL := `
+        DELETE FROM user_memories
+        WHERE memory_id IN (
+            SELECT memory_id FROM user_memories
+            WHERE user_id = ?
+            ORDER BY memory_id ASC
+            LIMIT ?
+        );`
+		_, err := app.DB.Exec(deleteOldestMemorySQL, userID, count-5)
+		if err != nil {
+			return fmt.Errorf("error deleting old memories: %w", err)
+		}
+	}
+
+	return nil
+}
+
+func (app *App) GetUserMemories(userID int64) ([]structs.Memory, error) {
+	// 定义查询SQL，获取所有相关的记忆
+	querySQL := `
+    SELECT conversation_id, parent_message_id, conversation_title
+    FROM user_memories
+    WHERE user_id = ?;
+    `
+	rows, err := app.DB.Query(querySQL, userID)
+	if err != nil {
+		return nil, fmt.Errorf("error querying user memories: %w", err)
+	}
+	defer rows.Close() // 确保关闭rows以释放数据库资源
+
+	var memories []structs.Memory
+	for rows.Next() {
+		var m structs.Memory
+		if err := rows.Scan(&m.ConversationID, &m.ParentMessageID, &m.ConversationTitle); err != nil {
+			return nil, fmt.Errorf("error scanning memory: %w", err)
+		}
+		memories = append(memories, m)
+	}
+
+	if err := rows.Err(); err != nil {
+		return nil, fmt.Errorf("error during rows iteration: %w", err)
+	}
+
+	return memories, nil
+}

applogic/chatgpt.go

@@ -515,7 +515,7 @@ func truncateHistoryGpt(history []structs.Message, prompt string, promptstr stri
 	for _, msg := range history {
 		tokenCount += len(msg.Text)
 	}
-	fmt.Printf("测试:%v\n", history)
+	//fmt.Printf("测试:%v\n", history)
 
 	if tokenCount >= MAX_TOKENS {
 		// 第一步：从开始逐个移除消息，直到满足令牌数量限制

applogic/gensokyo.go

@@ -136,7 +136,7 @@ func (app *App) GensokyoHandler(w http.ResponseWriter, r *http.Request) {
 
 	// 判断是否是群聊 然后判断触发词
 	if message.RealMessageType != "group_private" && message.MessageType != "private" {
-		if !checkMessageForHints(message.RawMessage) {
+		if !checkMessageForHints(utils.RemoveBracketsContent(message.RawMessage)) {
 			w.WriteHeader(http.StatusOK)
 			w.Write([]byte("Group message not hint words."))
 			return
@@ -497,6 +497,70 @@ func (app *App) GensokyoHandler(w http.ResponseWriter, r *http.Request) {
 		// 使用map映射conversationID和uid gid的关系
 		StoreUserInfo(conversationID, message.UserID, message.GroupID, message.RealMessageType, message.MessageType)
 
+		// 保存记忆
+		memoryCommand := config.GetMemoryCommand()
+
+		// 检查checkResetCommand是否在memoryCommand列表中
+		ismemoryCommand := false
+		for _, command := range memoryCommand {
+			if checkResetCommand == command {
+				ismemoryCommand = true
+				break
+			}
+		}
+
+		// 处理保存记忆
+		if ismemoryCommand {
+			app.handleSaveMemory(message, conversationID, parentMessageID)
+			return
+		}
+
+		// 记忆列表
+		memoryLoadCommand := config.GetMemoryLoadCommand()
+
+		// 检查checkResetCommand是否在memoryLoadCommand列表中或以其为前缀
+		ismemoryLoadCommand := false
+		isPrefixedMemoryLoadCommand := false // 新增变量用于检测前缀匹配
+		for _, command := range memoryLoadCommand {
+			if checkResetCommand == command {
+				ismemoryLoadCommand = true
+				break
+			}
+			if strings.HasPrefix(checkResetCommand, command) { // 检查前缀
+				isPrefixedMemoryLoadCommand = true
+			}
+		}
+
+		// 处理记忆列表
+		if ismemoryLoadCommand {
+			app.handleMemoryList(message)
+			return
+		}
+
+		// 新增处理载入记忆的逻辑
+		if isPrefixedMemoryLoadCommand {
+			app.handleLoadMemory(message, checkResetCommand)
+			return
+		}
+
+		// 新对话
+		newConversationCommand := config.GetNewConversationCommand()
+
+		// 检查checkResetCommand是否在newConversationCommand列表中
+		isnewConversationCommand := false
+		for _, command := range newConversationCommand {
+			if checkResetCommand == command {
+				isnewConversationCommand = true
+				break
+			}
+		}
+
+		// 处理新对话
+		if isnewConversationCommand {
+			app.handleNewConversation(message, conversationID, parentMessageID)
+			return
+		}
+
 		//每句话清空上一句话的messageBuilder
 		ClearMessage(conversationID)
 		fmtf.Printf("conversationID: %s,parentMessageID%s\n", conversationID, parentMessageID)
@@ -822,15 +886,36 @@ func (app *App) GensokyoHandler(w http.ResponseWriter, r *http.Request) {
 
 						// 添加第四个气泡
 						if config.GetNo4Promptkeyboard() {
+							// 合并所有命令到一个数组
+							var allCommands []string
+
+							// 获取并添加RestoreResponses
 							RestoreResponses := config.GetRestoreCommand()
-							if len(RestoreResponses) > 0 {
-								selectedRestoreResponse := RestoreResponses[rand.Intn(len(RestoreResponses))]
+							allCommands = append(allCommands, RestoreResponses...)
+
+							// 获取并添加memoryLoadCommand
+							memoryLoadCommand := config.GetMemoryLoadCommand()
+							allCommands = append(allCommands, memoryLoadCommand...)
+
+							// 获取并添加memoryCommand
+							memoryCommand := config.GetMemoryCommand()
+							allCommands = append(allCommands, memoryCommand...)
+
+							// 获取并添加newConversationCommand
+							newConversationCommand := config.GetNewConversationCommand()
+							allCommands = append(allCommands, newConversationCommand...)
+
+							// 检查合并后的命令数组长度
+							if len(allCommands) > 0 {
+								// 随机选择一个命令
+								selectedCommand := allCommands[rand.Intn(len(allCommands))]
+
+								// 在promptkeyboard的末尾添加选中的命令
 								if len(promptkeyboard) > 0 {
-									// 在promptkeyboard的末尾添加selectedRestoreResponse
-									promptkeyboard = append(promptkeyboard, selectedRestoreResponse)
+									promptkeyboard = append(promptkeyboard, selectedCommand)
 								} else {
-									// 如果promptkeyboard为空，我们也应当初始化它，并添加选中的恢复命令
-									promptkeyboard = []string{selectedRestoreResponse}
+									// 如果promptkeyboard为空，我们也应当初始化它，并添加选中的命令
+									promptkeyboard = []string{selectedCommand}
 								}
 							}
 						}