Commit Graph

844 Commits

Author SHA1 Message Date
CaIon
23d9554415 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
ead3b915ca 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
6c5dea7b01 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
39328d65c2 feat: able to delete logs now (close #486) 2023-09-17 17:09:56 +08:00
JustSong
315d7e8692 refactor: update logging related logic 2023-09-17 15:39:46 +08:00
JustSong
0ff78b0705 chore: update error code 2023-09-17 11:30:20 +08:00
CaIon
ac97409a3e Merge remote-tracking branch 'origin/main'
# Conflicts:
#	web/src/components/PersonalSetting.js
2023-09-15 18:01:06 +08:00
CaIon
2a961f1cbc feat: 渠道支持指定组织 2023-09-15 17:59:01 +08:00
CaIon
76c0c7918e feat: 避免请求出错时暴露渠道信息 2023-09-15 17:50:54 +08:00
JustSong
8c779729c7 fix: fix oauth2 state not checking 2023-09-15 00:24:20 +08:00
JustSong
6d241249d2 perf: only return quota when it's not zero 2023-09-13 22:05:10 +08:00
JustSong
750bf17334 fix: fix quota not return when error occurred (close #518) 2023-09-13 21:50:45 +08:00
CaIon
59b4bc37ea feat: 改为转发的方式获取midjourney图片 2023-09-12 03:46:05 +08:00
CaIon
06fc41d9a0 feat: add midjourney log 2023-09-12 03:17:26 +08:00
CaIon
57edbac346 feat: 删除无用功能 2023-09-10 01:13:12 +08:00
CaIon
e8895c92a8 修复充值bug 2023-09-09 05:05:46 +08:00
CaIon
ff8df45f95 修复充值bug 2023-09-09 05:04:49 +08:00
CaIon
a71b737a2c 合并请求 2023-09-09 03:19:55 +08:00
CaIon
c0636950c0 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	controller/relay.go
#	main.go
#	middleware/distributor.go
2023-09-09 03:15:55 +08:00
CaIon
f73ecc57c2 移除不必要的功能 2023-09-09 03:11:42 +08:00
CaIon
e25bcce452 merge 2023-09-09 01:50:41 +08:00
igophper
b31a9d7576 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
bbcf52be8f chore: add error prompt for Azure 2023-09-03 21:46:07 +08:00
JustSong
fa0fedff5c chore: pass through error out 2023-09-03 21:31:58 +08:00
JustSong
8e0a744da3 feat: support aiproxy's library 2023-09-03 12:51:59 +08:00
CaIon
a4cf25f4c6 修复多路复用bug 2023-08-31 00:44:16 +08:00
JustSong
f506056015 perf: preallocate array capacity 2023-08-30 21:15:56 +08:00
JustSong
59eab66373 feat: supper OpenRouter now (close #333, close #340) 2023-08-27 16:16:45 +08:00
JustSong
1966eb712e feat: supper whisper now (close #197) 2023-08-27 15:28:23 +08:00
JustSong
373f50c8eb Merge branch 'main' of https://github.com/songquanpeng/one-api 2023-08-26 13:36:58 +08:00
JustSong
6c808f80ff 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
32db0934e5 fix: fix the issue of function_call not working when using model mapping (#462) 2023-08-26 13:10:18 +08:00
JustSong
574be5bd1d perf: initialize all token encoder when starting (close #459, close $460) 2023-08-26 13:02:02 +08:00
JustSong
5ac2eac15f fix: fix error response (close #468) 2023-08-26 12:37:45 +08:00
JustSong
2193d46b17 fix: disable channel when 401 received (close #467) 2023-08-26 12:05:18 +08:00
CaIon
46d817ab64 merge 2023-08-25 01:03:45 +08:00
CaIon
e60239c93d 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
c7d1cef7b4 修改stat接口返回值 2023-08-25 00:40:11 +08:00
glzjin
04bd77e5d6 fix: fix xunfei crash (#451) 2023-08-20 22:07:50 +08:00
Benny
996b005173 fix: empty completion issue caused by bad status code from upstream channel (#422) 2023-08-19 17:58:45 +08:00
滔哥
ad3aef34a7 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
23ec88d6e9 fix: fix baidu & ali's quota calculation (#444)
* 修复阿里计费问题

* 修复百度计费问题
2023-08-19 17:14:39 +08:00
Benny
6c44925286 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
8cfc5eeb97 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
68b24da6a6 add epay 2023-08-14 22:16:32 +08:00
JustSong
29d5fa222d chore: update variable name 2023-08-13 00:50:26 +08:00
igophper
27b290c578 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
91bcc5f738 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
igophper
c4e10c561a refactor: add set event stream headers func (#402)
封装流式传输响应头的设置
2023-08-12 21:55:18 +08:00
JustSong
995b3147ce perf: use a goroutine to handle quota post consumption (#364) 2023-08-12 19:36:31 +08:00