Commit Graph

97 Commits

Author SHA1 Message Date
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
DeanYao
506c17a093
Merge pull request #4564 from MrrDrr/gpt4v_remove_max_tokens
remove max_tokens from the official version of gpt4-turbo
2024-04-25 13:01:21 +08:00
l.tingting
dd4648ed9a remove max_tokens from the official version of gpt4-turbo 2024-04-24 22:59:14 +08:00
sijinhui
d33f4b05dd Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/client/platforms/openai.ts
2024-04-22 17:52:47 +08:00
黑云白土
b7aab3c102
Update google.ts 2024-04-17 17:16:31 +08:00
DeanYao
9b2cb1e1c3
Merge pull request #4525 from ChatGPTNextWeb/chore-fix
Chore fix
2024-04-16 14:59:22 +08:00
butterfly
fb8b8d28da feat: (1) fix issues/4335 and issues/4518 2024-04-16 14:50:48 +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
黑云白土
5dc5bfb797
Merge branch 'main' into main 2024-04-11 01:24:34 +08:00
sijinhui
a83d79a9f4 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/api/auth.ts
#	app/client/platforms/openai.ts
#	app/components/settings.tsx
#	app/config/server.ts
#	app/constant.ts
#	app/locales/pt.ts
#	app/locales/sk.ts
#	app/locales/tw.ts
#	app/store/chat.ts
2024-04-09 10:39:16 +08:00
butterfly
9b982b408d feat: fix no max_tokens in payload when calling openai vision model 2024-04-08 18:29:08 +08:00
butterfly
63f9063255 feat: call claude api not in credential 'include' mode 2024-04-08 15:33:27 +08:00
butterfly
6dad353e1c feat: call claude api not in credential 'include' mode 2024-04-08 15:33:02 +08:00
butterfly
ef7617d545 feat: configs about app client 2024-04-08 13:41:02 +08:00
butterfly
0fbb560e90 feat: delete returned models in modals function of ClaudeApi instance 2024-04-07 20:05:19 +08:00
butterfly
86b5c55855 feat: roles must alternate between user and assistant in claude, so add a fake assistant message between two user messages 2024-04-07 18:02:31 +08:00
butterfly
768decde93 feat: parse response message 2024-04-07 15:20:27 +08:00
butterfly
69b079c86e feat: dev done 2024-04-07 11:32:57 +08:00
sijinhui
e6912f5be8 Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	app/api/common.ts
2024-03-28 16:07:23 +08:00
黑云白土
f8b180ac44
Update google.ts 2024-03-28 15:52:38 +08:00
DeanYao
6b3daec23f
Merge pull request #3314 from H0llyW00dzZ/text-moderation-azure
Feat ChatGPT LLM Api [Console Log] [Text Moderation] [Azure]
2024-03-28 13:38:56 +08:00
sijinhui
bf6528ce30
Merge branch 'ChatGPTNextWeb:main' into main 2024-03-24 17:30:40 +08:00
kidv
29e03b88c7 Fix: Handle empty server response in API call 2024-03-24 04:07:25 +08:00
sijinhui
a3cad6ad10
Merge branch 'ChatGPTNextWeb:main' into main 2024-02-28 11:56:01 +08:00
Fred
43e5dc2292
fix: fix the method to detect vision model 2024-02-28 11:33:43 +08:00
sijinhui
e1644b5203 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/client/platforms/openai.ts
#	app/locales/tw.ts
2024-02-27 17:54:35 +08:00
fred-bf
08fa22749a
fix: add max_tokens when using vision model (#4157) 2024-02-27 17:28:01 +08:00
fred-bf
ff166f7b4c
chore: adjust for ollama support (#4129) 2024-02-26 17:18:46 +08:00
sijinhui
e3b0d909fe 暂存merge 2024-02-21 14:16:58 +08:00
TheRam_
e2da3406d2
Add vision support (#4076) 2024-02-20 18:04:32 +08:00
sijinhui
adc55d67d2 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	.github/workflows/deploy_preview.yml
#	app/client/api.ts
#	app/client/platforms/google.ts
#	app/store/chat.ts
2024-02-08 21:29:22 +08:00
fred-bf
d74f636558
Fix/gemini app endpoint (#4017)
* fix: support custom api endpoint

* fix: attach api key to google gemini
2024-02-07 13:46:52 +08:00
fred-bf
b8f0822214
fix: support custom api endpoint (#4016) 2024-02-07 13:40:30 +08:00
fred-bf
bca74241e6
fix: fix gemini issue when using app (#4013)
* chore: update path

* fix: fix google auth logic

* fix: not using header authorization for google api

* chore: revert to allow stream
2024-02-07 13:17:11 +08:00
sijinhui
6bcb0a5c97 merge 2024-01-02 22:52:58 +08:00
sijinhui
8a5915d122 Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	app/layout.tsx
#	package.json
#	yarn.lock
2024-01-02 22:46:56 +08:00
Fred Liang
9eaf492d5b chore: low the google safety setting to avoid unexpected blocking 2023-12-31 19:49:22 +08:00
Fred Liang
a80502f7db
fix: fix gemini pro streaming api duplicated issue (#3721)
* fix: streaming duplicated issue

* chore: remove debug logs

* chore: add types defination
2023-12-31 19:08:16 +08:00
Fred Liang
5cf58d9446
feat: support streaming for Gemini Pro (#3688)
* feat: support streaming for Gemini Pro

* feat: display texts smoothly

* chore: remove comments
2023-12-29 03:42:45 +08:00
sijinhui
19f4ef9194 merge upstream 2023-12-27 22:47:01 +08:00
Yifei Zhang
c03abdac42
Merge pull request #3570 from Rocky0102/main 2023-12-27 01:24:44 +08:00
Fred Liang
199f29e63c
chore: auto concat messages 2023-12-25 04:33:47 +08:00
Fred Liang
7c3dfb7bae
feat: support custom gemini pro params 2023-12-24 17:24:04 +08:00
Fred Liang
75057f9a91
chroe: support error reason for gemini pro 2023-12-24 04:32:25 +08:00
Fred Liang
ae19a0dc5f
chroe: update model name 2023-12-24 04:22:12 +08:00
Fred Liang
20f2f61349
feat: support set api key from client side 2023-12-24 03:44:13 +08:00
Fred Liang
4169431f2c
fix: fix add api auth 2023-12-24 03:05:23 +08:00
Fred Liang
45798f993d
fix: fix type errors 2023-12-24 02:39:13 +08:00
Fred Liang
ae0d68c27e
fix: fix llm models field 2023-12-24 02:39:13 +08:00
Fred Liang
778e88cb56
chore: resolve conflict 2023-12-24 02:15:30 +08:00