feat: 普号强制打开gpt-4o

liuhuapiaoyuan · May 14, 2024 · 2a38be3 · 2a38be3
1 parent bc253e9
commit 2a38be3
Show file tree

Hide file tree

Showing 3 changed files with 160 additions and 40 deletions.
diff --git a/backend-api/backend-api.go b/backend-api/backend-api.go
@@ -200,7 +200,7 @@ func ProxyAll(r *ghttp.Request) {
 		if isCreateConversation {
 			CreateConversation(r, userId, chatgptId, userToken, r.UserAgent(), path)
 		} else if isLoadModels {
-			//AttachGPT4Mobile(ctx, response)
+			AttachGPT4O(ctx, response)
 		} else if isShare {
 			originalBody, shouldReturn, returnValue := loadRespString(response)
 			if shouldReturn {
@@ -250,35 +250,170 @@ func ProxyAll(r *ghttp.Request) {
 
 }
 
-// 处理models 增加gpt-4-mobile
-func AttachGPT4Mobile(ctx g.Ctx, response *http.Response) error {
+// 处理models 增加gpt-4O
+func AttachGPT4O(ctx g.Ctx, response *http.Response) error {
 	// 提取 /backend-api/models
 	originalBody, shouldReturn, returnValue := loadRespString(response)
 	if shouldReturn {
 		return returnValue
 	}
 	modifiedBody := string(originalBody)
-	// if strings.Contains(modifiedBody, "gpt-4") {
-	// }
-	resJson := gjson.New(modifiedBody)
-	models := resJson.Get("models").Array()
-	newObject := gjson.New(`{"capabilities":{},"description":"Browsing, Advanced Data Analysis, and DALL·E are now built into GPT-4","enabled_tools":["tools","tools2"],"max_tokens":32767,"product_features":{"attachments":{"accepted_mime_types":["text/x-csharp","application/vnd.openxmlformats-officedocument.wordprocessingml.document","text/x-tex","text/x-typescript","text/plain","text/x-ruby","application/msword","text/x-php","text/x-c++","text/markdown","application/x-latext","text/x-c","text/javascript","text/html","application/vnd.openxmlformats-officedocument.presentationml.presentation","application/json","text/x-java","application/pdf","text/x-script.python","text/x-sh"],"can_accept_all_mime_types":true,"image_mime_types":["image/jpeg","image/webp","image/gif","image/png"],"type":"retrieval"}},"slug":"gpt-4-mobile","tags":["confidential","gpt4","plus"],"title":"GPT4 (Mobile)"}`)
-	models = append(models, newObject)
-	resJson.Set("models", models)
-
-	categories := resJson.Get("categories").Array()
-
-	categories = append(categories, gjson.New(`{
-		"category": "gpt_4",
-		"human_category_name": "GPT-4",
-		"subscription_level": "plus",
-		"default_model": "gpt-4",
-		"browsing_model": "gpt-4-browsing",
-		"code_interpreter_model": "gpt-4-code-interpreter",
-		"plugins_model": "gpt-4-plugins"
-	}`))
-	resJson.Set("categories", categories)
-	modifiedBody = resJson.String()
+	if !strings.Contains(modifiedBody, "gpt-4") {
+		modifiedBody = `{
+			"models": [
+				{
+					"slug": "text-davinci-002-render-sha",
+					"max_tokens": 8191,
+					"title": "Default (GPT-3.5)",
+					"description": "我们最快的模型，非常适合大多数日常任务。",
+					"tags": [
+						"gpt3.5"
+					],
+					"capabilities": {},
+					"product_features": {}
+				},
+				{
+					"slug": "gpt-4o",
+					"max_tokens": 8192,
+					"title": "Scallion",
+					"description": "浏览、高级数据分析和 DALL·E 现已集成到 GPT-4 中",
+					"tags": [
+						"confidential",
+						"gpt4"
+					],
+					"capabilities": {},
+					"product_features": {
+						"attachments": {
+							"type": "retrieval",
+							"accepted_mime_types": [
+								"text/x-java",
+								"application/x-latext",
+								"text/javascript",
+								"text/x-script.python",
+								"application/pdf",
+								"text/html",
+								"text/x-php",
+								"text/x-c",
+								"text/x-csharp",
+								"application/vnd.openxmlformats-officedocument.presentationml.presentation",
+								"text/x-tex",
+								"application/json",
+								"text/plain",
+								"application/msword",
+								"text/x-ruby",
+								"text/markdown",
+								"text/x-sh",
+								"text/x-typescript",
+								"text/x-c++",
+								"application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+							],
+							"image_mime_types": [
+								"image/jpeg",
+								"image/gif",
+								"image/webp",
+								"image/png"
+							],
+							"can_accept_all_mime_types": true
+						}
+					},
+					"enabled_tools": [
+						"tools",
+						"tools2"
+					]
+				},
+				{
+					"slug": "auto",
+					"max_tokens": 8192,
+					"title": "Dynamic",
+					"description": "使用合适的模型来满足我的请求",
+					"tags": [
+						"confidential",
+						"gpt4"
+					],
+					"capabilities": {},
+					"product_features": {
+						"attachments": {
+							"type": "retrieval",
+							"accepted_mime_types": [
+								"text/x-java",
+								"application/x-latext",
+								"text/javascript",
+								"text/x-script.python",
+								"application/pdf",
+								"text/html",
+								"text/x-php",
+								"text/x-c",
+								"text/x-csharp",
+								"application/vnd.openxmlformats-officedocument.presentationml.presentation",
+								"text/x-tex",
+								"application/json",
+								"text/plain",
+								"application/msword",
+								"text/x-ruby",
+								"text/markdown",
+								"text/x-sh",
+								"text/x-typescript",
+								"text/x-c++",
+								"application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+							],
+							"image_mime_types": [
+								"image/jpeg",
+								"image/gif",
+								"image/webp",
+								"image/png"
+							],
+							"can_accept_all_mime_types": true
+						}
+					},
+					"enabled_tools": [
+						"tools",
+						"tools2"
+					]
+				}
+			],
+			"categories": [
+				{
+					"category": "gpt_3.5",
+					"human_category_name": "GPT-3.5",
+					"human_category_short_name": "3.5",
+					"icon": "bolt",
+					"icon_src": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xMi41NjU1IDIuMTEwN0MxMy41Njg2IDAuOTIxNiAxNS40OTU2IDEuODU3NjEgMTUuMTgxIDMuMzgxMjJMMTQuMjI3NCA4LjAwMDAzSDE5LjkyMzlDMjEuMTk5OSA4LjAwMDAzIDIxLjg5MzIgOS40OTE5NyAyMS4wNzA0IDEwLjQ2NzNMMTEuNDM0MyAyMS44ODk0QzEwLjQzMTEgMjMuMDc4NSA4LjUwNDI0IDIyLjE0MjUgOC44MTg3OSAyMC42MTg5TDkuNzcyMzYgMTZINC4wNzU4OEMyLjc5OTg3IDE2IDIuMTA2NTggMTQuNTA4MSAyLjkyOTM4IDEzLjUzMjhMMTIuNTY1NSAyLjExMDdaIiBmaWxsPSIjMjgyODI4Ii8+Cjwvc3ZnPgo=",
+					"subscription_level": "free",
+					"default_model": "text-davinci-002-render-sha",
+					"code_interpreter_model": "text-davinci-002-render-sha-code-interpreter",
+					"plugins_model": "text-davinci-002-render-sha-plugins",
+					"color": "#47C761",
+					"short_explainer": "非常适合用于日常任务",
+					"tagline": "最快速"
+				},
+				{
+					"category": "AG8PqS2q",
+					"human_category_name": "GPT-4o",
+					"human_category_short_name": "4o",
+					"icon": "stars",
+					"icon_src": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE5LjkxOTQgMC44OTY4ODhDMTkuODkzOCAwLjY3MDk5NCAxOS43MDI4IDAuNTAwMjMgMTkuNDc1NSAwLjVDMTkuMjQ4MSAwLjQ5OTc3IDE5LjA1NjcgMC42NzAxMzEgMTkuMDMwOCAwLjg5NTk4QzE4LjkwOTQgMS45NDc0IDE4LjU5NzIgMi42Njg3MiAxOC4xMDggMy4xNTc5NkMxNy42MTg3IDMuNjQ3MjEgMTYuODk3NCAzLjk1OTQ1IDE1Ljg0NTkgNC4wODA3MkMxNS42MjAxIDQuMTA2NzcgMTUuNDQ5OCA0LjI5ODEyIDE1LjQ1IDQuNTI1NDZDMTUuNDUwMiA0Ljc1MjggMTUuNjIxIDQuOTQzOCAxNS44NDY5IDQuOTY5MzhDMTYuODgwNSA1LjA4NjQ2IDE3LjYxODMgNS4zOTg2NCAxOC4xMiA1Ljg5MTI1QzE4LjYxODkgNi4zODExOCAxOC45MzcgNy4xMDE0NyAxOS4wMjk1IDguMTQyMzVDMTkuMDUwMSA4LjM3MzI5IDE5LjI0MzYgOC41NTAyNiAxOS40NzU1IDguNTVDMTkuNzA3MyA4LjU0OTc0IDE5LjkwMDYgOC4zNzIzNCAxOS45MjA1IDguMTQxMzVDMjAuMDA5MiA3LjExODA1IDIwLjMyNyA2LjM4MTU0IDIwLjgyOTIgNS44NzkyOUMyMS4zMzE2IDUuMzc3MDUgMjIuMDY4IDUuMDU5MTMgMjMuMDkxMyA0Ljk3MDU2QzIzLjMyMjMgNC45NTA1NiAyMy40OTk4IDQuNzU3MzYgMjMuNSA0LjUyNTUxQzIzLjUwMDIgNC4yOTM2NSAyMy4zMjMyIDQuMTAwMDUgMjMuMDkyMyA0LjA3OTU0QzIyLjA1MTUgMy45ODcwOCAyMS4zMzEyIDMuNjY4OTEgMjAuODQxMiAzLjE2OTk2QzIwLjM0ODcgMi42NjgyNyAyMC4wMzY0IDEuOTMwNTMgMTkuOTE5NCAwLjg5Njg4OFoiIGZpbGw9IiMyODI4MjgiLz4KPHBhdGggZD0iTTExLjk5MjYgMy44MjA1N0MxMS45MjY5IDMuMjM5NjkgMTEuNDM1OCAyLjgwMDYgMTAuODUxMiAyLjhDMTAuMjY2NiAyLjc5OTQgOS43NzQ1MiAzLjIzNzQ4IDkuNzA3NTkgMy44MTgyM0M5LjM5NTczIDYuNTIxOTEgOC41OTI4MyA4LjM3NjY4IDcuMzM0NzYgOS42MzQ3NkM2LjA3NjcgMTAuODkyOCA0LjIyMTkxIDExLjY5NTcgMS41MTgyMyAxMi4wMDc2QzAuOTM3NDg0IDEyLjA3NDUgMC40OTk0MDMgMTIuNTY2NiAwLjUwMDAwMSAxMy4xNTEyQzAuNTAwNTk5IDEzLjczNTggMC45Mzk2OTIgMTQuMjI2OSAxLjUyMDU3IDE0LjI5MjZDNC4xNzg1MiAxNC41OTM3IDYuMDc1NTUgMTUuMzk2NSA3LjM2NTU5IDE2LjY2MzNDOC42NDg2MiAxNy45MjMxIDkuNDY2NzYgMTkuNzc1MSA5LjcwNDQ4IDIyLjQ1MThDOS43NTcyNyAyMy4wNDU2IDEwLjI1NTEgMjMuNTAwNyAxMC44NTEzIDIzLjVDMTEuNDQ3NSAyMy40OTkzIDExLjk0NDMgMjMuMDQzMSAxMS45OTU3IDIyLjQ0OTFDMTIuMjIzNCAxOS44MTc4IDEzLjA0MSAxNy45MjQgMTQuMzMyNCAxNi42MzI0QzE1LjYyNCAxNS4zNDEgMTcuNTE3OCAxNC41MjM0IDIwLjE0OTEgMTQuMjk1N0MyMC43NDMxIDE0LjI0NDMgMjEuMTk5MyAxMy43NDc1IDIxLjIgMTMuMTUxM0MyMS4yMDA3IDEyLjU1NTEgMjAuNzQ1NiAxMi4wNTczIDIwLjE1MTggMTIuMDA0NUMxNy40NzUxIDExLjc2NjggMTUuNjIzMSAxMC45NDg3IDE0LjM2MzMgOS42NjU1OUMxMy4wOTY1IDguMzc1NTUgMTIuMjkzNyA2LjQ3ODUyIDExLjk5MjYgMy44MjA1N1oiIGZpbGw9IiMyODI4MjgiLz4KPC9zdmc+Cg==",
+					"subscription_level": "plus",
+					"default_model": "gpt-4o",
+					"color": "#5B41F9",
+					"short_explainer": "Newest and most advanced model",
+					"tagline": "智能且快速"
+				},
+				{
+					"category": "auto",
+					"human_category_name": "Dynamic",
+					"human_category_short_name": "",
+					"icon": "connected",
+					"icon_src": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgZmlsbD0ibm9uZSIgdmlld0JveD0iMCAwIDI0IDI0Ij48cGF0aCBmaWxsPSJjdXJyZW50Q29sb3IiIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTEyIDcuNDJhMjIgMjIgMCAwIDAtMi40NTMgMi4xMjdBMjIgMjIgMCAwIDAgNy40MiAxMmEyMiAyMiAwIDAgMCAyLjEyNyAyLjQ1M2MuODA3LjgwOCAxLjYzNiAxLjUyIDIuNDUzIDIuMTI4YTIyIDIyIDAgMCAwIDIuNDUzLTIuMTI4QTIyIDIyIDAgMCAwIDE2LjU4IDEyYTIyIDIyIDAgMCAwLTIuMTI3LTIuNDUzQTIyIDIyIDAgMCAwIDEyIDcuNDJtMS43NTEtMS4xNTRhMjUgMjUgMCAwIDEgMi4xMDQgMS44OCAyNSAyNSAwIDAgMSAxLjg4IDIuMTAzYy4zMTYtLjU1LjU3Ni0xLjA4NS43NzktMS41OS4zNS0uODc4LjUwNy0xLjYyNS41MDMtMi4yMDYtLjAwMy0uNTc0LS4xNi0uOTEzLS4zNTgtMS4xMTEtLjE5OS0uMTk5LS41MzctLjM1Ni0xLjExMi0uMzYtLjU4LS4wMDMtMS4zMjguMTUzLTIuMjA1LjUwNC0uNTA2LjIwMy0xLjA0LjQ2NC0xLjU5Ljc4Wm0zLjk4MyA3LjQ4NWEyNSAyNSAwIDAgMS0xLjg4IDIuMTA0IDI1IDI1IDAgMCAxLTIuMTAzIDEuODggMTMgMTMgMCAwIDAgMS41OS43NzljLjg3OC4zNSAxLjYyNS41MDcgMi4yMDYuNTAzLjU3NC0uMDAzLjkxMy0uMTYgMS4xMTEtLjM1OC4xOTktLjE5OS4zNTYtLjUzOC4zNi0xLjExMi4wMDMtLjU4LS4xNTQtMS4zMjgtLjUwNC0yLjIwNWExMyAxMyAwIDAgMC0uNzgtMS41OVpNMTIgMTguOTljLjg5LjU3IDEuNzY4IDEuMDMgMi42MDUgMS4zNjQgMS4wMjYuNDEgMi4wMzYuNjUyIDIuOTU1LjY0Ni45MjUtLjAwNiAxLjgyOC0uMjY3IDIuNS0uOTQuNjczLS42NzIuOTM0LTEuNTc1Ljk0LTIuNS4wMDYtLjkxOS0uMjM2LTEuOTI5LS42NDYtMi45NTRBMTUuNyAxNS43IDAgMCAwIDE4Ljk5IDEyYTE1LjYgMTUuNiAwIDAgMCAxLjM2NC0yLjYwNmMuNDEtMS4wMjUuNjUyLTIuMDM1LjY0Ni0yLjk1NC0uMDA2LS45MjUtLjI2Ny0xLjgyOC0uOTQtMi41LS42NzItLjY3My0xLjU3NS0uOTM0LTIuNS0uOTQtLjkxOS0uMDA2LTEuOTI5LjIzNS0yLjk1NC42NDYtLjgzOC4zMzUtMS43MTYuNzk1LTIuNjA2IDEuMzY0YTE1LjcgMTUuNyAwIDAgMC0yLjYwNi0xLjM2NEM4LjM3IDMuMjM2IDcuMzYgMi45OTQgNi40NCAzYy0uOTI1LjAwNi0xLjgyOC4yNjctMi41Ljk0LS42NzMuNjcyLS45MzQgMS41NzUtLjk0IDIuNS0uMDA2LjkxOS4yMzUgMS45MjkuNjQ2IDIuOTU1QTE1LjcgMTUuNyAwIDAgMCA1LjAxIDEyYy0uNTcuODktMS4wMyAxLjc2OC0xLjM2NCAyLjYwNS0uNDEgMS4wMjYtLjY1MiAyLjAzNi0uNjQ2IDIuOTU1LjAwNi45MjUuMjY3IDEuODI4Ljk0IDIuNS42NzIuNjczIDEuNTc1LjkzNCAyLjUuOTQuOTIuMDA2IDEuOTMtLjIzNSAyLjk1NS0uNjQ2QTE1LjcgMTUuNyAwIDAgMCAxMiAxOC45OW0tMS43NTEtMS4yNTVhMjUgMjUgMCAwIDEtMi4xMDQtMS44OCAyNSAyNSAwIDAgMS0xLjg4LTIuMTA0Yy0uMzE1LjU1LS41NzYgMS4wODUtLjc3OSAxLjU5LS4zNS44NzgtLjUwNyAxLjYyNS0uNTAzIDIuMjA2LjAwMy41NzQuMTYuOTEzLjM1OSAxLjExMS4xOTguMTk5LjUzNy4zNTYgMS4xMTEuMzYuNTguMDAzIDEuMzI4LS4xNTMgMi4yMDUtLjUwNC41MDYtLjIwMyAxLjA0LS40NjMgMS41OS0uNzhabS0zLjk4My03LjQ4NmEyNSAyNSAwIDAgMSAxLjg4LTIuMTA0IDI1IDI1IDAgMCAxIDIuMTAzLTEuODggMTMgMTMgMCAwIDAtMS41OS0uNzc5Yy0uODc4LS4zNS0xLjYyNS0uNTA3LTIuMjA2LS41MDMtLjU3NC4wMDMtLjkxMy4xNi0xLjExMS4zNTktLjE5OS4xOTgtLjM1Ni41MzctLjM2IDEuMTExLS4wMDMuNTguMTUzIDEuMzI4LjUwNCAyLjIwNS4yMDMuNTA2LjQ2NCAxLjA0Ljc4IDEuNTlaIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiPjwvcGF0aD48L3N2Zz4=",
+					"subscription_level": "free",
+					"default_model": "auto",
+					"plugins_model": "gpt-4-plugins",
+					"color": "",
+					"short_explainer": "为改善速度和智能程度而进行了优化。",
+					"tagline": ""
+				}
+			]
+		}`
+	}
 	// 将修改后的内容写回响应体
 	response.Body = io.NopCloser(bytes.NewBufferString(modifiedBody))
 	// 更新Content-Length

diff --git a/backend-api/me.go b/backend-api/me.go
@@ -20,25 +20,10 @@ func Me(r *ghttp.Request) {
 		return
 	}
 	resStr, err := ProxyRequestGet("/backend-api/me", r)
-
-	// UpStream := config.CHATPROXY
-	// // 请求后端接口
-	// res, err := g.Client().SetHeaderMap(map[string]string{
-	// 	"Authorization": "Bearer " + AccessToken,
-	// 	"User-Agent":    r.Header.Get("User-Agent"),
-	// 	"authKey":       config.AUTHKEY(ctx),
-	// }).Get(ctx, UpStream+"/backend-api/me")
 	if err != nil {
 		r.Response.WriteStatus(http.StatusUnauthorized)
 		return
 	}
-	// resStr := res.ReadAllString()
-	// if res.StatusCode != http.StatusOK {
-	// 	r.Response.Status = res.StatusCode
-	// 	r.Response.Write(resStr)
-
-	// 	return
-	// }
 	resJson := gjson.New(resStr)
 	resJson.Set("email", "[email protected]")
 	resJson.Set("name", record["user_username"].String()+expireTime)

diff --git a/config.yaml b/config.yaml
@@ -55,7 +55,7 @@ modules:
         enable: 1
 
 # 接入网关地址
-# CHATPROXY: "https://chat.openai.com"
+CHATPROXY: "https://chat.openai.com"
 JA3_PROXY: "http://a:[email protected]:9988"
 #CHATPROXY: "http://host.docker.internal:7999"
 #CHATPROXY: "https://chatgpt.ggss.club/gateway"