1. Async task model redirection (aligned with sync tasks):
- Integrate ModelMappedHelper in RelayTaskSubmit after model name
determination, populating OriginModelName / UpstreamModelName on RelayInfo.
- All task adaptors now send UpstreamModelName to upstream providers:
- Gemini & Vertex: BuildRequestURL uses UpstreamModelName.
- Doubao & Ali: BuildRequestBody conditionally overwrites body.Model.
- Vidu, Kling, Hailuo, Jimeng: convertToRequestPayload accepts RelayInfo
and unconditionally uses info.UpstreamModelName.
- Sora: BuildRequestBody parses JSON and multipart bodies to replace
the "model" field with UpstreamModelName.
- Frontend log visibility: LogTaskConsumption and taskBillingOther now
emit is_model_mapped / upstream_model_name in the "other" JSON field.
- Billing safety: RecalculateTaskQuotaByTokens reads model name from
BillingContext.OriginModelName (via taskModelName) instead of
task.Data["model"], preventing billing leaks from upstream model names.
2. Per-call billing (TaskPricePatches lifecycle):
- Rename TaskBillingContext.ModelName → OriginModelName; add PerCallBilling
bool field, populated from TaskPricePatches at submission time.
- settleTaskBillingOnComplete short-circuits when PerCallBilling is true,
skipping both adaptor adjustments and token-based recalculation.
- Remove ModelName from TaskSubmitResult; use relayInfo.OriginModelName
consistently in controller/relay.go for billing context and logging.
3. Multipart retry boundary mismatch fix:
- Root cause: after Sora (or OpenAI audio) rebuilds a multipart body with a
new boundary and overwrites c.Request.Header["Content-Type"], subsequent
calls to ParseMultipartFormReusable on retry would parse the cached
original body with the wrong boundary, causing "NextPart: EOF".
- Fix: ParseMultipartFormReusable now caches the original Content-Type in
gin context key "_original_multipart_ct" on first call and reuses it for
all subsequent parses, making multipart parsing retry-safe globally.
- Sora adaptor reverted to the standard pattern (direct header set/get),
which is now safe thanks to the root fix.
4. Tests:
- task_billing_test.go: update makeTask to use OriginModelName; add
PerCallBilling settlement tests (skip adaptor adjust, skip token recalc);
add non-per-call adaptor adjustment test with refund verification.
| Name |
Last commit
|
Last Update |
|---|---|---|
| .. | ||
| limiter | Loading commit data... | |
| api_type.go | Loading commit data... | |
| audio.go | Loading commit data... | |
| body_storage.go | Loading commit data... | |
| constants.go | Loading commit data... | |
| copy.go | Loading commit data... | |
| crypto.go | Loading commit data... | |
| custom-event.go | Loading commit data... | |
| database.go | Loading commit data... | |
| disk_cache.go | Loading commit data... | |
| disk_cache_config.go | Loading commit data... | |
| email-outlook-auth.go | Loading commit data... | |
| email.go | Loading commit data... | |
| embed-file-system.go | Loading commit data... | |
| endpoint_defaults.go | Loading commit data... | |
| endpoint_type.go | Loading commit data... | |
| env.go | Loading commit data... | |
| gin.go | Loading commit data... | |
| go-channel.go | Loading commit data... | |
| gopool.go | Loading commit data... | |
| hash.go | Loading commit data... | |
| init.go | Loading commit data... | |
| ip.go | Loading commit data... | |
| json.go | Loading commit data... | |
| model.go | Loading commit data... | |
| page_info.go | Loading commit data... | |
| performance_config.go | Loading commit data... | |
| pprof.go | Loading commit data... | |
| pyro.go | Loading commit data... | |
| quota.go | Loading commit data... | |
| rate-limit.go | Loading commit data... | |
| redis.go | Loading commit data... | |
| ssrf_protection.go | Loading commit data... | |
| str.go | Loading commit data... | |
| sys_log.go | Loading commit data... | |
| system_monitor.go | Loading commit data... | |
| system_monitor_unix.go | Loading commit data... | |
| system_monitor_windows.go | Loading commit data... | |
| topup-ratio.go | Loading commit data... | |
| totp.go | Loading commit data... | |
| url_validator.go | Loading commit data... | |
| url_validator_test.go | Loading commit data... | |
| utils.go | Loading commit data... | |
| validate.go | Loading commit data... | |
| verification.go | Loading commit data... |