mirror of
				https://github.com/songquanpeng/one-api.git
				synced 2025-11-04 15:53:42 +08:00 
			
		
		
		
	fix: update StreamHandler to support cross-region model IDs for AWS
This commit is contained in:
		@@ -104,13 +104,14 @@ func Handler(c *gin.Context, awsCli *bedrockruntime.Client, modelName string) (*
 | 
			
		||||
 | 
			
		||||
func StreamHandler(c *gin.Context, awsCli *bedrockruntime.Client) (*relaymodel.ErrorWithStatusCode, *relaymodel.Usage) {
 | 
			
		||||
	createdTime := helper.GetTimestamp()
 | 
			
		||||
	awsModelId, err := awsModelID(c.GetString(ctxkey.RequestModel))
 | 
			
		||||
	awsModelID, err := awsModelID(c.GetString(ctxkey.RequestModel))
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return utils.WrapErr(errors.Wrap(err, "awsModelID")), nil
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	awsModelID = utils.ConvertModelID2CrossRegionProfile(awsModelID, awsCli.Options().Region)
 | 
			
		||||
	awsReq := &bedrockruntime.InvokeModelWithResponseStreamInput{
 | 
			
		||||
		ModelId:     aws.String(awsModelId),
 | 
			
		||||
		ModelId:     aws.String(awsModelID),
 | 
			
		||||
		Accept:      aws.String("application/json"),
 | 
			
		||||
		ContentType: aws.String("application/json"),
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -141,13 +141,14 @@ func ResponseLlama2OpenAI(llamaResponse *Response) *openai.TextResponse {
 | 
			
		||||
 | 
			
		||||
func StreamHandler(c *gin.Context, awsCli *bedrockruntime.Client) (*relaymodel.ErrorWithStatusCode, *relaymodel.Usage) {
 | 
			
		||||
	createdTime := helper.GetTimestamp()
 | 
			
		||||
	awsModelId, err := awsModelID(c.GetString(ctxkey.RequestModel))
 | 
			
		||||
	awsModelID, err := awsModelID(c.GetString(ctxkey.RequestModel))
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return utils.WrapErr(errors.Wrap(err, "awsModelID")), nil
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	awsModelID = utils.ConvertModelID2CrossRegionProfile(awsModelID, awsCli.Options().Region)
 | 
			
		||||
	awsReq := &bedrockruntime.InvokeModelWithResponseStreamInput{
 | 
			
		||||
		ModelId:     aws.String(awsModelId),
 | 
			
		||||
		ModelId:     aws.String(awsModelID),
 | 
			
		||||
		Accept:      aws.String("application/json"),
 | 
			
		||||
		ContentType: aws.String("application/json"),
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user