Commit Graph

152 Commits

Author SHA1 Message Date
lloydzhou
c3eaa4762d hotfix: custom comfig for Gemini api. #4944 2024-07-17 12:48:59 +08:00
sijinhui
af741e4dbf merge 2024-07-11 13:09:18 +08:00
sijinhui
a70f984b0f Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	app/api/auth.ts
#	app/api/common.ts
#	app/azure.ts
#	app/client/api.ts
#	app/client/platforms/openai.ts
#	app/components/chat.tsx
#	app/components/settings.tsx
#	app/constant.ts
#	app/layout.tsx
#	app/masks/index.ts
#	app/store/chat.ts
#	app/store/config.ts
#	app/utils/hooks.ts
#	app/utils/model.ts
#	package.json
#	yarn.lock
2024-07-11 10:58:00 +08:00
lloydzhou
3628d68d9a update 2024-07-09 19:56:52 +08:00
lloydzhou
23872086fa merge code 2024-07-09 19:37:47 +08:00
lloydzhou
c229d2c3ce merge main 2024-07-09 16:53:15 +08:00
lloydzhou
fadd7f6eb4 try getAccessToken in app, fixbug to fetch in none stream mode 2024-07-09 14:50:40 +08:00
lloydzhou
f68cd2c5c0 review code 2024-07-09 12:27:44 +08:00
Dogtiti
9bdd37bb63 feat: qwen 2024-07-07 21:59:56 +08:00
Dogtiti
1caa61f4c0 feat: swap name and displayName for bytedance in custom models 2024-07-06 22:59:20 +08:00
Dogtiti
9b3b4494ba wip: doubao 2024-07-06 14:59:37 +08:00
Dogtiti
785d3748e1 feat: support baidu model 2024-07-06 13:05:09 +08:00
Dogtiti
14bc1b6aac chore: optimize the code 2024-07-05 23:56:10 +08:00
lloydzhou
1c20137b0e support azure deployment name 2024-07-05 19:59:45 +08:00
sijinhui
10cc788a49 添加模型 2024-06-24 23:26:14 +08:00
sijinhui
5b075a2a92 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/api/webdav/[...path]/route.ts
2024-06-24 22:48:27 +08:00
sijinhui
8fe96dbf0a temp 2024-06-24 18:08:49 +08:00
hengstchon
4640060891 feat: support model: claude-3-5-sonnet-20240620 2024-06-21 12:28:17 +02:00
sijinhui
52a2537c00 Merge remote-tracking branch 'upstream/main' into dev 2024-06-07 17:12:19 +08:00
sijinhui
ef4927a2ab 修改openai模型 2024-06-07 17:10:12 +08:00
junxian li-ssslab win10
1d8fd480ca Add new Teracloud domain
- Added 'bora.teracloud.jp' to the list of supported domains.
2024-06-07 03:28:00 +08:00
sijinhui
402d6b9664 删除掉没用的模型 2024-05-23 13:38:17 +08:00
sijinhui
4b1fcdac0d 添加微软gpt-4o 2024-05-23 13:29:32 +08:00
DeanYao
d89a12aa05
Revert "Chat gpt" 2024-05-20 19:02:46 +08:00
Hao Jia
01c9dbc1fd Merge remote-tracking branch 'origin/main' into gpt-4o
# Conflicts:
#	public/apple-touch-icon.png
2024-05-16 14:43:10 +08:00
sijinhui
d4c43acd9f Merge remote-tracking branch 'upstream/main' into dev 2024-05-15 23:17:04 +08:00
fred-bf
0bf758afd4
Merge pull request #4702 from ChatGPTNextWeb/feat/gemini-flash
feat: support gemini flash
2024-05-15 15:30:23 +08:00
Fred
6612550c06
feat: support gemini flash 2024-05-15 15:29:38 +08:00
sijinhui
71176bcc74 update ui 2024-05-15 00:39:45 +08:00
sijinhui
8dc76ac212 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/utils.ts
#	package.json
#	yarn.lock
2024-05-14 23:40:40 +08:00
sijinhui
cb62fa7634 add gpt-4o 2024-05-14 13:48:12 +08:00
Leo Li
ef5f910f19
support gpt-4o 2024-05-13 17:28:13 -04:00
sijinhui
db289255e9 change google cdn 2024-05-09 11:31:24 +08:00
sijinhui
0914682095 change model 2024-05-08 23:39:49 +08:00
sijinhui
7a287cef3a package 2024-05-08 11:54:47 +08:00
sijinhui
4fc3de5c55 package 2024-05-08 11:37:50 +08:00
sijinhui
5b1f0355ce Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/config/server.ts
#	app/utils/model.ts
2024-05-07 16:39:45 +08:00
butterfly
b3e856df1d feat: fix 1)the property named 'role' of the first message must be 'user' 2)if default summarize model 'gpt-3.5-turbo' is blocked, use currentModel instead 3)if apiurl&apikey set by location, useCustomConfig would be opened 2024-05-06 19:26:39 +08:00
sijinhui
35e7f12d88 add model 2024-04-28 14:34:58 +08:00
sijinhui
f07a3729b9 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/components/chat.tsx
#	app/constant.ts
#	app/store/access.ts
#	app/utils/hooks.ts
2024-04-26 14:02:16 +08:00
黑云白土
fcb1a657e3
Update constant.ts 2024-04-17 16:24:11 +08:00
sijinhui
7467bf1d25 Merge remote-tracking branch 'upstream/main' into update
# Conflicts:
#	app/constant.ts
#	app/locales/tw.ts
#	app/utils.ts
2024-04-16 13:26:10 +08:00
Algorithm5838
9564b261d5 Update constant.ts 2024-04-15 13:14:14 +03:00
DeanYao
1e2a662fa6
Merge pull request #4412 from RubuJam/main
Gemini will generate the request address based on the selected model name and supports Gemini 1.5 Pro (gemini-1.5-pro-latest).
2024-04-15 11:44:53 +08:00
l.tingting
6520f9b7eb add knowledge cutoff date for gpt-4-turbo-2024-04-09 2024-04-12 22:44:26 +08:00
黑云白土
0cffaf8dc5
Merge branch 'main' into main 2024-04-11 10:30:05 +08:00
sijinhui
fd4f05aa39 fix merge 2024-04-11 10:18:01 +08:00
sijinhui
a927024312 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/constant.ts
2024-04-11 10:07:03 +08:00
黑云白土
5dc5bfb797
Merge branch 'main' into main 2024-04-11 01:24:34 +08:00
sijinhui
40c6225c23 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/constant.ts
#	app/store/chat.ts
#	app/utils/model.ts
2024-04-10 23:23:17 +08:00