Beta66

applogic/gensokyo.go

@@ -363,7 +363,7 @@ func (app *App) GensokyoHandler(w http.ResponseWriter, r *http.Request) {
 			requestmsg = acnode.CheckWordIN(requestmsg)
 		}
 
-		fmtf.Printf("实际请求conversation端点内容:%v\n", requestmsg)
+		fmtf.Printf("实际请求conversation端点内容:[%v]%v\n", message.UserID, requestmsg)
 
 		requestBody, err := json.Marshal(map[string]interface{}{
 			"message":         requestmsg,
@@ -442,6 +442,9 @@ func (app *App) GensokyoHandler(w http.ResponseWriter, r *http.Request) {
 									} else {
 										utils.SendGroupMessage(message.GroupID, message.UserID, newPart)
 									}
+								} else {
+									//流的最后一次是完整结束的
+									fmtf.Printf("A完整信息: %s(sse完整结束)\n", response)
 								}
 
 							} else if response != "" {

main.go

@@ -23,6 +23,7 @@ func main() {
 	testFlag := flag.Bool("test", false, "Run the test script, test.txt中的是虚拟信息,一行一条")
 	ymlPath := flag.String("yml", "", "指定config.yml的路径")
 	vFlag := flag.Bool("v", false, "Run ProcessSensitiveWordsV2")
+	tidyFlag := flag.Bool("tidy", false, "Run tidylog")
 	flag.Parse()
 
 	// 如果用户指定了-yml参数
@@ -176,6 +177,13 @@ func main() {
 		}
 	}
 
+	// 根据-tidy参数决定是否运行utils.Tidylogs()
+	if *tidyFlag {
+		utils.Tidylogs()
+		fmtf.Println("日志整理完毕")
+		return
+	}
+
 	http.HandleFunc("/gensokyo", app.GensokyoHandler)
 	port := config.GetPort()
 	portStr := fmtf.Sprintf(":%d", port)

utils/log.go

@@ -0,0 +1,125 @@
+package utils
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+func Tidylogs() {
+	logDir := "./log"
+	files, err := os.ReadDir(logDir)
+	if err != nil {
+		fmt.Println("Error reading log directory:", err)
+		return
+	}
+
+	for _, file := range files {
+		fileName := file.Name()
+		if filepath.Ext(fileName) == ".log" && !strings.Contains(fileName, "-tidy") {
+			processLogFile(filepath.Join(logDir, fileName))
+		}
+	}
+}
+
+func processLogFile(filePath string) {
+	outputFilePath := strings.TrimSuffix(filePath, filepath.Ext(filePath)) + "-tidy.log"
+
+	// Check if the tidy file already exists
+	if _, err := os.Stat(outputFilePath); err == nil {
+		fmt.Println("Skipping as tidy file already exists:", outputFilePath)
+		return // File exists, skip processing
+	} else if !os.IsNotExist(err) {
+		fmt.Println("Error checking output file:", err)
+		return // Some other error occurred when checking the file
+	}
+
+	// Read the entire file
+	data, err := os.ReadFile(filePath)
+	if err != nil {
+		fmt.Println("Error reading file:", err)
+		return
+	}
+
+	// Define newline sequences and placeholder
+	crlf := []byte{'\r', '\n'}
+	lf := []byte{'\n'}
+	placeholder := []byte{0xFF, 0xFE} // Safe placeholder for double newlines
+
+	// Handle different newline formats
+	doubleCRLF := append(crlf, crlf...)
+	doubleLF := append(lf, lf...)
+
+	// Replace double newlines with a placeholder
+	data = bytes.ReplaceAll(data, doubleCRLF, placeholder)
+	data = bytes.ReplaceAll(data, doubleLF, placeholder)
+
+	// Remove standalone newlines
+	data = bytes.ReplaceAll(data, crlf, []byte{})
+	data = bytes.ReplaceAll(data, lf, []byte{})
+
+	// Replace placeholders with a single newline (LF)
+	data = bytes.ReplaceAll(data, placeholder, lf)
+
+	outputFile, err := os.Create(outputFilePath)
+	if err != nil {
+		fmt.Println("Error creating output file:", err)
+		return
+	}
+	defer outputFile.Close()
+
+	// Scan through the modified content
+	scanner := bufio.NewScanner(bytes.NewReader(data))
+	for scanner.Scan() {
+		line := scanner.Text()
+		// Process each line based on specific patterns
+		if strings.Contains(line, "实际请求conversation端点内容:") {
+			formatAndWriteQuestionLine(line, outputFile)
+		}
+		if strings.Contains(line, "A完整信息:") {
+			formatAndWriteAnswerLine(line, outputFile)
+		}
+	}
+
+	if err := scanner.Err(); err != nil {
+		fmt.Println("Error scanning content:", err)
+	}
+}
+
+func formatAndWriteQuestionLine(line string, outputFile *os.File) {
+	prefix := "实际请求conversation端点内容:"
+	startIndex := strings.Index(line, prefix)
+	if startIndex != -1 {
+		// 找到前缀后，提取从这个位置开始直到行尾的内容
+		messageStart := startIndex + len(prefix)
+		message := line[messageStart:]                  // 从"实际请求conversation端点内容:"后的内容开始提取到行尾
+		message = strings.TrimSpace(message)            // 去除前后空格
+		formattedLine := fmt.Sprintf("Q：%s\n", message) // 格式化行
+
+		// 写入到输出文件
+		_, err := outputFile.WriteString(formattedLine)
+		if err != nil {
+			fmt.Println("Error writing to output file:", err)
+		}
+	}
+}
+
+func formatAndWriteAnswerLine(line string, outputFile *os.File) {
+	prefix := "A完整信息:"
+	startIndex := strings.Index(line, prefix) // 查找"A完整信息:"的开始位置
+	if startIndex != -1 {
+		// 找到"A完整信息:"后，提取从这个位置开始直到行尾的内容
+		messageStart := startIndex + len(prefix)
+		message := line[messageStart:]                                     // 从"A完整信息:"后的内容开始提取到行尾
+		formattedLine := fmt.Sprintf("A：%s\n", strings.TrimSpace(message)) // 格式化并去除前后空白字符
+
+		// 写入到输出文件
+		_, err := outputFile.WriteString(formattedLine)
+		if err != nil {
+			fmt.Println("Error writing to output file:", err)
+		}
+	}
+}

utils/utils.go

@@ -280,6 +280,7 @@ func SendPrivateMessageSSE(UserID int64, message structs.InterfaceBody) error {
 	if message.Content == "" {
 		message.Content = " "
 		fmtf.Printf("过滤空SendPrivateMessageSSE,可能是llm api只发了换行符.")
+		return nil
 	}
 
 	// 构造请求体，包括InterfaceBody