Merge branch 'main' into alpha

relay/channel/vertex/adaptor.go

@@ -123,6 +123,14 @@ func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
 		if v, ok := claudeModelMap[info.UpstreamModelName]; ok {
 		if v, ok := claudeModelMap[info.UpstreamModelName]; ok {
 			model = v
 			model = v
 		}
 		}
+		if region == "global" {
+			return fmt.Sprintf(
+				"https://aiplatform.googleapis.com/v1/projects/%s/locations/global/publishers/anthropic/models/%s:%s",
+				adc.ProjectID,
+				model,
+				suffix,
+			), nil
+		} else {
 			return fmt.Sprintf(
 			return fmt.Sprintf(
 				"https://%s-aiplatform.googleapis.com/v1/projects/%s/locations/%s/publishers/anthropic/models/%s:%s",
 				"https://%s-aiplatform.googleapis.com/v1/projects/%s/locations/%s/publishers/anthropic/models/%s:%s",
 				region,
 				region,
@@ -131,6 +139,7 @@ func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
 				model,
 				model,
 				suffix,
 				suffix,
 			), nil
 			), nil
+		}
 	} else if a.RequestMode == RequestModeLlama {
 	} else if a.RequestMode == RequestModeLlama {
 		return fmt.Sprintf(
 		return fmt.Sprintf(
 			"https://%s-aiplatform.googleapis.com/v1beta1/projects/%s/locations/%s/endpoints/openapi/chat/completions",
 			"https://%s-aiplatform.googleapis.com/v1beta1/projects/%s/locations/%s/endpoints/openapi/chat/completions",