* 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
144 lines
3.2 KiB
Go
144 lines
3.2 KiB
Go
package common
|
|
|
|
import (
|
|
"encoding/base64"
|
|
"encoding/json"
|
|
"fmt"
|
|
kitutil "github.com/QuantumNous/new-api/relaykit/relayconvert/kitutil"
|
|
"strconv"
|
|
"strings"
|
|
"unsafe"
|
|
|
|
"github.com/samber/lo"
|
|
)
|
|
|
|
const LocalLogContentLimit = 2048
|
|
|
|
// LocalLogPreview limits log-only content unless debug logging is enabled.
|
|
func LocalLogPreview(content string) string {
|
|
if DebugEnabled || len(content) <= LocalLogContentLimit {
|
|
return content
|
|
}
|
|
return fmt.Sprintf("%s... [truncated, original_length=%d, limit=%d]", content[:LocalLogContentLimit], len(content), LocalLogContentLimit)
|
|
}
|
|
|
|
func GetStringIfEmpty(str string, defaultValue string) string {
|
|
if str == "" {
|
|
return defaultValue
|
|
}
|
|
return str
|
|
}
|
|
|
|
func GetRandomString(length int) string {
|
|
if length <= 0 {
|
|
return ""
|
|
}
|
|
return lo.RandomString(length, lo.AlphanumericCharset)
|
|
}
|
|
|
|
func MapToJsonStr(m map[string]interface{}) string {
|
|
bytes, err := json.Marshal(m)
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
return string(bytes)
|
|
}
|
|
|
|
func StrToMap(str string) (map[string]interface{}, error) {
|
|
m := make(map[string]interface{})
|
|
err := Unmarshal([]byte(str), &m)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return m, nil
|
|
}
|
|
|
|
func StrToJsonArray(str string) ([]interface{}, error) {
|
|
var js []interface{}
|
|
err := json.Unmarshal([]byte(str), &js)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return js, nil
|
|
}
|
|
|
|
func IsJsonArray(str string) bool {
|
|
var js []interface{}
|
|
return json.Unmarshal([]byte(str), &js) == nil
|
|
}
|
|
|
|
func IsJsonObject(str string) bool {
|
|
var js map[string]interface{}
|
|
return json.Unmarshal([]byte(str), &js) == nil
|
|
}
|
|
|
|
func String2Int(str string) int {
|
|
num, err := strconv.Atoi(str)
|
|
if err != nil {
|
|
return 0
|
|
}
|
|
return num
|
|
}
|
|
|
|
func StringsContains(strs []string, str string) bool {
|
|
for _, s := range strs {
|
|
if s == str {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// StringToByteSlice []byte only read, panic on append
|
|
func StringToByteSlice(s string) []byte {
|
|
tmp1 := (*[2]uintptr)(unsafe.Pointer(&s))
|
|
tmp2 := [3]uintptr{tmp1[0], tmp1[1], tmp1[1]}
|
|
return *(*[]byte)(unsafe.Pointer(&tmp2))
|
|
}
|
|
|
|
func EncodeBase64(str string) string {
|
|
return base64.StdEncoding.EncodeToString([]byte(str))
|
|
}
|
|
|
|
func GetJsonString(data any) string {
|
|
if data == nil {
|
|
return ""
|
|
}
|
|
b, _ := json.Marshal(data)
|
|
return string(b)
|
|
}
|
|
|
|
// NormalizeBillingPreference clamps the billing preference to valid values.
|
|
func NormalizeBillingPreference(pref string) string {
|
|
switch strings.TrimSpace(pref) {
|
|
case "subscription_first", "wallet_first", "subscription_only", "wallet_only":
|
|
return strings.TrimSpace(pref)
|
|
default:
|
|
return "subscription_first"
|
|
}
|
|
}
|
|
|
|
// MaskEmail masks a user email to prevent PII leakage in logs
|
|
// Returns "***masked***" if email is empty, otherwise shows only the domain part
|
|
func MaskEmail(email string) string {
|
|
if email == "" {
|
|
return "***masked***"
|
|
}
|
|
|
|
// Find the @ symbol
|
|
atIndex := strings.Index(email, "@")
|
|
if atIndex == -1 {
|
|
// No @ symbol found, return masked
|
|
return "***masked***"
|
|
}
|
|
|
|
// Return only the domain part with @ symbol
|
|
return "***@" + email[atIndex+1:]
|
|
}
|
|
|
|
// MaskSensitiveInfo moved to the conversion kit (kitutil) because the types
|
|
// package error formatting depends on it; host callers keep this name.
|
|
func MaskSensitiveInfo(str string) string {
|
|
return kitutil.MaskSensitiveInfo(str)
|
|
}
|