Merge 1cf84d2106 into 3809375694

Merge pull request #6457 from ACTOR-ALCHEMIST/main
Support OpenAI o3 and o4-mini
2025-10-15 14:33:43 +08:00 · 2025-04-22 14:55:15 +08:00 · 2025-04-19 16:00:41 +08:00 · 2025-04-19 15:59:31 +08:00 · 2025-04-19 15:56:53 +08:00 · 2025-04-19 15:50:48 +08:00
4 changed files with 21 additions and 7 deletions
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ English / [简体中文](./README_CN.md)
 [![MacOS][MacOS-image]][download-url]
 [![Linux][Linux-image]][download-url]

-[NextChatAI](https://nextchat.club?utm_source=readme) / [Web App Demo](https://app.nextchat.dev) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [Discord](https://discord.gg/YCkeafCafC) / [Enterprise Edition](#enterprise-edition) / [Twitter](https://twitter.com/NextChatDev)
+[NextChatAI](https://nextchat.club?utm_source=readme) / [iOS APP](https://apps.apple.com/us/app/nextchat-ai/id6743085599) / [Web App Demo](https://app.nextchat.dev) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [Enterprise Edition](#enterprise-edition) 


 [saas-url]: https://nextchat.club?utm_source=readme
@@ -41,7 +41,9 @@ English / [简体中文](./README_CN.md)
 </div>

 ## 🥳 Cheer for NextChat iOS Version Online!
- > [ 👉 Click Here Install Now](https://apps.apple.com/us/app/nextchat-ai/id6743085599)
+> [👉 Click Here to Install Now](https://apps.apple.com/us/app/nextchat-ai/id6743085599)
+
+> [❤️ Source Code Coming Soon](https://github.com/ChatGPTNextWeb/NextChat-iOS)

 ![Github iOS Image](https://github.com/user-attachments/assets/e0aa334f-4c13-4dc9-8310-e3b09fa4b9f3)

--- a/app/client/platforms/openai.ts
+++ b/app/client/platforms/openai.ts
@@ -198,7 +198,8 @@ export class ChatGPTApi implements LLMApi {
    const isDalle3 = _isDalle3(options.config.model);
    const isO1OrO3 =
      options.config.model.startsWith("o1") ||
-      options.config.model.startsWith("o3");
+      options.config.model.startsWith("o3") ||
+      options.config.model.startsWith("o4-mini");
    if (isDalle3) {
      const prompt = getMessageTextContent(
        options.messages.slice(-1)?.pop() as any,
@@ -243,7 +244,7 @@ export class ChatGPTApi implements LLMApi {
      }

      // add max_tokens to vision model
-      if (visionModel) {
+      if (visionModel && !isO1OrO3) {
        requestPayload["max_tokens"] = Math.max(modelConfig.max_tokens, 4000);
      }
    }
--- a/app/constant.ts
+++ b/app/constant.ts
@@ -478,6 +478,8 @@ export const VISION_MODEL_REGEXES = [
  /^dall-e-3$/, // Matches exactly "dall-e-3"
  /glm-4v/,
  /vl/i,
+  /o3/,
+  /o4-mini/,
 ];

 export const EXCLUDE_VISION_MODEL_REGEXES = [/claude-3-5-haiku-20241022/];
@@ -516,6 +518,8 @@ const openaiModels = [
  "o1-mini",
  "o1-preview",
  "o3-mini",
+  "o3",
+  "o4-mini",
 ];

 const googleModels = [
--- a/yarn.lock
+++ b/yarn.lock
@@ -2423,6 +2423,11 @@
  resolved "https://registry.npmmirror.com/@types/tough-cookie/-/tough-cookie-4.0.5.tgz#cb6e2a691b70cb177c6e3ae9c1d2e8b2ea8cd304"
  integrity sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==

+"@types/trusted-types@^2.0.7":
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11"
+  integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==
+
 "@types/unist@*", "@types/unist@^2.0.0":
  version "2.0.6"
  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
@@ -3958,9 +3963,11 @@ domhandler@^4.2.0, domhandler@^4.3.1:
    domelementtype "^2.2.0"

 dompurify@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.5.tgz#eb3d9cfa10037b6e73f32c586682c4b2ab01fbed"
-  integrity sha512-F9e6wPGtY+8KNMRAVfxeCOHU0/NPWMSENNq4pQctuXRqqdEPW7q3CrLbR5Nse044WwacyjHGOMlvNsBe1y6z9A==
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.2.4.tgz#af5a5a11407524431456cf18836c55d13441cd8e"
+  integrity sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==
+  optionalDependencies:
+    "@types/trusted-types" "^2.0.7"

 domutils@^2.8.0:
  version "2.8.0"
Author	SHA1	Message	Date
dependabot[bot]	08b761b431	Merge `1cf84d2106` into `3809375694`	2025-04-22 14:55:15 +08:00
RiverRay	3809375694	Merge pull request #6457 from ACTOR-ALCHEMIST/main Some checks failed Run Tests / test (push) Has been cancelled Details Support OpenAI o3 and o4-mini	2025-04-19 16:00:41 +08:00
RiverRay	1b0de25986	Update README.md	2025-04-19 15:59:31 +08:00
RiverRay	865c45dd29	Update README.md	2025-04-19 15:56:53 +08:00
RiverRay	1f5d8e6d9c	Merge pull request #6458 from ChatGPTNextWeb/Leizhenpeng-patch-7 Update README.md	2025-04-19 15:50:48 +08:00
Jasper Hu	2d7229d2b8	feat: 支持 OpenAI 新模型 o3 与 o4-mini，并适配新参数	2025-04-18 20:36:07 +01:00
dependabot[bot]	1cf84d2106	chore(deps): bump dompurify from 3.0.5 to 3.2.4 Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.0.5 to 3.2.4. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/3.0.5...3.2.4) --- updated-dependencies: - dependency-name: dompurify dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2025-03-14 12:06:13 +00:00