fix(handler): normalize compat model for message routing
This commit is contained in:
@@ -541,6 +541,7 @@ func (h *OpenAIGatewayHandler) Messages(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
reqModel := modelResult.String()
|
reqModel := modelResult.String()
|
||||||
|
routingModel := service.NormalizeOpenAICompatRequestedModel(reqModel)
|
||||||
reqStream := gjson.GetBytes(body, "stream").Bool()
|
reqStream := gjson.GetBytes(body, "stream").Bool()
|
||||||
|
|
||||||
reqLog = reqLog.With(zap.String("model", reqModel), zap.Bool("stream", reqStream))
|
reqLog = reqLog.With(zap.String("model", reqModel), zap.Bool("stream", reqStream))
|
||||||
@@ -606,7 +607,7 @@ func (h *OpenAIGatewayHandler) Messages(c *gin.Context) {
|
|||||||
apiKey.GroupID,
|
apiKey.GroupID,
|
||||||
"", // no previous_response_id
|
"", // no previous_response_id
|
||||||
sessionHash,
|
sessionHash,
|
||||||
reqModel,
|
routingModel,
|
||||||
failedAccountIDs,
|
failedAccountIDs,
|
||||||
service.OpenAIUpstreamTransportAny,
|
service.OpenAIUpstreamTransportAny,
|
||||||
)
|
)
|
||||||
@@ -621,7 +622,7 @@ func (h *OpenAIGatewayHandler) Messages(c *gin.Context) {
|
|||||||
if apiKey.Group != nil {
|
if apiKey.Group != nil {
|
||||||
defaultModel = apiKey.Group.DefaultMappedModel
|
defaultModel = apiKey.Group.DefaultMappedModel
|
||||||
}
|
}
|
||||||
if defaultModel != "" && defaultModel != reqModel {
|
if defaultModel != "" && defaultModel != routingModel {
|
||||||
reqLog.Info("openai_messages.fallback_to_default_model",
|
reqLog.Info("openai_messages.fallback_to_default_model",
|
||||||
zap.String("default_mapped_model", defaultModel),
|
zap.String("default_mapped_model", defaultModel),
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user