Ecosystem/ai-gateway
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔖 chore: rename incorrect variable names

Browse Source
This commit is contained in:
MartialBE 2024-05-29 12:27:32 +08:00
parent c2f8a79be2
commit 23f7dd0612
No known key found for this signature in database
GPG Key ID: 27C0267EC84B0A5C
19 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
providers/ali/chat.go
View File

@ -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
}

6
providers/ali/embeddings.go
View File

@ -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

12
providers/baidu/chat.go
View File

@ -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
}

6
providers/baidu/embeddings.go
View File

@ -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

12
providers/claude/chat.go
View File

@ -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
}

6
providers/cohere/chat.go
View File

@ -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

12
providers/gemini/chat.go
View File

@ -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
}

12
providers/hunyuan/chat.go
View File

@ -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
}

12
providers/minimax/chat.go
View File

@ -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
}

6
providers/minimax/embeddings.go
View File

@ -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

6
providers/openai/chat.go
View File

@ -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
}

6
providers/openai/completion.go
View File

@ -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
}

6
providers/openai/image_generations.go
View File

@ -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
}

12
providers/palm/chat.go
View File

@ -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
}

12
providers/tencent/chat.go
View File

@ -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
}

6
providers/xunfei/chat.go
View File

@ -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 {

12
providers/zhipu/chat.go
View File

@ -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
}

6
providers/zhipu/embeddings.go
View File

@ -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

6
providers/zhipu/image_generations.go
View File

@ -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