Merge 83e6ff6d96 into 3809375694

Merge pull request #6457 from ACTOR-ALCHEMIST/main
Support OpenAI o3 and o4-mini
2025-10-14 22:13:41 +08:00 · 2025-05-07 16:01:16 +00: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 17 additions and 12 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,13 +40,14 @@ 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)
+
+> [❤️ Source Code Coming Soon](https://github.com/ChatGPTNextWeb/NextChat-iOS)
+
+![Github iOS Image](https://github.com/user-attachments/assets/e0aa334f-4c13-4dc9-8310-e3b09fa4b9f3)
+
 
-<img src="https://github.com/user-attachments/assets/f3952210-3af1-4dc0-9b81-40eaa4847d9a"/>
-
-
-
 ## 🫣 NextChat Support MCP  ! 
 > Before build, please set env ENABLE_MCP=true

--- 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/app/masks/index.ts
+++ b/app/masks/index.ts
@@ -30,9 +30,8 @@ if (typeof window != "undefined") {
      return { cn: [], tw: [], en: [] };
    })
    .then((masks) => {
-      const { cn = [], tw = [], en = [] } = masks;
-      return [...cn, ...tw, ...en].map((m) => {
-        BUILTIN_MASKS.push(BUILTIN_MASK_STORE.add(m));
+     return Object.values(masks).flat().map((m) => {
+        BUILTIN_MASKS.push(BUILTIN_MASK_STORE.add(m as BuiltinMask));
      });
    });
 }
Author	SHA1	Message	Date
Lincoln Minto	97c972b21b	Merge `83e6ff6d96` into `3809375694`	2025-05-07 16:01:16 +00: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
Lincoln Minto	83e6ff6d96	Refactor: Simplify mask data processing using Object.values and flat 💻 变更类型 \| Change Type feat 🔀 变更说明 \| Description of Change This PR refactors the code handling mask data processing by simplifying the logic and improving scalability and type safety. Code Enhancements: Refactored the mask processing logic in app/masks/index.ts: Replaced manual destructuring of cn, tw, and en keys with Object.values to dynamically handle all mask data. Used .flat() to simplify merging mask arrays into a single collection. Added explicit type casting (as BuiltinMask) for improved type safety. Benefits: Improved Maintainability: By eliminating hardcoded destructuring, the code can adapt automatically to new mask keys without modification. Enhanced Readability: The use of Object.values and flat provides a cleaner, more concise approach. Scalability: The updated implementation supports dynamic mask additions without breaking functionality. 📝 补充信息 \| Additional Information This change ensures the mask processing code is robust and easier to extend in future updates. Release Notes: New Features: Simplified mask data processing using dynamic Object.values and .flat() methods. Enhanced type safety with explicit type casting (as BuiltinMask).	2025-01-07 09:53:54 -03:00