mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-04-18 07:17:28 +00:00
d6e11fd2e1
Add three billing lifecycle methods to the TaskAdaptor interface: - EstimateBilling: compute OtherRatios from user request before pricing - AdjustBillingOnSubmit: adjust ratios from upstream submit response - AdjustBillingOnComplete: determine final quota at task terminal state Introduce BaseBilling as embeddable no-op default for adaptors without custom billing. Move Sora/Ali OtherRatios logic from shared validation into per-adaptor EstimateBilling implementations. Add TaskBillingContext to persist pricing params (model_price, group_ratio, other_ratios) in task private data for async polling settlement. Extract RecalculateTaskQuota as a general-purpose delta settlement function and unify polling billing via settleTaskBillingOnComplete (adaptor-first, then token-based fallback).
96 lines
2.9 KiB
Go
96 lines
2.9 KiB
Go
package taskcommon
|
|
|
|
import (
|
|
"encoding/base64"
|
|
"fmt"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/model"
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
"github.com/QuantumNous/new-api/setting/system_setting"
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
// UnmarshalMetadata converts a map[string]any metadata to a typed struct via JSON round-trip.
|
|
// This replaces the repeated pattern: json.Marshal(metadata) → json.Unmarshal(bytes, &target).
|
|
func UnmarshalMetadata(metadata map[string]any, target any) error {
|
|
if metadata == nil {
|
|
return nil
|
|
}
|
|
metaBytes, err := common.Marshal(metadata)
|
|
if err != nil {
|
|
return fmt.Errorf("marshal metadata failed: %w", err)
|
|
}
|
|
if err := common.Unmarshal(metaBytes, target); err != nil {
|
|
return fmt.Errorf("unmarshal metadata failed: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// DefaultString returns val if non-empty, otherwise fallback.
|
|
func DefaultString(val, fallback string) string {
|
|
if val == "" {
|
|
return fallback
|
|
}
|
|
return val
|
|
}
|
|
|
|
// DefaultInt returns val if non-zero, otherwise fallback.
|
|
func DefaultInt(val, fallback int) int {
|
|
if val == 0 {
|
|
return fallback
|
|
}
|
|
return val
|
|
}
|
|
|
|
// EncodeLocalTaskID encodes an upstream operation name to a URL-safe base64 string.
|
|
// Used by Gemini/Vertex to store upstream names as task IDs.
|
|
func EncodeLocalTaskID(name string) string {
|
|
return base64.RawURLEncoding.EncodeToString([]byte(name))
|
|
}
|
|
|
|
// DecodeLocalTaskID decodes a base64-encoded upstream operation name.
|
|
func DecodeLocalTaskID(id string) (string, error) {
|
|
b, err := base64.RawURLEncoding.DecodeString(id)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return string(b), nil
|
|
}
|
|
|
|
// BuildProxyURL constructs the video proxy URL using the public task ID.
|
|
// e.g., "https://your-server.com/v1/videos/task_xxxx/content"
|
|
func BuildProxyURL(taskID string) string {
|
|
return fmt.Sprintf("%s/v1/videos/%s/content", system_setting.ServerAddress, taskID)
|
|
}
|
|
|
|
// Status-to-progress mapping constants for polling updates.
|
|
const (
|
|
ProgressSubmitted = "10%"
|
|
ProgressQueued = "20%"
|
|
ProgressInProgress = "30%"
|
|
ProgressComplete = "100%"
|
|
)
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// BaseBilling — embeddable no-op implementations for TaskAdaptor billing methods.
|
|
// Adaptors that do not need custom billing can embed this struct directly.
|
|
// ---------------------------------------------------------------------------
|
|
|
|
type BaseBilling struct{}
|
|
|
|
// EstimateBilling returns nil (no extra ratios; use base model price).
|
|
func (BaseBilling) EstimateBilling(_ *gin.Context, _ *relaycommon.RelayInfo) map[string]float64 {
|
|
return nil
|
|
}
|
|
|
|
// AdjustBillingOnSubmit returns nil (no submit-time adjustment).
|
|
func (BaseBilling) AdjustBillingOnSubmit(_ *relaycommon.RelayInfo, _ []byte) map[string]float64 {
|
|
return nil
|
|
}
|
|
|
|
// AdjustBillingOnComplete returns 0 (keep pre-charged amount).
|
|
func (BaseBilling) AdjustBillingOnComplete(_ *model.Task, _ *relaycommon.TaskInfo) int {
|
|
return 0
|
|
}
|