Commit Graph

204 Commits

Author SHA1 Message Date
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
7a5596b909 hotfix 2024-07-04 15:48:48 +08:00
lloydzhou
e7b16bfbc0 add function to check model is available 2024-07-04 15:30:24 +08:00
lloydzhou
69974d5651 gemini using real sse format response #3677 #3688 2024-07-01 13:24:01 +00:00
DirkSchlossmacher
f2b2344f02 Merge remote-tracking branch 'upstream/main' 2024-06-25 07:48:18 +02:00
Fred
9fb8fbcc65
fix: validate the url to avoid SSRF 2024-06-24 14:31:50 +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
GH Action - Upstream Sync
ca3656e031 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-05-07 01:08:09 +00: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
DirkSchlossmacher
4cd6327b19 Merge remote-tracking branch 'upstream/main' 2024-04-29 07:15:01 +02: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
DirkSchlossmacher
116202f761 if (!apiKey || !!serverConfig.hideUserApiKey) { 2024-04-18 11:13:22 +02:00
DirkSchlossmacher
699d6edaab systemApiKey 2024-04-17 18:08:09 +02:00
DirkSchlossmacher
8eecd945f5 Merge remote-tracking branch 'upstream/main' 2024-04-17 17:19:57 +02:00
butterfly
b72d7fbeda feat: fix webdav 逻辑2 2024-04-12 13:46:37 +08:00
butterfly
ee15c14049 feat: fix webdav 逻辑 2024-04-12 13:40:37 +08:00
butterfly
df3313971d feat: Optimize code 2024-04-09 18:24:22 +08:00
butterfly
b175132854 feat: Optimize var names 2024-04-09 18:23:52 +08:00
butterfly
8b191bd2f7 feat: white webdav server domain 2024-04-09 18:05:56 +08:00
butterfly
5446d8d4a2 feat: fix illegal exports in app/api/anthropic/[...path]/route.ts 2024-04-08 13:59:55 +08:00
butterfly
3cb4315193 feat: clean codes 2024-04-07 11:50:25 +08:00
butterfly
69b079c86e feat: dev done 2024-04-07 11:32:57 +08:00
DeanYao
8ef77f50c3
Merge branch 'main' into serverrside 2024-03-28 11:20:52 +08:00
Klaas Reineke
20c81d0148 Fixing manual merge 2024-03-25 18:16:20 +01:00
Klaas Reineke
f1526ebf65 Merge remote-tracking branch 'upstream/main' into klaas20240303 2024-03-25 15:56:20 +01:00
fred-bf
e8d76a513d
patch: disable webdav redirect 2024-03-24 14:15:04 +08:00
H0llyW00dzZ
c0c54e5709
Fix Webdav Syncing Issues
- [+] feat(route.ts): add endpoint validation and improve error handling
- [+] refactor(route.ts): use targetPath for request validation and error messages
- [+] fix(route.ts): correct targetUrl formation
2024-03-20 01:40:41 +07:00
Fred
99aa064319
fix: fix webdav sync issue 2024-03-14 01:58:25 +08:00
Fred
6aaf83f3c2
fix: fix upstash sync issue 2024-03-14 01:56:36 +08:00
Fred
8645214654
fix: change matching pattern 2024-03-14 01:26:13 +08:00
Fred
eebc334e02
fix: remove corsFetch 2024-03-14 00:57:54 +08:00
Fred
038fa3b301
fix: add webdav request filter 2024-03-14 00:33:26 +08:00
Fred
9a8497299d
fix: adjust upstash api 2024-03-13 23:58:28 +08:00
NieXi
f6cdda9029
update google api region (#3934)
Co-authored-by: GH Action - Upstream Sync <action@github.com>
2024-01-27 15:55:44 +08:00
Yasin
5a7b9abe33
Fix: Routes /api/cors/[...path] was not configured to run with the Edge Runtime 2024-01-08 18:43:31 +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
5c638251f8
fix: fix using different model 2023-12-25 05:12:21 +08:00
Fred Liang
cad461b121
chore: remove console log 2023-12-25 04:09:38 +08:00
Fred Liang
5af68ac545
fix: fix issue https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web/issues/3616 2023-12-25 04:07:35 +08:00
H0llyW00dzZ
35471a41c8
Fix & Feat [Auth] Api Key Variable
- [+] fix(auth.ts): fix variable name from serverApiKey to systemApiKey
- [+] feat(auth.ts): add support for Google API key in addition to Azure API key
2023-12-25 00:37:48 +07:00
Fred Liang
aea794e522
chore: remove openai log from google api handler 2023-12-24 17:37:07 +08:00
Fred Liang
7d9a2132cb
fix: fix server token fetch policy 2023-12-24 03:57:30 +08:00
Fred Liang
20f2f61349
feat: support set api key from client side 2023-12-24 03:44:13 +08:00
Fred Liang
4169431f2c
fix: fix add api auth 2023-12-24 03:05:23 +08:00
Fred Liang
778e88cb56
chore: resolve conflict 2023-12-24 02:15:30 +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
GH Action - Upstream Sync
76df875392 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-11-28 00:40:02 +00: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
DirkSchlossmacher
948f11b112 Merge https://github.com/Yidadaa/ChatGPT-Next-Web 2023-11-17 14:38:36 +01:00
DirkSchlossmacher
855cc6879d (!apiKey || !!serverConfig.hideUserApiKey) { 2023-11-17 11:44:28 +01:00
DirkSchlossmacher
d94205e967 api key 2023-11-16 11:11:53 +01:00
Eric-2369
74eb42c111
config: exclude hkg1 from the deployment regions of the edge function 2023-11-16 11:33:10 +08:00
GH Action - Upstream Sync
539d5368bc Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-11-16 00:56:56 +00:00
Yidadaa
9876a1aeca fix: #3275 refuse on server side if hide user api key 2023-11-16 00:53:11 +08:00
GH Action - Upstream Sync
7974974fbf Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-11-12 00:58:29 +00:00
Yidadaa
a5a1f2e8ad feat: CUSTOM_MODELS support mapper 2023-11-12 00:46:21 +08:00
DirkSchlossmacher
945160a66f Merge remote-tracking branch 'upstream/main' 2023-11-10 15:29:44 +01: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
DirkSchlossmacher
6e7cede1a0 Squashed commit of the following:
commit e6b72ac1ff
Author: Yifei Zhang <yidadaa@qq.com>
Date:   Fri Nov 10 02:59:47 2023 +0800

    Update README.md

commit 8032e6d68d
Author: Yifei Zhang <yidadaa@qq.com>
Date:   Fri Nov 10 02:59:30 2023 +0800

    Update README.md

commit c7e0a6f37f
Author: Yidadaa <yidadaa@qq.com>
Date:   Fri Nov 10 02:57:40 2023 +0800

    doc: update azure env vars

commit 1141cd2e6e
Merge: fd2f441 c9dd953
Author: Yifei Zhang <yidadaa@qq.com>
Date:   Fri Nov 10 02:55:12 2023 +0800

    Merge pull request #3206 from Yidadaa/azure

commit c9dd953817
Author: Yidadaa <yidadaa@qq.com>
Date:   Fri Nov 10 02:50:50 2023 +0800

    fixup

commit b7ffca031e
Author: Yidadaa <yidadaa@qq.com>
Date:   Fri Nov 10 02:43:30 2023 +0800

    feat: close #935 add azure support

commit fd2f441e02
Author: Yifei Zhang <yidadaa@qq.com>
Date:   Thu Nov 9 20:45:25 2023 +0800

    feat: wont send max_tokens
2023-11-10 03:06:59 +01:00
Yidadaa
b7ffca031e feat: close #935 add azure support 2023-11-10 02:43:37 +08:00
DirkSchlossmacher
70c72e1def Merge remote-tracking branch 'upstream/HEAD' 2023-11-09 07:35:07 +01:00
Yidadaa
d93f05f511 feat: close #3187 use CUSTOM_MODELS to control model list 2023-11-09 03:01:29 +08:00
DirkSchlossmacher
9bdbce97ce
Merge branch 'Yidadaa:main' into feature/SSO 2023-11-08 12:46:33 +01:00
安忆
9cb889c34f
docs: up to date 2023-11-08 07:09:52 +08:00
JuliusMoehring
4628980974 Merge branch 'main' of https://github.com/DirkSchlossmacher/ChatGPT-Next-Web-AdEx into feature/SSO 2023-11-07 19:05:53 +01:00
JuliusMoehring
7d6496a727 Fix next auth routes 2023-11-07 17:44:01 +01:00
Yidadaa
c5ca278253 feat: close #2908 allow to disable parse settings from link 2023-11-08 00:30:02 +08:00
JuliusMoehring
3942f511cf Add authentication 2023-11-07 17:25:40 +01:00
Yidadaa
5610f423d0 feat: add multi-model support 2023-10-30 02:07:11 +08:00
Yidadaa
59fbadd9eb fixup 2023-09-19 02:21:31 +08:00
Yidadaa
adb860b464 fix: #2820 try to fix 520 error code 2023-09-19 02:12:43 +08:00
Amor Zara
bd69116df2
Update route.ts
Correct typo error and make warning more specific.
2023-09-15 11:21:42 +08:00
Yidadaa
dc555b2206 fixup 2023-09-13 02:52:28 +08:00
Yidadaa
6f83fbd212 feat: add webdav support 2023-09-13 02:51:02 +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
yuanliang feng
7a0b437626
Update common.ts 2023-07-10 17:26:28 +08:00
ShengYan, Zhang
dd047fd58f fix: typos 2023-07-10 10:09:19 +08:00
Yidadaa
4131fccbe0 feat: close #2192 use /list/models to get model ids 2023-07-04 23:16:24 +08:00
Constaline
c05de45d99 feat: add "Hide_Balance_Query" environment variable 2023-06-25 20:20:36 +08:00
mushan0x0
9c05d136f5
fix: #2061 RequestInit TypeError 2023-06-20 11:57:31 +08:00
Yidadaa
184a0b9481 fix: #1954 lazy render bugs 2023-06-15 01:34:21 +08:00
Yidadaa
0fb775d71a fix: #1931 try to fix cors issues 2023-06-15 00:28:47 +08:00
Yidadaa
0d4611052e feat: white url list for openai security 2023-06-13 00:39:29 +08:00
Yidadaa
6410aa214e feat: just disable all ngnix buffer 2023-06-08 23:49:06 +08:00
Yidadaa
a3a77006ff fixup: #1815 req.body will be broken in edge runtime 2023-06-07 02:24:45 +08:00