Commit Graph

246 Commits

Author SHA1 Message Date
CaIon
946eed4d60 fix: enable cors for token routers and dashboard routers 2023-09-18 01:42:04 +08:00
CaIon
352ef053d5 合并最新代码 2023-09-17 21:07:00 +08:00
CaIon
985e26fd1b Merge remote-tracking branch 'origin/main'
# Conflicts:
#	controller/log.go
#	controller/relay-audio.go
#	controller/relay-image.go
#	controller/relay-text.go
#	controller/relay.go
#	middleware/distributor.go
#	model/log.go
#	web/src/components/OperationSetting.js
2023-09-17 20:59:12 +08:00
Xyfacai
ecf8a6d875
feat: supprt channel priority now & record channel id in log (#484)
* feat: 支持设置渠道优先级 & 日志中显示使用的渠道ID

* fix: 设置渠道优先级未更新 ability

* chore: update implementation

---------

Co-authored-by: Xiangyuan Liu <xiangyuan.liu@ui.com>
Co-authored-by: JustSong <songquanpeng@foxmail.com>
Co-authored-by: JustSong <39998050+songquanpeng@users.noreply.github.com>
2023-09-17 19:18:16 +08:00
igophper
24df3e5f62
feat: support non-stream mode for xunfei (#498)
* feat:xunfei suport none stream

* fix:join content ignore seq

---------

Co-authored-by: igophper <admin@jialilgu.cn>
2023-09-17 18:16:12 +08:00
JustSong
328aa68255 feat: able to delete logs now (close #486) 2023-09-17 17:09:56 +08:00
JustSong
42451d9d02 refactor: update logging related logic 2023-09-17 15:39:46 +08:00
JustSong
959bcdef88 chore: update error code 2023-09-17 11:30:20 +08:00
CaIon
377da2dfcb Merge remote-tracking branch 'origin/main'
# Conflicts:
#	web/src/components/PersonalSetting.js
2023-09-15 18:01:06 +08:00
CaIon
cc09dd4f9d feat: 渠道支持指定组织 2023-09-15 17:59:01 +08:00
CaIon
d1d789616f feat: 避免请求出错时暴露渠道信息 2023-09-15 17:50:54 +08:00
JustSong
39ae8075e4 fix: fix oauth2 state not checking 2023-09-15 00:24:20 +08:00
JustSong
420c375140 perf: only return quota when it's not zero 2023-09-13 22:05:10 +08:00
JustSong
01863d3e44 fix: fix quota not return when error occurred (close #518) 2023-09-13 21:50:45 +08:00
CaIon
84645128c3 feat: 改为转发的方式获取midjourney图片 2023-09-12 03:46:05 +08:00
CaIon
4895bd744a feat: add midjourney log 2023-09-12 03:17:26 +08:00
CaIon
4a836a4cb6 feat: 删除无用功能 2023-09-10 01:13:12 +08:00
CaIon
16aabbc490 修复充值bug 2023-09-09 05:05:46 +08:00
CaIon
01a66ff33c 修复充值bug 2023-09-09 05:04:49 +08:00
CaIon
443e2bd168 合并请求 2023-09-09 03:19:55 +08:00
CaIon
9c08d78349 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	controller/relay.go
#	main.go
#	middleware/distributor.go
2023-09-09 03:15:55 +08:00
CaIon
9ab4f7a271 移除不必要的功能 2023-09-09 03:11:42 +08:00
CaIon
43be1982d7 merge 2023-09-09 01:50:41 +08:00
igophper
d0a0e871e1
fix: support ali's embedding model (#481, close #469)
* feat:支持阿里的 embedding 模型

* fix: add to model list

---------

Co-authored-by: JustSong <songquanpeng@foxmail.com>
Co-authored-by: JustSong <39998050+songquanpeng@users.noreply.github.com>
2023-09-03 22:12:35 +08:00
JustSong
a721a5b6f9 chore: add error prompt for Azure 2023-09-03 21:46:07 +08:00
JustSong
621eb91b46 chore: pass through error out 2023-09-03 21:31:58 +08:00
JustSong
04acdb1ccb feat: support aiproxy's library 2023-09-03 12:51:59 +08:00
CaIon
fe94656260 修复多路复用bug 2023-08-31 00:44:16 +08:00
JustSong
abbf2fded0 perf: preallocate array capacity 2023-08-30 21:15:56 +08:00
JustSong
56b5007379 feat: supper OpenRouter now (close #333, close #340) 2023-08-27 16:16:45 +08:00
JustSong
d09d317459 feat: supper whisper now (close #197) 2023-08-27 15:28:23 +08:00
JustSong
1c4409ae80 Merge branch 'main' of https://github.com/songquanpeng/one-api 2023-08-26 13:36:58 +08:00
JustSong
5ee24e8acf feat: support 360's models (close #331, close #461)
feat: support 360's models (close #331, close #461)
2023-08-26 13:36:20 +08:00
shao0222
4f2f911e4d
fix: fix the issue of function_call not working when using model mapping (#462) 2023-08-26 13:10:18 +08:00
JustSong
fdb2cccf65 perf: initialize all token encoder when starting (close #459, close $460) 2023-08-26 13:02:02 +08:00
JustSong
a3e267df7e fix: fix error response (close #468) 2023-08-26 12:37:45 +08:00
JustSong
ac7c0f3a76 fix: disable channel when 401 received (close #467) 2023-08-26 12:05:18 +08:00
CaIon
d9d5b001a7 merge 2023-08-25 01:03:45 +08:00
CaIon
c0f0201f5f Merge remote-tracking branch 'origin/main'
# Conflicts:
#	controller/relay-text.go
#	go.mod
#	web/src/components/PersonalSetting.js
#	web/src/components/TokensTable.js
#	web/src/pages/Home/index.js
2023-08-25 00:51:02 +08:00
CaIon
3b0f1ae978 修改stat接口返回值 2023-08-25 00:40:11 +08:00
glzjin
efeb9a16ce
fix: fix xunfei crash (#451) 2023-08-20 22:07:50 +08:00
Benny
05e4f2b439
fix: empty completion issue caused by bad status code from upstream channel (#422) 2023-08-19 17:58:45 +08:00
滔哥
7e058bfb9b
feat: support xunfei's v2 api (#442, close #440)
* 兼容讯飞v2接口

* Revert "兼容讯飞v2接口"

This reverts commit 21f05d1294b8693d0a21664a23ec04f028b9b117.

* fix: fix implementation

---------

Co-authored-by: JustSong <songquanpeng@foxmail.com>
Co-authored-by: JustSong <39998050+songquanpeng@users.noreply.github.com>
2023-08-19 17:50:34 +08:00
glzjin
dfaa0183b7
fix: fix baidu & ali's quota calculation (#444)
* 修复阿里计费问题

* 修复百度计费问题
2023-08-19 17:14:39 +08:00
Benny
23b1c63538
fix: claude model ratio (#449)
* fix: Claude model ratio

* chore: update implementation

---------

Co-authored-by: JustSong <songquanpeng@foxmail.com>
2023-08-19 16:58:34 +08:00
JustSong
86c2627c24 fix: update cache immediately after cache get
Co-authored-by: chikasaki <1347283135@qq.com>
Co-authored-by: Cruel <157922018@qq.com>
2023-08-16 23:40:50 +08:00
CaIon
8f2119e410 add epay 2023-08-14 22:16:32 +08:00
JustSong
3da12e99d9 chore: update variable name 2023-08-13 00:50:26 +08:00
igophper
4ef5e2020c
fix: fix baidu's embedding api (#398)
* fix:judge baidu embeddings input type

* chore: add back update all channels balance

* chore: update default configuration for sql connection

---------

Co-authored-by: JustSong <songquanpeng@foxmail.com>
2023-08-13 00:45:04 +08:00
igophper
af20063a8d
feat: able to refresh baidu access token automatically (#400, close #401)
* feat:baidu channel support apiKey and secretKey

添加百度文心渠道时支持填写secretKey|apiKey或者accessToken,支持自动刷新accessToken

* fix

* fix

* fix

* chore: update implementation

---------

Co-authored-by: JustSong <songquanpeng@foxmail.com>
Co-authored-by: JustSong <39998050+songquanpeng@users.noreply.github.com>
2023-08-12 23:41:44 +08:00