Commit Graph

110 Commits

Author SHA1 Message Date
sijinhui
e0799f8f48 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/client/platforms/openai.ts
#	app/constant.ts
#	app/utils/model.ts
2024-08-06 13:08:13 +08:00
Dogtiti
3da717d9fc fix: azure summary 2024-08-06 11:20:03 +08:00
lloydzhou
ac599aa47c add dalle3 model 2024-08-02 18:00:42 +08:00
Lloyd Zhou
5b126c7e52
Revert "feat: improve components structure" 2024-07-22 22:18:51 +08:00
Dogtiti
038e6df8f0 feat: improve components structure 2024-07-22 16:02:45 +08:00
sijinhui
c8f2d8029b Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/components/settings.tsx
#	app/constant.ts
#	app/store/chat.ts
2024-07-21 07:25:36 +08:00
Chenglong Wang
0236e13187
Change gpt summary model to gpt-4o-mini. 2024-07-19 23:36:57 +08:00
sijinhui
60813d448f 修改消息压缩使用的模型url 2024-07-19 18:03:38 +08:00
sijinhui
69c434c047 merge 并添加新模型mini 2024-07-19 13:03:36 +08:00
sijinhui
35532f8781 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/api/google/[...path]/route.ts
#	app/client/platforms/google.ts
#	app/constant.ts
#	app/store/prompt.ts
#	app/utils/hooks.ts
#	public/prompts.json
2024-07-19 12:56:46 +08:00
DDDDD12138
8edc0989e2 chore: remove unused imports and correct typos 2024-07-18 01:51:56 +08:00
sijinhui
45913941e8 fix little bug 2024-07-17 13:47:09 +08:00
sijinhui
7d9e85b4f4 fix google bug 2024-07-17 13:45:09 +08:00
sijinhui
37392d068c 修复模型选择继承的小bug 2024-07-12 11:28:32 +08:00
sijinhui
4733de20b2 注释一堆注释 2024-07-12 00:33:13 +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
Dogtiti
5e0657ce55 feat: add getClientApi method 2024-07-06 11:27:53 +08:00
lloydzhou
1c20137b0e support azure deployment name 2024-07-05 19:59:45 +08:00
sijinhui
007c004a44 修改最大限制 2024-06-24 18:09:58 +08:00
sijinhui
a697822445 限制每天使用量 2024-05-25 21:14:21 +08:00
sijinhui
941f40afb5 优化新建窗口可以继承模型配置 2024-05-17 13:15:22 +08:00
sijinhui
aac77eb980 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/store/config.ts
#	app/utils.ts
#	yarn.lock
2024-05-17 09:59:38 +08:00
Dean-YZG
0aa807df19 feat: remove empty memoryPrompt in ChatMessages 2024-05-16 14:41:18 +08:00
Dean-YZG
c10447df79 feat: 1)upload image with type 'heic' 2)change the empty message to ';' for models 3) 2024-05-13 16:24:15 +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
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
l.tingting
aa084ea09a add timezone in system prompts 2024-04-12 23:07:29 +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
butterfly
79f342439a feat: Solve the problem of using openai interface protocol for user-defined claude model & add some famous webdav endpoints 2024-04-09 20:49:51 +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
264da6798c feat: remove duplicate Input Template 2024-04-08 18:06:17 +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
DeanYao
e38b527ac2
Merge pull request #3205 from H0llyW00dzZ/summarizelogic
Refactor Summarize Logic
2024-03-28 15:19:32 +08:00
sijinhui
747bed9826 重构绘图相关 2024-02-22 00:21:36 +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
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
fred-bf
9d5801fb5f
fix: avoiding not operation for custom models (#4010) 2024-02-07 10:31:49 +08:00
sijinhui
830f98f335 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/constant.ts
2024-02-05 17:20:46 +08:00
H0llyW00dzZ
a5517a1a51
Improve Default System Template (#3996)
* Feat [UI/UX] [Constant] [DEFAULT System Template] replace hardcoded

- [+] feat(constant.ts): replace hardcoded OpenAI with dynamic ServiceProvider variable in DEFAULT_SYSTEM_TEMPLATE

* Improve [UI/UX] [Chat] "fillTemplateWith"

- [+] feat(chat.ts): add DEFAULT_MODELS to modelConfig
- [+] fix(chat.ts): replace replaceAll with regex in output string replacement
- [+] refactor(chat.ts): use const instead of let for cutoff variable
2024-02-05 13:35:51 +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
reece00
3ba598633c
Non -GPT model disable system prompt (#3684) 2023-12-28 23:52:45 +08:00
sijinhui
19f4ef9194 merge upstream 2023-12-27 22:47:01 +08:00
Fred Liang
199f29e63c
chore: auto concat messages 2023-12-25 04:33:47 +08:00