From 23f7dd0612a71538ebf50e2ba1a295a06d20c41c Mon Sep 17 00:00:00 2001 From: MartialBE Date: Wed, 29 May 2024 12:27:32 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=96=20chore:=20rename=20incorrect=20va?= =?UTF-8?q?riable=20names?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- providers/ali/chat.go | 12 ++++++------ providers/ali/embeddings.go | 6 +++--- providers/baidu/chat.go | 12 ++++++------ providers/baidu/embeddings.go | 6 +++--- providers/claude/chat.go | 12 ++++++------ providers/cohere/chat.go | 6 +++--- providers/gemini/chat.go | 12 ++++++------ providers/hunyuan/chat.go | 12 ++++++------ providers/minimax/chat.go | 12 ++++++------ providers/minimax/embeddings.go | 6 +++--- providers/openai/chat.go | 6 +++--- providers/openai/completion.go | 6 +++--- providers/openai/image_generations.go | 6 +++--- providers/palm/chat.go | 12 ++++++------ providers/tencent/chat.go | 12 ++++++------ providers/xunfei/chat.go | 6 +++--- providers/zhipu/chat.go | 12 ++++++------ providers/zhipu/embeddings.go | 6 +++--- providers/zhipu/image_generations.go | 6 +++--- 19 files changed, 84 insertions(+), 84 deletions(-) diff --git a/providers/ali/chat.go b/providers/ali/chat.go index f30a1472..1efa0ffa 100644 --- a/providers/ali/chat.go +++ b/providers/ali/chat.go @@ -82,10 +82,10 @@ func (p *AliProvider) getAliChatRequest(request *types.ChatCompletionRequest) (* // 转换为OpenAI聊天请求体 func (p *AliProvider) convertToChatOpenai(response *AliChatResponse, request *types.ChatCompletionRequest) (openaiResponse *types.ChatCompletionResponse, errWithCode *types.OpenAIErrorWithStatusCode) { - error := errorHandle(&response.AliError) - if error != nil { + aiError := errorHandle(&response.AliError) + if aiError != nil { errWithCode = &types.OpenAIErrorWithStatusCode{ - OpenAIError: *error, + OpenAIError: *aiError, StatusCode: http.StatusBadRequest, } return @@ -191,9 +191,9 @@ func (h *aliStreamHandler) handlerStream(rawLine *[]byte, dataChan chan string, return } - error := errorHandle(&aliResponse.AliError) - if error != nil { - errChan <- error + aiError := errorHandle(&aliResponse.AliError) + if aiError != nil { + errChan <- aiError return } diff --git a/providers/ali/embeddings.go b/providers/ali/embeddings.go index c64961aa..bf504c13 100644 --- a/providers/ali/embeddings.go +++ b/providers/ali/embeddings.go @@ -49,10 +49,10 @@ func convertFromEmbeddingOpenai(request *types.EmbeddingRequest) *AliEmbeddingRe } func (p *AliProvider) convertToEmbeddingOpenai(response *AliEmbeddingResponse, request *types.EmbeddingRequest) (openaiResponse *types.EmbeddingResponse, errWithCode *types.OpenAIErrorWithStatusCode) { - error := errorHandle(&response.AliError) - if error != nil { + aiError := errorHandle(&response.AliError) + if aiError != nil { errWithCode = &types.OpenAIErrorWithStatusCode{ - OpenAIError: *error, + OpenAIError: *aiError, StatusCode: http.StatusBadRequest, } return diff --git a/providers/baidu/chat.go b/providers/baidu/chat.go index 92f44b1c..4c0bbb65 100644 --- a/providers/baidu/chat.go +++ b/providers/baidu/chat.go @@ -82,10 +82,10 @@ func (p *BaiduProvider) getBaiduChatRequest(request *types.ChatCompletionRequest } func (p *BaiduProvider) convertToChatOpenai(response *BaiduChatResponse, request *types.ChatCompletionRequest) (openaiResponse *types.ChatCompletionResponse, errWithCode *types.OpenAIErrorWithStatusCode) { - error := errorHandle(&response.BaiduError) - if error != nil { + aiError := errorHandle(&response.BaiduError) + if aiError != nil { errWithCode = &types.OpenAIErrorWithStatusCode{ - OpenAIError: *error, + OpenAIError: *aiError, StatusCode: http.StatusBadRequest, } return @@ -204,9 +204,9 @@ func (h *baiduStreamHandler) handlerStream(rawLine *[]byte, dataChan chan string return } - error := errorHandle(&baiduResponse.BaiduError) - if error != nil { - errChan <- error + aiError := errorHandle(&baiduResponse.BaiduError) + if aiError != nil { + errChan <- aiError return } diff --git a/providers/baidu/embeddings.go b/providers/baidu/embeddings.go index a62fdf2f..d8e1f118 100644 --- a/providers/baidu/embeddings.go +++ b/providers/baidu/embeddings.go @@ -47,10 +47,10 @@ func convertFromEmbeddingOpenai(request *types.EmbeddingRequest) *BaiduEmbedding } func (p *BaiduProvider) convertToEmbeddingOpenai(response *BaiduEmbeddingResponse, request *types.EmbeddingRequest) (openaiResponse *types.EmbeddingResponse, errWithCode *types.OpenAIErrorWithStatusCode) { - error := errorHandle(&response.BaiduError) - if error != nil { + aiError := errorHandle(&response.BaiduError) + if aiError != nil { errWithCode = &types.OpenAIErrorWithStatusCode{ - OpenAIError: *error, + OpenAIError: *aiError, StatusCode: http.StatusBadRequest, } return diff --git a/providers/claude/chat.go b/providers/claude/chat.go index 3ebe803f..9165ab3e 100644 --- a/providers/claude/chat.go +++ b/providers/claude/chat.go @@ -153,10 +153,10 @@ func ConvertFromChatOpenai(request *types.ChatCompletionRequest) (*ClaudeRequest } func ConvertToChatOpenai(provider base.ProviderInterface, response *ClaudeResponse, request *types.ChatCompletionRequest) (openaiResponse *types.ChatCompletionResponse, errWithCode *types.OpenAIErrorWithStatusCode) { - error := errorHandle(&response.Error) - if error != nil { + aiError := errorHandle(&response.Error) + if aiError != nil { errWithCode = &types.OpenAIErrorWithStatusCode{ - OpenAIError: *error, + OpenAIError: *aiError, StatusCode: http.StatusBadRequest, } return @@ -218,9 +218,9 @@ func (h *ClaudeStreamHandler) HandlerStream(rawLine *[]byte, dataChan chan strin return } - error := errorHandle(&claudeResponse.Error) - if error != nil { - errChan <- error + aiError := errorHandle(&claudeResponse.Error) + if aiError != nil { + errChan <- aiError return } diff --git a/providers/cohere/chat.go b/providers/cohere/chat.go index 921a7ddc..6b7a76a6 100644 --- a/providers/cohere/chat.go +++ b/providers/cohere/chat.go @@ -120,10 +120,10 @@ func ConvertFromChatOpenai(request *types.ChatCompletionRequest) (*CohereRequest } func ConvertToChatOpenai(provider base.ProviderInterface, response *CohereResponse, request *types.ChatCompletionRequest) (openaiResponse *types.ChatCompletionResponse, errWithCode *types.OpenAIErrorWithStatusCode) { - error := errorHandle(&response.CohereError) - if error != nil { + aiError := errorHandle(&response.CohereError) + if aiError != nil { errWithCode = &types.OpenAIErrorWithStatusCode{ - OpenAIError: *error, + OpenAIError: *aiError, StatusCode: http.StatusBadRequest, } return diff --git a/providers/gemini/chat.go b/providers/gemini/chat.go index 28185345..5ca5bf12 100644 --- a/providers/gemini/chat.go +++ b/providers/gemini/chat.go @@ -136,10 +136,10 @@ func convertFromChatOpenai(request *types.ChatCompletionRequest) (*GeminiChatReq } func (p *GeminiProvider) convertToChatOpenai(response *GeminiChatResponse, request *types.ChatCompletionRequest) (openaiResponse *types.ChatCompletionResponse, errWithCode *types.OpenAIErrorWithStatusCode) { - error := errorHandle(&response.GeminiErrorResponse) - if error != nil { + aiError := errorHandle(&response.GeminiErrorResponse) + if aiError != nil { errWithCode = &types.OpenAIErrorWithStatusCode{ - OpenAIError: *error, + OpenAIError: *aiError, StatusCode: http.StatusBadRequest, } return @@ -180,9 +180,9 @@ func (h *geminiStreamHandler) handlerStream(rawLine *[]byte, dataChan chan strin return } - error := errorHandle(&geminiResponse.GeminiErrorResponse) - if error != nil { - errChan <- error + aiError := errorHandle(&geminiResponse.GeminiErrorResponse) + if aiError != nil { + errChan <- aiError return } diff --git a/providers/hunyuan/chat.go b/providers/hunyuan/chat.go index f588d425..773c7bc6 100644 --- a/providers/hunyuan/chat.go +++ b/providers/hunyuan/chat.go @@ -69,10 +69,10 @@ func (p *HunyuanProvider) getChatRequest(request *types.ChatCompletionRequest) ( } func (p *HunyuanProvider) convertToChatOpenai(response *ChatCompletionsResponse, request *types.ChatCompletionRequest) (openaiResponse *types.ChatCompletionResponse, errWithCode *types.OpenAIErrorWithStatusCode) { - error := errorHandle(&response.Response.HunyuanResponseError) - if error != nil { + aiError := errorHandle(&response.Response.HunyuanResponseError) + if aiError != nil { errWithCode = &types.OpenAIErrorWithStatusCode{ - OpenAIError: *error, + OpenAIError: *aiError, StatusCode: http.StatusBadRequest, } return @@ -143,9 +143,9 @@ func (h *tunyuanStreamHandler) handlerStream(rawLine *[]byte, dataChan chan stri return } - error := errorHandle(&tunyuanChatResponse.HunyuanResponseError) - if error != nil { - errChan <- error + aiError := errorHandle(&tunyuanChatResponse.HunyuanResponseError) + if aiError != nil { + errChan <- aiError return } diff --git a/providers/minimax/chat.go b/providers/minimax/chat.go index fcc83422..4cef16a9 100644 --- a/providers/minimax/chat.go +++ b/providers/minimax/chat.go @@ -82,10 +82,10 @@ func (p *MiniMaxProvider) getChatRequest(request *types.ChatCompletionRequest) ( } func (p *MiniMaxProvider) convertToChatOpenai(response *MiniMaxChatResponse, request *types.ChatCompletionRequest) (openaiResponse *types.ChatCompletionResponse, errWithCode *types.OpenAIErrorWithStatusCode) { - error := errorHandle(&response.MiniMaxBaseResp.BaseResp) - if error != nil { + aiError := errorHandle(&response.MiniMaxBaseResp.BaseResp) + if aiError != nil { errWithCode = &types.OpenAIErrorWithStatusCode{ - OpenAIError: *error, + OpenAIError: *aiError, StatusCode: http.StatusBadRequest, } return @@ -214,9 +214,9 @@ func (h *minimaxStreamHandler) handlerStream(rawLine *[]byte, dataChan chan stri return } - error := errorHandle(&miniResponse.BaseResp) - if error != nil { - errChan <- error + aiError := errorHandle(&miniResponse.BaseResp) + if aiError != nil { + errChan <- aiError return } diff --git a/providers/minimax/embeddings.go b/providers/minimax/embeddings.go index d2706951..cbbae337 100644 --- a/providers/minimax/embeddings.go +++ b/providers/minimax/embeddings.go @@ -61,10 +61,10 @@ func convertFromEmbeddingOpenai(request *types.EmbeddingRequest) *MiniMaxEmbeddi } func (p *MiniMaxProvider) convertToEmbeddingOpenai(response *MiniMaxEmbeddingResponse, request *types.EmbeddingRequest) (openaiResponse *types.EmbeddingResponse, errWithCode *types.OpenAIErrorWithStatusCode) { - error := errorHandle(&response.BaseResp) - if error != nil { + aiError := errorHandle(&response.BaseResp) + if aiError != nil { errWithCode = &types.OpenAIErrorWithStatusCode{ - OpenAIError: *error, + OpenAIError: *aiError, StatusCode: http.StatusBadRequest, } return diff --git a/providers/openai/chat.go b/providers/openai/chat.go index 8857b6fa..7f5b36ae 100644 --- a/providers/openai/chat.go +++ b/providers/openai/chat.go @@ -116,9 +116,9 @@ func (h *OpenAIStreamHandler) HandlerChatStream(rawLine *[]byte, dataChan chan s return } - error := ErrorHandle(&openaiResponse.OpenAIErrorResponse) - if error != nil { - errChan <- error + aiError := ErrorHandle(&openaiResponse.OpenAIErrorResponse) + if aiError != nil { + errChan <- aiError return } diff --git a/providers/openai/completion.go b/providers/openai/completion.go index 3a775605..066204d0 100644 --- a/providers/openai/completion.go +++ b/providers/openai/completion.go @@ -98,9 +98,9 @@ func (h *OpenAIStreamHandler) handlerCompletionStream(rawLine *[]byte, dataChan return } - error := ErrorHandle(&openaiResponse.OpenAIErrorResponse) - if error != nil { - errChan <- error + aiError := ErrorHandle(&openaiResponse.OpenAIErrorResponse) + if aiError != nil { + errChan <- aiError return } diff --git a/providers/openai/image_generations.go b/providers/openai/image_generations.go index c3e505b0..60e4bd5a 100644 --- a/providers/openai/image_generations.go +++ b/providers/openai/image_generations.go @@ -45,8 +45,8 @@ func IsWithinRange(element string, value int) bool { if _, ok := common.DalleGenerationImageAmounts[element]; !ok { return false } - min := common.DalleGenerationImageAmounts[element][0] - max := common.DalleGenerationImageAmounts[element][1] + minCount := common.DalleGenerationImageAmounts[element][0] + maxCount := common.DalleGenerationImageAmounts[element][1] - return value >= min && value <= max + return value >= minCount && value <= maxCount } diff --git a/providers/palm/chat.go b/providers/palm/chat.go index 36672f42..c9785258 100644 --- a/providers/palm/chat.go +++ b/providers/palm/chat.go @@ -83,10 +83,10 @@ func (p *PalmProvider) getChatRequest(request *types.ChatCompletionRequest) (*ht } func (p *PalmProvider) convertToChatOpenai(response *PaLMChatResponse, request *types.ChatCompletionRequest) (openaiResponse *types.ChatCompletionResponse, errWithCode *types.OpenAIErrorWithStatusCode) { - error := errorHandle(&response.PaLMErrorResponse) - if error != nil { + aiError := errorHandle(&response.PaLMErrorResponse) + if aiError != nil { errWithCode = &types.OpenAIErrorWithStatusCode{ - OpenAIError: *error, + OpenAIError: *aiError, StatusCode: http.StatusBadRequest, } return @@ -161,9 +161,9 @@ func (h *palmStreamHandler) handlerStream(rawLine *[]byte, dataChan chan string, return } - error := errorHandle(&palmChatResponse.PaLMErrorResponse) - if error != nil { - errChan <- error + aiError := errorHandle(&palmChatResponse.PaLMErrorResponse) + if aiError != nil { + errChan <- aiError return } diff --git a/providers/tencent/chat.go b/providers/tencent/chat.go index fb4ef287..6d82252a 100644 --- a/providers/tencent/chat.go +++ b/providers/tencent/chat.go @@ -92,10 +92,10 @@ func (p *TencentProvider) getChatRequest(request *types.ChatCompletionRequest) ( } func (p *TencentProvider) convertToChatOpenai(response *TencentChatResponse, request *types.ChatCompletionRequest) (openaiResponse *types.ChatCompletionResponse, errWithCode *types.OpenAIErrorWithStatusCode) { - error := errorHandle(&response.TencentResponseError) - if error != nil { + aiError := errorHandle(&response.TencentResponseError) + if aiError != nil { errWithCode = &types.OpenAIErrorWithStatusCode{ - OpenAIError: *error, + OpenAIError: *aiError, StatusCode: http.StatusBadRequest, } return @@ -167,9 +167,9 @@ func (h *tencentStreamHandler) handlerStream(rawLine *[]byte, dataChan chan stri return } - error := errorHandle(&tencentChatResponse.TencentResponseError) - if error != nil { - errChan <- error + aiError := errorHandle(&tencentChatResponse.TencentResponseError) + if aiError != nil { + errChan <- aiError return } diff --git a/providers/xunfei/chat.go b/providers/xunfei/chat.go index a72d9d83..a95a8d9d 100644 --- a/providers/xunfei/chat.go +++ b/providers/xunfei/chat.go @@ -217,9 +217,9 @@ func (h *xunfeiHandler) handlerData(rawLine *[]byte, isFinished *bool) (*XunfeiC return nil, common.ErrorToOpenAIError(err) } - error := errorHandle(&xunfeiChatResponse) - if error != nil { - return nil, error + aiError := errorHandle(&xunfeiChatResponse) + if aiError != nil { + return nil, aiError } if xunfeiChatResponse.Payload.Choices.Status == 2 { diff --git a/providers/zhipu/chat.go b/providers/zhipu/chat.go index 982096ae..955e491e 100644 --- a/providers/zhipu/chat.go +++ b/providers/zhipu/chat.go @@ -81,10 +81,10 @@ func (p *ZhipuProvider) getChatRequest(request *types.ChatCompletionRequest) (*h } func (p *ZhipuProvider) convertToChatOpenai(response *ZhipuResponse, request *types.ChatCompletionRequest) (openaiResponse *types.ChatCompletionResponse, errWithCode *types.OpenAIErrorWithStatusCode) { - error := errorHandle(&response.Error) - if error != nil { + aiError := errorHandle(&response.Error) + if aiError != nil { errWithCode = &types.OpenAIErrorWithStatusCode{ - OpenAIError: *error, + OpenAIError: *aiError, StatusCode: http.StatusBadRequest, } return @@ -244,9 +244,9 @@ func (h *zhipuStreamHandler) handlerStream(rawLine *[]byte, dataChan chan string return } - error := errorHandle(&zhipuResponse.Error) - if error != nil { - errChan <- error + aiError := errorHandle(&zhipuResponse.Error) + if aiError != nil { + errChan <- aiError return } diff --git a/providers/zhipu/embeddings.go b/providers/zhipu/embeddings.go index 78947ec1..01897391 100644 --- a/providers/zhipu/embeddings.go +++ b/providers/zhipu/embeddings.go @@ -48,10 +48,10 @@ func convertFromEmbeddingOpenai(request *types.EmbeddingRequest) *ZhipuEmbedding } func (p *ZhipuProvider) convertToEmbeddingOpenai(response *ZhipuEmbeddingResponse, request *types.EmbeddingRequest) (openaiResponse *types.EmbeddingResponse, errWithCode *types.OpenAIErrorWithStatusCode) { - error := errorHandle(&response.Error) - if error != nil { + aiError := errorHandle(&response.Error) + if aiError != nil { errWithCode = &types.OpenAIErrorWithStatusCode{ - OpenAIError: *error, + OpenAIError: *aiError, StatusCode: http.StatusBadRequest, } return diff --git a/providers/zhipu/image_generations.go b/providers/zhipu/image_generations.go index cfbf55bc..fa47cf0a 100644 --- a/providers/zhipu/image_generations.go +++ b/providers/zhipu/image_generations.go @@ -42,10 +42,10 @@ func (p *ZhipuProvider) CreateImageGenerations(request *types.ImageRequest) (*ty } func (p *ZhipuProvider) convertToImageOpenai(response *ZhipuImageGenerationResponse) (openaiResponse *types.ImageResponse, errWithCode *types.OpenAIErrorWithStatusCode) { - error := errorHandle(&response.Error) - if error != nil { + aiError := errorHandle(&response.Error) + if aiError != nil { errWithCode = &types.OpenAIErrorWithStatusCode{ - OpenAIError: *error, + OpenAIError: *aiError, StatusCode: http.StatusBadRequest, } return