xinyin025/one-api
1
0
Fork 0
mirror of https://github.com/songquanpeng/one-api.git synced 2025-10-01 23:56:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
639 Commits 5 Branches 405 Tags 100 MiB
8e59b41078
Commit Graph

76 Commits

Author SHA1 Message Date
Calcium-Ion
8e59b41078
Merge branch 'songquanpeng:main' into main 2023-11-06 02:41:28 +08:00
wzxjohn
bc7c9105f4
chore: update quota calc logic (close #599) (#627) 
* fix: change quota calc code (close #599)

Use float64 during calc and do math.Ceil after calc. This will result in the quota being used slightly more than the official standard, but it will be guaranteed that it will not be less.

* chore: remove blank line

---------

Co-authored-by: JustSong <songquanpeng@foxmail.com>
 2023-11-05 19:15:06 +08:00
Calcium-Ion
7688e9f9dd
Merge branch 'songquanpeng:main' into main 2023-10-30 16:12:09 +08:00
JustSong
89d458b9cf feat: able to set RELAY_TIMEOUT 2023-10-22 20:39:49 +08:00
JustSong
63fafba112 feat: support ERNIE-Bot-4 (close #608) 2023-10-22 18:48:35 +08:00
yiGmMk
57aa637c77
fix: set Accept header if not given (#615) 
* fix: fastgpt调用通义千问问答失败

* refactor: Dockerfile

* Revert "refactor: Dockerfile"

This reverts commit a538c4f28e.

* chore: update implementation

---------

Co-authored-by: JustSong <songquanpeng@foxmail.com>
 2023-10-22 17:56:20 +08:00
vc
3b483639a4
feat: add cloudflare ai gateway support for image & audio (#607) 
* Update channel-test.go

* Update relay-audio.go

* Update relay-image.go

* chore: using a util function

---------

Co-authored-by: JustSong <songquanpeng@foxmail.com>
 2023-10-22 17:50:52 +08:00
CaIon
fc2ef52366 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	README.md
#	go.mod
#	go.sum
#	model/log.go
#	web/src/App.js
#	web/src/components/ChannelsTable.js
 2023-10-16 17:31:26 +08:00
JustSong
e28d4b1741 feat: support cloudflare AI gateway now (close #565, #598) 2023-10-14 15:26:28 +08:00
JustSong
b4b4acc288 feat: support Tencent's model (close #519) 2023-10-03 14:19:03 +08:00
JustSong
47c08c72ce fix: check user quota when pre-consume quota 2023-10-01 12:49:40 +08:00
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
42451d9d02 refactor: update logging related logic 2023-09-17 15:39:46 +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
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
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
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
56b5007379 feat: supper OpenRouter now (close #333, close #340) 2023-08-27 16:16:45 +08:00
JustSong
a3e267df7e fix: fix error response (close #468) 2023-08-26 12:37:45 +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
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
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
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
JustSong
0e9ff8825e perf: use a goroutine to handle quota post consumption (#364) 2023-08-12 19:36:31 +08:00
JustSong
7bddc73b96 perf: flush response after response handled (close #364) 2023-08-12 18:10:15 +08:00
JustSong
d96cf2e84d fix: fix stream mode determine related logic (close #360) 2023-08-06 18:09:00 +08:00
glzjin
446337c329
fix: calculate usage if not given in non-stream mode (#352) 2023-08-06 17:40:31 +08:00
JustSong
fe8f216dd9 refactor: update billing related code 2023-07-29 22:32:05 +08:00
JustSong
8a866078b2 feat: support xunfei's llm (close #206) 2023-07-29 21:55:57 +08:00
JustSong
f45d586400 fix: fix model mapping cannot be deleted 2023-07-29 19:17:26 +08:00
JustSong
130e6bfd83 feat: support baidu's embedding model (close #324) 2023-07-29 12:15:07 +08:00
JustSong
e92da7928b feat: support ali's llm (close #326) 2023-07-28 23:45:08 +08:00
JustSong
c134604cee fix: use channel type to determine api type (close #321) 2023-07-24 23:34:14 +08:00
mrhaoji
929e43ef81
fix: baseURL not working in APITypePaLM (#317) 
* fix: baseURL not working in APITypePaLM

* chore: use the same logic as claude

---------

Co-authored-by: JustSong <songquanpeng@foxmail.com>
 2023-07-24 22:37:57 +08:00
JustSong
3da119efba perf: reuse http client to reduce delay 2023-07-23 15:18:58 +08:00