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

Merge branch 'songquanpeng:main' into refactor-main

Browse Source
This commit is contained in:
ckt 2023-07-25 22:38:59 +08:00 committed by GitHub
commit ccd7a99b68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
controller/relay-text.go
View File

@ -85,13 +85,14 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
} }
} }
apiType := APITypeOpenAI apiType := APITypeOpenAI
if strings.HasPrefix(textRequest.Model, "claude") { switch channelType {
case common.ChannelTypeAnthropic:
apiType = APITypeClaude apiType = APITypeClaude
} else if strings.HasPrefix(textRequest.Model, "ERNIE") { case common.ChannelTypeBaidu:
apiType = APITypeBaidu apiType = APITypeBaidu
} else if strings.HasPrefix(textRequest.Model, "PaLM") { case common.ChannelTypePaLM:
apiType = APITypePaLM apiType = APITypePaLM
} else if strings.HasPrefix(textRequest.Model, "chatglm_") { case common.ChannelTypeZhipu:
apiType = APITypeZhipu apiType = APITypeZhipu
} }
baseURL := common.ChannelBaseURLs[channelType] baseURL := common.ChannelBaseURLs[channelType]
@ -140,6 +141,9 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
fullRequestURL += "?access_token=" + apiKey // TODO: access token expire in 30 days fullRequestURL += "?access_token=" + apiKey // TODO: access token expire in 30 days
case APITypePaLM: case APITypePaLM:
fullRequestURL = "https://generativelanguage.googleapis.com/v1beta2/models/chat-bison-001:generateMessage" fullRequestURL = "https://generativelanguage.googleapis.com/v1beta2/models/chat-bison-001:generateMessage"
if baseURL != "" {
fullRequestURL = fmt.Sprintf("%s/v1beta2/models/chat-bison-001:generateMessage", baseURL)
}
apiKey := c.Request.Header.Get("Authorization") apiKey := c.Request.Header.Get("Authorization")
apiKey = strings.TrimPrefix(apiKey, "Bearer ") apiKey = strings.TrimPrefix(apiKey, "Bearer ")
fullRequestURL += "?key=" + apiKey fullRequestURL += "?key=" + apiKey

2
router/relay-router.go
View File

@ -12,7 +12,7 @@ func SetRelayRouter(router *gin.Engine) {
modelsRouter := router.Group("/v1/models") modelsRouter := router.Group("/v1/models")
modelsRouter.Use(middleware.TokenAuth()) modelsRouter.Use(middleware.TokenAuth())
{ {
modelsRouter.GET("/", controller.ListModels) modelsRouter.GET("", controller.ListModels)
modelsRouter.GET("/:model", controller.RetrieveModel) modelsRouter.GET("/:model", controller.RetrieveModel)
} }
relayV1Router := router.Group("/v1") relayV1Router := router.Group("/v1")