merge: resolve conflicts with main branch

This commit is contained in:
saikidev
2025-02-19 15:26:00 +08:00
16 changed files with 712 additions and 160 deletions

View File

@@ -14,6 +14,7 @@ import (
"github.com/songquanpeng/one-api/relay/adaptor/alibailian"
"github.com/songquanpeng/one-api/relay/adaptor/baiduv2"
"github.com/songquanpeng/one-api/relay/adaptor/doubao"
"github.com/songquanpeng/one-api/relay/adaptor/geminiv2"
"github.com/songquanpeng/one-api/relay/adaptor/minimax"
"github.com/songquanpeng/one-api/relay/adaptor/novita"
"github.com/songquanpeng/one-api/relay/channeltype"
@@ -60,6 +61,8 @@ func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
return baiduv2.GetRequestURL(meta)
case channeltype.AliBailian:
return alibailian.GetRequestURL(meta)
case channeltype.GeminiOpenAICompatible:
return geminiv2.GetRequestURL(meta)
case channeltype.PPIO:
return ppio.GetRequestURL(meta)
default: