Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main #4849

Draft
wants to merge 178 commits into
base: feat/voice-input
Choose a base branch
from
Draft

Main #4849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
178 commits
Select commit Hold shift + click to select a range
5610f42
feat: add multi-model support
Yidadaa Sep 25, 2023
cdf0311
feat: add claude and bard
Yidadaa Nov 7, 2023
544bab0
Refactor Summarize Logic
H0llyW00dzZ Nov 9, 2023
39f3afd
Update .env.template 更正单词
surkaa Nov 16, 2023
fe0f078
Feat ChatGPT LLM Api [Console Log] [Text Moderation] [Azure]
H0llyW00dzZ Nov 19, 2023
10ea9bf
fix: MessageSelectorWarning
Nov 29, 2023
36e9c6a
Refactor Api Common [Server Side] [Console Log]
H0llyW00dzZ Dec 1, 2023
8dc8682
Fix Api Common [Server Side]
H0llyW00dzZ Dec 4, 2023
1442337
The language filtering option of the mask is stored
reece00 Dec 11, 2023
943a270
fix(chat-item): selected chat-item showing border in other pages
erich2s Dec 15, 2023
f05bf0a
chore(deps-dev): bump eslint-plugin-prettier from 4.2.1 to 5.1.3
dependabot[bot] Jan 15, 2024
86f42d5
fix: webdav check httpcode list
Dup4 Jan 18, 2024
3554872
Add gpt-4-0125-preview
leo4life2 Jan 25, 2024
bf1b5c3
Update Docker Ignore
H0llyW00dzZ Feb 21, 2024
524c9be
support \(...\) and \[...\] style math formula
MrrDrr Mar 2, 2024
ed8099b
Update README.md
MrrDrr Mar 2, 2024
e33d05c
merge
leo4life2 Mar 5, 2024
754303e
v0.0.0
Kivi1998 Mar 14, 2024
2053db4
ChatGPT Logo
Kivi1998 Mar 19, 2024
c0c54e5
Fix Webdav Syncing Issues
H0llyW00dzZ Mar 19, 2024
5bf4027
Merge branch 'main' into main
Kivi1998 Mar 21, 2024
ebbd870
Merge pull request #4353 from H0llyW00dzZ/cherry-pick-webdav
fred-bf Mar 21, 2024
29e03b8
Fix: Handle empty server response in API call
Mar 23, 2024
e8d76a5
patch: disable webdav redirect
fred-bf Mar 24, 2024
90af4e3
Merge pull request #4381 from ChatGPTNextWeb/fred-bf-patch-3
fred-bf Mar 24, 2024
f1b4c08
Merge pull request #4379 from EasonQwQ/main
fred-bf Mar 24, 2024
8e554a8
chore(deps): bump emoji-picker-react from 4.5.15 to 4.9.2
dependabot[bot] Mar 25, 2024
6dd7a6a
chore(deps-dev): bump @types/node from 20.9.0 to 20.11.30
dependabot[bot] Mar 25, 2024
a4e4286
Merge pull request #4186 from MrrDrr/formula_rendering
Dean-YZG Mar 25, 2024
a1aaea9
Merge pull request #4391 from ChatGPTNextWeb/dependabot/npm_and_yarn/…
Dean-YZG Mar 26, 2024
dcad400
chore(deps-dev): bump @types/react from 18.2.14 to 18.2.70
dependabot[bot] Mar 26, 2024
e5edd85
Merge pull request #4390 from ChatGPTNextWeb/dependabot/npm_and_yarn/…
Dean-YZG Mar 26, 2024
5bc3930
Merge pull request #4389 from ChatGPTNextWeb/dependabot/npm_and_yarn/…
Dean-YZG Mar 26, 2024
76603d1
chore(deps-dev): bump @tauri-apps/cli from 1.5.7 to 1.5.11
dependabot[bot] Mar 26, 2024
1049006
Merge pull request #4366 from Essmatiko123/dependabot/npm_and_yarn/es…
Dean-YZG Mar 26, 2024
711bf19
Merge pull request #4264 from ChatGPTNextWeb/dependabot/npm_and_yarn/…
Dean-YZG Mar 26, 2024
3c97a4f
Merge pull request #4091 from H0llyW00dzZ/docker-ignore
Dean-YZG Mar 26, 2024
43824bd
Merge pull request #4193 from MrrDrr/env_bug_fix
Dean-YZG Mar 26, 2024
afaa529
Merge pull request #3870 from Dup4/fix-webdav-check
Dean-YZG Mar 27, 2024
53fb52c
fix docker
hmhuming Mar 27, 2024
0de9242
Merge pull request #3529 from erich2s/chat-item-selected-border
Dean-YZG Mar 27, 2024
c93b36f
Merge pull request #3508 from reece00/Mask-language
Dean-YZG Mar 27, 2024
24caa3b
Merge branch 'main' of https://github.com/hmhuming/ChatGPT-Next-Web
hmhuming Mar 28, 2024
93e2151
Merge pull request #4408 from hmhuming/main
Dean-YZG Mar 28, 2024
8ef77f5
Merge branch 'main' into serverrside
Dean-YZG Mar 28, 2024
57026f6
Merge pull request #3424 from H0llyW00dzZ/serverrside
Dean-YZG Mar 28, 2024
e056a1d
Merge pull request #3405 from Yuliang-Lee/fix/MessageSelectorWarning
Dean-YZG Mar 28, 2024
6b3daec
Merge pull request #3314 from H0llyW00dzZ/text-moderation-azure
Dean-YZG Mar 28, 2024
113d961
Merge pull request #3280 from surkaa/patch-1
Dean-YZG Mar 28, 2024
e38b527
Merge pull request #3205 from H0llyW00dzZ/summarizelogic
Dean-YZG Mar 28, 2024
27ed57a
Update utils.ts
RubuJam Mar 28, 2024
cd30368
Update constant.ts
RubuJam Mar 28, 2024
f8b180a
Update google.ts
RubuJam Mar 28, 2024
4d0c77b
更新 constant.ts
RubuJam Mar 28, 2024
17e57bb
feat: update apple-touch-icon.png
xiaotianxt Mar 30, 2024
15e5958
feat: settings command dev done
Apr 2, 2024
9f3fc5e
Merge pull request #4417 from xiaotianxt/main
Dean-YZG Apr 4, 2024
69b079c
feat: dev done
Apr 7, 2024
3cb4315
feat: clean codes
Apr 7, 2024
768decd
feat: parse response message
Apr 7, 2024
86b5c55
feat: roles must alternate between user and assistant in claude, so a…
Apr 7, 2024
0fbb560
feat: delete returned models in modals function of ClaudeApi instance
Apr 7, 2024
ef7617d
feat: configs about app client
Apr 8, 2024
5446d8d
feat: fix illegal exports in app/api/anthropic/[...path]/route.ts
Apr 8, 2024
6dad353
feat: call claude api not in credential 'include' mode
Apr 8, 2024
63f9063
feat: call claude api not in credential 'include' mode
Apr 8, 2024
f68b8af
Merge pull request #4457 from ChatGPTNextWeb/feat-multi-models
Dean-YZG Apr 8, 2024
264da67
feat: remove duplicate Input Template
Apr 8, 2024
9b03ab8
Merge pull request #4461 from ChatGPTNextWeb/chore-fix
Dean-YZG Apr 8, 2024
9b982b4
feat: fix no max_tokens in payload when calling openai vision model
Apr 8, 2024
1b83dd0
Merge pull request #4462 from ChatGPTNextWeb/chore-fix
Dean-YZG Apr 8, 2024
02b0e79
feat: modify some propmt in DEFAULT_INPUT_TEMPLATE about expressing l…
Apr 8, 2024
db533fc
Merge pull request #4466 from ChatGPTNextWeb/chore-fix
Dean-YZG Apr 8, 2024
6cb296f
feat: remove debug code
Apr 9, 2024
984c79e
Merge pull request #4469 from ChatGPTNextWeb/chore-fix
Dean-YZG Apr 9, 2024
d508127
feat: fix system prompt
Apr 9, 2024
c7b14cb
Merge pull request #4470 from ChatGPTNextWeb/chore-fix
Dean-YZG Apr 9, 2024
84681d3
Update layout.tsx
dlb-data Apr 9, 2024
598468c
Update layout.tsx
dlb-data Apr 9, 2024
7fcfbc3
feat: 补充文档
Apr 9, 2024
f3106e3
Merge pull request #4477 from ChatGPTNextWeb/chore-fix
Dean-YZG Apr 9, 2024
8b191bd
feat: white webdav server domain
Apr 9, 2024
4cb0655
feat: Optimize document
Apr 9, 2024
b175132
feat: Optimize var names
Apr 9, 2024
df33139
feat: Optimize code
Apr 9, 2024
908ce3b
feat: Optimize document
Apr 9, 2024
13db64f
Merge pull request #4479 from ChatGPTNextWeb/chore-fix
Dean-YZG Apr 9, 2024
79f3424
feat: Solve the problem of using openai interface protocol for user-d…
Apr 9, 2024
dd1d850
Merge pull request #4476 from dlb-data/dlb-data-patch-1
Dean-YZG Apr 10, 2024
67acc38
Merge pull request #4480 from ChatGPTNextWeb/chore-fix
Dean-YZG Apr 10, 2024
6c718ad
Merge branch 'main' of github.com:ChatGPTNextWeb/ChatGPT-Next-Web
leo4life2 Apr 10, 2024
6319f41
add new turbo
leo4life2 Apr 10, 2024
f101ee3
support new vision models
leo4life2 Apr 10, 2024
5dc5bfb
Merge branch 'main' into main
RubuJam Apr 10, 2024
55a93e7
Merge pull request #4487 from leo4life2/main
Dean-YZG Apr 11, 2024
0cffaf8
Merge branch 'main' into main
RubuJam Apr 11, 2024
1756bdd
Improve tw Traditional Chinese locale
PeterDaveHello Apr 11, 2024
ee15c14
feat: fix webdav 逻辑
Apr 12, 2024
b72d7fb
feat: fix webdav 逻辑2
Apr 12, 2024
55d7014
feat: fix the logtics of client joining webdav url
Apr 12, 2024
af3ebac
Merge pull request #4507 from ChatGPTNextWeb/chore-fix
Dean-YZG Apr 12, 2024
fd8d0a1
feat: fix the logtics of client joining webdav url
Apr 12, 2024
6520f9b
add knowledge cutoff date for gpt-4-turbo-2024-04-09
MrrDrr Apr 12, 2024
aa084ea
add timezone in system prompts
MrrDrr Apr 12, 2024
2322851
perf: avoid read localStorage on every render
SukkaW Apr 14, 2024
d112dc4
Merge pull request #4500 from PeterDaveHello/locale-tw-cht
Dean-YZG Apr 15, 2024
e2c0d2a
Merge pull request #4509 from MrrDrr/add_knowledge_cutoff
Dean-YZG Apr 15, 2024
f742a7e
Merge pull request #4510 from MrrDrr/add_timezone_in_system_prompts
Dean-YZG Apr 15, 2024
51f7daa
Merge pull request #4514 from SukkaW/fix-ls-performance
Dean-YZG Apr 15, 2024
1e2a662
Merge pull request #4412 from RubuJam/main
Dean-YZG Apr 15, 2024
9564b26
Update constant.ts
Algorithm5838 Apr 15, 2024
ad80153
Merge pull request #4520 from Algorithm5838/refactor-models
Dean-YZG Apr 16, 2024
fb8b8d2
feat: (1) fix issues/4335 and issues/4518
Apr 16, 2024
9b2cb1e
Merge pull request #4525 from ChatGPTNextWeb/chore-fix
Dean-YZG Apr 16, 2024
fcb1a65
Update constant.ts
RubuJam Apr 17, 2024
b7aab3c
Update google.ts
RubuJam Apr 17, 2024
c96e4b7
feat: Support a way to define default model by adding DEFAULT_MODEL env.
jalr4ever Apr 19, 2024
1cd0beb
chore: No outline when element is in `:focus-visible` state
RoyRao2333 Apr 23, 2024
dd4648e
remove max_tokens from the official version of gpt4-turbo
MrrDrr Apr 24, 2024
9aec3b7
Merge pull request #4545 from jalr4ever/main-default-model-env
Dean-YZG Apr 25, 2024
7d647c9
Merge pull request #4535 from RubuJam/main
Dean-YZG Apr 25, 2024
69642fb
Merge pull request #4557 from RoyRao2333/dev/no-fucos-outline
Dean-YZG Apr 25, 2024
506c17a
Merge pull request #4564 from MrrDrr/gpt4v_remove_max_tokens
Dean-YZG Apr 25, 2024
b2e8a1e
feat: bump version code
fred-bf Apr 30, 2024
52312db
Merge pull request #4595 from ChatGPTNextWeb/feat/bump-version
fred-bf Apr 30, 2024
4cd9437
fix i think
rooben-me May 3, 2024
9cd3358
this is the fix
rooben-me May 3, 2024
9d728ec
this is ti
rooben-me May 3, 2024
6fc7c50
this
rooben-me May 3, 2024
7b61d05
new fix
rooben-me May 3, 2024
a103582
fix
rooben-me May 3, 2024
1da7d81
Fix cloud data sync issue with Upstash (#4563)
rooben-me May 3, 2024
8ef2617
Removed spaces
rooben-me May 3, 2024
b3e856d
feat: fix 1)the property named 'role' of the first message must be 'u…
May 6, 2024
a1493bf
feat: bugfix
May 6, 2024
58c0d3e
Merge pull request #4625 from ChatGPTNextWeb/chore-fix
Dean-YZG May 6, 2024
864529c
feat: googleApiKey & anthropicApiKey support setting multi-key
May 6, 2024
3513c68
Merge pull request #4626 from ChatGPTNextWeb/chore-fix
Dean-YZG May 7, 2024
cd48f7e
chore(deps): bump next from 13.4.9 to 14.1.1
dependabot[bot] May 10, 2024
212ae76
Merge pull request #4610 from rooben-me/fix-sync
Dean-YZG May 13, 2024
c10447d
feat: 1)upload image with type 'heic' 2)change the empty message to …
May 13, 2024
d3131d2
Fix typo for "OpenAI Endpoint" in the en locale
DmitrySandalov May 13, 2024
2d1f0c9
feat: support env var DEFAULT_INPUT_TEMPLATE to custom default templa…
May 13, 2024
9d7ce20
feat: support env var DEFAULT_INPUT_TEMPLATE to custom default templa…
May 13, 2024
8ec7212
Merge pull request #4670 from DmitrySandalov/patch-1
Dean-YZG May 13, 2024
6b30e16
Merge pull request #4647 from ChatGPTNextWeb/dependabot/npm_and_yarn/…
Dean-YZG May 13, 2024
fffbee8
Merge remote-tracking branch 'origin/main' into chore-fix
May 13, 2024
ef5f910
support gpt-4o
leo4life2 May 13, 2024
5df8b1d
fix: revert gpt-4-turbo-preview detection
fred-bf May 14, 2024
9faab96
Merge pull request #4674 from leo4life2/main
fred-bf May 14, 2024
3a007e4
feat: bump version
fred-bf May 14, 2024
cf635a5
Merge pull request #4684 from ChatGPTNextWeb/fred-bf-patch-4
fred-bf May 14, 2024
d411159
Dockerfile: Listen to any addresses instead of localhost, fixes #4682
ReeseWang May 14, 2024
6612550
feat: support gemini flash
fred-bf May 15, 2024
0bf758a
Merge pull request #4702 from ChatGPTNextWeb/feat/gemini-flash
fred-bf May 15, 2024
4789a7f
feat: add gemini flash into vision model list
fred-bf May 15, 2024
0eccb54
Merge branch 'main' into feat/gemini-flash
fred-bf May 15, 2024
1e00c89
Merge pull request #4703 from ChatGPTNextWeb/feat/gemini-flash
fred-bf May 15, 2024
cf29a8f
chore: custom node listen address by `--host` flag
fred-bf May 15, 2024
8688842
gpt-4o as vision model
leo4life2 May 15, 2024
bffd9d9
Merge pull request #4706 from leo4life2/patch-1
fred-bf May 16, 2024
e58cb2b
chore: wrap the node command flag
fred-bf May 16, 2024
48d44ec
Merge branch 'main' into chore-fix
fred-bf May 16, 2024
0aa807d
feat: remove empty memoryPrompt in ChatMessages
May 16, 2024
01c9dbc
Merge remote-tracking branch 'origin/main' into gpt-4o
Kivi1998 May 16, 2024
f55f04a
Merge pull request #4671 from ChatGPTNextWeb/chore-fix
Dean-YZG May 16, 2024
bfdb47a
ChatGPT Logo
Kivi1998 May 16, 2024
7f3516f
Merge branch 'main' into chatGPT
Kivi1998 May 16, 2024
22ef3d3
update translation
zhz8951 May 19, 2024
c3e2f3b
Merge pull request #4732 from zhz8951/main
Dean-YZG May 20, 2024
754acd7
Merge pull request #4710 from Kivi1998/chatGPT
Dean-YZG May 20, 2024
d89a12a
Revert "Chat gpt"
Dean-YZG May 20, 2024
de11112
Merge pull request #4743 from ChatGPTNextWeb/revert-4710-chatGPT
Dean-YZG May 20, 2024
3866448
Merge pull request #4689 from ReeseWang/main
fred-bf May 22, 2024
bf3bc3c
fix: make env PROXY_URL avaliable in Docker container.
shawn-mxi-ai May 24, 2024
da2e237
Merge pull request #4771 from yangxiang92/main
Dean-YZG May 27, 2024
1d8fd48
Add new Teracloud domain
junxian-li-hpc Jun 6, 2024
b6735bf
Merge pull request #4826 from junxian-li-hpc/fix-webdav
fred-bf Jun 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 92 additions & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,97 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
*.lcov

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Node.js dependencies
/node_modules
/jspm_packages

# TypeScript v1 declaration files
typings

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variable files
.env
.env.test

# local env files
.env*.local

# docker-compose env files
.env
# Next.js build output
.next
out

# Nuxt.js build output
.nuxt
dist

# Gatsby files
.cache/


# Vuepress build output
.vuepress/dist

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/

# Temporary folders
tmp
temp

# IDE and editor directories
.idea
.vscode
*.swp
*.swo
*~

# OS generated files
.DS_Store
Thumbs.db

# secret key
*.key
*.key.pub
*.key.pub
16 changes: 15 additions & 1 deletion .env.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Your openai api key. (required)
OPENAI_API_KEY=sk-xxxx

# Access passsword, separated by comma. (optional)
# Access password, separated by comma. (optional)
CODE=your-password

# You can start service behind a proxy
Expand Down Expand Up @@ -47,3 +47,17 @@ ENABLE_BALANCE_QUERY=
# If you want to disable parse settings from url, set this value to 1.
DISABLE_FAST_LINK=


# anthropic claude Api Key.(optional)
ANTHROPIC_API_KEY=

### anthropic claude Api version. (optional)
ANTHROPIC_API_VERSION=



### anthropic claude Api url (optional)
ANTHROPIC_URL=

### (optional)
WHITE_WEBDEV_ENDPOINTS=
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ CMD if [ -n "$PROXY_URL" ]; then \
echo "[ProxyList]" >> $conf; \
echo "$protocol $host $port" >> $conf; \
cat /etc/proxychains.conf; \
proxychains -f $conf node server.js; \
proxychains -f $conf node server.js --host 0.0.0.0; \
else \
node server.js; \
fi
25 changes: 24 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,18 @@ Google Gemini Pro Api Key.

Google Gemini Pro Api Url.

### `ANTHROPIC_API_KEY` (optional)

anthropic claude Api Key.

### `ANTHROPIC_API_VERSION` (optional)

anthropic claude Api version.

### `ANTHROPIC_URL` (optional)

anthropic claude Api Url.

### `HIDE_USER_API_KEY` (optional)

> Default: Empty
Expand All @@ -216,7 +228,7 @@ If you do not want users to use GPT-4, set this value to 1.

> Default: Empty

If you do want users to query balance, set this value to 1, or you should set it to 0.
If you do want users to query balance, set this value to 1.

### `DISABLE_FAST_LINK` (optional)

Expand All @@ -233,6 +245,17 @@ To control custom models, use `+` to add a custom model, use `-` to hide a model

User `-all` to disable all default models, `+all` to enable all default models.

### `WHITE_WEBDEV_ENDPOINTS` (optional)

You can use this option if you want to increase the number of webdav service addresses you are allowed to access, as required by the format:
- Each address must be a complete endpoint
> `https://xxxx/yyy`
- Multiple addresses are connected by ', '

### `DEFAULT_INPUT_TEMPLATE` (optional)

Customize the default template used to initialize the User Input Preprocessing configuration item in Settings.

## Requirements

NodeJS >= 18, Docker >= 20
Expand Down
22 changes: 22 additions & 0 deletions README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,18 @@ Google Gemini Pro 密钥.

Google Gemini Pro Api Url.

### `ANTHROPIC_API_KEY` (optional)

anthropic claude Api Key.

### `ANTHROPIC_API_VERSION` (optional)

anthropic claude Api version.

### `ANTHROPIC_URL` (optional)

anthropic claude Api Url.

### `HIDE_USER_API_KEY` (可选)

如果你不想让用户自行填入 API Key,将此环境变量设置为 1 即可。
Expand All @@ -130,13 +142,23 @@ Google Gemini Pro Api Url.

如果你想禁用从链接解析预制设置,将此环境变量设置为 1 即可。

### `WHITE_WEBDEV_ENDPOINTS` (可选)

如果你想增加允许访问的webdav服务地址,可以使用该选项,格式要求:
- 每一个地址必须是一个完整的 endpoint
> `https://xxxx/xxx`
- 多个地址以`,`相连

### `CUSTOM_MODELS` (可选)

> 示例:`+qwen-7b-chat,+glm-6b,-gpt-3.5-turbo,gpt-4-1106-preview=gpt-4-turbo` 表示增加 `qwen-7b-chat` 和 `glm-6b` 到模型列表,而从列表中删除 `gpt-3.5-turbo`,并将 `gpt-4-1106-preview` 模型名字展示为 `gpt-4-turbo`。
> 如果你想先禁用所有模型,再启用指定模型,可以使用 `-all,+gpt-3.5-turbo`,则表示仅启用 `gpt-3.5-turbo`

用来控制模型列表,使用 `+` 增加一个模型,使用 `-` 来隐藏一个模型,使用 `模型名=展示名` 来自定义模型的展示名,用英文逗号隔开。

### `DEFAULT_INPUT_TEMPLATE` (可选)
自定义默认的 template,用于初始化『设置』中的『用户输入预处理』配置项

## 开发

点击下方按钮,开始二次开发:
Expand Down
Loading
Loading