diff --git a/relay/channel/aws/adaptor.go b/relay/channel/aws/adaptor.go index 849a2e097..423cf842d 100644 --- a/relay/channel/aws/adaptor.go +++ b/relay/channel/aws/adaptor.go @@ -88,7 +88,7 @@ func (a *Adaptor) Init(info *relaycommon.RelayInfo) { func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) { if info.ChannelOtherSettings.AwsKeyType == dto.AwsKeyTypeApiKey { - awsModelId := awsModelID(info.UpstreamModelName) + awsModelId := getAwsModelID(info.UpstreamModelName) a.ClientMode = ClientModeApiKey awsSecret := strings.Split(info.ApiKey, "|") if len(awsSecret) != 2 { diff --git a/relay/channel/aws/relay-aws.go b/relay/channel/aws/relay-aws.go index f55690949..8a06003a5 100644 --- a/relay/channel/aws/relay-aws.go +++ b/relay/channel/aws/relay-aws.go @@ -57,9 +57,11 @@ func doAwsClientRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor, } 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) if canCrossRegion { 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, "-") regionPrefix := "" if len(parts) > 0 { @@ -141,11 +143,10 @@ func awsModelCrossRegion(awsModelId, awsRegionPrefix string) string { return modelPrefix + "." + awsModelId } -func awsModelID(requestModel string) string { - if awsModelID, ok := awsModelIDMap[requestModel]; ok { - return awsModelID +func getAwsModelID(requestModel string) string { + if awsModelIDName, ok := awsModelIDMap[requestModel]; ok { + return awsModelIDName } - return requestModel }