Update main.go

main.go

@@ -131,51 +131,6 @@ func authMiddleware(next http.HandlerFunc) http.HandlerFunc {
 	}
 }
 
-// 修改消息转换函数，将所有消息合并为一条
-func transformMessages(messages []Message) []struct {
-	Role    string `json:"role"`
-	Content []struct {
-		Type string `json:"type"`
-		Text string `json:"text"`
-	} `json:"content"`
-} {
-	var allContent []string
-
-	// 遍历所有消息，添加角色前缀
-	for _, msg := range messages[:len(messages)-1] {
-		rolePrefix := strings.Title(msg.Role) // System/User/Assistant
-		allContent = append(allContent, fmt.Sprintf("%s: %s", rolePrefix, msg.Content))
-	}
-
-	// 获取最后一条消息
-	lastMsg := messages[len(messages)-1]
-	rolePrefix := strings.Title(lastMsg.Role)
-	allContent = append(allContent, fmt.Sprintf("%s: %s", rolePrefix, lastMsg.Content))
-
-	// 将所有内容合并为一条消息
-	return []struct {
-		Role    string `json:"role"`
-		Content []struct {
-			Type string `json:"type"`
-			Text string `json:"text"`
-		} `json:"content"`
-	}{
-		{
-			Role: "user",
-			Content: []struct {
-				Type string `json:"type"`
-				Text string `json:"text"`
-			}{
-				{
-					Type: "text",
-					Text: strings.Join(allContent, "\n\n"), // 使用双换行符分隔不同消息
-				},
-			},
-		},
-	}
-}
-
-// 修改 forwardToSider 函数中的请求构造部分
 func forwardToSider(w http.ResponseWriter, r *http.Request) {
 	fmt.Printf("收到新请求: %s %s\n", r.Method, r.URL.Path)
 
@@ -211,19 +166,24 @@ func forwardToSider(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// 合并所有消息为一个字符串
-	var allMessages []string
-	for _, msg := range userReq.Messages {
-		rolePrefix := strings.Title(msg.Role) // System/User/Assistant
-		allMessages = append(allMessages, fmt.Sprintf("%s: %s", rolePrefix, msg.Content))
+	// 获取全部用户消息内容，并合并为一条带多角色前缀的消息
+	mergedPrompt := "你好" // 默认提示词，当消息数组为空时使用
+	if len(userReq.Messages) > 0 {
+		var builder strings.Builder
+		// 依次遍历所有历史消息
+		for i, msg := range userReq.Messages {
+			// 例如：[user] 请求内容 或者 [assistant] 回复内容
+			builder.WriteString(fmt.Sprintf("[%s] %s", msg.Role, msg.Content))
+			if i < len(userReq.Messages)-1 {
+				builder.WriteString("\n")
+			}
+		}
+		mergedPrompt = builder.String()
 	}
+	fmt.Printf("处理的mergedPrompt: %s\n", mergedPrompt)
 
-	// 将所有消息合并为一个prompt
-	prompt := strings.Join(allMessages, "\n\n")
-	fmt.Printf("处理的prompt: %s\n", prompt)
-
-	// 添加prompt到配置中
-	defaultConfig["prompt"] = prompt
+	// 添加prompt到配置中（使用合并后的所有消息）
+	defaultConfig["prompt"] = mergedPrompt
 
 	// 添加model到配置中
 	if userReq.Model != "" {
@@ -237,34 +197,8 @@ func forwardToSider(w http.ResponseWriter, r *http.Request) {
 
 	fmt.Printf("使用的模型: %s\n", defaultConfig["model"])
 
-	// 构造 Sider 请求
-	siderReq := struct {
-		AppName    string `json:"app_name"`
-		AppVersion string `json:"app_version"`
-		TzName     string `json:"tz_name"`
-		Cid        string `json:"cid"`
-		Search     bool   `json:"search"`
-		AutoSearch bool   `json:"auto_search"`
-		Model      string `json:"model"`
-		Stream     bool   `json:"stream"`
-		Messages   []struct {
-			Role    string `json:"role"`
-			Content []struct {
-				Type string `json:"type"`
-				Text string `json:"text"`
-			} `json:"content"`
-		} `json:"messages"`
-	}{
-		AppName:    "ChitChat_Edge_Ext",
-		AppVersion: "4.40.0",
-		TzName:     "Asia/Shanghai",
-		Model:      userReq.Model,
-		Stream:     userReq.Stream,
-		Messages:   transformMessages(userReq.Messages),
-	}
-
-	// 转换为JSON
-	finalBody, err := json.Marshal(siderReq)
+	// 转换回JSON
+	finalBody, err := json.Marshal(defaultConfig)
 	if err != nil {
 		fmt.Printf("生成最终请求体失败: %v\n", err)
 		http.Error(w, "处理请求失败", http.StatusInternalServerError)
@@ -316,160 +250,84 @@ func forwardToSider(w http.ResponseWriter, r *http.Request) {
 
 	fmt.Printf("Sider响应状态码: %d\n", resp.StatusCode)
 
-	// 读取响应体并保存副本
-	bodyBytes, err := io.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Printf("读取响应体失败: %v\n", err)
-		http.Error(w, "读取响应失败", http.StatusInternalServerError)
-		return
-	}
-
-	// 打印完整的响应信息
-	fmt.Printf("Sider响应体: %s\n", string(bodyBytes))
-
-	// 如果是错误状态码，打印更多调试信息
-	if resp.StatusCode != http.StatusOK {
-		fmt.Printf("导致%d错误的请求体: %s\n", resp.StatusCode, string(finalBody))
-		fmt.Printf("请求Headers: %+v\n", req.Header)
-		http.Error(w, fmt.Sprintf("Sider服务返回错误: %d - %s", resp.StatusCode, string(bodyBytes)), resp.StatusCode)
-		return
-	}
-
-	// 重新创建一个新的 Reader，供后续处理使用
-	resp.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
-
-	// 根据 stream 参数选择响应模式
-	if userReq.Stream {
-		handleStreamResponse(w, resp, userReq.Model)
-	} else {
-		handleNonStreamResponse(w, resp, userReq.Model)
-	}
-}
-
-func indexHandler(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "text/html; charset=utf-8")
-	fmt.Fprintf(w, "🚀服务已启动！")
-}
-
-type Model struct {
-	ID         string   `json:"id"`
-	Object     string   `json:"object"`
-	OwnedBy    string   `json:"owned_by"`
-	Permission []string `json:"permission"`
-}
-
-type ModelListResponse struct {
-	Object string  `json:"object"`
-	Data   []Model `json:"data"`
-}
-
-func listModelsHandler(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-	w.Header().Set("Access-Control-Allow-Methods", "GET, OPTIONS")
-	w.Header().Set("Access-Control-Allow-Headers", "Content-Type, Authorization")
-
-	if r.Method == "OPTIONS" {
-		w.WriteHeader(http.StatusOK)
-		return
-	}
-	authMiddleware(func(w http.ResponseWriter, r *http.Request) {
-		models := []Model{
-			{ID: "gpt-4o", Object: "model", OwnedBy: "sider", Permission: []string{"read"}},
-			{ID: "claude-3.5-sonnet", Object: "model", OwnedBy: "sider", Permission: []string{"read"}},
-			{ID: "deepseek-reasoner", Object: "model", OwnedBy: "sider", Permission: []string{"read"}},
-			{ID: "o3-mini", Object: "model", OwnedBy: "sider", Permission: []string{"read"}},
-			{ID: "o1", Object: "model", OwnedBy: "sider", Permission: []string{"read"}},
-			{ID: "llama-3.1-405b", Object: "model", OwnedBy: "sider", Permission: []string{"read"}},
-			{ID: "gemini-2.0-pro", Object: "model", OwnedBy: "sider", Permission: []string{"read"}},
-		}
-
-		response := ModelListResponse{
-			Object: "list",
-			Data:   models,
-		}
-
+	if !userReq.Stream {
+		// 非流式响应
 		w.Header().Set("Content-Type", "application/json")
-		json.NewEncoder(w).Encode(response)
-	})(w, r)
-}
-
-// 修改 handleNonStreamResponse 函数
-func handleNonStreamResponse(w http.ResponseWriter, resp *http.Response, model string) {
-	w.Header().Set("Content-Type", "application/json")
-	fullResponse := ""
-	reader := bufio.NewReader(resp.Body)
+		fullResponse := ""
+		reader := bufio.NewReader(resp.Body)
 
-	for {
-		line, err := reader.ReadString('\n')
-		if err != nil {
-			if err == io.EOF {
-				break
+		for {
+			line, err := reader.ReadString('\n')
+			if err != nil {
+				if err == io.EOF {
+					break
+				}
+				http.Error(w, "读取响应失败", http.StatusInternalServerError)
+				return
 			}
-			http.Error(w, "读取响应失败", http.StatusInternalServerError)
-			return
-		}
 
-		line = strings.TrimSpace(line)
-		line = strings.TrimPrefix(line, "data:")
+			line = strings.TrimSpace(line)
+			line = strings.TrimPrefix(line, "data:")
 
-		if line == "" || line == "[DONE]" {
-			continue
-		}
+			if line == "" || line == "[DONE]" {
+				continue
+			}
 
-		var siderResp SiderResponse
-		if err := json.Unmarshal([]byte(line), &siderResp); err != nil {
-			continue
-		}
+			var siderResp SiderResponse
+			if err := json.Unmarshal([]byte(line), &siderResp); err != nil {
+				continue
+			}
 
-		fullResponse += siderResp.Data.Text
-	}
+			fullResponse += siderResp.Data.Text
+		}
 
-	openAIResp := OpenAIResponse{
-		ID:      "chatcmpl-" + time.Now().Format("20060102150405"),
-		Object:  "chat.completion",
-		Created: time.Now().Unix(),
-		Model:   model, // 使用传入的模型名称
-		Choices: []struct {
-			Message struct {
-				Role    string `json:"role"`
-				Content string `json:"content"`
-			} `json:"message"`
-			FinishReason string `json:"finish_reason"`
-			Index        int    `json:"index"`
-		}{
-			{
-				Message: struct {
+		openAIResp := OpenAIResponse{
+			ID:      "chatcmpl-" + time.Now().Format("20060102150405"),
+			Object:  "chat.completion",
+			Created: time.Now().Unix(),
+			Model:   userReq.Model,
+			Choices: []struct {
+				Message struct {
 					Role    string `json:"role"`
 					Content string `json:"content"`
-				}{
-					Role:    "assistant",
-					Content: fullResponse,
+				} `json:"message"`
+				FinishReason string `json:"finish_reason"`
+				Index        int    `json:"index"`
+			}{
+				{
+					Message: struct {
+						Role    string `json:"role"`
+						Content string `json:"content"`
+					}{
+						Role:    "assistant",
+						Content: fullResponse,
+					},
+					FinishReason: "stop",
+					Index:        0,
 				},
-				FinishReason: "stop",
-				Index:        0,
 			},
-		},
-		Usage: struct {
-			PromptTokens     int `json:"prompt_tokens"`
-			CompletionTokens int `json:"completion_tokens"`
-			TotalTokens      int `json:"total_tokens"`
-		}{
-			PromptTokens:     0,
-			CompletionTokens: len(fullResponse),
-			TotalTokens:      len(fullResponse),
-		},
-	}
+			Usage: struct {
+				PromptTokens     int `json:"prompt_tokens"`
+				CompletionTokens int `json:"completion_tokens"`
+				TotalTokens      int `json:"total_tokens"`
+			}{
+				PromptTokens:     len(mergedPrompt),
+				CompletionTokens: len(fullResponse),
+				TotalTokens:      len(mergedPrompt) + len(fullResponse),
+			},
+		}
 
-	json.NewEncoder(w).Encode(openAIResp)
-}
+		json.NewEncoder(w).Encode(openAIResp)
+		return
+	}
 
-// 修改 handleStreamResponse 函数
-func handleStreamResponse(w http.ResponseWriter, resp *http.Response, model string) {
+	// 流式响应
 	w.Header().Set("Content-Type", "text/event-stream")
 	w.Header().Set("Cache-Control", "no-cache")
 	w.Header().Set("Connection", "keep-alive")
 	w.WriteHeader(http.StatusOK)
 
+	// 使用bufio.Reader来读取流式响应
 	reader := bufio.NewReader(resp.Body)
 
 	for {
@@ -483,13 +341,16 @@ func handleStreamResponse(w http.ResponseWriter, resp *http.Response, model stri
 			return
 		}
 
+		// 去除前缀和空白字符
 		line = strings.TrimSpace(line)
 		line = strings.TrimPrefix(line, "data:")
 
+		// 跳过空行
 		if line == "" {
 			continue
 		}
 
+		// 如果是[DONE]，发送OpenAI格式的[DONE]
 		if line == "[DONE]" {
 			_, err = w.Write([]byte("data: [DONE]\n\n"))
 			if err != nil {
@@ -499,17 +360,19 @@ func handleStreamResponse(w http.ResponseWriter, resp *http.Response, model stri
 			break
 		}
 
+		// 解析Sider响应
 		var siderResp SiderResponse
 		if err := json.Unmarshal([]byte(line), &siderResp); err != nil {
 			fmt.Printf("解析Sider响应失败: %v\n", err)
 			continue
 		}
 
+		// 转换为OpenAI格式
 		openAIResp := OpenAIStreamResponse{
-			ID:      "chatcmpl-" + time.Now().Format("20060102150405"),
+			ID:      "chatcmpl-" + siderResp.Data.ChatModel,
 			Object:  "chat.completion.chunk",
 			Created: time.Now().Unix(),
-			Model:   model, // 使用传入的模型名称
+			Model:   siderResp.Data.ChatModel,
 			Choices: []struct {
 				Delta struct {
 					Content string `json:"content"`
@@ -529,12 +392,14 @@ func handleStreamResponse(w http.ResponseWriter, resp *http.Response, model stri
 			},
 		}
 
+		// 转换为JSON
 		openAIJSON, err := json.Marshal(openAIResp)
 		if err != nil {
 			fmt.Printf("转换OpenAI格式失败: %v\n", err)
 			continue
 		}
 
+		// 发送OpenAI格式的响应
 		_, err = w.Write([]byte("data: " + string(openAIJSON) + "\n\n"))
 		if err != nil {
 			fmt.Printf("写入响应失败: %v\n", err)
@@ -544,6 +409,53 @@ func handleStreamResponse(w http.ResponseWriter, resp *http.Response, model stri
 	}
 }
 
+func indexHandler(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "text/html; charset=utf-8")
+	fmt.Fprintf(w, "🚀服务已启动！")
+}
+
+type Model struct {
+	ID         string   `json:"id"`
+	Object     string   `json:"object"`
+	OwnedBy    string   `json:"owned_by"`
+	Permission []string `json:"permission"`
+}
+
+type ModelListResponse struct {
+	Object string  `json:"object"`
+	Data   []Model `json:"data"`
+}
+
+func listModelsHandler(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Access-Control-Allow-Origin", "*")
+	w.Header().Set("Access-Control-Allow-Methods", "GET, OPTIONS")
+	w.Header().Set("Access-Control-Allow-Headers", "Content-Type, Authorization")
+
+	if r.Method == "OPTIONS" {
+		w.WriteHeader(http.StatusOK)
+		return
+	}
+	authMiddleware(func(w http.ResponseWriter, r *http.Request) {
+		models := []Model{
+			{ID: "gpt-4o", Object: "model", OwnedBy: "sider", Permission: []string{"read"}},
+			{ID: "claude-3.5-sonnet", Object: "model", OwnedBy: "sider", Permission: []string{"read"}},
+			{ID: "deepseek-reasoner", Object: "model", OwnedBy: "sider", Permission: []string{"read"}},
+			{ID: "o3-mini", Object: "model", OwnedBy: "sider", Permission: []string{"read"}},
+			{ID: "o1", Object: "model", OwnedBy: "sider", Permission: []string{"read"}},
+			{ID: "llama-3.1-405b", Object: "model", OwnedBy: "sider", Permission: []string{"read"}},
+			{ID: "gemini-2.0-pro", Object: "model", OwnedBy: "sider", Permission: []string{"read"}},
+		}
+
+		response := ModelListResponse{
+			Object: "list",
+			Data:   models,
+		}
+
+		w.Header().Set("Content-Type", "application/json")
+		json.NewEncoder(w).Encode(response)
+	})(w, r)
+}
+
 func main() {
 	// 注册路由处理函数
 	http.HandleFunc("/", indexHandler) // 添加主页路由