Beta59

.gitignore

@@ -1,7 +1,8 @@
 # specific
-config.yml
+*.yml
 *.sqlite
 *.txt
+*.7z
 
 # Go specific
 *.exe

applogic/app.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 
+	"github.com/hoshinonyaruko/gensokyo-llm/config"
 	"github.com/hoshinonyaruko/gensokyo-llm/fmtf"
 	"github.com/hoshinonyaruko/gensokyo-llm/hunyuan"
 	"github.com/hoshinonyaruko/gensokyo-llm/structs"
@@ -262,6 +263,10 @@ func (app *App) updateUserContext(userID int64, parentMessageID string) error {
 }
 
 func (app *App) getHistory(conversationID, parentMessageID string) ([]structs.Message, error) {
+	// 如果不开启上下文
+	if config.GetNoContext() {
+		return nil, nil
+	}
 	var history []structs.Message
 
 	// SQL 查询获取历史信息

applogic/chatgpt.go

@@ -410,19 +410,17 @@ func truncateHistoryGpt(history []structs.Message, prompt string) []structs.Mess
 		tokenCount += len(msg.Text)
 	}
 
-	if tokenCount <= MAX_TOKENS {
-		return history
-	}
-
-	// 第一步：从开始逐个移除消息，直到满足令牌数量限制
-	for tokenCount > MAX_TOKENS && len(history) > 0 {
-		tokenCount -= len(history[0].Text)
-		history = history[1:]
-
-		// 确保移除后，历史记录仍然以user消息结尾
-		if len(history) > 0 && history[0].Role == "assistant" {
+	if tokenCount >= MAX_TOKENS {
+		// 第一步：从开始逐个移除消息，直到满足令牌数量限制
+		for tokenCount > MAX_TOKENS && len(history) > 0 {
 			tokenCount -= len(history[0].Text)
 			history = history[1:]
+
+			// 确保移除后，历史记录仍然以user消息结尾
+			if len(history) > 0 && history[0].Role == "assistant" {
+				tokenCount -= len(history[0].Text)
+				history = history[1:]
+			}
 		}
 	}
 

applogic/embeddings.go

@@ -112,7 +112,7 @@ func (app *App) CalculateTextEmbeddingHunyuan(text string) ([]float64, error) {
 	}
 
 	if config.GetPrintVector() {
-		fmt.Printf("混元返回的向量:%v\n", embedding)
+		fmtf.Printf("混元返回的向量:%v\n", embedding)
 	}
 
 	return embedding, nil
@@ -229,9 +229,16 @@ func (app *App) insertVectorData(text string, vector []float64) (int64, error) {
 	norm := math.Sqrt(sum)
 	n := config.GetCacheN()
 	k := config.GetCacheK()
-	l := int(norm * k)
+	// 先进行四舍五入，然后转换为int64
+	l := int64(math.Round(norm * k))
 	groupID := l % n
 
+	if config.GetPrintHanming() {
+		fmtf.Printf("(norm*k): %v\n", norm*k)
+		fmtf.Printf("(norm*k) mod n ==== (%v) mod %v\n", l, n)
+		fmtf.Printf("groupid : %v\n", groupID)
+	}
+
 	result, err := app.DB.Exec("INSERT INTO vector_data (text, vector, norm, group_id) VALUES (?, ?, ?, ?)", text, binaryVector, norm, groupID)
 	if err != nil {
 		return 0, err
@@ -246,7 +253,7 @@ func (app *App) insertVectorData(text string, vector []float64) (int64, error) {
 }
 
 // searchSimilarText函数根据汉明距离搜索数据库中与给定向量相似的文本
-func (app *App) searchSimilarText(vector []float64, threshold int, targetGroupID int) ([]TextDistance, []int, error) {
+func (app *App) searchSimilarText(vector []float64, threshold int, targetGroupID int64) ([]TextDistance, []int, error) {
 	binaryVector := vectorToBinaryConcurrent(vector) // 二值化查询向量
 	var results []TextDistance
 	var ids []int
@@ -289,17 +296,19 @@ func (app *App) searchSimilarText(vector []float64, threshold int, targetGroupID
 	return results, sortedIds, nil
 }
 
-func calculateGroupID(vector []float64) int {
+func calculateGroupID(vector []float64) int64 {
 	var sum float64
 	for _, v := range vector {
 		sum += v * v
 	}
 	norm := math.Sqrt(sum)
 	k := config.GetCacheK()
 	n := config.GetCacheN()
-	l := int(norm * k)
+	// 先进行四舍五入，然后转换为int64
+	l := int64(math.Round(norm * k))
 	groupid := l % n // 通过范数计算出一个整数，并将其模n来分配到一个组
 	if config.GetPrintHanming() {
+		fmtf.Printf("(norm*k): %v\n", norm*k)
 		fmtf.Printf("(norm*k) mod n ==== (%v) mod %v\n", l, n)
 		fmtf.Printf("groupid : %v\n", groupid)
 	}

applogic/ernie.go

@@ -364,19 +364,17 @@ func truncateHistoryErnie(history []structs.Message, prompt string) []structs.Me
 		tokenCount += len(msg.Text)
 	}
 
-	if tokenCount <= MAX_TOKENS {
-		return history
-	}
-
-	// 第一步：逐个移除消息直到满足令牌数量限制
-	for tokenCount > MAX_TOKENS && len(history) > 0 {
-		tokenCount -= len(history[0].Text)
-		history = history[1:]
-
-		// 确保移除后，历史记录仍然以user消息结尾
-		if len(history) > 0 && history[0].Role == "assistant" {
+	if tokenCount >= MAX_TOKENS {
+		// 第一步：逐个移除消息直到满足令牌数量限制
+		for tokenCount > MAX_TOKENS && len(history) > 0 {
 			tokenCount -= len(history[0].Text)
 			history = history[1:]
+
+			// 确保移除后，历史记录仍然以user消息结尾
+			if len(history) > 0 && history[0].Role == "assistant" {
+				tokenCount -= len(history[0].Text)
+				history = history[1:]
+			}
 		}
 	}
 
@@ -391,9 +389,9 @@ func truncateHistoryErnie(history []structs.Message, prompt string) []structs.Me
 		}
 	}
 
-	// 第三步：确保以user结尾
-	if len(history) > 0 && history[len(history)-1].Role == "assistant" {
-		for len(history) > 0 && history[len(history)-1].Role != "user" {
+	// 第三步：确保以assistant结尾
+	if len(history) > 0 && history[len(history)-1].Role == "user" {
+		for len(history) > 0 && history[len(history)-1].Role != "assistant" {
 			history = history[:len(history)-1]
 		}
 	}