* test(relayconvert): add golden snapshot matrix and relaykit boundary guard Phase 0 of the relaykit extraction plan: pin byte-level output of every registered (from,to) request/response/stream conversion route, and forbid kit-bound packages from growing host-only imports. * wip(relayconvert): drop gin.Context from converter signatures; add convmeta draft Phase 1 in progress: relayconvert now takes context.Context; host media resolver adapts gin.Context back at the service boundary. * refactor(relayconvert): decouple converters from RelayInfo, gin, and settings Phase 1 of the relaykit extraction plan: - converters now depend on convmeta.Meta (implemented by RelayInfo) instead of *relaycommon.RelayInfo; ClaudeConvertInfo and the format guesser move to convmeta with aliases left behind - host settings reach converters via a convmeta.Options snapshot built in RelayInfo.ConvOptions; no more model_setting/reasoning global reads inside the conversion layer - effort-suffix helpers move to service/relayconvert/reasoning (old package forwards); chat-to-responses upgrade policy moves to service (host routing logic, not conversion) - golden conversion matrix unchanged * test(relayconvert): tighten boundary — kit packages now free of gin/setting imports * refactor(dto): drop gin and logger dependencies Phase 2 (part 1): dto.Request.IsStream now takes *http.Request instead of *gin.Context (Gemini's impl reads query/path off the std request); dto's three logger calls become common.SysError. Boundary test allowlist is now empty — kit-bound packages import no gin/setting/logger/model. * refactor(kit): extract dependency-free kitutil; dto/types/relayconvert stop importing common Phase 2 of the relaykit extraction plan: - new service/relayconvert/kitutil holds the pure helpers the kit needs (JSON wrappers, pointer/string/uuid/timestamp utils, MaskSensitiveInfo, pluggable LogInfo/LogError hooks, Debug flag) - dto, types, and all relayconvert packages now use kitutil; their only remaining internal deps are dto/types/constant - common keeps every original symbol (MaskSensitiveInfo delegates to kitutil) so host code is untouched; main.go routes kit logging into common.SysLog/SysError and mirrors DebugEnabled - golden conversion matrix unchanged * refactor(kit): move EndpointType/FinishReason to types; OpenRouter dialect via Options Kit packages (dto/types/relayconvert/reasonmap) no longer import constant: - EndpointType and finish-reason values live in types; constant re-exports - the OpenRouter special-case in claude->openai request conversion reads Options.OpenRouterDialect, set by the host from the channel type; InitChannelMeta invalidates the cached snapshot on channel switch * refactor: extract relaykit submodule (dto/types/relayconvert/reasonmap) Phase 3 of the relaykit extraction plan: - new go module github.com/QuantumNous/new-api/relaykit containing dto (minus task family), types, relayconvert (with convmeta/kitutil/reasoning), and reasonmap; host consumes it via require + replace, go.work for dev - task-family dto (task/suno/midjourney/video) stays in the host dto package; dual-consumer host files alias it as taskdto - relaykit builds and tests standalone (GOWORK=off): no host imports, no gin, no DB, no settings - golden conversion matrix unchanged * build(docker): copy relaykit/go.mod before go mod download The local-replace submodule's go.mod must exist inside the build context for the main module graph to resolve. * fix: address relaykit extraction regressions * fix: address relaykit review regressions * docs: document Meta nil receiver contract * fix(relaykit): fail OpenAI→Claude conversion without max_tokens; reject negative default_max_tokens The Claude Messages API requires max_tokens (omitting it is a 400 "Field required"), but with a nil Options.Claude.DefaultMaxTokens hook the converters silently emitted a request the upstream is guaranteed to reject. Both OpenAI Chat and Responses → Claude conversions now return sharedclaude.ErrMissingMaxTokens when no path (client value, default hook, thinking-adapter floor) supplied one. Unreachable in the host, which always configures the hook. Host side, claude.default_max_tokens now rejects negative values at the option API before persisting — they would wrap into huge unsigned values during conversion. Zero stays allowed: the current API treats max_tokens: 0 as cache pre-warming. * fix: make Gemini safety settings read path race-free
176 lines
4.5 KiB
Go
176 lines
4.5 KiB
Go
package billingexpr
|
|
|
|
import (
|
|
"fmt"
|
|
"math"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/expr-lang/expr"
|
|
"github.com/expr-lang/expr/ast"
|
|
"github.com/expr-lang/expr/vm"
|
|
)
|
|
|
|
const maxCacheSize = 256
|
|
|
|
// DefaultExprVersion is used when an expression string has no version prefix.
|
|
const DefaultExprVersion = 1
|
|
|
|
// ParseExprVersion extracts the version tag and body from an expression string.
|
|
// Format: "v1:tier(...)" → version=1, body="tier(...)".
|
|
// No prefix defaults to DefaultExprVersion.
|
|
func ParseExprVersion(exprStr string) (version int, body string) {
|
|
if strings.HasPrefix(exprStr, "v1:") {
|
|
return 1, exprStr[3:]
|
|
}
|
|
return DefaultExprVersion, exprStr
|
|
}
|
|
|
|
type cachedEntry struct {
|
|
prog *vm.Program
|
|
usedVars map[string]bool
|
|
version int
|
|
}
|
|
|
|
var (
|
|
cacheMu sync.RWMutex
|
|
cache = make(map[string]*cachedEntry, 64)
|
|
)
|
|
|
|
// compileEnvPrototypeV1 is the v1 type-checking prototype used at compile time.
|
|
var compileEnvPrototypeV1 = map[string]interface{}{
|
|
"p": float64(0),
|
|
"c": float64(0),
|
|
"len": float64(0),
|
|
"cr": float64(0),
|
|
"cc": float64(0),
|
|
"cc1h": float64(0),
|
|
"img": float64(0),
|
|
"img_o": float64(0),
|
|
"ai": float64(0),
|
|
"ao": float64(0),
|
|
"tier": func(string, float64) float64 { return 0 },
|
|
"header": func(string) string { return "" },
|
|
"param": func(string) interface{} { return nil },
|
|
"has": func(interface{}, string) bool { return false },
|
|
"hour": func(string) int { return 0 },
|
|
"minute": func(string) int { return 0 },
|
|
"weekday": func(string) int { return 0 },
|
|
"month": func(string) int { return 0 },
|
|
"day": func(string) int { return 0 },
|
|
"max": math.Max,
|
|
"min": math.Min,
|
|
"abs": math.Abs,
|
|
"ceil": math.Ceil,
|
|
"floor": math.Floor,
|
|
}
|
|
|
|
func getCompileEnv(version int) map[string]interface{} {
|
|
switch version {
|
|
default:
|
|
return compileEnvPrototypeV1
|
|
}
|
|
}
|
|
|
|
// CompileFromCache compiles an expression string, using a cached program when
|
|
// available. The cache is keyed by the SHA-256 hex digest of the expression.
|
|
func CompileFromCache(exprStr string) (*vm.Program, error) {
|
|
return compileFromCacheByHash(exprStr, ExprHashString(exprStr))
|
|
}
|
|
|
|
// CompileFromCacheByHash is like CompileFromCache but accepts a pre-computed
|
|
// hash, useful when the caller already has the BillingSnapshot.ExprHash.
|
|
func CompileFromCacheByHash(exprStr, hash string) (*vm.Program, error) {
|
|
return compileFromCacheByHash(exprStr, hash)
|
|
}
|
|
|
|
func compileFromCacheByHash(exprStr, hash string) (*vm.Program, error) {
|
|
cacheMu.RLock()
|
|
if entry, ok := cache[hash]; ok {
|
|
cacheMu.RUnlock()
|
|
return entry.prog, nil
|
|
}
|
|
cacheMu.RUnlock()
|
|
|
|
version, body := ParseExprVersion(exprStr)
|
|
prog, err := expr.Compile(body, expr.Env(getCompileEnv(version)), expr.AsFloat64())
|
|
if err != nil {
|
|
return nil, fmt.Errorf("expr compile error: %w", err)
|
|
}
|
|
|
|
vars := extractUsedVars(prog)
|
|
|
|
cacheMu.Lock()
|
|
if len(cache) >= maxCacheSize {
|
|
cache = make(map[string]*cachedEntry, 64)
|
|
}
|
|
cache[hash] = &cachedEntry{prog: prog, usedVars: vars, version: version}
|
|
cacheMu.Unlock()
|
|
|
|
return prog, nil
|
|
}
|
|
|
|
// ExprVersion returns the version of a cached expression. Returns DefaultExprVersion
|
|
// if the expression hasn't been compiled yet or is empty.
|
|
func ExprVersion(exprStr string) int {
|
|
if exprStr == "" {
|
|
return DefaultExprVersion
|
|
}
|
|
hash := ExprHashString(exprStr)
|
|
cacheMu.RLock()
|
|
if entry, ok := cache[hash]; ok {
|
|
cacheMu.RUnlock()
|
|
return entry.version
|
|
}
|
|
cacheMu.RUnlock()
|
|
v, _ := ParseExprVersion(exprStr)
|
|
return v
|
|
}
|
|
|
|
func extractUsedVars(prog *vm.Program) map[string]bool {
|
|
vars := make(map[string]bool)
|
|
node := prog.Node()
|
|
ast.Find(node, func(n ast.Node) bool {
|
|
if id, ok := n.(*ast.IdentifierNode); ok {
|
|
vars[id.Value] = true
|
|
}
|
|
return false
|
|
})
|
|
return vars
|
|
}
|
|
|
|
// UsedVars returns the set of identifier names referenced by an expression.
|
|
// The result is cached alongside the compiled program. Returns nil for empty input.
|
|
func UsedVars(exprStr string) map[string]bool {
|
|
if exprStr == "" {
|
|
return nil
|
|
}
|
|
hash := ExprHashString(exprStr)
|
|
cacheMu.RLock()
|
|
if entry, ok := cache[hash]; ok {
|
|
cacheMu.RUnlock()
|
|
return entry.usedVars
|
|
}
|
|
cacheMu.RUnlock()
|
|
|
|
// Compile (and cache) to populate usedVars
|
|
if _, err := compileFromCacheByHash(exprStr, hash); err != nil {
|
|
return nil
|
|
}
|
|
cacheMu.RLock()
|
|
entry, ok := cache[hash]
|
|
cacheMu.RUnlock()
|
|
if ok {
|
|
return entry.usedVars
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// InvalidateCache clears the compiled-expression cache.
|
|
// Called when billing rules are updated.
|
|
func InvalidateCache() {
|
|
cacheMu.Lock()
|
|
cache = make(map[string]*cachedEntry, 64)
|
|
cacheMu.Unlock()
|
|
}
|