Commit Graph

79 Commits

Author SHA1 Message Date
sijinhui
5d6d676b87 merge 2024-09-19 00:07:37 +08:00
DDMeaqua
a3b664763e chore: default header 2024-09-18 14:57:43 +08:00
DDMeaqua
dfaafe3adb Merge branch 'main' into tts 2024-09-18 13:48:28 +08:00
DDMeaqua
3ae8ec1af6 feat: tts 2024-09-18 11:24:25 +08:00
DDMeaqua
212605a7e3 Merge branch 'main' into tts-stt 2024-09-18 10:39:56 +08:00
DDDDD12138
63ffd473d5 chore: remove unused imports 2024-09-15 20:17:02 +08:00
sijinhui
df2ebaf970 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/client/platforms/openai.ts
#	app/components/chat.module.scss
#	app/components/chat.tsx
#	app/layout.tsx
#	app/store/chat.ts
#	package.json
#	yarn.lock
2024-09-07 19:00:38 +08:00
lloydzhou
f5209fc344 stash code 2024-08-28 23:58:46 +08:00
DDMeaqua
318e0989a2 fix: transcription headers 2024-08-28 13:13:41 +08:00
DDMeaqua
2f410fc09f feat: add tts stt 2024-08-27 16:21:02 +08:00
sijinhui
0b930db371 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/components/settings.tsx
#	app/components/sidebar.tsx
2024-08-13 18:24:57 +08:00
l.tingting
ca865a80dc dall-e-3 adds 'quality' and 'style' options 2024-08-10 11:09:07 +08:00
sijinhui
b874a82fab Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/client/api.ts
#	app/components/settings.tsx
#	app/constant.ts
#	src-tauri/tauri.conf.json
2024-08-07 21:11:58 +08:00
webws
b2c1644d69 feat: add support for iFLYTEK Spark API (接入讯飞星火模型) 2024-08-06 17:54:30 +08:00
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
fec80c6c51
Merge pull request #5173 from ConnectAI-E/feature/dalle
add dalle3 model
2024-08-05 20:49:37 +08:00
Dogtiti
a6b7432358
Merge pull request #5180 from frostime/contrib-modellist
 feat: 调整模型列表,将自定义模型放在前面显示
2024-08-05 20:49:07 +08:00
frostime
150fc84b9b feat(model): 增加 sorted 字段,并使用该字段对模型列表进行排序
1. 在 Model 和 Provider 类型中增加 sorted 字段(api.ts)
2. 默认模型在初始化的时候,自动设置默认 sorted 字段,从 1000 开始自增长(constant.ts)
3. 自定义模型更新的时候,自动分配 sorted 字段(model.ts)
2024-08-05 19:43:32 +08:00
sijinhui
5f5c2164f8 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/api/alibaba.ts
#	app/api/anthropic.ts
#	app/api/azure.ts
#	app/api/baidu.ts
#	app/api/bytedance.ts
#	app/api/openai.ts
#	yarn.lock
2024-08-05 14:44:13 +08:00
lloydzhou
4a95dcb6e9 hotfix get wrong llm 2024-08-05 12:45:25 +08:00
lloydzhou
46cb48023e fix typescript error 2024-08-02 18:50:48 +08:00
sijinhui
8a0f998f69 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/components/settings.tsx
#	app/config/server.ts
#	app/constant.ts
#	package.json
#	yarn.lock
2024-08-02 17:14:45 +08:00
sijinhui
f1bd456a41 merge 2024-08-01 16:31:11 +08:00
lloydzhou
6a0bda00f5 merge main 2024-08-01 15:39:54 +08:00
lloydzhou
fd9e94e078 merge main 2024-08-01 13:18:33 +08:00
lloydzhou
40cbabc330 add moonshot api 2024-08-01 11:55:22 +08:00
sijinhui
7e1cdbec80 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/components/chat.tsx
#	app/components/home.tsx
#	app/components/settings.tsx
#	app/components/sidebar.tsx
#	app/config/server.ts
#	app/constant.ts
#	app/layout.tsx
#	app/store/access.ts
#	app/utils/model.ts
2024-07-25 21:22:36 +08:00
lloydzhou
8f6e5d73a2 hotfix: can send sd task in client 2024-07-25 12:31:30 +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
bb349a03da fix get headers for bytedance 2024-07-09 19:21:27 +08:00
lloydzhou
c229d2c3ce merge main 2024-07-09 16:53:15 +08:00
Dogtiti
9bdd37bb63 feat: qwen 2024-07-07 21:59:56 +08:00
Dogtiti
d726c71141 wip: tencent 2024-07-07 14:43:28 +08:00
Dogtiti
1caa61f4c0 feat: swap name and displayName for bytedance in custom models 2024-07-06 22:59:20 +08:00
Dogtiti
f3e3f08377 fix: apiClient 2024-07-06 21:25:00 +08:00
Dogtiti
2ec8b7a804 Merge branch 'main' of https://github.com/ConnectAI-E/ChatGPT-Next-Web into feature/ByteDance 2024-07-06 21:14:07 +08:00
Dogtiti
9f7d137b05 Merge branch 'main' of https://github.com/ConnectAI-E/ChatGPT-Next-Web into feat-baidu 2024-07-06 21:11:50 +08:00
Lloyd Zhou
7218f13783
Merge pull request #4934 from ConnectAI-E/feature/client-headers
feat: optimize getHeaders
2024-07-06 20:08:16 +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
5e0657ce55 feat: add getClientApi method 2024-07-06 11:27:53 +08:00
Dogtiti
700b06f9c5 feat: optimize getHeaders 2024-07-06 11:16:00 +08:00
Dogtiti
b58bbf8eb4 feat: optimize getHeaders 2024-07-06 11:15:06 +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
lloydzhou
37e2517dac fix: 1. anthropic client using common getHeaders; 2. always using Authorization header send access code 2024-07-01 10:24:33 +00:00
lloydzhou
d65ddead11 fix: anthropic client using common getHeaders 2024-07-01 09:41:01 +00:00