Skip to content

Commit 112dd80

Browse files
authored
fix: vertex maas api addr (#2810)
* fix: vertex maas api addr
1 parent 723b85b commit 112dd80

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

relay/channel/vertex/adaptor.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
)
2525

2626
const (
27-
RequestModeClaude = 1
28-
RequestModeGemini = 2
29-
RequestModeLlama = 3
27+
RequestModeClaude = 1
28+
RequestModeGemini = 2
29+
RequestModeOpenSource = 3
3030
)
3131

3232
var claudeModelMap = map[string]string{
@@ -115,7 +115,7 @@ func (a *Adaptor) Init(info *relaycommon.RelayInfo) {
115115
} else if strings.Contains(info.UpstreamModelName, "llama") ||
116116
// open source models
117117
strings.Contains(info.UpstreamModelName, "-maas") {
118-
a.RequestMode = RequestModeLlama
118+
a.RequestMode = RequestModeOpenSource
119119
} else {
120120
a.RequestMode = RequestModeGemini
121121
}
@@ -166,10 +166,9 @@ func (a *Adaptor) getRequestUrl(info *relaycommon.RelayInfo, modelName, suffix s
166166
suffix,
167167
), nil
168168
}
169-
} else if a.RequestMode == RequestModeLlama {
169+
} else if a.RequestMode == RequestModeOpenSource {
170170
return fmt.Sprintf(
171-
"https://%s-aiplatform.googleapis.com/v1beta1/projects/%s/locations/%s/endpoints/openapi/chat/completions",
172-
region,
171+
"https://aiplatform.googleapis.com/v1beta1/projects/%s/locations/%s/endpoints/openapi/chat/completions",
173172
adc.ProjectID,
174173
region,
175174
), nil
@@ -242,7 +241,7 @@ func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
242241
model = v
243242
}
244243
return a.getRequestUrl(info, model, suffix)
245-
} else if a.RequestMode == RequestModeLlama {
244+
} else if a.RequestMode == RequestModeOpenSource {
246245
return a.getRequestUrl(info, "", "")
247246
}
248247
return "", errors.New("unsupported request mode")
@@ -340,7 +339,7 @@ func (a *Adaptor) ConvertOpenAIRequest(c *gin.Context, info *relaycommon.RelayIn
340339
}
341340
c.Set("request_model", request.Model)
342341
return geminiRequest, nil
343-
} else if a.RequestMode == RequestModeLlama {
342+
} else if a.RequestMode == RequestModeOpenSource {
344343
return request, nil
345344
}
346345
return nil, errors.New("unsupported request mode")
@@ -375,7 +374,7 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycom
375374
} else {
376375
return gemini.GeminiChatStreamHandler(c, info, resp)
377376
}
378-
case RequestModeLlama:
377+
case RequestModeOpenSource:
379378
return openai.OaiStreamHandler(c, info, resp)
380379
}
381380
} else {
@@ -391,7 +390,7 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycom
391390
}
392391
return gemini.GeminiChatHandler(c, info, resp)
393392
}
394-
case RequestModeLlama:
393+
case RequestModeOpenSource:
395394
return openai.OpenaiHandler(c, info, resp)
396395
}
397396
}

0 commit comments

Comments
 (0)