Calcium-Ion
c36418c863
* refactor: consolidate relay protocol converters * refactor relayconvert text converters * feat: refine relay converters and advanced custom routing * refactor: enhance logging and add thought signature handling for Gemini requests * refactor: enhance channel cache and pricing endpoint handling for advanced custom models * feat: preserve billing usage semantics * feat: add protocol-aware billing usage * Delete useless files * chore: update action versions in workflow files * chore: update Docker action versions in workflow files * fix: harden billing usage settlement and hot-path route matching - estimate Gemini completion tokens locally when billable usageMetadata is prompt-only but output content was received (e.g. client aborts the stream before the final chunk), and rebuild the attached billing_usage as estimated so settlement does not bill zero output tokens - guard NewClaudeMessagesBillingUsage against all-zero ClaudeUsage, matching the OpenAI/Gemini constructors, so a zero billing_usage cannot override a non-zero top-level usage during settlement - cache compiled advanced-custom route model regexes; they run on the request hot path and were recompiled per request - move the effectiveBillingUsage remap to PostTextConsumeQuota only, and document that calculateTextQuotaSummary expects remapped usage - document the updatePricingLock -> channelSyncLock lock ordering that InitChannelCache/CacheUpdateChannel rely on, and the aux-struct pitfall in GeminiChatResponse.UnmarshalJSON
47 lines
1.2 KiB
Go
47 lines
1.2 KiB
Go
package media
|
|
|
|
import (
|
|
"errors"
|
|
"sync"
|
|
|
|
"github.com/QuantumNous/new-api/types"
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
type MediaResolver struct {
|
|
GetBase64Data func(c *gin.Context, source types.FileSource, reason ...string) (string, string, error)
|
|
DecodeBase64FileData func(base64String string) (string, string, error)
|
|
}
|
|
|
|
var (
|
|
mediaResolverMu sync.RWMutex
|
|
mediaResolver MediaResolver
|
|
)
|
|
|
|
func SetMediaResolver(resolver MediaResolver) {
|
|
mediaResolverMu.Lock()
|
|
defer mediaResolverMu.Unlock()
|
|
|
|
mediaResolver = resolver
|
|
}
|
|
|
|
func ResolveBase64Data(c *gin.Context, source types.FileSource, reason ...string) (string, string, error) {
|
|
mediaResolverMu.RLock()
|
|
resolver := mediaResolver.GetBase64Data
|
|
mediaResolverMu.RUnlock()
|
|
if resolver == nil {
|
|
return "", "", errors.New("relayconvert media resolver is not configured")
|
|
}
|
|
return resolver(c, source, reason...)
|
|
}
|
|
|
|
func DecodeBase64FileData(base64String string) (string, string, error) {
|
|
mediaResolverMu.RLock()
|
|
resolver := mediaResolver.DecodeBase64FileData
|
|
mediaResolverMu.RUnlock()
|
|
if resolver == nil {
|
|
return "", "", errors.New("relayconvert media resolver is not configured")
|
|
}
|
|
return resolver(base64String)
|
|
}
|