mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-11 06:30:21 +00:00
feat: configurable tool pricing, Sub2API channel, and alpha search billing
Add admin-configurable tool-call prices with cross-provider surcharge settlement, Sub2API channel support, /v1/alpha/search relay, and usage-log surcharge UI.
This commit is contained in:
@@ -0,0 +1,194 @@
|
||||
package common
|
||||
|
||||
import (
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/QuantumNous/new-api/common"
|
||||
"github.com/QuantumNous/new-api/dto"
|
||||
"github.com/QuantumNous/new-api/setting/operation_setting"
|
||||
)
|
||||
|
||||
var reservedBillableToolNames = map[string]struct{}{
|
||||
dto.BuildInToolWebSearchPreview: {},
|
||||
dto.BuildInToolWebSearch: {},
|
||||
dto.BuildInToolFileSearch: {},
|
||||
dto.BuildInToolGoogleSearch: {},
|
||||
dto.BuildInToolImageGeneration: {},
|
||||
}
|
||||
|
||||
// CountBillableToolCall is the single entry point for per-call tool billing counts.
|
||||
// Built-in call types always count; custom function/tool_use names only count when priced.
|
||||
func (info *RelayInfo) CountBillableToolCall(itemType string, functionName string) {
|
||||
if info == nil {
|
||||
return
|
||||
}
|
||||
if info.ResponsesUsageInfo == nil {
|
||||
info.ResponsesUsageInfo = &ResponsesUsageInfo{
|
||||
BuiltInTools: make(map[string]*BuildInToolInfo),
|
||||
}
|
||||
}
|
||||
if info.ResponsesUsageInfo.BuiltInTools == nil {
|
||||
info.ResponsesUsageInfo.BuiltInTools = make(map[string]*BuildInToolInfo)
|
||||
}
|
||||
|
||||
switch itemType {
|
||||
case dto.BuildInCallWebSearchCall:
|
||||
info.incrementBillableToolCall(resolveWebSearchToolName(info.ResponsesUsageInfo.BuiltInTools))
|
||||
case dto.BuildInCallFileSearchCall:
|
||||
info.incrementBillableToolCall(dto.BuildInToolFileSearch)
|
||||
case dto.BuildInCallFunctionCall, dto.BuildInCallToolUse:
|
||||
if functionName == "" {
|
||||
return
|
||||
}
|
||||
if _, reserved := reservedBillableToolNames[functionName]; reserved {
|
||||
return
|
||||
}
|
||||
if operation_setting.GetToolPriceForModel(functionName, info.OriginModelName) <= 0 {
|
||||
return
|
||||
}
|
||||
info.incrementBillableToolCall(functionName)
|
||||
}
|
||||
}
|
||||
|
||||
func resolveWebSearchToolName(tools map[string]*BuildInToolInfo) string {
|
||||
if _, ok := tools[dto.BuildInToolWebSearchPreview]; ok {
|
||||
return dto.BuildInToolWebSearchPreview
|
||||
}
|
||||
if _, ok := tools[dto.BuildInToolWebSearch]; ok {
|
||||
return dto.BuildInToolWebSearch
|
||||
}
|
||||
return dto.BuildInToolWebSearchPreview
|
||||
}
|
||||
|
||||
func (info *RelayInfo) incrementBillableToolCall(name string) {
|
||||
if existing, ok := info.ResponsesUsageInfo.BuiltInTools[name]; ok && existing != nil {
|
||||
existing.CallCount++
|
||||
return
|
||||
}
|
||||
info.ResponsesUsageInfo.BuiltInTools[name] = &BuildInToolInfo{
|
||||
ToolName: name,
|
||||
CallCount: 1,
|
||||
}
|
||||
}
|
||||
|
||||
// ImageGenerationCallCounter counts completed Responses image_generation_call
|
||||
// outputs with stream-safe identity deduplication.
|
||||
type ImageGenerationCallCounter struct {
|
||||
seen map[string]struct{}
|
||||
count int
|
||||
}
|
||||
|
||||
// Observe records one completed final image output when billable.
|
||||
// outputIndex may be nil; when set and nonnegative it participates in dedup.
|
||||
func (c *ImageGenerationCallCounter) Observe(item *dto.ResponsesOutput, outputIndex *int) {
|
||||
if c == nil || item == nil {
|
||||
return
|
||||
}
|
||||
if item.Type != dto.ResponsesOutputTypeImageGenerationCall {
|
||||
return
|
||||
}
|
||||
if strings.TrimSpace(item.Result) == "" {
|
||||
return
|
||||
}
|
||||
switch strings.ToLower(strings.TrimSpace(item.Status)) {
|
||||
case "failed", "cancelled", "canceled", "incomplete", "partial":
|
||||
return
|
||||
}
|
||||
|
||||
aliases := make([]string, 0, 4)
|
||||
if item.ID != "" {
|
||||
aliases = append(aliases, "id:"+item.ID)
|
||||
}
|
||||
if item.CallId != "" {
|
||||
aliases = append(aliases, "call:"+item.CallId)
|
||||
}
|
||||
if outputIndex != nil && *outputIndex >= 0 {
|
||||
aliases = append(aliases, fmt.Sprintf("index:%d", *outputIndex))
|
||||
}
|
||||
sum := sha256.Sum256([]byte(item.Result))
|
||||
aliases = append(aliases, "result:"+hex.EncodeToString(sum[:]))
|
||||
|
||||
if c.seen == nil {
|
||||
c.seen = make(map[string]struct{})
|
||||
}
|
||||
for _, alias := range aliases {
|
||||
if _, ok := c.seen[alias]; ok {
|
||||
return
|
||||
}
|
||||
}
|
||||
for _, alias := range aliases {
|
||||
c.seen[alias] = struct{}{}
|
||||
}
|
||||
c.count++
|
||||
}
|
||||
|
||||
// Reset clears pending observations (used when a terminal response fails).
|
||||
func (c *ImageGenerationCallCounter) Reset() {
|
||||
if c == nil {
|
||||
return
|
||||
}
|
||||
c.seen = nil
|
||||
c.count = 0
|
||||
}
|
||||
|
||||
// Count returns the deduplicated completed image output count before commit capping.
|
||||
func (c *ImageGenerationCallCounter) Count() int {
|
||||
if c == nil {
|
||||
return 0
|
||||
}
|
||||
return c.count
|
||||
}
|
||||
|
||||
// Commit writes the capped completed-output count into RelayInfo once.
|
||||
// Request tool declarations alone must not become billable calls.
|
||||
func (c *ImageGenerationCallCounter) Commit(info *RelayInfo) {
|
||||
if info == nil {
|
||||
return
|
||||
}
|
||||
if info.ResponsesUsageInfo == nil {
|
||||
info.ResponsesUsageInfo = &ResponsesUsageInfo{
|
||||
BuiltInTools: make(map[string]*BuildInToolInfo),
|
||||
}
|
||||
}
|
||||
if info.ResponsesUsageInfo.BuiltInTools == nil {
|
||||
info.ResponsesUsageInfo.BuiltInTools = make(map[string]*BuildInToolInfo)
|
||||
}
|
||||
|
||||
count := 0
|
||||
if c != nil {
|
||||
count = c.count
|
||||
}
|
||||
if count > dto.MaxImageN {
|
||||
count = dto.MaxImageN
|
||||
}
|
||||
|
||||
if existing, ok := info.ResponsesUsageInfo.BuiltInTools[dto.BuildInToolImageGeneration]; ok && existing != nil {
|
||||
existing.CallCount = count
|
||||
return
|
||||
}
|
||||
info.ResponsesUsageInfo.BuiltInTools[dto.BuildInToolImageGeneration] = &BuildInToolInfo{
|
||||
ToolName: dto.BuildInToolImageGeneration,
|
||||
CallCount: count,
|
||||
}
|
||||
}
|
||||
|
||||
// IsNonBillableResponsesStatus reports terminal response statuses that must not
|
||||
// bill pending image_generation observations.
|
||||
func IsNonBillableResponsesStatus(status []byte) bool {
|
||||
if len(status) == 0 {
|
||||
return false
|
||||
}
|
||||
var s string
|
||||
if err := common.Unmarshal(status, &s); err != nil {
|
||||
return false
|
||||
}
|
||||
switch strings.ToLower(strings.TrimSpace(s)) {
|
||||
case "failed", "cancelled", "canceled", "incomplete":
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user