mirror of
https://github.com/router-for-me/CLIProxyAPI.git
synced 2026-11-17 07:08:01 +08:00
- Apply canonical thinking normalization, suffix stripping, and plugin model metadata fallback in prepareExecutorCall across Execute, ExecuteStream, and CountTokens. - Resolve plugin-registered ThinkingApplier by provider key before format fallback and validate unknown thinking suffixes on non-native-Responses models. - Run thinking normalization before NewPayloadFinalizer so user payload rules act as the final host-side mutation. Closes: #6940
41 lines
2.2 KiB
Go
41 lines
2.2 KiB
Go
package helps
|
|
|
|
import (
|
|
"github.com/router-for-me/CLIProxyAPI/v8/internal/registry"
|
|
"github.com/router-for-me/CLIProxyAPI/v8/internal/thinking"
|
|
cliproxyauth "github.com/router-for-me/CLIProxyAPI/v8/sdk/cliproxy/auth"
|
|
cliproxyexecutor "github.com/router-for-me/CLIProxyAPI/v8/sdk/cliproxy/executor"
|
|
)
|
|
|
|
// APIKeyModelIsCompat reports whether the selected API-key model enables
|
|
// compatibility handling for Claude thinking blocks.
|
|
func APIKeyModelIsCompat(req cliproxyexecutor.Request) bool {
|
|
modelInfo, ok := cliproxyauth.ResolvedModelInfo(req)
|
|
return ok && modelInfo != nil && modelInfo.IsCompat
|
|
}
|
|
|
|
// ApplyRequestThinking preserves the registry lookup path unless the auth
|
|
// manager bound authoritative model capabilities to this execution attempt.
|
|
func ApplyRequestThinking(body []byte, req cliproxyexecutor.Request, opts cliproxyexecutor.Options, fromFormat, toFormat, provider string, normalizedUpdatesChanged ...bool) ([]byte, error) {
|
|
return ApplyRequestThinkingWithModelInfo(body, req, opts, fromFormat, toFormat, provider, nil, normalizedUpdatesChanged...)
|
|
}
|
|
|
|
// ApplyRequestThinkingWithModelInfo applies request thinking and falls back to
|
|
// fallbackModelInfo when neither request metadata nor the global registry
|
|
// resolves a model definition.
|
|
func ApplyRequestThinkingWithModelInfo(body []byte, req cliproxyexecutor.Request, opts cliproxyexecutor.Options, fromFormat, toFormat, provider string, fallbackModelInfo *registry.ModelInfo, normalizedUpdatesChanged ...bool) ([]byte, error) {
|
|
originalSource := opts.OriginalRequest
|
|
if len(originalSource) == 0 {
|
|
originalSource = req.Payload
|
|
}
|
|
source := req.Payload
|
|
if len(source) == 0 {
|
|
source = opts.OriginalRequest
|
|
}
|
|
summaryConfig := translatedRequestSummaryConfig(body, req.Payload, originalSource, req.Model, fromFormat, toFormat)
|
|
if modelInfo, ok := cliproxyauth.ResolvedModelInfo(req); ok {
|
|
return thinking.ApplyThinkingWithModelInfoAndSummary(body, source, req.Model, fromFormat, toFormat, provider, modelInfo, summaryConfig, normalizedUpdatesChanged...)
|
|
}
|
|
return thinking.ApplyThinkingWithFallbackModelInfoAndSummary(body, source, req.Model, fromFormat, toFormat, provider, fallbackModelInfo, summaryConfig, normalizedUpdatesChanged...)
|
|
}
|