Commit Graph

77 Commits

Author SHA1 Message Date
sijinhui
6cb317e00d Merge remote-tracking branch 'upstream/main' into merge
# Conflicts:
#	app/api/openai.ts
#	app/client/platforms/openai.ts
#	app/store/chat.ts
#	app/store/config.ts
2024-10-09 17:57:25 +08:00
lloydzhou
6293b95a3b update default api base url 2024-09-30 10:13:11 +08:00
lloydzhou
a50c282d01 remove DEFAULT_API_HOST 2024-09-30 01:19:20 +08:00
sijinhui
8a732bae87 Merge remote-tracking branch 'upstream/main' 2024-09-29 10:04:17 +08:00
Dogtiti
c6ebd6e73c fix: default model 2024-09-27 17:00:24 +08:00
sijinhui
5d6d676b87 merge 2024-09-19 00:07:37 +08:00
Dogtiti
a8c70d84a9
Merge pull request #5459 from DDMeaqua/tts
add tts
2024-09-18 15:42:16 +08:00
skymkmk
36a0c7b8a3
fix: default is forced to set gpt-3.5-turbo if no server default model have been set 2024-09-16 02:07:22 +08:00
DDMeaqua
2f410fc09f feat: add tts stt 2024-08-27 16:21:02 +08:00
sijinhui
dd884acab3 Merge remote-tracking branch 'upstream/main' into merge
# Conflicts:
#	app/constant.ts
#	app/locales/ar.ts
#	app/locales/bn.ts
#	app/locales/cs.ts
#	app/locales/de.ts
#	app/locales/es.ts
#	app/locales/fr.ts
#	app/locales/id.ts
#	app/locales/it.ts
#	app/locales/jp.ts
#	app/locales/ko.ts
#	app/locales/no.ts
#	app/locales/pt.ts
#	app/locales/ru.ts
#	app/locales/sk.ts
#	app/locales/tr.ts
#	app/locales/vi.ts
2024-08-21 22:58:14 +08:00
zhangjian10
1102ef6e6b
fix: Determine if Tencent is authorized 2024-08-18 23:47:23 +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
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
f85ec95877 hotfix for tencent sign 2024-08-01 15:33:48 +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
Dogtiti
3935c725c9 feat: sd setting 2024-07-23 22:44:09 +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
YeungYeah
ee22fba448
Merge branch 'main' into main 2024-07-17 22:16:30 +08:00
sijinhui
98a93e0020 fix bug 2024-07-17 12:50:57 +08:00
lloydzhou
7102bed959 update 2024-07-17 12:48:59 +08:00
lloydzhou
c3eaa4762d hotfix: custom comfig for Gemini api. #4944 2024-07-17 12:48:59 +08:00
lloydzhou
476bdac717 update 2024-07-12 21:52:38 +08:00
lloydzhou
9b97dca601 hotfix: custom comfig for Gemini api. #4944 2024-07-12 21:27:30 +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
23872086fa merge code 2024-07-09 19:37:47 +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
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
lloydzhou
1c20137b0e support azure deployment name 2024-07-05 19:59:45 +08:00
YeungYeah
74986803db feat: add google api safety setting 2024-06-15 12:09: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
Wayland Zhan
c96e4b7966 feat: Support a way to define default model by adding DEFAULT_MODEL env. 2024-04-19 06:57:15 +00: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
69b079c86e feat: dev done 2024-04-07 11:32:57 +08:00
sijinhui
8513c459b1 增加语音功能 2024-03-28 00:51:45 +08:00
sijinhui
8620df325d 增加语音输入 2024-03-28 00:48:40 +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
sijinhui
936ae673d3 Google AI模型支持 2024-01-15 23:57:33 +08:00
sijinhui
19f4ef9194 merge upstream 2023-12-27 22:47:01 +08:00
Fred Liang
778e88cb56
chore: resolve conflict 2023-12-24 02:15:30 +08:00
sijinhui
b43c0b0109 init 2023-12-16 23:05:14 +08:00