luispater commited on
Commit
76caa93
·
unverified ·
1 Parent(s): 1c7cd61

fix(executor): add `allowCompat` support for reasoning effort normalization

Browse files

Introduced `allowCompat` parameter to improve compatibility handling for reasoning effort in payloads across OpenAI and similar models.

internal/runtime/executor/codex_executor.go CHANGED
@@ -54,8 +54,8 @@ func (e *CodexExecutor) Execute(ctx context.Context, auth *cliproxyauth.Auth, re
54
  from := opts.SourceFormat
55
  to := sdktranslator.FromString("codex")
56
  body := sdktranslator.TranslateRequest(from, to, req.Model, bytes.Clone(req.Payload), false)
57
- body = applyReasoningEffortMetadata(body, req.Metadata, req.Model, "reasoning.effort")
58
- body = normalizeThinkingConfig(body, upstreamModel)
59
  if errValidate := validateThinkingConfig(body, upstreamModel); errValidate != nil {
60
  return resp, errValidate
61
  }
@@ -152,8 +152,8 @@ func (e *CodexExecutor) ExecuteStream(ctx context.Context, auth *cliproxyauth.Au
152
  to := sdktranslator.FromString("codex")
153
  body := sdktranslator.TranslateRequest(from, to, req.Model, bytes.Clone(req.Payload), true)
154
 
155
- body = applyReasoningEffortMetadata(body, req.Metadata, req.Model, "reasoning.effort")
156
- body = normalizeThinkingConfig(body, upstreamModel)
157
  if errValidate := validateThinkingConfig(body, upstreamModel); errValidate != nil {
158
  return nil, errValidate
159
  }
@@ -254,7 +254,7 @@ func (e *CodexExecutor) CountTokens(ctx context.Context, auth *cliproxyauth.Auth
254
 
255
  modelForCounting := req.Model
256
 
257
- body = applyReasoningEffortMetadata(body, req.Metadata, req.Model, "reasoning.effort")
258
  body, _ = sjson.SetBytes(body, "model", upstreamModel)
259
  body, _ = sjson.DeleteBytes(body, "previous_response_id")
260
  body, _ = sjson.SetBytes(body, "stream", false)
 
54
  from := opts.SourceFormat
55
  to := sdktranslator.FromString("codex")
56
  body := sdktranslator.TranslateRequest(from, to, req.Model, bytes.Clone(req.Payload), false)
57
+ body = applyReasoningEffortMetadata(body, req.Metadata, req.Model, "reasoning.effort", false)
58
+ body = normalizeThinkingConfig(body, upstreamModel, false)
59
  if errValidate := validateThinkingConfig(body, upstreamModel); errValidate != nil {
60
  return resp, errValidate
61
  }
 
152
  to := sdktranslator.FromString("codex")
153
  body := sdktranslator.TranslateRequest(from, to, req.Model, bytes.Clone(req.Payload), true)
154
 
155
+ body = applyReasoningEffortMetadata(body, req.Metadata, req.Model, "reasoning.effort", false)
156
+ body = normalizeThinkingConfig(body, upstreamModel, false)
157
  if errValidate := validateThinkingConfig(body, upstreamModel); errValidate != nil {
158
  return nil, errValidate
159
  }
 
254
 
255
  modelForCounting := req.Model
256
 
257
+ body = applyReasoningEffortMetadata(body, req.Metadata, req.Model, "reasoning.effort", false)
258
  body, _ = sjson.SetBytes(body, "model", upstreamModel)
259
  body, _ = sjson.DeleteBytes(body, "previous_response_id")
260
  body, _ = sjson.SetBytes(body, "stream", false)
internal/runtime/executor/iflow_executor.go CHANGED
@@ -57,12 +57,12 @@ func (e *IFlowExecutor) Execute(ctx context.Context, auth *cliproxyauth.Auth, re
57
  from := opts.SourceFormat
58
  to := sdktranslator.FromString("openai")
59
  body := sdktranslator.TranslateRequest(from, to, req.Model, bytes.Clone(req.Payload), false)
60
- body = applyReasoningEffortMetadata(body, req.Metadata, req.Model, "reasoning_effort")
61
  upstreamModel := util.ResolveOriginalModel(req.Model, req.Metadata)
62
  if upstreamModel != "" {
63
  body, _ = sjson.SetBytes(body, "model", upstreamModel)
64
  }
65
- body = normalizeThinkingConfig(body, upstreamModel)
66
  if errValidate := validateThinkingConfig(body, upstreamModel); errValidate != nil {
67
  return resp, errValidate
68
  }
@@ -148,12 +148,12 @@ func (e *IFlowExecutor) ExecuteStream(ctx context.Context, auth *cliproxyauth.Au
148
  to := sdktranslator.FromString("openai")
149
  body := sdktranslator.TranslateRequest(from, to, req.Model, bytes.Clone(req.Payload), true)
150
 
151
- body = applyReasoningEffortMetadata(body, req.Metadata, req.Model, "reasoning_effort")
152
  upstreamModel := util.ResolveOriginalModel(req.Model, req.Metadata)
153
  if upstreamModel != "" {
154
  body, _ = sjson.SetBytes(body, "model", upstreamModel)
155
  }
156
- body = normalizeThinkingConfig(body, upstreamModel)
157
  if errValidate := validateThinkingConfig(body, upstreamModel); errValidate != nil {
158
  return nil, errValidate
159
  }
 
57
  from := opts.SourceFormat
58
  to := sdktranslator.FromString("openai")
59
  body := sdktranslator.TranslateRequest(from, to, req.Model, bytes.Clone(req.Payload), false)
60
+ body = applyReasoningEffortMetadata(body, req.Metadata, req.Model, "reasoning_effort", false)
61
  upstreamModel := util.ResolveOriginalModel(req.Model, req.Metadata)
62
  if upstreamModel != "" {
63
  body, _ = sjson.SetBytes(body, "model", upstreamModel)
64
  }
65
+ body = normalizeThinkingConfig(body, upstreamModel, false)
66
  if errValidate := validateThinkingConfig(body, upstreamModel); errValidate != nil {
67
  return resp, errValidate
68
  }
 
148
  to := sdktranslator.FromString("openai")
149
  body := sdktranslator.TranslateRequest(from, to, req.Model, bytes.Clone(req.Payload), true)
150
 
151
+ body = applyReasoningEffortMetadata(body, req.Metadata, req.Model, "reasoning_effort", false)
152
  upstreamModel := util.ResolveOriginalModel(req.Model, req.Metadata)
153
  if upstreamModel != "" {
154
  body, _ = sjson.SetBytes(body, "model", upstreamModel)
155
  }
156
+ body = normalizeThinkingConfig(body, upstreamModel, false)
157
  if errValidate := validateThinkingConfig(body, upstreamModel); errValidate != nil {
158
  return nil, errValidate
159
  }
internal/runtime/executor/openai_compat_executor.go CHANGED
@@ -59,12 +59,13 @@ func (e *OpenAICompatExecutor) Execute(ctx context.Context, auth *cliproxyauth.A
59
  translated = e.overrideModel(translated, modelOverride)
60
  }
61
  translated = applyPayloadConfigWithRoot(e.cfg, req.Model, to.String(), "", translated)
62
- translated = applyReasoningEffortMetadata(translated, req.Metadata, req.Model, "reasoning_effort")
 
63
  upstreamModel := util.ResolveOriginalModel(req.Model, req.Metadata)
64
  if upstreamModel != "" && modelOverride == "" {
65
  translated, _ = sjson.SetBytes(translated, "model", upstreamModel)
66
  }
67
- translated = normalizeThinkingConfig(translated, upstreamModel)
68
  if errValidate := validateThinkingConfig(translated, upstreamModel); errValidate != nil {
69
  return resp, errValidate
70
  }
@@ -154,12 +155,13 @@ func (e *OpenAICompatExecutor) ExecuteStream(ctx context.Context, auth *cliproxy
154
  translated = e.overrideModel(translated, modelOverride)
155
  }
156
  translated = applyPayloadConfigWithRoot(e.cfg, req.Model, to.String(), "", translated)
157
- translated = applyReasoningEffortMetadata(translated, req.Metadata, req.Model, "reasoning_effort")
 
158
  upstreamModel := util.ResolveOriginalModel(req.Model, req.Metadata)
159
  if upstreamModel != "" && modelOverride == "" {
160
  translated, _ = sjson.SetBytes(translated, "model", upstreamModel)
161
  }
162
- translated = normalizeThinkingConfig(translated, upstreamModel)
163
  if errValidate := validateThinkingConfig(translated, upstreamModel); errValidate != nil {
164
  return nil, errValidate
165
  }
@@ -325,6 +327,27 @@ func (e *OpenAICompatExecutor) resolveUpstreamModel(alias string, auth *cliproxy
325
  return ""
326
  }
327
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
328
  func (e *OpenAICompatExecutor) resolveCompatConfig(auth *cliproxyauth.Auth) *config.OpenAICompatibility {
329
  if auth == nil || e.cfg == nil {
330
  return nil
 
59
  translated = e.overrideModel(translated, modelOverride)
60
  }
61
  translated = applyPayloadConfigWithRoot(e.cfg, req.Model, to.String(), "", translated)
62
+ allowCompat := e.allowCompatReasoningEffort(req.Model, auth)
63
+ translated = applyReasoningEffortMetadata(translated, req.Metadata, req.Model, "reasoning_effort", allowCompat)
64
  upstreamModel := util.ResolveOriginalModel(req.Model, req.Metadata)
65
  if upstreamModel != "" && modelOverride == "" {
66
  translated, _ = sjson.SetBytes(translated, "model", upstreamModel)
67
  }
68
+ translated = normalizeThinkingConfig(translated, upstreamModel, allowCompat)
69
  if errValidate := validateThinkingConfig(translated, upstreamModel); errValidate != nil {
70
  return resp, errValidate
71
  }
 
155
  translated = e.overrideModel(translated, modelOverride)
156
  }
157
  translated = applyPayloadConfigWithRoot(e.cfg, req.Model, to.String(), "", translated)
158
+ allowCompat := e.allowCompatReasoningEffort(req.Model, auth)
159
+ translated = applyReasoningEffortMetadata(translated, req.Metadata, req.Model, "reasoning_effort", allowCompat)
160
  upstreamModel := util.ResolveOriginalModel(req.Model, req.Metadata)
161
  if upstreamModel != "" && modelOverride == "" {
162
  translated, _ = sjson.SetBytes(translated, "model", upstreamModel)
163
  }
164
+ translated = normalizeThinkingConfig(translated, upstreamModel, allowCompat)
165
  if errValidate := validateThinkingConfig(translated, upstreamModel); errValidate != nil {
166
  return nil, errValidate
167
  }
 
327
  return ""
328
  }
329
 
330
+ func (e *OpenAICompatExecutor) allowCompatReasoningEffort(model string, auth *cliproxyauth.Auth) bool {
331
+ trimmed := strings.TrimSpace(model)
332
+ if trimmed == "" || e == nil || e.cfg == nil {
333
+ return false
334
+ }
335
+ compat := e.resolveCompatConfig(auth)
336
+ if compat == nil || len(compat.Models) == 0 {
337
+ return false
338
+ }
339
+ for i := range compat.Models {
340
+ entry := compat.Models[i]
341
+ if strings.EqualFold(strings.TrimSpace(entry.Alias), trimmed) {
342
+ return true
343
+ }
344
+ if strings.EqualFold(strings.TrimSpace(entry.Name), trimmed) {
345
+ return true
346
+ }
347
+ }
348
+ return false
349
+ }
350
+
351
  func (e *OpenAICompatExecutor) resolveCompatConfig(auth *cliproxyauth.Auth) *config.OpenAICompatibility {
352
  if auth == nil || e.cfg == nil {
353
  return nil
internal/runtime/executor/payload_helpers.go CHANGED
@@ -48,7 +48,7 @@ func applyThinkingMetadataCLI(payload []byte, metadata map[string]any, model str
48
  // applyReasoningEffortMetadata applies reasoning effort overrides from metadata to the given JSON path.
49
  // Metadata values take precedence over any existing field when the model supports thinking, intentionally
50
  // overwriting caller-provided values to honor suffix/default metadata priority.
51
- func applyReasoningEffortMetadata(payload []byte, metadata map[string]any, model, field string) []byte {
52
  if len(metadata) == 0 {
53
  return payload
54
  }
@@ -59,20 +59,20 @@ func applyReasoningEffortMetadata(payload []byte, metadata map[string]any, model
59
  if baseModel == "" {
60
  baseModel = model
61
  }
62
- if !util.ModelSupportsThinking(baseModel) && !util.IsOpenAICompatibilityModel(baseModel) {
63
  return payload
64
  }
65
  if effort, ok := util.ReasoningEffortFromMetadata(metadata); ok && effort != "" {
66
- if util.ModelUsesThinkingLevels(model) {
67
  if updated, err := sjson.SetBytes(payload, field, effort); err == nil {
68
  return updated
69
  }
70
  }
71
  }
72
  // Fallback: numeric thinking_budget suffix for level-based (OpenAI-style) models.
73
- if util.ModelUsesThinkingLevels(model) {
74
  if budget, _, _, matched := util.ThinkingFromMetadata(metadata); matched && budget != nil {
75
- if effort, ok := util.OpenAIThinkingBudgetToEffort(model, *budget); ok && effort != "" {
76
  if updated, err := sjson.SetBytes(payload, field, effort); err == nil {
77
  return updated
78
  }
@@ -237,13 +237,13 @@ func matchModelPattern(pattern, model string) bool {
237
  // reasoning fields. For models with level-based thinking, it validates and
238
  // normalizes the reasoning effort level. For models with numeric budget thinking,
239
  // it strips the effort string fields.
240
- func normalizeThinkingConfig(payload []byte, model string) []byte {
241
  if len(payload) == 0 || model == "" {
242
  return payload
243
  }
244
 
245
  if !util.ModelSupportsThinking(model) {
246
- if util.IsOpenAICompatibilityModel(model) {
247
  return payload
248
  }
249
  return stripThinkingFields(payload, false)
 
48
  // applyReasoningEffortMetadata applies reasoning effort overrides from metadata to the given JSON path.
49
  // Metadata values take precedence over any existing field when the model supports thinking, intentionally
50
  // overwriting caller-provided values to honor suffix/default metadata priority.
51
+ func applyReasoningEffortMetadata(payload []byte, metadata map[string]any, model, field string, allowCompat bool) []byte {
52
  if len(metadata) == 0 {
53
  return payload
54
  }
 
59
  if baseModel == "" {
60
  baseModel = model
61
  }
62
+ if !util.ModelSupportsThinking(baseModel) && !allowCompat {
63
  return payload
64
  }
65
  if effort, ok := util.ReasoningEffortFromMetadata(metadata); ok && effort != "" {
66
+ if util.ModelUsesThinkingLevels(baseModel) || allowCompat {
67
  if updated, err := sjson.SetBytes(payload, field, effort); err == nil {
68
  return updated
69
  }
70
  }
71
  }
72
  // Fallback: numeric thinking_budget suffix for level-based (OpenAI-style) models.
73
+ if util.ModelUsesThinkingLevels(baseModel) || allowCompat {
74
  if budget, _, _, matched := util.ThinkingFromMetadata(metadata); matched && budget != nil {
75
+ if effort, ok := util.OpenAIThinkingBudgetToEffort(baseModel, *budget); ok && effort != "" {
76
  if updated, err := sjson.SetBytes(payload, field, effort); err == nil {
77
  return updated
78
  }
 
237
  // reasoning fields. For models with level-based thinking, it validates and
238
  // normalizes the reasoning effort level. For models with numeric budget thinking,
239
  // it strips the effort string fields.
240
+ func normalizeThinkingConfig(payload []byte, model string, allowCompat bool) []byte {
241
  if len(payload) == 0 || model == "" {
242
  return payload
243
  }
244
 
245
  if !util.ModelSupportsThinking(model) {
246
+ if allowCompat {
247
  return payload
248
  }
249
  return stripThinkingFields(payload, false)
internal/runtime/executor/qwen_executor.go CHANGED
@@ -51,12 +51,12 @@ func (e *QwenExecutor) Execute(ctx context.Context, auth *cliproxyauth.Auth, req
51
  from := opts.SourceFormat
52
  to := sdktranslator.FromString("openai")
53
  body := sdktranslator.TranslateRequest(from, to, req.Model, bytes.Clone(req.Payload), false)
54
- body = applyReasoningEffortMetadata(body, req.Metadata, req.Model, "reasoning_effort")
55
  upstreamModel := util.ResolveOriginalModel(req.Model, req.Metadata)
56
  if upstreamModel != "" {
57
  body, _ = sjson.SetBytes(body, "model", upstreamModel)
58
  }
59
- body = normalizeThinkingConfig(body, upstreamModel)
60
  if errValidate := validateThinkingConfig(body, upstreamModel); errValidate != nil {
61
  return resp, errValidate
62
  }
@@ -131,12 +131,12 @@ func (e *QwenExecutor) ExecuteStream(ctx context.Context, auth *cliproxyauth.Aut
131
  to := sdktranslator.FromString("openai")
132
  body := sdktranslator.TranslateRequest(from, to, req.Model, bytes.Clone(req.Payload), true)
133
 
134
- body = applyReasoningEffortMetadata(body, req.Metadata, req.Model, "reasoning_effort")
135
  upstreamModel := util.ResolveOriginalModel(req.Model, req.Metadata)
136
  if upstreamModel != "" {
137
  body, _ = sjson.SetBytes(body, "model", upstreamModel)
138
  }
139
- body = normalizeThinkingConfig(body, upstreamModel)
140
  if errValidate := validateThinkingConfig(body, upstreamModel); errValidate != nil {
141
  return nil, errValidate
142
  }
 
51
  from := opts.SourceFormat
52
  to := sdktranslator.FromString("openai")
53
  body := sdktranslator.TranslateRequest(from, to, req.Model, bytes.Clone(req.Payload), false)
54
+ body = applyReasoningEffortMetadata(body, req.Metadata, req.Model, "reasoning_effort", false)
55
  upstreamModel := util.ResolveOriginalModel(req.Model, req.Metadata)
56
  if upstreamModel != "" {
57
  body, _ = sjson.SetBytes(body, "model", upstreamModel)
58
  }
59
+ body = normalizeThinkingConfig(body, upstreamModel, false)
60
  if errValidate := validateThinkingConfig(body, upstreamModel); errValidate != nil {
61
  return resp, errValidate
62
  }
 
131
  to := sdktranslator.FromString("openai")
132
  body := sdktranslator.TranslateRequest(from, to, req.Model, bytes.Clone(req.Payload), true)
133
 
134
+ body = applyReasoningEffortMetadata(body, req.Metadata, req.Model, "reasoning_effort", false)
135
  upstreamModel := util.ResolveOriginalModel(req.Model, req.Metadata)
136
  if upstreamModel != "" {
137
  body, _ = sjson.SetBytes(body, "model", upstreamModel)
138
  }
139
+ body = normalizeThinkingConfig(body, upstreamModel, false)
140
  if errValidate := validateThinkingConfig(body, upstreamModel); errValidate != nil {
141
  return nil, errValidate
142
  }