Commit Graph

68 Commits

Author SHA1 Message Date
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
147fc9a35a fix ts type error 2024-07-09 15:10:23 +08:00
lloydzhou
71af2628eb hotfix: old AZURE_URL config error: "DeploymentNotFound". #4945 #4930 2024-07-09 00:32:18 +08:00
lloydzhou
6dc4844c12 using default azure api-version value 2024-07-06 00:05:59 +08:00
lloydzhou
d9758be3ae fix ts 2024-07-05 20:20:21 +08:00
lloydzhou
6b1b530443 remove makeAzurePath 2024-07-05 20:15:56 +08:00
lloydzhou
1c20137b0e support azure deployment name 2024-07-05 19:59:45 +08:00
lloydzhou
97aa72ec5b hotfix ts 2024-07-04 08:36:25 +00:00
lloydzhou
aa08183439 hotfix 2024-07-04 16:03:35 +08:00
lloydzhou
e7b16bfbc0 add function to check model is available 2024-07-04 15:30:24 +08:00
DeanYao
d89a12aa05
Revert "Chat gpt" 2024-05-20 19:02:46 +08:00
Hao Jia
01c9dbc1fd Merge remote-tracking branch 'origin/main' into gpt-4o
# Conflicts:
#	public/apple-touch-icon.png
2024-05-16 14:43:10 +08:00
sijinhui
a82a32163c debug log 2024-05-03 16:42:37 +08:00
sijinhui
84638d9364 fix log 2024-04-26 18:12:07 +08:00
sijinhui
2100f681df debug log 2024-04-26 18:00:03 +08:00
sijinhui
66c5852dbf fix log 2024-04-03 00:08:35 +08:00
sijinhui
5b2367bede 某个没用的log 2024-04-02 11:53:58 +08:00
sijinhui
f686fe09ce 认证中间状态 2024-04-01 23:29:41 +08:00
sijinhui
013bb7ca01 进一步优化认证流程 2024-03-31 01:18:47 +08:00
sijinhui
cea656ec9a '修复命名错误' 2024-03-30 23:59:41 +08:00
sijinhui
8debb785fb 初次优化认证-查询已存在用户时逻辑问题 2024-03-30 22:49:01 +08:00
sijinhui
20b35078f0 初次优化认证 2024-03-30 22:41:41 +08:00
sijinhui
e6912f5be8 Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	app/api/common.ts
2024-03-28 16:07:23 +08:00
DeanYao
8ef77f50c3
Merge branch 'main' into serverrside 2024-03-28 11:20:52 +08:00
sijinhui
5aef4ed70f 修复一下图表的bug 2024-02-22 13:14:34 +08:00
sijinhui
747bed9826 重构绘图相关 2024-02-22 00:21:36 +08:00
sijinhui
19f4ef9194 merge upstream 2023-12-27 22:47:01 +08:00
Yifei Zhang
350ddd2af1
Merge pull request #3215 from akira-cn/main
fix: remove the content-encoding header
2023-12-27 01:26:48 +08:00
Fred Liang
422d70d928
chore: update auth value logic (#3630) 2023-12-25 10:25:43 +08:00
Fred Liang
19137b79bc
fix: return bearer header when using openai 2023-12-25 09:57:40 +08:00
Fred Liang
f5ed1604aa
fix: fix removing bearer header 2023-12-25 05:24:20 +08:00
Fred Liang
778e88cb56
chore: resolve conflict 2023-12-24 02:15:30 +08:00
sijinhui
07c48ef7fd 加强不可用模型过滤 2023-12-22 21:20:30 +08:00
sijinhui
b43c0b0109 init 2023-12-16 23:05:14 +08:00
H0llyW00dzZ
8dc8682078
Fix Api Common [Server Side]
- [+] fix(common.ts): improve handling of OpenAI-Organization header
 - Check if serverConfig.openaiOrgId is defined and not an empty string
 - Log the value of openaiOrganizationHeader if present, otherwise log that the header is not present
 - Conditionally delete the OpenAI-Organization header from the response if [Org ID] is undefined or empty (not setup in ENV)
2023-12-04 13:33:23 +07:00
H0llyW00dzZ
36e9c6ac4d
Refactor Api Common [Server Side] [Console Log]
- [+] refactor(common.ts): remove unnecessary console.log for [Org ID] in requestOpenai function
- [+] refactor(common.ts): conditionally delete OpenAI-Organization header from response if [Org ID] is not set up in ENV
2023-12-01 19:49:12 +07:00
H0llyW00dzZ
f9d916925e
Fixup Api Common [Server Side] [Console Log]
- [+] fix(common.ts): fix condition to check if serverConfig.openaiOrgId is not undefined
2023-11-25 10:23:16 +07:00
H0llyW00dzZ
f9258878db
Fix Api Common [Server Side] [Console Log]
- [+] fix(common.ts): fix console.log statement for [Org ID] to handle undefined value
2023-11-25 10:10:06 +07:00
Yidadaa
a5a1f2e8ad feat: CUSTOM_MODELS support mapper 2023-11-12 00:46:21 +08:00
akira-cn
dd6e79922a fix: remove the content-encoding header 2023-11-10 20:42:12 +08:00
akira-cn
bf84269520 fix: remove the content-encoding header 2023-11-10 20:38:53 +08:00
Ensteinjun
6b2db97347 fixbug 2023-11-10 15:44:07 +08:00
Yidadaa
b7ffca031e feat: close #935 add azure support 2023-11-10 02:43:37 +08:00
Yidadaa
d93f05f511 feat: close #3187 use CUSTOM_MODELS to control model list 2023-11-09 03:01:29 +08:00
安忆
9cb889c34f
docs: up to date 2023-11-08 07:09:52 +08:00
Yifei Zhang
0b7de6f7b2
fix: #2594 trim the / 2023-08-10 10:47:06 +08:00
Yidadaa
b14c5cd89c fix: #2485 one-time-use body 2023-08-08 21:36:37 +08:00
Yidadaa
30473ec41e fix: #2367 do not copy in async callback after sharing to ShareGPT 2023-07-16 16:14:57 +08:00
markshawn2020
1c335a68e0 fixed openai base url if empty 2023-07-14 21:03:32 +08:00
yuanliang feng
a832cfb343
Update common.ts 2023-07-11 15:46:40 +08:00