* 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
150 lines
5.3 KiB
Go
150 lines
5.3 KiB
Go
package openai
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"io"
|
|
"math"
|
|
"net/http"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/constant"
|
|
"github.com/QuantumNous/new-api/logger"
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
"github.com/QuantumNous/new-api/relay/helper"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
"github.com/QuantumNous/new-api/service"
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func OpenaiTTSHandler(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) *dto.Usage {
|
|
// the status code has been judged before, if there is a body reading failure,
|
|
// it should be regarded as a non-recoverable error, so it should not return err for external retry.
|
|
// Analogous to nginx's load balancing, it will only retry if it can't be requested or
|
|
// if the upstream returns a specific status code, once the upstream has already written the header,
|
|
// the subsequent failure of the response body should be regarded as a non-recoverable error,
|
|
// and can be terminated directly.
|
|
defer service.CloseResponseBodyGracefully(resp)
|
|
usage := &dto.Usage{}
|
|
usage.PromptTokens = info.GetEstimatePromptTokens()
|
|
usage.TotalTokens = info.GetEstimatePromptTokens()
|
|
for k, v := range resp.Header {
|
|
if !service.ShouldCopyUpstreamHeader(c, k, v) {
|
|
continue
|
|
}
|
|
c.Writer.Header().Set(k, v[0])
|
|
}
|
|
c.Writer.WriteHeader(resp.StatusCode)
|
|
|
|
if info.IsStream {
|
|
helper.StreamScannerHandler(c, resp, info, func(data string, sr *helper.StreamResult) {
|
|
if service.SundaySearch(data, "usage") {
|
|
var simpleResponse dto.SimpleResponse
|
|
if err := common.Unmarshal([]byte(data), &simpleResponse); err != nil {
|
|
logger.LogError(c, err.Error())
|
|
sr.Error(err)
|
|
} else if simpleResponse.Usage.TotalTokens != 0 {
|
|
usage.PromptTokens = simpleResponse.Usage.InputTokens
|
|
usage.CompletionTokens = simpleResponse.OutputTokens
|
|
usage.TotalTokens = simpleResponse.TotalTokens
|
|
}
|
|
}
|
|
if err := helper.StringData(c, data); err != nil {
|
|
sr.Error(err)
|
|
}
|
|
})
|
|
} else {
|
|
common.SetContextKey(c, constant.ContextKeyLocalCountTokens, true)
|
|
// 读取响应体到缓冲区
|
|
bodyBytes, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
logger.LogError(c, fmt.Sprintf("failed to read TTS response body: %v", err))
|
|
c.Writer.WriteHeaderNow()
|
|
return usage
|
|
}
|
|
|
|
// 写入响应到客户端
|
|
c.Writer.WriteHeaderNow()
|
|
_, err = c.Writer.Write(bodyBytes)
|
|
if err != nil {
|
|
logger.LogError(c, fmt.Sprintf("failed to write TTS response: %v", err))
|
|
}
|
|
|
|
// 计算音频时长并更新 usage
|
|
audioFormat := "mp3" // 默认格式
|
|
if audioReq, ok := info.Request.(*dto.AudioRequest); ok && audioReq.ResponseFormat != "" {
|
|
audioFormat = audioReq.ResponseFormat
|
|
}
|
|
|
|
var duration float64
|
|
var durationErr error
|
|
|
|
if audioFormat == "pcm" {
|
|
// PCM 格式没有文件头,根据 OpenAI TTS 的 PCM 参数计算时长
|
|
// 采样率: 24000 Hz, 位深度: 16-bit (2 bytes), 声道数: 1
|
|
const sampleRate = 24000
|
|
const bytesPerSample = 2
|
|
const channels = 1
|
|
duration = float64(len(bodyBytes)) / float64(sampleRate*bytesPerSample*channels)
|
|
} else {
|
|
ext := "." + audioFormat
|
|
reader := bytes.NewReader(bodyBytes)
|
|
duration, durationErr = common.GetAudioDuration(c.Request.Context(), reader, ext)
|
|
}
|
|
|
|
usage.PromptTokensDetails.TextTokens = usage.PromptTokens
|
|
|
|
if durationErr != nil {
|
|
logger.LogWarn(c, fmt.Sprintf("failed to get audio duration: %v", durationErr))
|
|
// 如果无法获取时长,则设置保底的 CompletionTokens,根据body大小计算
|
|
sizeInKB := float64(len(bodyBytes)) / 1000.0
|
|
estimatedTokens := int(math.Ceil(sizeInKB)) // 粗略估算每KB约等于1 token
|
|
usage.CompletionTokens = estimatedTokens
|
|
usage.CompletionTokenDetails.AudioTokens = estimatedTokens
|
|
} else if duration > 0 {
|
|
// 计算 token: ceil(duration) / 60.0 * 1000,即每分钟 1000 tokens。
|
|
// duration 解析自上游返回的音频元数据,饱和转换防止 int 回绕。
|
|
completionTokens := common.QuotaRound(math.Ceil(duration) / 60.0 * 1000)
|
|
usage.CompletionTokens = completionTokens
|
|
usage.CompletionTokenDetails.AudioTokens = completionTokens
|
|
}
|
|
usage.TotalTokens = usage.PromptTokens + usage.CompletionTokens
|
|
}
|
|
|
|
return usage
|
|
}
|
|
|
|
func OpenaiSTTHandler(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo, responseFormat string) (*types.NewAPIError, *dto.Usage) {
|
|
defer service.CloseResponseBodyGracefully(resp)
|
|
|
|
responseBody, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError), nil
|
|
}
|
|
// 写入新的 response body
|
|
service.IOCopyBytesGracefully(c, resp, responseBody)
|
|
|
|
var responseData struct {
|
|
Usage *dto.Usage `json:"usage"`
|
|
}
|
|
if err := common.Unmarshal(responseBody, &responseData); err == nil && responseData.Usage != nil {
|
|
if responseData.Usage.TotalTokens > 0 {
|
|
usage := responseData.Usage
|
|
if usage.PromptTokens == 0 {
|
|
usage.PromptTokens = usage.InputTokens
|
|
}
|
|
if usage.CompletionTokens == 0 {
|
|
usage.CompletionTokens = usage.OutputTokens
|
|
}
|
|
return nil, usage
|
|
}
|
|
}
|
|
|
|
usage := &dto.Usage{}
|
|
usage.PromptTokens = info.GetEstimatePromptTokens()
|
|
usage.CompletionTokens = 0
|
|
usage.TotalTokens = usage.PromptTokens + usage.CompletionTokens
|
|
return nil, usage
|
|
}
|