mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-11-22 15:14:35 +00:00
Merge origin/main into codex/fix-native-responses-namespace
Resolve conflict in openai_gateway_passthrough.go streaming path: keep main's normalizeCompletedImageGenerationStatus normalization ahead of this branch's namespace restore block, mirroring the established order in openai_gateway_response_handling.go.
This commit is contained in:
commit
252ef8b73a
310 files changed
+18489
-1087
No files matched your search
@@ -183,7 +183,11 @@ func (s *OpenAIGatewayService) Forward(ctx context.Context, c *gin.Context, acco
|
||||
if apiKey != nil {
|
||||
imageGenerationAllowed = GroupAllowsImageGeneration(apiKey.Group)
|
||||
}
|
||||
codexImageGenerationBridgeEnabled := isCodexCLI && imageGenerationAllowed && codexImageGenerationExplicitToolPolicy != codexImageGenerationExplicitToolPolicyStrip && s.isCodexImageGenerationBridgeEnabled(ctx, account, apiKey)
|
||||
codexImageGenerationBridgeEnabled := isCodexCLI &&
|
||||
!isOpenAIResponsesLiteHeader(c.GetHeader(responsesLiteHeader)) &&
|
||||
imageGenerationAllowed &&
|
||||
codexImageGenerationExplicitToolPolicy != codexImageGenerationExplicitToolPolicyStrip &&
|
||||
s.isCodexImageGenerationBridgeEnabled(ctx, account, apiKey)
|
||||
var imageIntent bool
|
||||
if isCodexCLI && codexImageGenerationExplicitToolPolicy == codexImageGenerationExplicitToolPolicyStrip {
|
||||
decoded, decodeErr := ensureReqBody()
|
||||
|
||||
Reference in new issue
Block a user