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
|
3486954e07
|
🐛 fix(openai): 上次 commit 后 openai.ts 文件中出现类型不匹配的 bug
|
2024-08-05 20:26:48 +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 |
|
Dogtiti
|
4a8e85c28a
|
fix: empty response
|
2024-08-02 22:16:08 +08:00 |
|
lloydzhou
|
8c83fe23a1
|
using b64_json for dall-e-3
|
2024-08-02 20:58:21 +08:00 |
|
lloydzhou
|
46cb48023e
|
fix typescript error
|
2024-08-02 18:50:48 +08:00 |
|
lloydzhou
|
ac599aa47c
|
add dalle3 model
|
2024-08-02 18:00:42 +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 |
|
Dogtiti
|
a17df037af
|
feat: add lodash-es
|
2024-08-01 23:54:14 +08:00 |
|
lloydzhou
|
dfc36e5210
|
update
|
2024-08-01 19:02:40 +08:00 |
|
lloydzhou
|
c359b92ddc
|
update
|
2024-08-01 18:58:07 +08:00 |
|
lloydzhou
|
e1d6131f13
|
update
|
2024-08-01 16:49:55 +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
|
b8bbc37b8e
|
merge main
|
2024-08-01 11:57:23 +08:00 |
|
lloydzhou
|
40cbabc330
|
add moonshot api
|
2024-08-01 11:55:22 +08:00 |
|
lloydzhou
|
64c3dcd732
|
hotfix for using google api in app
|
2024-07-30 12:03:06 +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
|
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
|
a3d4a7253f
|
Merge remote-tracking branch 'source/main'
|
2024-07-19 21:38:25 +08:00 |
|
sijinhui
|
1bc6a79d6a
|
Merge remote-tracking branch 'upstream/main' into dev
|
2024-07-19 18:06:31 +08:00 |
|
sijinhui
|
60813d448f
|
修改消息压缩使用的模型url
|
2024-07-19 18:03:38 +08:00 |
|
lloydzhou
|
ac470a6d07
|
Merge remote-tracking branch 'connectai/feature-cache-storage' into feature-cache-storage
|
2024-07-19 15:39:51 +08:00 |
|
Dogtiti
|
7237d33be3
|
fix: ts type
|
2024-07-19 14:55:47 +08:00 |
|
lloydzhou
|
1610b480af
|
remove console.log
|
2024-07-19 13:54:33 +08:00 |
|
lloydzhou
|
287fa0a39c
|
feat: 1. using cache storage store image data; 2. get base64image before chat to api #5013
|
2024-07-19 13:50:10 +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 |
|
YeungYeah
|
26c2598f56
|
fix: fix bug in generating wrong gemini request url
|
2024-07-18 23:41:20 +08:00 |
|
YeungYeah
|
ee22fba448
|
Merge branch 'main' into main
|
2024-07-17 22:16:30 +08:00 |
|
Dogtiti
|
b3cfaf1420
|
refator: google
|
2024-07-17 20:05:34 +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 |
|
lloydzhou
|
c3eaa4762d
|
hotfix: custom comfig for Gemini api. #4944
|
2024-07-17 12:48:59 +08:00 |
|
lloydzhou
|
ffddf93a8f
|
support cloudflare ai gateway
|
2024-07-17 12:48:57 +08:00 |
|
lloydzhou
|
9b97dca601
|
hotfix: custom comfig for Gemini api. #4944
|
2024-07-12 21:27:30 +08:00 |
|
lloydzhou
|
728c38396a
|
support cloudflare ai gateway
|
2024-07-12 12:00:25 +08:00 |
|
sijinhui
|
d3356f692e
|
Merge remote-tracking branch 'upstream/main' into dev
|
2024-07-12 11:36:21 +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
|
f8c2732fdc
|
Merge pull request #4971 from ConnectAI-E/hotfix/alibaba
change build messages for qwen in client
|
2024-07-11 10:25:39 +08:00 |
|
lloydzhou
|
2299a4156d
|
change build messages for qwen in client
|
2024-07-11 00:50:58 +08:00 |
|
lloydzhou
|
32b82b9cb3
|
change build messages for qwen in client
|
2024-07-11 00:48:58 +08:00 |
|
lloydzhou
|
6885812d21
|
hotfix Gemini finish twice. #4955 #4966
|
2024-07-10 18:59:44 +08:00 |
|