|
|
@@ -33,7 +33,7 @@ func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
|
|
|
if info.RelayMode == constant.RelayModeRerank {
|
|
|
return fmt.Sprintf("%s/v1/rerank", info.BaseUrl), nil
|
|
|
} else if info.RelayMode == constant.RelayModeEmbeddings {
|
|
|
- return fmt.Sprintf("%s/v1/embeddings ", info.BaseUrl), nil
|
|
|
+ return fmt.Sprintf("%s/v1/embeddings", info.BaseUrl), nil
|
|
|
} else if info.RelayMode == constant.RelayModeChatCompletions {
|
|
|
return fmt.Sprintf("%s/v1/chat/completions", info.BaseUrl), nil
|
|
|
}
|
|
|
@@ -59,14 +59,17 @@ func (a *Adaptor) ConvertRerankRequest(c *gin.Context, relayMode int, request dt
|
|
|
}
|
|
|
|
|
|
func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) {
|
|
|
- if info.RelayMode == constant.RelayModeRerank {
|
|
|
+ switch info.RelayMode {
|
|
|
+ case constant.RelayModeRerank:
|
|
|
err, usage = siliconflowRerankHandler(c, resp)
|
|
|
- } else if info.RelayMode == constant.RelayModeChatCompletions {
|
|
|
+ case constant.RelayModeChatCompletions:
|
|
|
if info.IsStream {
|
|
|
err, usage = openai.OaiStreamHandler(c, resp, info)
|
|
|
} else {
|
|
|
err, usage = openai.OpenaiHandler(c, resp, info.PromptTokens, info.UpstreamModelName)
|
|
|
}
|
|
|
+ case constant.RelayModeEmbeddings:
|
|
|
+ err, usage = openai.OpenaiHandler(c, resp, info.PromptTokens, info.UpstreamModelName)
|
|
|
}
|
|
|
return
|
|
|
}
|