Compare commits

...

86 Commits

Author SHA1 Message Date
maxiaoxiao
51189b1c24 Merge b9e3f47243 into 3809375694 2025-05-29 07:42:56 +00:00
maxiaoxiao
b9e3f47243 Merge branch 'ChatGPTNextWeb:main' into main 2025-05-29 15:42:54 +08:00
RiverRay
3809375694 Merge pull request #6457 from ACTOR-ALCHEMIST/main
Some checks failed
Run Tests / test (push) Has been cancelled
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
maxiaoxiao
5ac2a404a4 Merge branch 'ChatGPTNextWeb:main' into main 2025-04-17 15:13:24 +08:00
RiverRay
11b37c15bd Merge pull request #6450 from stephen-zeng/main
Some checks failed
Run Tests / test (push) Has been cancelled
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
RiverRay
48469bd8ca Merge pull request #6392 from ChatGPTNextWeb/Leizhenpeng-patch-6
Some checks failed
Run Tests / test (push) Has been cancelled
Update README.md
2025-03-20 17:52:02 +08:00
maxiaoxiao
24b2a0c14b Merge branch 'ChatGPTNextWeb:main' into main 2025-02-19 12:24:22 +08:00
GH Action - Upstream Sync
a69234e715 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-09-16 01:07:37 +00:00
GH Action - Upstream Sync
c90d65a98d Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-09-15 01:10:39 +00:00
GH Action - Upstream Sync
ca9aa50ad1 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-09-14 01:02:35 +00:00
GH Action - Upstream Sync
22616b0ea0 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-09-13 01:03:24 +00:00
GH Action - Upstream Sync
c13f9b0f21 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-09-10 01:03:32 +00:00
GH Action - Upstream Sync
ba123dfcdf Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-09-09 01:04:58 +00:00
GH Action - Upstream Sync
aa16dfe59d Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-09-08 01:08:11 +00:00
GH Action - Upstream Sync
82aa3c483c Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-09-07 01:01:48 +00:00
GH Action - Upstream Sync
1f53f41d53 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-09-05 01:02:48 +00:00
GH Action - Upstream Sync
08119f9087 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-30 01:02:33 +00:00
GH Action - Upstream Sync
217026bd5d Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-28 01:01:45 +00:00
GH Action - Upstream Sync
27a315fad5 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-25 01:05:08 +00:00
GH Action - Upstream Sync
3ad56ad304 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-22 01:01:16 +00:00
GH Action - Upstream Sync
9cb7c4907f Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-21 00:59:44 +00:00
GH Action - Upstream Sync
4b3e664cee Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-20 00:59:39 +00:00
GH Action - Upstream Sync
81d9584338 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-17 00:58:03 +00:00
GH Action - Upstream Sync
000f750d7c Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-16 00:59:39 +00:00
GH Action - Upstream Sync
e644718b8a Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-14 01:00:12 +00:00
GH Action - Upstream Sync
4acb5f624c Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-09 01:00:34 +00:00
GH Action - Upstream Sync
6ee6671028 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-08 00:59:43 +00:00
GH Action - Upstream Sync
3d7b39f6ff Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-07 01:00:02 +00:00
GH Action - Upstream Sync
f414d2d41e Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-06 00:59:19 +00:00
GH Action - Upstream Sync
a2cf5eb9d7 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-04 01:03:36 +00:00
GH Action - Upstream Sync
27f8d4e463 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-03 00:58:24 +00:00
GH Action - Upstream Sync
207737fd61 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-02 00:58:55 +00:00
GH Action - Upstream Sync
d5b8a0d191 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-31 00:49:12 +00:00
GH Action - Upstream Sync
25c42a02c8 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-30 00:59:01 +00:00
GH Action - Upstream Sync
0ed5dc627a Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-27 00:57:58 +00:00
GH Action - Upstream Sync
58a2cf4d0e Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-26 00:58:13 +00:00
GH Action - Upstream Sync
3f9f78b823 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-23 00:59:05 +00:00
GH Action - Upstream Sync
79aeffed01 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-21 01:03:03 +00:00
GH Action - Upstream Sync
daab120d4c Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-20 00:57:28 +00:00
GH Action - Upstream Sync
9d4d486dac Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-19 01:09:46 +00:00
GH Action - Upstream Sync
9bbaa7cebd Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-18 00:57:50 +00:00
GH Action - Upstream Sync
9d623dc11d Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-17 00:58:56 +00:00
GH Action - Upstream Sync
4357db6a65 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-16 00:59:44 +00:00
GH Action - Upstream Sync
1e59be5f06 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-14 01:03:03 +00:00
GH Action - Upstream Sync
eb945f1c64 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-13 00:58:30 +00:00
GH Action - Upstream Sync
e07af01413 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-12 00:57:45 +00:00
GH Action - Upstream Sync
59e1449b2f Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-11 00:58:47 +00:00
GH Action - Upstream Sync
9d217bdaf5 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-10 00:58:50 +00:00
GH Action - Upstream Sync
90ecefad85 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-07 01:02:25 +00:00
GH Action - Upstream Sync
f1bf2c612d Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-06 00:55:51 +00:00
GH Action - Upstream Sync
e5590697aa Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-05 00:57:08 +00:00
GH Action - Upstream Sync
5bb365c383 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-04 00:57:20 +00:00
GH Action - Upstream Sync
b09ee3ffc7 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-07-02 00:57:27 +00:00
GH Action - Upstream Sync
372e6f5f4f Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-06-27 00:56:53 +00:00
GH Action - Upstream Sync
4c7affabd0 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-06-25 00:56:44 +00:00
GH Action - Upstream Sync
fba2dd3e6c Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-06-08 00:55:57 +00:00
GH Action - Upstream Sync
e57a71a90b Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-05-28 00:54:54 +00:00
GH Action - Upstream Sync
c7d3287432 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-05-23 00:54:15 +00:00
GH Action - Upstream Sync
4a9e125185 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-05-21 00:54:29 +00:00
GH Action - Upstream Sync
3014a9765f Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-05-17 00:54:17 +00:00
GH Action - Upstream Sync
cf1e4e3a23 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-05-16 00:54:30 +00:00
GH Action - Upstream Sync
ff84b2d397 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-05-15 00:54:11 +00:00
GH Action - Upstream Sync
ddc45b9e09 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-05-14 00:54:19 +00:00
GH Action - Upstream Sync
7aa0bd7686 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-05-08 00:43:24 +00:00
GH Action - Upstream Sync
ad4c7531cb Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-05-07 00:53:16 +00:00
GH Action - Upstream Sync
e679f0b9db Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-05-01 00:56:31 +00:00
GH Action - Upstream Sync
a988bb91c7 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-04-26 00:52:29 +00:00
GH Action - Upstream Sync
6137cc25c7 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-04-17 00:52:10 +00:00
GH Action - Upstream Sync
e5f4bde59e Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-04-16 00:51:23 +00:00
GH Action - Upstream Sync
f081ad2c43 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-04-15 03:15:06 +00:00
GH Action - Upstream Sync
087dc20091 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-04-13 00:42:21 +00:00
GH Action - Upstream Sync
9f805096d0 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-04-12 00:52:08 +00:00
GH Action - Upstream Sync
43b0b5b9e4 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-04-11 00:51:58 +00:00
GH Action - Upstream Sync
462b6ea279 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-04-10 00:51:22 +00:00
GH Action - Upstream Sync
e3ed3d3189 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-04-09 00:51:24 +00:00
GH Action - Upstream Sync
07be7804a6 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-04-04 00:56:50 +00:00
GH Action - Upstream Sync
915d533a2b Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-03-29 00:51:16 +00:00
GH Action - Upstream Sync
7738cc3af0 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-03-28 00:51:06 +00:00
GH Action - Upstream Sync
59c25231ce Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-03-27 00:50:38 +00:00
3 changed files with 32 additions and 9 deletions

View File

@@ -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

View File

@@ -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);
}
}

View File

@@ -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 = [