* 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
294 lines
8.5 KiB
Go
294 lines
8.5 KiB
Go
package model
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/constant"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
const userCacheSchemaVersion = 2
|
|
|
|
type UserBase struct {
|
|
Id int `json:"id"`
|
|
Group string `json:"group"`
|
|
Email string `json:"email"`
|
|
Quota int `json:"quota"`
|
|
Status int `json:"status"`
|
|
Role int `json:"role"`
|
|
Username string `json:"username"`
|
|
Setting string `json:"setting"`
|
|
AuthVersion int64 `json:"-"`
|
|
CacheSchema int `json:"-"`
|
|
}
|
|
|
|
func (user *UserBase) WriteContext(c *gin.Context) {
|
|
common.SetContextKey(c, constant.ContextKeyUserGroup, user.Group)
|
|
common.SetContextKey(c, constant.ContextKeyUserQuota, user.Quota)
|
|
common.SetContextKey(c, constant.ContextKeyUserStatus, user.Status)
|
|
common.SetContextKey(c, constant.ContextKeyUserEmail, user.Email)
|
|
common.SetContextKey(c, constant.ContextKeyUserName, user.Username)
|
|
common.SetContextKey(c, constant.ContextKeyUserSetting, user.GetSetting())
|
|
}
|
|
|
|
func (user *UserBase) GetSetting() dto.UserSetting {
|
|
setting := dto.UserSetting{}
|
|
if user.Setting != "" {
|
|
err := common.Unmarshal([]byte(user.Setting), &setting)
|
|
if err != nil {
|
|
common.SysLog("failed to unmarshal setting: " + err.Error())
|
|
}
|
|
}
|
|
return setting
|
|
}
|
|
|
|
// getUserCacheKey returns the key for user cache
|
|
func getUserCacheKey(userId int) string {
|
|
return fmt.Sprintf("user:%d", userId)
|
|
}
|
|
|
|
func userCacheTTLSeconds() int {
|
|
ttl := common.RedisKeyCacheSeconds()
|
|
if ttl <= 0 {
|
|
return 60
|
|
}
|
|
return ttl
|
|
}
|
|
|
|
// invalidateUserCache clears user cache
|
|
func invalidateUserCache(userId int) error {
|
|
if !common.RedisEnabled {
|
|
return nil
|
|
}
|
|
return common.RedisDelKey(getUserCacheKey(userId))
|
|
}
|
|
|
|
// InvalidateUserCache is the exported version of invalidateUserCache.
|
|
// 供 controller 等上层包在用户状态变更(如禁用、删除、角色变更)后主动清理缓存。
|
|
func InvalidateUserCache(userId int) error {
|
|
return invalidateUserCache(userId)
|
|
}
|
|
|
|
func populateUserCache(user User) error {
|
|
if !common.RedisEnabled {
|
|
return nil
|
|
}
|
|
return writeUserCache(user.ToBaseUser(), true)
|
|
}
|
|
|
|
// updateUserCache refreshes non-quota user cache fields.
|
|
// Quota is maintained by atomic quota delta paths and must not be overwritten
|
|
// by stale user snapshots from profile/settings updates.
|
|
func updateUserCache(user User) error {
|
|
if !common.RedisEnabled {
|
|
return nil
|
|
}
|
|
return writeUserCache(user.ToBaseUser(), false)
|
|
}
|
|
|
|
// GetUserCache gets complete user cache from hash
|
|
func GetUserCache(userId int) (*UserBase, error) {
|
|
// Try getting from Redis first
|
|
userCache, err := cacheGetUserBase(userId)
|
|
if err == nil {
|
|
return userCache, nil
|
|
}
|
|
|
|
// Redis misses and read failures both fall back to the shared database. A
|
|
// version fence newer than the database is the one exception: allowing that
|
|
// snapshot would re-authorize a user while a restrictive update is pending.
|
|
user, err := GetUserById(userId, false)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if common.RedisEnabled {
|
|
floor, floorErr := getUserAuthVersionFloor(userId)
|
|
if floorErr == nil && floor > user.AuthVersion {
|
|
return nil, ErrUserAuthCachePending
|
|
}
|
|
if err := populateUserCache(*user); err != nil {
|
|
if errors.Is(err, ErrUserAuthCachePending) {
|
|
return nil, err
|
|
}
|
|
common.SysLog("failed to synchronously populate user cache: " + err.Error())
|
|
}
|
|
}
|
|
return user.ToBaseUser(), nil
|
|
}
|
|
|
|
func cacheGetUserBase(userId int) (*UserBase, error) {
|
|
if !common.RedisEnabled {
|
|
return nil, fmt.Errorf("redis is not enabled")
|
|
}
|
|
var userCache UserBase
|
|
// Try getting from Redis first
|
|
err := common.RedisHGetObj(getUserCacheKey(userId), &userCache)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if userCache.Id != userId || userCache.CacheSchema != userCacheSchemaVersion || userCache.AuthVersion <= 0 {
|
|
return nil, fmt.Errorf("user cache schema is stale")
|
|
}
|
|
floor, err := getUserAuthVersionFloor(userId)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if floor > userCache.AuthVersion {
|
|
return nil, ErrUserAuthCachePending
|
|
}
|
|
return &userCache, nil
|
|
}
|
|
|
|
// Add atomic quota operations using hash fields
|
|
func cacheIncrUserQuota(userId int, delta int64) error {
|
|
if !common.RedisEnabled {
|
|
return nil
|
|
}
|
|
return common.RedisHIncrBy(getUserCacheKey(userId), "Quota", delta)
|
|
}
|
|
|
|
func cacheDecrUserQuota(userId int, delta int64) error {
|
|
return cacheIncrUserQuota(userId, -delta)
|
|
}
|
|
|
|
// Helper functions to get individual fields if needed
|
|
func getUserGroupCache(userId int) (string, error) {
|
|
cache, err := GetUserCache(userId)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return cache.Group, nil
|
|
}
|
|
|
|
func getUserQuotaCache(userId int) (int, error) {
|
|
cache, err := GetUserCache(userId)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
return cache.Quota, nil
|
|
}
|
|
|
|
func getUserStatusCache(userId int) (int, error) {
|
|
cache, err := GetUserCache(userId)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
return cache.Status, nil
|
|
}
|
|
|
|
func getUserNameCache(userId int) (string, error) {
|
|
cache, err := GetUserCache(userId)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return cache.Username, nil
|
|
}
|
|
|
|
func getUserSettingCache(userId int) (dto.UserSetting, error) {
|
|
cache, err := GetUserCache(userId)
|
|
if err != nil {
|
|
return dto.UserSetting{}, err
|
|
}
|
|
return cache.GetSetting(), nil
|
|
}
|
|
|
|
// New functions for individual field updates
|
|
func updateUserStatusCache(userId int, status bool) error {
|
|
statusInt := common.UserStatusEnabled
|
|
if !status {
|
|
statusInt = common.UserStatusDisabled
|
|
}
|
|
return updateUserCacheField(userId, "Status", statusInt)
|
|
}
|
|
|
|
func updateUserQuotaCache(userId int, quota int) error {
|
|
if !common.RedisEnabled {
|
|
return nil
|
|
}
|
|
return common.RedisHSetField(getUserCacheKey(userId), "Quota", fmt.Sprintf("%d", quota))
|
|
}
|
|
|
|
// RefreshUserGroupCache writes the database-authoritative group into an
|
|
// existing user hash without changing the user's authentication version.
|
|
func RefreshUserGroupCache(userId int) error {
|
|
if !common.RedisEnabled {
|
|
return nil
|
|
}
|
|
if userId <= 0 {
|
|
return fmt.Errorf("invalid user id")
|
|
}
|
|
var authoritative User
|
|
if err := DB.Select("id", "auth_version", commonGroupCol).Where("id = ?", userId).First(&authoritative).Error; err != nil {
|
|
return err
|
|
}
|
|
// Group transitions intentionally keep the same authentication version. A
|
|
// refresh that read the previous group can therefore arrive after a newer
|
|
// refresh and still pass the auth-version fence. Re-read after every write
|
|
// and repair the cache when the authoritative group changed in between.
|
|
for range 3 {
|
|
if err := updateUserCacheFieldAtVersion(userId, "Group", authoritative.Group, authoritative.AuthVersion); err != nil {
|
|
return err
|
|
}
|
|
|
|
var verified User
|
|
if err := DB.Select("id", "auth_version", commonGroupCol).Where("id = ?", userId).First(&verified).Error; err != nil {
|
|
return err
|
|
}
|
|
if verified.AuthVersion == authoritative.AuthVersion && verified.Group == authoritative.Group {
|
|
return nil
|
|
}
|
|
authoritative = verified
|
|
}
|
|
|
|
// Preserve the freshest snapshot observed even when the row was too busy to
|
|
// stabilize within the bounded retries. Returning an error lets best-effort
|
|
// callers emit an operation-specific warning.
|
|
if err := updateUserCacheFieldAtVersion(userId, "Group", authoritative.Group, authoritative.AuthVersion); err != nil {
|
|
return err
|
|
}
|
|
return fmt.Errorf("user group changed repeatedly during cache refresh")
|
|
}
|
|
|
|
func updateUserEmailCache(userId int, email string) error {
|
|
return updateUserCacheField(userId, "Email", email)
|
|
}
|
|
|
|
func updateUserNameCache(userId int, username string) error {
|
|
return updateUserCacheField(userId, "Username", username)
|
|
}
|
|
|
|
func updateUserSettingCache(userId int, setting string) error {
|
|
return updateUserCacheField(userId, "Setting", setting)
|
|
}
|
|
|
|
// updateUserCacheField prevents individual cache refreshes from bypassing the
|
|
// auth-version fence. It intentionally does nothing when the complete hash is
|
|
// absent; the next GetUserCache call will repopulate it from the database.
|
|
func updateUserCacheField(userId int, field string, value interface{}) error {
|
|
if !common.RedisEnabled {
|
|
return nil
|
|
}
|
|
var user User
|
|
if err := DB.Select("id", "auth_version").Where("id = ?", userId).First(&user).Error; err != nil {
|
|
return err
|
|
}
|
|
if user.AuthVersion <= 0 {
|
|
return fmt.Errorf("invalid user auth version")
|
|
}
|
|
return updateUserCacheFieldAtVersion(userId, field, value, user.AuthVersion)
|
|
}
|
|
|
|
// GetUserLanguage returns the user's language preference from cache
|
|
// Uses the existing GetUserCache mechanism for efficiency
|
|
func GetUserLanguage(userId int) string {
|
|
userCache, err := GetUserCache(userId)
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
return userCache.GetSetting().Language
|
|
}
|