github/new-api
1
0
Fork 0
mirror of https://github.com/QuantumNous/new-api.git synced 2026-05-01 02:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename AWS model ID and region prefix functions for clarity

Browse Source
This commit is contained in:
CaIon
2025-10-16 12:10:55 +08:00
parent 1f2bdb1402
commit d4749ba388
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
relay/channel/aws/adaptor.go
View File

@@ -88,7 +88,7 @@ func (a *Adaptor) Init(info *relaycommon.RelayInfo) {
func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) { func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
if info.ChannelOtherSettings.AwsKeyType == dto.AwsKeyTypeApiKey { if info.ChannelOtherSettings.AwsKeyType == dto.AwsKeyTypeApiKey {
awsModelId := awsModelID(info.UpstreamModelName) awsModelId := getAwsModelID(info.UpstreamModelName)
a.ClientMode = ClientModeApiKey a.ClientMode = ClientModeApiKey
awsSecret := strings.Split(info.ApiKey, "|") awsSecret := strings.Split(info.ApiKey, "|")
if len(awsSecret) != 2 { if len(awsSecret) != 2 {

15
relay/channel/aws/relay-aws.go
View File

@@ -57,9 +57,11 @@ func doAwsClientRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor,
} }
a.AwsClient = awsCli a.AwsClient = awsCli
awsModelId := awsModelID(info.UpstreamModelName) println(info.UpstreamModelName)
// 获取对应的AWS模型ID
awsModelId := getAwsModelID(info.UpstreamModelName)
awsRegionPrefix := awsRegionPrefix(awsCli.Options().Region) awsRegionPrefix := getAwsRegionPrefix(awsCli.Options().Region)
canCrossRegion := awsModelCanCrossRegion(awsModelId, awsRegionPrefix) canCrossRegion := awsModelCanCrossRegion(awsModelId, awsRegionPrefix)
if canCrossRegion { if canCrossRegion {
awsModelId = awsModelCrossRegion(awsModelId, awsRegionPrefix) awsModelId = awsModelCrossRegion(awsModelId, awsRegionPrefix)
@@ -119,7 +121,7 @@ func doAwsClientRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor,
} }
} }
func awsRegionPrefix(awsRegionId string) string { func getAwsRegionPrefix(awsRegionId string) string {
parts := strings.Split(awsRegionId, "-") parts := strings.Split(awsRegionId, "-")
regionPrefix := "" regionPrefix := ""
if len(parts) > 0 { if len(parts) > 0 {
@@ -141,11 +143,10 @@ func awsModelCrossRegion(awsModelId, awsRegionPrefix string) string {
return modelPrefix + "." + awsModelId return modelPrefix + "." + awsModelId
} }
func awsModelID(requestModel string) string { func getAwsModelID(requestModel string) string {
if awsModelID, ok := awsModelIDMap[requestModel]; ok { if awsModelIDName, ok := awsModelIDMap[requestModel]; ok {
return awsModelID return awsModelIDName
} }
return requestModel return requestModel
} }