Skip to content

Commit cd354cf

Browse files
authored
Merge pull request #4685 from ChatGPTNextWeb/main
feat: update upstream
2 parents 1cce87a + cf635a5 commit cd354cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2437
-720
lines changed

.dockerignore

Lines changed: 92 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,97 @@
1+
# Logs
2+
logs
3+
*.log
4+
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
7+
8+
# Runtime data
9+
pids
10+
*.pid
11+
*.seed
12+
*.pid.lock
13+
14+
# Directory for instrumented libs generated by jscoverage/JSCover
15+
lib-cov
16+
17+
# Coverage directory used by tools like istanbul
18+
coverage
19+
*.lcov
20+
21+
# nyc test coverage
22+
.nyc_output
23+
24+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
25+
.grunt
26+
27+
# Node.js dependencies
28+
/node_modules
29+
/jspm_packages
30+
31+
# TypeScript v1 declaration files
32+
typings
33+
34+
# Optional npm cache directory
35+
.npm
36+
37+
# Optional eslint cache
38+
.eslintcache
39+
40+
# Optional REPL history
41+
.node_repl_history
42+
43+
# Output of 'npm pack'
44+
*.tgz
45+
46+
# Yarn Integrity file
47+
.yarn-integrity
48+
49+
# dotenv environment variable files
50+
.env
51+
.env.test
52+
153
# local env files
254
.env*.local
355

4-
# docker-compose env files
5-
.env
56+
# Next.js build output
57+
.next
58+
out
59+
60+
# Nuxt.js build output
61+
.nuxt
62+
dist
63+
64+
# Gatsby files
65+
.cache/
66+
67+
68+
# Vuepress build output
69+
.vuepress/dist
70+
71+
# Serverless directories
72+
.serverless/
73+
74+
# FuseBox cache
75+
.fusebox/
76+
77+
# DynamoDB Local files
78+
.dynamodb/
79+
80+
# Temporary folders
81+
tmp
82+
temp
83+
84+
# IDE and editor directories
85+
.idea
86+
.vscode
87+
*.swp
88+
*.swo
89+
*~
90+
91+
# OS generated files
92+
.DS_Store
93+
Thumbs.db
694

95+
# secret key
796
*.key
8-
*.key.pub
97+
*.key.pub

.env.template

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Your openai api key. (required)
33
OPENAI_API_KEY=sk-xxxx
44

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

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

50+
51+
# anthropic claude Api Key.(optional)
52+
ANTHROPIC_API_KEY=
53+
54+
### anthropic claude Api version. (optional)
55+
ANTHROPIC_API_VERSION=
56+
57+
58+
59+
### anthropic claude Api url (optional)
60+
ANTHROPIC_URL=
61+
62+
### (optional)
63+
WHITE_WEBDEV_ENDPOINTS=

README.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ One-Click to get a well-designed cross-platform ChatGPT web UI, with GPT3, GPT4
2525
[MacOS-image]: https://img.shields.io/badge/-MacOS-black?logo=apple
2626
[Linux-image]: https://img.shields.io/badge/-Linux-333?logo=ubuntu
2727

28-
[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FYidadaa%2FChatGPT-Next-Web&env=OPENAI_API_KEY&env=CODE&env=GOOGLE_API_KEY&project-name=chatgpt-next-web&repository-name=ChatGPT-Next-Web)
28+
[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FChatGPTNextWeb%2FChatGPT-Next-Web&env=OPENAI_API_KEY&env=CODE&project-name=nextchat&repository-name=NextChat)
2929

3030
[![Deploy on Zeabur](https://zeabur.com/button.svg)](https://zeabur.com/templates/ZBUEFA)
3131

@@ -200,6 +200,18 @@ Google Gemini Pro Api Key.
200200

201201
Google Gemini Pro Api Url.
202202

203+
### `ANTHROPIC_API_KEY` (optional)
204+
205+
anthropic claude Api Key.
206+
207+
### `ANTHROPIC_API_VERSION` (optional)
208+
209+
anthropic claude Api version.
210+
211+
### `ANTHROPIC_URL` (optional)
212+
213+
anthropic claude Api Url.
214+
203215
### `HIDE_USER_API_KEY` (optional)
204216

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

217229
> Default: Empty
218230
219-
If you do want users to query balance, set this value to 1, or you should set it to 0.
231+
If you do want users to query balance, set this value to 1.
220232

221233
### `DISABLE_FAST_LINK` (optional)
222234

@@ -233,6 +245,13 @@ To control custom models, use `+` to add a custom model, use `-` to hide a model
233245

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

248+
### `WHITE_WEBDEV_ENDPOINTS` (可选)
249+
250+
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:
251+
- Each address must be a complete endpoint
252+
> `https://xxxx/yyy`
253+
- Multiple addresses are connected by ', '
254+
236255
## Requirements
237256

238257
NodeJS >= 18, Docker >= 20

README_CN.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,18 @@ Google Gemini Pro 密钥.
114114

115115
Google Gemini Pro Api Url.
116116

117+
### `ANTHROPIC_API_KEY` (optional)
118+
119+
anthropic claude Api Key.
120+
121+
### `ANTHROPIC_API_VERSION` (optional)
122+
123+
anthropic claude Api version.
124+
125+
### `ANTHROPIC_URL` (optional)
126+
127+
anthropic claude Api Url.
128+
117129
### `HIDE_USER_API_KEY` (可选)
118130

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

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

145+
### `WHITE_WEBDEV_ENDPOINTS` (可选)
146+
147+
如果你想增加允许访问的webdav服务地址,可以使用该选项,格式要求:
148+
- 每一个地址必须是一个完整的 endpoint
149+
> `https://xxxx/xxx`
150+
- 多个地址以`,`相连
151+
133152
### `CUSTOM_MODELS` (可选)
134153

135154
> 示例:`+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`

0 commit comments

Comments
 (0)