airkjw/CLIProxyAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(thinking): pass source and target formats to ApplyThinking for cross-format validation

Browse Source 
Update ApplyThinking signature to accept fromFormat and toFormat parameters
instead of a single provider string. This enables:

- Proper level-to-budget conversion when source is level-based (openai/codex)
  and target is budget-based (gemini/claude)
- Strict budget range validation when source and target formats match
- Level clamping to nearest supported level for cross-format requests
- Format alias resolution in SDK translator registry for codex/openai-response

Also adds ErrBudgetOutOfRange error code and improves iflow config extraction
to fall back to openai format when iflow-specific config is not present.
This commit is contained in:
hkfires
2026-01-17 22:53:10 +08:00
parent d5ef4a6d15
commit c7e8830a56
15 changed files with 341 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdk/translator/registry.go
+47 -15
View File
@@ -38,15 +38,31 @@ func (r *Registry) Register(from, to Format, request RequestTransform, response
r.responses[from][to] = response
}
// formatAliases returns compatible aliases for a format, ordered by preference.
func formatAliases(format Format) []Format {
switch format {
case "codex":
return []Format{"codex", "openai-response"}
case "openai-response":
return []Format{"openai-response", "codex"}
default:
return []Format{format}
}
}
// TranslateRequest converts a payload between schemas, returning the original payload
// if no translator is registered.
func (r *Registry) TranslateRequest(from, to Format, model string, rawJSON []byte, stream bool) []byte {
r.mu.RLock()
defer r.mu.RUnlock()
if byTarget, ok := r.requests[from]; ok {
if fn, isOk := byTarget[to]; isOk && fn != nil {
return fn(model, rawJSON, stream)
for _, fromFormat := range formatAliases(from) {
if byTarget, ok := r.requests[fromFormat]; ok {
for _, toFormat := range formatAliases(to) {
if fn, isOk := byTarget[toFormat]; isOk && fn != nil {
return fn(model, rawJSON, stream)
}
}
}
}
return rawJSON
@@ -57,9 +73,13 @@ func (r *Registry) HasResponseTransformer(from, to Format) bool {
r.mu.RLock()
defer r.mu.RUnlock()
if byTarget, ok := r.responses[from]; ok {
if _, isOk := byTarget[to]; isOk {
return true
for _, toFormat := range formatAliases(to) {
if byTarget, ok := r.responses[toFormat]; ok {
for _, fromFormat := range formatAliases(from) {
if _, isOk := byTarget[fromFormat]; isOk {
return true
}
}
}
}
return false
@@ -70,9 +90,13 @@ func (r *Registry) TranslateStream(ctx context.Context, from, to Format, model s
r.mu.RLock()
defer r.mu.RUnlock()
if byTarget, ok := r.responses[to]; ok {
if fn, isOk := byTarget[from]; isOk && fn.Stream != nil {
return fn.Stream(ctx, model, originalRequestRawJSON, requestRawJSON, rawJSON, param)
for _, toFormat := range formatAliases(to) {
if byTarget, ok := r.responses[toFormat]; ok {
for _, fromFormat := range formatAliases(from) {
if fn, isOk := byTarget[fromFormat]; isOk && fn.Stream != nil {
return fn.Stream(ctx, model, originalRequestRawJSON, requestRawJSON, rawJSON, param)
}
}
}
}
return []string{string(rawJSON)}
@@ -83,9 +107,13 @@ func (r *Registry) TranslateNonStream(ctx context.Context, from, to Format, mode
r.mu.RLock()
defer r.mu.RUnlock()
if byTarget, ok := r.responses[to]; ok {
if fn, isOk := byTarget[from]; isOk && fn.NonStream != nil {
return fn.NonStream(ctx, model, originalRequestRawJSON, requestRawJSON, rawJSON, param)
for _, toFormat := range formatAliases(to) {
if byTarget, ok := r.responses[toFormat]; ok {
for _, fromFormat := range formatAliases(from) {
if fn, isOk := byTarget[fromFormat]; isOk && fn.NonStream != nil {
return fn.NonStream(ctx, model, originalRequestRawJSON, requestRawJSON, rawJSON, param)
}
}
}
}
return string(rawJSON)
@@ -96,9 +124,13 @@ func (r *Registry) TranslateTokenCount(ctx context.Context, from, to Format, cou
r.mu.RLock()
defer r.mu.RUnlock()
if byTarget, ok := r.responses[to]; ok {
if fn, isOk := byTarget[from]; isOk && fn.TokenCount != nil {
return fn.TokenCount(ctx, count)
for _, toFormat := range formatAliases(to) {
if byTarget, ok := r.responses[toFormat]; ok {
for _, fromFormat := range formatAliases(from) {
if fn, isOk := byTarget[fromFormat]; isOk && fn.TokenCount != nil {
return fn.TokenCount(ctx, count)
}
}
}
}
return string(rawJSON)