Merge 636b234079 into fb3af2a08f

Merge pull request #6515 from dupl/main
Removed deprecated Gemini models
2025-10-09 03:26:38 +08:00 · 2025-06-17 01:40:56 +03:00 · 2025-06-14 13:35:32 +08:00 · 2025-06-12 15:34:03 +08:00 · 2025-06-12 11:19:24 +08:00 · 2025-06-12 11:13:31 +08:00
2 changed files with 23 additions and 7 deletions
--- a/app/client/platforms/openai.ts
+++ b/app/client/platforms/openai.ts
@ -56,7 +56,7 @@ export interface OpenAIListModelResponse {

 export interface RequestPayload {
  messages: {
-    role: "system" | "user" | "assistant";
+    role: "developer" | "system" | "user" | "assistant";
    content: string | MultimodalContent[];
  }[];
  stream?: boolean;
@ -238,8 +238,16 @@ export class ChatGPTApi implements LLMApi {
        // Please do not ask me why not send max_tokens, no reason, this param is just shit, I dont want to explain anymore.
      };

-      // O1 使用 max_completion_tokens 控制token数 (https://platform.openai.com/docs/guides/reasoning#controlling-costs)
      if (isO1OrO3) {
+        // by default the o1/o3 models will not attempt to produce output that includes markdown formatting
+        // manually add "Formatting re-enabled" developer message to encourage markdown inclusion in model responses
+        // (https://learn.microsoft.com/en-us/azure/ai-services/openai/how-to/reasoning?tabs=python-secure#markdown-output)
+        requestPayload["messages"].unshift({
+          role: "developer",
+          content: "Formatting re-enabled",
+        });
+
+        // o1/o3 uses max_completion_tokens to control the number of tokens (https://platform.openai.com/docs/guides/reasoning#controlling-costs)
        requestPayload["max_completion_tokens"] = modelConfig.max_tokens;
      }

--- a/app/constant.ts
+++ b/app/constant.ts
@ -533,20 +533,15 @@ const openaiModels = [
 ];

 const googleModels = [
-  "gemini-1.0-pro", // Deprecated on 2/15/2025
  "gemini-1.5-pro-latest",
  "gemini-1.5-pro",
  "gemini-1.5-pro-002",
-  "gemini-1.5-pro-exp-0827",
  "gemini-1.5-flash-latest",
  "gemini-1.5-flash-8b-latest",
  "gemini-1.5-flash",
  "gemini-1.5-flash-8b",
  "gemini-1.5-flash-002",
-  "gemini-1.5-flash-exp-0827",
  "learnlm-1.5-pro-experimental",
-  "gemini-exp-1114",
-  "gemini-exp-1121",
  "gemini-exp-1206",
  "gemini-2.0-flash",
  "gemini-2.0-flash-exp",
@ -556,6 +551,7 @@ const googleModels = [
  "gemini-2.0-flash-thinking-exp-01-21",
  "gemini-2.0-pro-exp",
  "gemini-2.0-pro-exp-02-05",
+  "gemini-2.5-pro-preview-06-05",
 ];

 const anthropicModels = [
@ -642,6 +638,18 @@ const xAIModes = [
  "grok-2-vision-1212",
  "grok-2-vision",
  "grok-2-vision-latest",
+  "grok-3-mini-fast-beta",
+  "grok-3-mini-fast",
+  "grok-3-mini-fast-latest",
+  "grok-3-mini-beta",
+  "grok-3-mini",
+  "grok-3-mini-latest",
+  "grok-3-fast-beta",
+  "grok-3-fast",
+  "grok-3-fast-latest",
+  "grok-3-beta",
+  "grok-3",
+  "grok-3-latest",
 ];

 const chatglmModels = [
Author	SHA1	Message	Date
wyfyjc	d66c03bfe6	Merge `636b234079` into `fb3af2a08f`	2025-06-17 01:40:56 +03:00
RiverRay	fb3af2a08f	Merge pull request #6515 from dupl/main Some checks failed Run Tests / test (push) Has been cancelled Details Removed deprecated Gemini models	2025-06-14 13:35:32 +08:00
dupl	eb193ac0ff	Removed deprecated Gemini models	2025-06-12 15:34:03 +08:00
RiverRay	c30ddfbb07	Merge pull request #6425 from yunlingz/o_model_md_response Some checks failed Run Tests / test (push) Has been cancelled Details Fix: Encourage markdown inclusion in model responses for o1/o3	2025-06-12 11:19:24 +08:00
RiverRay	a2f0149786	Merge pull request #6460 from dreamsafari/main 加入Grok3模型列表	2025-06-12 11:13:31 +08:00
GH Action - Upstream Sync	03d36f96ed	Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web	2025-06-12 01:53:30 +00:00
RiverRay	705dffc664	Merge pull request #6514 from KevinShiCN/patch-1 Some checks failed Run Tests / test (push) Has been cancelled Details Add gemini-2.5-pro-preview-06-05 into constant.ts	2025-06-11 16:14:09 +08:00
KevinShiCN	02f7e6de98	Add gemini-2.5-pro-preview-06-05 into constant.ts	2025-06-08 23:59:49 +08:00
dreamsafari	843dc52efa	加入Grok3模型列表	2025-04-22 13:06:54 +08:00
Yunling Zhu	c261ebc82c	use unshift to improve perf	2025-04-06 16:56:54 +08:00
Yunling Zhu	f7c747c65f	encourage markdown inclusion for o1/o3	2025-04-03 22:11:59 +08:00