Merge 16f74f1748 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
5 changed files with 21 additions and 17 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
@@ -40,11 +40,12 @@ English / [简体中文](./README_CN.md)

 </div>

-## 🥳 Cheer for DeepSeek, China's AI star!
- > Purpose-Built UI for DeepSeek Reasoner Model
+## 🥳 Cheer for NextChat iOS Version Online!
+> [👉 Click Here to Install Now](https://apps.apple.com/us/app/nextchat-ai/id6743085599)

-<img src="https://github.com/user-attachments/assets/f3952210-3af1-4dc0-9b81-40eaa4847d9a"/>
+> [❤️ Source Code Coming Soon](https://github.com/ChatGPTNextWeb/NextChat-iOS)

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

 
 ## 🫣 NextChat Support MCP  ! 
--- 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/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
    "spark-md5": "^3.0.2",
    "use-debounce": "^9.0.4",
    "zod": "^3.24.1",
-    "zustand": "^4.3.8"
+    "zustand": "^5.0.3"
  },
  "devDependencies": {
    "@tauri-apps/api": "^2.1.1",
--- a/yarn.lock
+++ b/yarn.lock
@@ -8328,7 +8328,7 @@ use-memo-one@^1.1.3:
  resolved "https://registry.npmmirror.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
  integrity sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==

-use-sync-external-store@1.2.0, use-sync-external-store@^1.0.0:
+use-sync-external-store@^1.0.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
  integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
@@ -8637,12 +8637,10 @@ zod@^3.23.8, zod@^3.24.1:
  resolved "https://registry.yarnpkg.com/zod/-/zod-3.24.1.tgz#27445c912738c8ad1e9de1bea0359fa44d9d35ee"
  integrity sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==

-zustand@^4.3.8:
-  version "4.3.8"
-  resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.3.8.tgz#37113df8e9e1421b0be1b2dca02b49b76210e7c4"
-  integrity sha512-4h28KCkHg5ii/wcFFJ5Fp+k1J3gJoasaIbppdgZFO4BPJnsNxL0mQXBSFgOgAdCdBj35aDTPvdAJReTMntFPGg==
-  dependencies:
-    use-sync-external-store "1.2.0"
+zustand@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/zustand/-/zustand-5.0.3.tgz#b323435b73d06b2512e93c77239634374b0e407f"
+  integrity sha512-14fwWQtU3pH4dE0dOpdMiWjddcH+QzKIgk1cl8epwSE7yag43k/AD/m4L6+K7DytAOr9gGBe3/EXj9g7cdostg==

 zwitch@^2.0.0:
  version "2.0.4"
Author	SHA1	Message	Date
dependabot[bot]	ea4459fdc0	Merge `16f74f1748` 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
RiverRay	c9ef6d58ed	Update README.md	2025-04-19 15:50:17 +08:00
Jasper Hu	2d7229d2b8	feat: 支持 OpenAI 新模型 o3 与 o4-mini，并适配新参数	2025-04-18 20:36:07 +01:00
dependabot[bot]	16f74f1748	chore(deps): bump zustand from 4.3.8 to 5.0.3 Bumps [zustand](https://github.com/pmndrs/zustand) from 4.3.8 to 5.0.3. - [Release notes](https://github.com/pmndrs/zustand/releases) - [Commits](https://github.com/pmndrs/zustand/compare/v4.3.8...v5.0.3) --- updated-dependencies: - dependency-name: zustand dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-01-19 16:10:26 +00:00