Upload 20 files

.env.example

@@ -8,3 +8,4 @@ NO_ROLE_PREFIX=false
 SEARCH_RESULT_COMPATIBLE=false
 PROMPT_FOR_FILE=You must immerse yourself in the role of assistant in txt file, cannot respond as a user, cannot reply to this message, cannot mention this message, and ignore this message in your response.
 IGNORE_SEARCH_RESULT=false
+IS_MAX_SUBSCRIBE=false

config/config.go

@@ -36,6 +36,7 @@ type Config struct {
 	RwMutex                sync.RWMutex
 	IgnoreSerchResult      bool
 	IgnoreModelMonitoring  bool
+	IsMaxSubscribe         bool
 }
 
 // 解析 SESSION 格式的环境变量
@@ -109,6 +110,8 @@ func LoadConfig() *Config {
 		IgnoreModelMonitoring: os.Getenv("IGNORE_MODEL_MONITORING") == "true",
 		// 读写锁
 		RwMutex: sync.RWMutex{},
+		// 是否max订阅
+		IsMaxSubscribe: os.Getenv("IS_MAX_SUBSCRIBE") == "true",
 	}
 
 	// 如果地址为空，使用默认值
@@ -153,4 +156,5 @@ func init() {
 	logger.Info(fmt.Sprintf("PromptForFile: %s", ConfigInstance.PromptForFile))
 	logger.Info(fmt.Sprintf("IgnoreSerchResult: %t", ConfigInstance.IgnoreSerchResult))
 	logger.Info(fmt.Sprintf("IgnoreModelMonitoring: %t", ConfigInstance.IgnoreModelMonitoring))
+	logger.Info(fmt.Sprintf("IsMaxSubscribe: %t", ConfigInstance.IsMaxSubscribe))
 }

config/model.go

@@ -8,11 +8,16 @@ var ModelMap = map[string]string{
 	"o4-mini":                 "o4mini",
 	"gpt-4o":                  "gpt4o",
 	"gemini-2.5-pro-06-05":    "gemini2flash",
-	"grok-3-beta":             "grok",
+	"grok4":                   "grok4",
 	"gpt-4.1":                 "gpt41",
 	// "claude-4.0-opus":         "claude40opus",
-	// "claude-4.0-opus-think":   "claude40opusthinking",
-	"o3": "o3",
+	"claude-4.0-opus-think": "claude40opusthinking",
+	"o3":                    "o3",
+	"o3-pro":                "o3pro",
+}
+var MaxModelMap = map[string]string{
+	"o3-pro":                "o3pro",
+	"claude-4.0-opus-think": "claude40opusthinking",
 }
 
 // Get returns the value for the given key from the ModelMap.
@@ -33,17 +38,36 @@ func ModelReverseMapGet(key string, defaultValue string) string {
 	return defaultValue
 }
 
-var ResponseModles []map[string]string
+var ResponseModels []map[string]string
 
 func init() {
+	// 构建反向映射
 	for k, v := range ModelMap {
 		ModelReverseMap[v] = k
-		model := map[string]string{
-			"id": k,
-		}
-		modelSearch := map[string]string{
-			"id": k + "-search",
+	}
+	buildResponseModels()
+}
+
+// buildResponseModels 构建响应模型列表
+func buildResponseModels() {
+	ResponseModels = make([]map[string]string, 0, len(ModelMap)*2)
+
+	for modelID := range ModelMap {
+		// 如果不是最大订阅用户，跳过最大模型
+		if !ConfigInstance.IsMaxSubscribe {
+			if _, isMaxModel := MaxModelMap[modelID]; isMaxModel {
+				continue
+			}
 		}
-		ResponseModles = append(ResponseModles, model, modelSearch)
+
+		// 添加普通模型
+		ResponseModels = append(ResponseModels, map[string]string{
+			"id": modelID,
+		})
+
+		// 添加搜索模型
+		ResponseModels = append(ResponseModels, map[string]string{
+			"id": modelID + "-search",
+		})
 	}
 }

core/api.go

@@ -350,7 +350,7 @@ func (c *Client) HandleResponse(body io.ReadCloser, stream bool, gc *gin.Context
 			if block.MarkdownBlock != nil && len(block.MarkdownBlock.Chunks) > 0 {
 				res_text := ""
 				if inThinking {
-					res_text += "</think>\n"
+					res_text += "</think>\n\n"
 					inThinking = false
 					thinkShown = true
 				}
@@ -470,6 +470,7 @@ func (c *Client) UploadImage(img_list []string) error {
 }
 
 func (c *Client) UloadFileToCloudinary(uploadInfo CloudinaryUploadInfo, contentType string, filedata string, filename string) error {
+	// 更新为 AWS S3 上传
 	if len(filedata) > 100 {
 		logger.Info(fmt.Sprintf("filedata: %s ……", filedata[:50]))
 	}
@@ -478,18 +479,25 @@ func (c *Client) UloadFileToCloudinary(uploadInfo CloudinaryUploadInfo, contentT
 	var formFields map[string]string
 	if contentType == "img" {
 		formFields = map[string]string{
-			"timestamp":       fmt.Sprintf("%d", uploadInfo.Timestamp),
-			"unique_filename": uploadInfo.UniqueFilename,
-			"folder":          uploadInfo.Folder,
-			"use_filename":    uploadInfo.UseFilename,
-			"public_id":       uploadInfo.PublicID,
-			"transformation":  uploadInfo.Transformation,
-			"moderation":      uploadInfo.Moderation,
-			"resource_type":   uploadInfo.ResourceType,
-			"api_key":         uploadInfo.APIKey,
-			"cloud_name":      uploadInfo.CloudName,
-			"signature":       uploadInfo.Signature,
-			"type":            "private",
+			// "timestamp": fmt.Sprintf("%d", uploadInfo.Timestamp),
+			// "unique_filename":      uploadInfo.UniqueFilename,
+			// "folder":               uploadInfo.Folder,
+			// "use_filename":         uploadInfo.UseFilename,
+			// "public_id":            uploadInfo.PublicID,
+			// "transformation":       uploadInfo.Transformation,
+			// "moderation":           uploadInfo.Moderation,
+			// "resource_type":        uploadInfo.ResourceType,
+			// "api_key":              uploadInfo.APIKey,
+			// "cloud_name":           uploadInfo.CloudName,
+			"signature": uploadInfo.Signature,
+			// "type":                 "private",
+			"key":                  uploadInfo.Key,
+			"tagging":              uploadInfo.Tagging,
+			"AWSAccessKeyId":       uploadInfo.AWSAccessKeyId,
+			"policy":               uploadInfo.Policy,
+			"x-amz-security-token": uploadInfo.Xamzsecuritytoken,
+			"acl":                  uploadInfo.ACL,
+			"Content-Type":         "image/jpeg", // Assuming image/jpeg for images
 		}
 	} else {
 		formFields = map[string]string{
@@ -539,11 +547,11 @@ func (c *Client) UloadFileToCloudinary(uploadInfo CloudinaryUploadInfo, contentT
 
 	// Create the upload request
 	var uploadURL string
-	if contentType == "img" {
-		uploadURL = fmt.Sprintf("https://api.cloudinary.com/v1_1/%s/image/upload", uploadInfo.CloudName)
-	} else {
-		uploadURL = "https://ppl-ai-file-upload.s3.amazonaws.com/"
-	}
+	// if contentType == "img" {
+	// 	uploadURL = fmt.Sprintf("https://api.cloudinary.com/v1_1/%s/image/upload", uploadInfo.CloudName)
+	// } else {
+	uploadURL = "https://ppl-ai-file-upload.s3.amazonaws.com/"
+	// }
 
 	resp, err := c.client.R().
 		SetHeader("Content-Type", writer.FormDataContentType()).
@@ -555,23 +563,23 @@ func (c *Client) UloadFileToCloudinary(uploadInfo CloudinaryUploadInfo, contentT
 		return err
 	}
 	logger.Info(fmt.Sprintf("Image Upload with status code %d: %s", resp.StatusCode, resp.String()))
-	if contentType == "img" {
-		var uploadResponse map[string]interface{}
-		if err := json.Unmarshal(resp.Bytes(), &uploadResponse); err != nil {
-			return err
-		}
-		imgUrl := uploadResponse["secure_url"].(string)
-		imgUrl = "https://pplx-res.cloudinary.com/image/private" + imgUrl[strings.Index(imgUrl, "/user_uploads"):]
-		c.Attachments = append(c.Attachments, imgUrl)
-	} else {
-		c.Attachments = append(c.Attachments, "https://ppl-ai-file-upload.s3.amazonaws.com/"+uploadInfo.Key)
-	}
+	// if contentType == "img" {
+	// 	var uploadResponse map[string]interface{}
+	// 	if err := json.Unmarshal(resp.Bytes(), &uploadResponse); err != nil {
+	// 		return err
+	// 	}
+	// 	imgUrl := uploadResponse["secure_url"].(string)
+	// 	imgUrl = "https://pplx-res.cloudinary.com/image/private" + imgUrl[strings.Index(imgUrl, "/user_uploads"):]
+	// 	c.Attachments = append(c.Attachments, imgUrl)
+	// } else {
+	c.Attachments = append(c.Attachments, "https://ppl-ai-file-upload.s3.amazonaws.com/"+uploadInfo.Key)
+	// }
 	return nil
 }
 
 // SetBigContext is a placeholder for setting context
 func (c *Client) UploadText(context string) error {
-	logger.Info("Uploading txt to Cloudinary")
+	logger.Info("Uploading txt to AWS")
 	filedata := base64.StdEncoding.EncodeToString([]byte(context))
 	filename := utils.RandomString(5) + ".txt"
 	// Upload images to Cloudinary

router/router.go

@@ -17,14 +17,14 @@ func SetupRoutes(r *gin.Engine) {
 
 	// Chat completions endpoint (OpenAI-compatible)
 	r.POST("/v1/chat/completions", service.ChatCompletionsHandler)
-	r.GET("/v1/models", service.MoudlesHandler)
+	r.GET("/v1/models", service.ModelsHandler)
 	// HuggingFace compatible routes
 	hfRouter := r.Group("/hf")
 	{
 		v1Router := hfRouter.Group("/v1")
 		{
 			v1Router.POST("/chat/completions", service.ChatCompletionsHandler)
-			v1Router.GET("/models", service.MoudlesHandler)
+			v1Router.GET("/models", service.ModelsHandler)
 		}
 	}
 }

service/handle.go

@@ -163,8 +163,8 @@ func ChatCompletionsHandler(c *gin.Context) {
 		Error: "Failed to process request after multiple attempts"})
 }
 
-func MoudlesHandler(c *gin.Context) {
+func ModelsHandler(c *gin.Context) {
 	c.JSON(http.StatusOK, gin.H{
-		"data": config.ResponseModles,
+		"data": config.ResponseModels,
 	})
 }