mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-11-20 15:06:36 +00:00
merge: upstream v0.1.106 into release/custom-0.1.106
Resolved conflicts: - VERSION: set to 0.1.106.1 - wire_gen.go: keep our version with accountUsageService - antigravity_gateway_service.go: keep accountUsageService field/param - openai_gateway_service.go: keep billing model override logic - account.go: keep both affinity methods and new custom base URL methods - dto/types.go: keep both affinity fields and new custom base URL fields - CreateAccountModal.vue: keep both affinity and custom base URL logic - EditAccountModal.vue: keep both affinity and custom base URL state
This commit is contained in:
commit
fc5e96aa9f
30 files changed
+816
-112
No files matched your search
@@ -550,6 +550,7 @@ func (h *OpenAIGatewayHandler) Messages(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
reqModel := modelResult.String()
|
||||
routingModel := service.NormalizeOpenAICompatRequestedModel(reqModel)
|
||||
reqStream := gjson.GetBytes(body, "stream").Bool()
|
||||
|
||||
reqLog = reqLog.With(zap.String("model", reqModel), zap.Bool("stream", reqStream))
|
||||
@@ -618,7 +619,7 @@ func (h *OpenAIGatewayHandler) Messages(c *gin.Context) {
|
||||
apiKey.GroupID,
|
||||
"", // no previous_response_id
|
||||
sessionHash,
|
||||
reqModel,
|
||||
routingModel,
|
||||
failedAccountIDs,
|
||||
service.OpenAIUpstreamTransportAny,
|
||||
)
|
||||
@@ -633,7 +634,7 @@ func (h *OpenAIGatewayHandler) Messages(c *gin.Context) {
|
||||
if apiKey.Group != nil {
|
||||
defaultModel = apiKey.Group.DefaultMappedModel
|
||||
}
|
||||
if defaultModel != "" && defaultModel != reqModel {
|
||||
if defaultModel != "" && defaultModel != routingModel {
|
||||
reqLog.Info("openai_messages.fallback_to_default_model",
|
||||
zap.String("default_mapped_model", defaultModel),
|
||||
)
|
||||
|
||||
Reference in new issue
Block a user