update

check/check.go

@@ -44,25 +44,25 @@ func CheckEnvVariable() {
 		}
 	}
 
-	//if config.SessionImageChatMapStr != "" {
-	//	pattern := `^([a-zA-Z0-9\-\/]+=([a-zA-Z0-9\-\.]+))(,[a-zA-Z0-9\-\/]+=([a-zA-Z0-9\-\.]+))*`
-	//	match, _ := regexp.MatchString(pattern, config.SessionImageChatMapStr)
-	//	if !match {
-	//		logger.FatalLog("环境变量 SESSION_IMAGE_CHAT_MAP 设置有误")
-	//	} else {
-	//		sessionImageChatMap := make(map[string]string)
-	//		pairs := strings.Split(config.SessionImageChatMapStr, ",")
-	//
-	//		for _, pair := range pairs {
-	//			kv := strings.Split(pair, "=")
-	//			sessionImageChatMap["session_id="+kv[0]] = kv[1]
-	//		}
-	//
-	//		config.SessionImageChatMap = sessionImageChatMap
-	//	}
-	//} else {
-	//	logger.SysLog("环境变量 SESSION_IMAGE_CHAT_MAP 未设置，生图可能会异常")
-	//}
+	if config.SessionImageChatMapStr != "" {
+		pattern := `^([a-zA-Z0-9\-\/]+=([a-zA-Z0-9\-\.]+))(,[a-zA-Z0-9\-\/]+=([a-zA-Z0-9\-\.]+))*`
+		match, _ := regexp.MatchString(pattern, config.SessionImageChatMapStr)
+		if !match {
+			logger.FatalLog("环境变量 SESSION_IMAGE_CHAT_MAP 设置有误")
+		} else {
+			sessionImageChatMap := make(map[string]string)
+			pairs := strings.Split(config.SessionImageChatMapStr, ",")
+
+			for _, pair := range pairs {
+				kv := strings.Split(pair, "=")
+				sessionImageChatMap["session_id="+kv[0]] = kv[1]
+			}
+
+			config.SessionImageChatMap = sessionImageChatMap
+		}
+	} else {
+		logger.SysLog("环境变量 SESSION_IMAGE_CHAT_MAP 未设置，生图可能会异常")
+	}
 
 	logger.SysLog("environment variable check passed.")
 }

common/config/config.go

@@ -27,6 +27,12 @@ var AutoModelChatMapType = env.Int("AUTO_MODEL_CHAT_MAP_TYPE", 1)
 var YesCaptchaClientKey = env.String("YES_CAPTCHA_CLIENT_KEY", "")
 var CheatUrl = env.String("CHEAT_URL", "https://gs-cheat.aytsao.cn/genspark/create/req/body")
 
+// 隐藏思考过程
+var ReasoningHide = env.Int("REASONING_HIDE", 0)
+
+// 前置message
+var PRE_MESSAGES_JSON = env.String("PRE_MESSAGES_JSON", "")
+
 var RateLimitCookieLockDuration = env.Int("RATE_LIMIT_COOKIE_LOCK_DURATION", 10*60)
 
 // 路由前缀
@@ -35,6 +41,7 @@ var ModelChatMapStr = env.String("MODEL_CHAT_MAP", "")
 var ModelChatMap = make(map[string]string)
 var SessionImageChatMap = make(map[string]string)
 var GlobalSessionManager *SessionManager
+
 var SessionImageChatMapStr = env.String("SESSION_IMAGE_CHAT_MAP", "")
 var YescaptchaClient *yescaptcha.Client
 

common/constants.go

@@ -3,13 +3,13 @@ package common
 import "time"
 
 var StartTime = time.Now().Unix() // unit: second
-var Version = "v1.10.10"          // this hard coding will be replaced automatically when building, no need to manually change
+var Version = "v1.10.14"          // this hard coding will be replaced automatically when building, no need to manually change
 
 var DefaultOpenaiModelList = []string{
 	"gpt-4o",
 	"o1",
 	"o3-mini-high",
-	"claude-3-5-sonnet",
+	"claude-3-7-sonnet",
 	"claude-3-5-haiku",
 	"gemini-2.0-flash",
 	"deep-seek-v3",
@@ -28,7 +28,7 @@ var TextModelList = []string{
 	"gpt-4o",
 	"o1",
 	"o3-mini-high",
-	"claude-3-5-sonnet",
+	"claude-3-7-sonnet",
 	"claude-3-5-haiku",
 	"gemini-2.0-flash",
 	"deep-seek-v3",
@@ -37,7 +37,7 @@ var TextModelList = []string{
 
 var MixtureModelList = []string{
 	"gpt-4o",
-	"claude-3-5-sonnet",
+	"claude-3-7-sonnet",
 	"gemini-2.0-flash",
 }
 

controller/chat.go

@@ -336,6 +336,12 @@ func fetchImageBytes(url string) ([]byte, error) {
 
 func createRequestBody(c *gin.Context, client cycletls.CycleTLS, cookie string, openAIReq *model.OpenAIChatCompletionRequest) (map[string]interface{}, error) {
 	openAIReq.SystemMessagesProcess(openAIReq.Model)
+	if config.PRE_MESSAGES_JSON != "" {
+		err := openAIReq.PrependMessagesFromJSON(config.PRE_MESSAGES_JSON)
+		if err != nil {
+			return nil, fmt.Errorf("PrependMessagesFromJSON err: %v PrependMessagesFromJSON:", err, config.PRE_MESSAGES_JSON)
+		}
+	}
 
 	// 处理消息中的图像 URL
 	err := processMessages(c, client, cookie, openAIReq.Messages)
@@ -486,7 +492,7 @@ func createImageRequestBody(c *gin.Context, cookie string, openAIReq *model.Open
 	}
 	var currentQueryString string
 	if len(chatId) != 0 {
-		currentQueryString = fmt.Sprintf("id=%s&type=%s", chatId, imageType)
+		currentQueryString = fmt.Sprintf("id=%s&type=%s", "90280b44-9ddf-4f4f-ba62-d72d38a82f99", imageType)
 	} else {
 		currentQueryString = fmt.Sprintf("type=%s", imageType)
 	}
@@ -563,25 +569,64 @@ func createStreamResponse(responseId, modelName string, jsonData []byte, delta m
 // handleMessageFieldDelta 处理消息字段增量
 func handleMessageFieldDelta(c *gin.Context, event map[string]interface{}, responseId, modelName string, jsonData []byte) error {
 	fieldName, ok := event["field_name"].(string)
-	if !ok || (fieldName != "session_state.answer" &&
-		!strings.Contains(fieldName, "session_state.streaming_detail_answer") &&
-		//fieldName != "session_state.reflection" &&
-		fieldName != "session_state.streaming_markmap") {
+	if !ok {
 		return nil
 	}
 
-	var delta string
-	if (modelName == "o1" || modelName == "o3-mini-high") && fieldName == "session_state.answer" {
-		delta, ok = event["field_value"].(string)
-	} else {
-		delta, ok = event["delta"].(string)
+	// 基础允许列表（所有配置下都需要处理的字段）
+	baseAllowed := fieldName == "session_state.answer" ||
+		strings.Contains(fieldName, "session_state.streaming_detail_answer") ||
+		fieldName == "session_state.streaming_markmap"
+
+	// 需要显示思考过程时需要额外处理的字段
+	if config.ReasoningHide != 1 {
+		baseAllowed = baseAllowed ||
+			fieldName == "session_state.answerthink_is_started" ||
+			fieldName == "session_state.answerthink" ||
+			fieldName == "session_state.answerthink_is_finished"
 	}
-	if !ok {
+
+	if !baseAllowed {
 		return nil
 	}
 
-	streamResp := createStreamResponse(responseId, modelName, jsonData, model.OpenAIDelta{Content: delta, Role: "assistant"}, nil)
-	return sendSSEvent(c, streamResp)
+	// 获取 delta 内容
+	var delta string
+	switch {
+	case (modelName == "o1" || modelName == "o3-mini-high") && fieldName == "session_state.answer":
+		delta, _ = event["field_value"].(string)
+	default:
+		delta, _ = event["delta"].(string)
+	}
+
+	// 创建基础响应
+	createResponse := func(content string) model.OpenAIChatCompletionResponse {
+		return createStreamResponse(
+			responseId,
+			modelName,
+			jsonData,
+			model.OpenAIDelta{Content: content, Role: "assistant"},
+			nil,
+		)
+	}
+
+	// 发送基础事件
+	var err error
+	if err = sendSSEvent(c, createResponse(delta)); err != nil {
+		return err
+	}
+
+	// 处理思考过程标记
+	if config.ReasoningHide != 1 {
+		switch fieldName {
+		case "session_state.answerthink_is_started":
+			err = sendSSEvent(c, createResponse("<think>\n"))
+		case "session_state.answerthink_is_finished":
+			err = sendSSEvent(c, createResponse("\n</think>"))
+		}
+	}
+
+	return err
 }
 
 type Content struct {
@@ -863,9 +908,9 @@ func handleStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie string
 				case common.IsFreeLimit(data):
 					isRateLimit = true
 					logger.Warnf(ctx, "Cookie free rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
-					//config.AddRateLimitCookie(cookie, time.Now().Add(24*60*60*time.Second))
+					config.AddRateLimitCookie(cookie, time.Now().Add(24*60*60*time.Second))
 					// 删除cookie
-					config.RemoveCookie(cookie)
+					//config.RemoveCookie(cookie)
 					break SSELoop // 使用 label 跳出 SSE 循环
 				case common.IsNotLogin(data):
 					isRateLimit = true
@@ -1100,6 +1145,7 @@ func handleNonStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie str
 
 		scanner := bufio.NewScanner(strings.NewReader(response.Body))
 		var content string
+		var answerThink string
 		var firstLine string
 		var projectId string
 		isRateLimit := false
@@ -1131,9 +1177,9 @@ func handleNonStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie str
 			case common.IsFreeLimit(line):
 				isRateLimit = true
 				logger.Warnf(ctx, "Cookie free rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
-				//config.AddRateLimitCookie(cookie, time.Now().Add(24*60*60*time.Second))
+				config.AddRateLimitCookie(cookie, time.Now().Add(24*60*60*time.Second))
 				// 删除cookie
-				config.RemoveCookie(cookie)
+				//config.RemoveCookie(cookie)
 				break
 			case common.IsNotLogin(line):
 				isRateLimit = true
@@ -1159,6 +1205,7 @@ func handleNonStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie str
 					FieldName string `json:"field_name"`
 					Content   string `json:"content"`
 					Id        string `json:"id"`
+					Delta     string `json:"delta"`
 				}
 				if err := json.Unmarshal([]byte(data), &parsedResponse); err != nil {
 					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
@@ -1167,6 +1214,25 @@ func handleNonStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie str
 				if parsedResponse.Type == "project_start" {
 					projectId = parsedResponse.Id
 				}
+				if parsedResponse.Type == "message_field" {
+					// 提取思考过程
+					if config.ReasoningHide != 1 {
+						if parsedResponse.FieldName == "session_state.answerthink_is_started" {
+							answerThink = "<think>\n"
+						}
+						if parsedResponse.FieldName == "session_state.answerthink_is_finished" {
+							answerThink = answerThink + "\n</think>"
+						}
+					}
+				}
+				if parsedResponse.Type == "message_field_delta" {
+					// 提取思考过程
+					if config.ReasoningHide != 1 {
+						if parsedResponse.FieldName == "session_state.answerthink" {
+							answerThink = answerThink + parsedResponse.Delta
+						}
+					}
+				}
 				if parsedResponse.Type == "message_result" {
 					// 删除临时会话
 					go func() {
@@ -1191,7 +1257,7 @@ func handleNonStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie str
 						}
 						parsedResponse.Content = content.DetailAnswer
 					}
-					content = parsedResponse.Content
+					content = strings.TrimSpace(answerThink + parsedResponse.Content)
 					break
 				}
 			}
@@ -1311,31 +1377,31 @@ func ImageProcess(c *gin.Context, client cycletls.CycleTLS, openAIReq model.Open
 	)
 
 	var (
-		//sessionImageChatManager *config.SessionMapManager
-		maxRetries int
-		cookie     string
-		chatId     string
+		sessionImageChatManager *config.SessionMapManager
+		maxRetries              int
+		cookie                  string
+		chatId                  string
 	)
 
 	cookieManager := config.NewCookieManager()
-	//sessionImageChatManager = config.NewSessionMapManager()
+	sessionImageChatManager = config.NewSessionMapManager()
 	ctx := c.Request.Context()
 
 	// Initialize session manager and get initial cookie
-	//if len(config.SessionImageChatMap) == 0 {
-	//logger.Warnf(ctx, "未配置环境变量 SESSION_IMAGE_CHAT_MAP, 可能会生图失败!")
-	maxRetries = len(cookieManager.Cookies)
+	if len(config.SessionImageChatMap) == 0 {
+		logger.Warnf(ctx, "未配置环境变量 SESSION_IMAGE_CHAT_MAP, 可能会生图失败!")
+		maxRetries = len(cookieManager.Cookies)
 
-	var err error
-	cookie, err = cookieManager.GetRandomCookie()
-	if err != nil {
-		logger.Errorf(ctx, "Failed to get initial cookie: %v", err)
-		return nil, fmt.Errorf(errNoValidCookies)
+		var err error
+		cookie, err = cookieManager.GetRandomCookie()
+		if err != nil {
+			logger.Errorf(ctx, "Failed to get initial cookie: %v", err)
+			return nil, fmt.Errorf(errNoValidCookies)
+		}
+	} else {
+		maxRetries = sessionImageChatManager.GetSize()
+		cookie, chatId, _ = sessionImageChatManager.GetRandomKeyValue()
 	}
-	//} else {
-	//	maxRetries = sessionImageChatManager.GetSize()
-	//	cookie, chatId, _ = sessionImageChatManager.GetRandomKeyValue()
-	//}
 
 	for attempt := 0; attempt < maxRetries; attempt++ {
 		// Create request body
@@ -1394,9 +1460,9 @@ func ImageProcess(c *gin.Context, client cycletls.CycleTLS, openAIReq model.Open
 			//	}
 			//} else {
 			//cookieManager := config.NewCookieManager()
-			//config.AddRateLimitCookie(cookie, time.Now().Add(24*60*60*time.Second))
+			config.AddRateLimitCookie(cookie, time.Now().Add(24*60*60*time.Second))
 			// 删除cookie
-			config.RemoveCookie(cookie)
+			//config.RemoveCookie(cookie)
 			cookie, err = cookieManager.GetNextCookie()
 			if err != nil {
 				logger.Errorf(ctx, "No more valid cookies available after attempt %d", attempt+1)

main.go

@@ -6,7 +6,6 @@ import (
 	"genspark2api/common"
 	"genspark2api/common/config"
 	logger "genspark2api/common/loggger"
-	"genspark2api/job"
 	"genspark2api/middleware"
 	"genspark2api/router"
 	"genspark2api/yescaptcha"
@@ -34,7 +33,7 @@ func main() {
 	config.GlobalSessionManager = config.NewSessionManager()
 
 	// 定时任务 每天9点整重载GS_COOKIES
-	go job.LoadCookieTask()
+	//go job.LoadCookieTask()
 
 	server := gin.New()
 	server.Use(gin.Recovery())

model/openai.go

@@ -1,5 +1,7 @@
 package model
 
+import "encoding/json"
+
 type OpenAIChatCompletionRequest struct {
 	Model    string              `json:"model"`
 	Stream   bool                `json:"stream"`
@@ -24,6 +26,31 @@ type OpenAIChatMessage struct {
 	SessionState *SessionState `json:"session_state"`
 }
 
+func (r *OpenAIChatCompletionRequest) AddMessage(message OpenAIChatMessage) {
+	r.Messages = append([]OpenAIChatMessage{message}, r.Messages...)
+}
+
+func (r *OpenAIChatCompletionRequest) PrependMessagesFromJSON(jsonString string) error {
+	var newMessages []OpenAIChatMessage
+	err := json.Unmarshal([]byte(jsonString), &newMessages)
+	if err != nil {
+		return err
+	}
+
+	// 查找最后一个 system role 的索引
+	var insertIndex int
+	for i := len(r.Messages) - 1; i >= 0; i-- {
+		if r.Messages[i].Role == "system" {
+			insertIndex = i + 1
+			break
+		}
+	}
+
+	// 将 newMessages 插入到找到的索引后面
+	r.Messages = append(r.Messages[:insertIndex], append(newMessages, r.Messages[insertIndex:]...)...)
+	return nil
+}
+
 func (r *OpenAIChatCompletionRequest) SystemMessagesProcess(model string) {
 	if r.Messages == nil {
 		return