Beta78

applogic/chatgpt.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"io"
 	"net/http"
+	"net/url"
 	"strings"
 	"sync"
 
@@ -135,7 +136,7 @@ func (app *App) ChatHandlerChatgpt(w http.ResponseWriter, r *http.Request) {
 		}
 
 		// 截断历史信息
-		userhistory = truncateHistoryGpt(userhistory, msg.Text)
+		userhistory = truncateHistoryGpt(userhistory, msg.Text, promptstr)
 
 		// 注意追加的顺序，确保问题在系统提示词之后
 		// 使用...操作符来展开userhistory切片并追加到history切片
@@ -146,8 +147,8 @@ func (app *App) ChatHandlerChatgpt(w http.ResponseWriter, r *http.Request) {
 
 	// 构建请求到ChatGPT API
 	model := config.GetGptModel(promptstr)
-	apiURL := config.GetGptApiPath()
-	token := config.GetGptToken()
+	apiURL := config.GetGptApiPath(promptstr)
+	token := config.GetGptToken(promptstr)
 
 	// 构造消息历史和当前消息
 	messages := []map[string]interface{}{}
@@ -173,20 +174,52 @@ func (app *App) ChatHandlerChatgpt(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// 构建请求体
-	requestBody := map[string]interface{}{
-		"model":           model,
-		"messages":        messages,
-		"safe_mode":       safemode,
-		"stream":          useSSe,
-		"moderation":      gptModeration,
-		"moderation_stop": gptModerationStop,
+	var requestBody map[string]interface{}
+
+	if config.GetStandardGptApi() {
+		requestBody = map[string]interface{}{
+			"model":    model,
+			"messages": messages,
+			"stream":   useSSe,
+		}
+	} else {
+		requestBody = map[string]interface{}{
+			"model":           model,
+			"messages":        messages,
+			"safe_mode":       safemode,
+			"stream":          useSSe,
+			"moderation":      gptModeration,
+			"moderation_stop": gptModerationStop,
+		}
 	}
 
 	fmtf.Printf("chatgpt requestBody :%v", requestBody)
 	requestBodyJSON, _ := json.Marshal(requestBody)
 
-	// 准备HTTP请求
+	// 获取代理服务器地址
+	proxyURL := config.GetProxy(promptstr)
+	if err != nil {
+		http.Error(w, fmtf.Sprintf("Failed to get proxy: %v", err), http.StatusInternalServerError)
+		return
+	}
+
 	client := &http.Client{}
+
+	// 检查是否有有效的代理地址
+	if proxyURL != "" {
+		proxy, err := url.Parse(proxyURL)
+		if err != nil {
+			http.Error(w, fmtf.Sprintf("Failed to parse proxy URL: %v", err), http.StatusInternalServerError)
+			return
+		}
+
+		// 配置客户端使用代理
+		client.Transport = &http.Transport{
+			Proxy: http.ProxyURL(proxy),
+		}
+	}
+
+	// 创建HTTP请求
 	req, err := http.NewRequest("POST", apiURL, bytes.NewBuffer(requestBodyJSON))
 	if err != nil {
 		http.Error(w, fmtf.Sprintf("Failed to create request: %v", err), http.StatusInternalServerError)
@@ -438,8 +471,8 @@ func (app *App) ChatHandlerChatgpt(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func truncateHistoryGpt(history []structs.Message, prompt string) []structs.Message {
-	MAX_TOKENS := config.GetMaxTokenGpt()
+func truncateHistoryGpt(history []structs.Message, prompt string, promptstr string) []structs.Message {
+	MAX_TOKENS := config.GetMaxTokenGpt(promptstr)
 
 	tokenCount := len(prompt)
 	for _, msg := range history {

applogic/gensokyo.go

@@ -223,7 +223,7 @@ func (app *App) GensokyoHandler(w http.ResponseWriter, r *http.Request) {
 		}
 
 		// 如果使用向量缓存 或者使用 向量安全词
-		if config.GetUseCache() || config.GetVectorSensitiveFilter() {
+		if config.GetUseCache(promptstr) || config.GetVectorSensitiveFilter() {
 			if config.GetPrintHanming() {
 				fmtf.Printf("计算向量的文本: %v", newmsg)
 			}
@@ -515,7 +515,7 @@ func (app *App) GensokyoHandler(w http.ResponseWriter, r *http.Request) {
 								}
 							}
 							//清空之前加入缓存
-							// 缓存省钱部分
+							// 缓存省钱部分 这里默认不被覆盖,如果主配置开了缓存,始终缓存.
 							if config.GetUseCache() {
 								if response != "" {
 									fmtf.Printf("缓存了Q:%v,A:%v,向量ID:%v", newmsg, response, lastSelectedVectorID)
@@ -556,7 +556,12 @@ func (app *App) GensokyoHandler(w http.ResponseWriter, r *http.Request) {
 							promptkeyboard = config.GetPromptkeyboard()
 						} else {
 							fmtf.Printf("ai生成气泡:%v", "Q"+newmsg+"A"+response)
-							promptkeyboard = GetPromptKeyboardAI("Q" + newmsg + "A" + response)
+							promptkeyboard = GetPromptKeyboardAI("Q"+newmsg+"A"+response, promptstr)
+						}
+
+						// 使用acnode.CheckWordOUT()过滤promptkeyboard中的每个字符串
+						for i, item := range promptkeyboard {
+							promptkeyboard[i] = acnode.CheckWordOUT(item)
 						}
 
 						// 使用acnode.CheckWordOUT()过滤promptkeyboard中的每个字符串

applogic/promptkeyboard.go

@@ -6,9 +6,11 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"net/url"
 	"strings"
 
 	"github.com/hoshinonyaruko/gensokyo-llm/config"
+	"github.com/hoshinonyaruko/gensokyo-llm/fmtf"
 )
 
 // ResponseDataPromptKeyboard 用于解析外层响应
@@ -19,20 +21,35 @@ type ResponseDataPromptKeyboard struct {
 }
 
 // 你要扮演一个json生成器,根据我下一句提交的QA内容,推断我可能会继续问的问题,生成json数组格式的结果,如:输入Q我好累啊A要休息一下吗,返回["嗯，我想要休息","我想喝杯咖啡","你平时怎么休息呢"]，返回需要是["","",""]需要2-3个结果
-func GetPromptKeyboardAI(msg string) []string {
-	url := config.GetAIPromptkeyboardPath()
+func GetPromptKeyboardAI(msg string, promptstr string) []string {
+	baseurl := config.GetAIPromptkeyboardPath()
+	// 使用net/url包来构建和编码URL
+	urlParams := url.Values{}
+	if promptstr != "" {
+		urlParams.Add("prompt", promptstr)
+	}
+
+	// 将查询参数编码后附加到基本URL上
+	fullURL := baseurl
+	if len(urlParams) > 0 {
+		fullURL += "?" + urlParams.Encode()
+	}
+
+	fmtf.Printf("Generated PromptKeyboard URL:%v\n", fullURL)
+
 	requestBody, err := json.Marshal(map[string]interface{}{
 		"message":         msg,
 		"conversationId":  "",
 		"parentMessageId": "",
 		"user_id":         "",
 	})
+
 	if err != nil {
 		fmt.Printf("Error marshalling request: %v\n", err)
 		return config.GetPromptkeyboard()
 	}
 
-	resp, err := http.Post(url, "application/json", bytes.NewBuffer(requestBody))
+	resp, err := http.Post(fullURL, "application/json", bytes.NewBuffer(requestBody))
 	if err != nil {
 		fmt.Printf("Error sending request: %v\n", err)
 		return config.GetPromptkeyboard()

applogic/rwkv.go

@@ -134,7 +134,7 @@ func (app *App) ChatHandlerRwkv(w http.ResponseWriter, r *http.Request) {
 		}
 
 		// 截断历史信息
-		userhistory = truncateHistoryGpt(userhistory, msg.Text)
+		userhistory = truncateHistoryRwkv(userhistory, msg.Text, promptstr)
 
 		// 注意追加的顺序，确保问题在系统提示词之后
 		// 使用...操作符来展开userhistory切片并追加到history切片
@@ -439,3 +439,49 @@ func (app *App) ChatHandlerRwkv(w http.ResponseWriter, r *http.Request) {
 	}
 
 }
+
+func truncateHistoryRwkv(history []structs.Message, prompt string, promptstr string) []structs.Message {
+	MAX_TOKENS := config.GetRwkvMaxTokens(promptstr)
+
+	tokenCount := len(prompt)
+	for _, msg := range history {
+		tokenCount += len(msg.Text)
+	}
+
+	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:]
+			}
+		}
+	}
+
+	// 第二步：检查并移除包含空文本的QA对
+	for i := 0; i < len(history)-1; i++ { // 使用len(history)-1是因为我们要检查成对的消息
+		q := history[i]
+		a := history[i+1]
+
+		// 检查Q和A是否成对，且A的角色应为assistant，Q的角色为user，避免删除非QA对的消息
+		if q.Role == "user" && a.Role == "assistant" && (len(q.Text) == 0 || len(a.Text) == 0) {
+			fmtf.Println("closeai-找到了空的对话: ", q, a)
+			// 移除这对QA
+			history = append(history[:i], history[i+2:]...)
+			i-- // 因为删除了元素，调整索引以正确检查下一个元素
+		}
+	}
+
+	// 确保以user结尾，如果不是则尝试移除直到满足条件
+	if len(history) > 0 && history[len(history)-1].Role != "user" {
+		for len(history) > 0 && history[len(history)-1].Role != "user" {
+			history = history[:len(history)-1]
+		}
+	}
+
+	return history
+}