Merge fc6ddce88c into 3809375694

Merge pull request #6457 from ACTOR-ALCHEMIST/main
Support OpenAI o3 and o4-mini
2025-10-15 22:43:43 +08:00 · 2025-04-20 00:30:32 +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
5 changed files with 43 additions and 25 deletions
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -40,12 +40,6 @@ jobs:
      fail-fast: false
      matrix:
        config:
-          - os: ubuntu-latest
-            arch: x86_64
-            rust_target: x86_64-unknown-linux-gnu
-          - os: macos-latest
-            arch: aarch64
-            rust_target: x86_64-apple-darwin,aarch64-apple-darwin
          - os: windows-latest
            arch: x86_64
            rust_target: x86_64-pc-windows-msvc
@@ -77,12 +71,6 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
        with:
          releaseId: ${{ needs.create-release.outputs.release_id }}
          args: ${{ matrix.config.os == 'macos-latest' && '--target universal-apple-darwin' || '' }}
--- 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/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -995,6 +995,8 @@ function _Chat() {
  const fontSize = config.fontSize;
  const fontFamily = config.fontFamily;

+  const slashOffsetRef = useRef(0);
+
  const [showExport, setShowExport] = useState(false);

  const inputRef = useRef<HTMLTextAreaElement>(null);
@@ -1093,10 +1095,13 @@ function _Chat() {
      setPromptHints([]);
    } else if (text.match(ChatCommandPrefix)) {
      setPromptHints(chatCommands.search(text));
-    } else if (!config.disablePromptHint && n < SEARCH_TEXT_LIMIT) {
+    } else if (
+      !config.disablePromptHint &&
+      text.length < slashOffsetRef.current + SEARCH_TEXT_LIMIT
+    ) {
      // check if need to trigger auto completion
-      if (text.startsWith("/")) {
-        let searchText = text.slice(1);
+      if (text.slice(slashOffsetRef.current).startsWith("/")) {
+        let searchText = text.slice(slashOffsetRef.current + 1);
        onSearch(searchText);
      }
    }
@@ -1134,7 +1139,7 @@ function _Chat() {
        setUserInput("");
      } else {
        // or fill the prompt
-        setUserInput(prompt.content);
+        setUserInput(prompt.content + userInput.slice(0, slashOffsetRef.current));
      }
      inputRef.current?.focus();
    }, 30);
@@ -1185,6 +1190,8 @@ function _Chat() {
      setUserInput(chatStore.lastInput ?? "");
      e.preventDefault();
      return;
+    } else if (e.key === "/") {
+      slashOffsetRef.current = userInput.length;
    }
    if (shouldSubmit(e) && promptHints.length === 0) {
      doSubmit(userInput);
--- a/app/constant.ts
+++ b/app/constant.ts
@@ -417,6 +417,14 @@ export const KnowledgeCutOffDate: Record<string, string> = {
  "gpt-4-turbo": "2023-12",
  "gpt-4-turbo-2024-04-09": "2023-12",
  "gpt-4-turbo-preview": "2023-12",
+  "gpt-4.1": "2024-06",
+  "gpt-4.1-2025-04-14": "2024-06",
+  "gpt-4.1-mini": "2024-06",
+  "gpt-4.1-mini-2025-04-14": "2024-06",
+  "gpt-4.1-nano": "2024-06",
+  "gpt-4.1-nano-2025-04-14": "2024-06",
+  "gpt-4.5-preview": "2023-10",
+  "gpt-4.5-preview-2025-02-27": "2023-10",
  "gpt-4o": "2023-10",
  "gpt-4o-2024-05-13": "2023-10",
  "gpt-4o-2024-08-06": "2023-10",
@@ -458,6 +466,7 @@ export const DEFAULT_TTS_VOICES = [
 export const VISION_MODEL_REGEXES = [
  /vision/,
  /gpt-4o/,
+  /gpt-4\.1/,
  /claude-3/,
  /gemini-1\.5/,
  /gemini-exp/,
@@ -469,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/];
@@ -485,6 +496,14 @@ const openaiModels = [
  "gpt-4-32k-0613",
  "gpt-4-turbo",
  "gpt-4-turbo-preview",
+  "gpt-4.1",
+  "gpt-4.1-2025-04-14",
+  "gpt-4.1-mini",
+  "gpt-4.1-mini-2025-04-14",
+  "gpt-4.1-nano",
+  "gpt-4.1-nano-2025-04-14",
+  "gpt-4.5-preview",
+  "gpt-4.5-preview-2025-02-27",
  "gpt-4o",
  "gpt-4o-2024-05-13",
  "gpt-4o-2024-08-06",
@@ -499,6 +518,8 @@ const openaiModels = [
  "o1-mini",
  "o1-preview",
  "o3-mini",
+  "o3",
+  "o4-mini",
 ];

 const googleModels = [
Author	SHA1	Message	Date
jasongwq	34ae72ba4f	Merge `fc6ddce88c` into `3809375694`	2025-04-20 00:30:32 +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
RiverRay	11b37c15bd	Merge pull request #6450 from stephen-zeng/main Some checks failed Run Tests / test (push) Has been cancelled Details Add gpt-4.1 family & gpt-4.5-preview support	2025-04-17 08:29:19 +08:00
QwQwQ	1d0038f17d	add gpt-4.5-preview support	2025-04-16 22:10:47 +08:00
QwQwQ	619fa519c0	add gpt-4.1 family support	2025-04-16 22:02:35 +08:00
jasongwq	fc6ddce88c	Update app.yml	2024-06-24 11:41:26 +08:00
jasongwq	ecc1dd6474	Support using slash ("/") anywhere in UserInput; previously only supported at the beginning of UserInput	2024-06-23 12:47:13 +08:00