* 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
109 lines
2.8 KiB
Go
109 lines
2.8 KiB
Go
package controller
|
|
|
|
import (
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/model"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
"github.com/QuantumNous/new-api/setting/operation_setting"
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func GetSubscription(c *gin.Context) {
|
|
var remainQuota int
|
|
var usedQuota int
|
|
var err error
|
|
var token *model.Token
|
|
var expiredTime int64
|
|
if common.DisplayTokenStatEnabled {
|
|
tokenId := c.GetInt("token_id")
|
|
token, err = model.GetTokenById(tokenId)
|
|
expiredTime = token.ExpiredTime
|
|
remainQuota = token.RemainQuota
|
|
usedQuota = token.UsedQuota
|
|
} else {
|
|
userId := c.GetInt("id")
|
|
remainQuota, err = model.GetUserQuota(userId, false)
|
|
usedQuota, err = model.GetUserUsedQuota(userId)
|
|
}
|
|
if expiredTime <= 0 {
|
|
expiredTime = 0
|
|
}
|
|
if err != nil {
|
|
openAIError := types.OpenAIError{
|
|
Message: err.Error(),
|
|
Type: "upstream_error",
|
|
}
|
|
c.JSON(200, gin.H{
|
|
"error": openAIError,
|
|
})
|
|
return
|
|
}
|
|
quota := remainQuota + usedQuota
|
|
amount := float64(quota)
|
|
// OpenAI 兼容接口中的 *_USD 字段含义保持“额度单位”对应值:
|
|
// 我们将其解释为以“站点展示类型”为准:
|
|
// - USD: 直接除以 QuotaPerUnit
|
|
// - CNY: 先转 USD 再乘汇率
|
|
// - TOKENS: 直接使用 tokens 数量
|
|
switch operation_setting.GetQuotaDisplayType() {
|
|
case operation_setting.QuotaDisplayTypeCNY:
|
|
amount = amount / common.QuotaPerUnit * operation_setting.USDExchangeRate
|
|
case operation_setting.QuotaDisplayTypeTokens:
|
|
// amount 保持 tokens 数值
|
|
default:
|
|
amount = amount / common.QuotaPerUnit
|
|
}
|
|
if token != nil && token.UnlimitedQuota {
|
|
amount = 100000000
|
|
}
|
|
subscription := OpenAISubscriptionResponse{
|
|
Object: "billing_subscription",
|
|
HasPaymentMethod: true,
|
|
SoftLimitUSD: amount,
|
|
HardLimitUSD: amount,
|
|
SystemHardLimitUSD: amount,
|
|
AccessUntil: expiredTime,
|
|
}
|
|
c.JSON(200, subscription)
|
|
return
|
|
}
|
|
|
|
func GetUsage(c *gin.Context) {
|
|
var quota int
|
|
var err error
|
|
var token *model.Token
|
|
if common.DisplayTokenStatEnabled {
|
|
tokenId := c.GetInt("token_id")
|
|
token, err = model.GetTokenById(tokenId)
|
|
quota = token.UsedQuota
|
|
} else {
|
|
userId := c.GetInt("id")
|
|
quota, err = model.GetUserUsedQuota(userId)
|
|
}
|
|
if err != nil {
|
|
openAIError := types.OpenAIError{
|
|
Message: err.Error(),
|
|
Type: "new_api_error",
|
|
}
|
|
c.JSON(200, gin.H{
|
|
"error": openAIError,
|
|
})
|
|
return
|
|
}
|
|
amount := float64(quota)
|
|
switch operation_setting.GetQuotaDisplayType() {
|
|
case operation_setting.QuotaDisplayTypeCNY:
|
|
amount = amount / common.QuotaPerUnit * operation_setting.USDExchangeRate
|
|
case operation_setting.QuotaDisplayTypeTokens:
|
|
// tokens 保持原值
|
|
default:
|
|
amount = amount / common.QuotaPerUnit
|
|
}
|
|
usage := OpenAIUsageResponse{
|
|
Object: "list",
|
|
TotalUsage: amount * 100,
|
|
}
|
|
c.JSON(200, usage)
|
|
return
|
|
}
|