* 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
199 lines
5.8 KiB
Go
199 lines
5.8 KiB
Go
package minimax
|
|
|
|
import (
|
|
"encoding/hex"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
"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"
|
|
)
|
|
|
|
type MiniMaxTTSRequest struct {
|
|
Model string `json:"model"`
|
|
Text string `json:"text"`
|
|
Stream bool `json:"stream,omitempty"`
|
|
StreamOptions *StreamOptions `json:"stream_options,omitempty"`
|
|
VoiceSetting VoiceSetting `json:"voice_setting"`
|
|
PronunciationDict *PronunciationDict `json:"pronunciation_dict,omitempty"`
|
|
AudioSetting *AudioSetting `json:"audio_setting,omitempty"`
|
|
TimbreWeights []TimbreWeight `json:"timbre_weights,omitempty"`
|
|
LanguageBoost string `json:"language_boost,omitempty"`
|
|
VoiceModify *VoiceModify `json:"voice_modify,omitempty"`
|
|
SubtitleEnable bool `json:"subtitle_enable,omitempty"`
|
|
OutputFormat string `json:"output_format,omitempty"`
|
|
AigcWatermark bool `json:"aigc_watermark,omitempty"`
|
|
}
|
|
|
|
type StreamOptions struct {
|
|
ExcludeAggregatedAudio bool `json:"exclude_aggregated_audio,omitempty"`
|
|
}
|
|
|
|
type VoiceSetting struct {
|
|
VoiceID string `json:"voice_id"`
|
|
Speed float64 `json:"speed,omitempty"`
|
|
Vol float64 `json:"vol,omitempty"`
|
|
Pitch int `json:"pitch,omitempty"`
|
|
Emotion string `json:"emotion,omitempty"`
|
|
TextNormalization bool `json:"text_normalization,omitempty"`
|
|
LatexRead bool `json:"latex_read,omitempty"`
|
|
}
|
|
|
|
type PronunciationDict struct {
|
|
Tone []string `json:"tone,omitempty"`
|
|
}
|
|
|
|
type AudioSetting struct {
|
|
SampleRate int `json:"sample_rate,omitempty"`
|
|
Bitrate int `json:"bitrate,omitempty"`
|
|
Format string `json:"format,omitempty"`
|
|
Channel int `json:"channel,omitempty"`
|
|
ForceCbr bool `json:"force_cbr,omitempty"`
|
|
}
|
|
|
|
type TimbreWeight struct {
|
|
VoiceID string `json:"voice_id"`
|
|
Weight int `json:"weight"`
|
|
}
|
|
|
|
type VoiceModify struct {
|
|
Pitch int `json:"pitch,omitempty"`
|
|
Intensity int `json:"intensity,omitempty"`
|
|
Timbre int `json:"timbre,omitempty"`
|
|
SoundEffects string `json:"sound_effects,omitempty"`
|
|
}
|
|
|
|
type MiniMaxTTSResponse struct {
|
|
Data MiniMaxTTSData `json:"data"`
|
|
ExtraInfo MiniMaxExtraInfo `json:"extra_info"`
|
|
TraceID string `json:"trace_id"`
|
|
BaseResp MiniMaxBaseResp `json:"base_resp"`
|
|
}
|
|
|
|
type MiniMaxTTSData struct {
|
|
Audio string `json:"audio"`
|
|
Status int `json:"status"`
|
|
}
|
|
|
|
type MiniMaxExtraInfo struct {
|
|
UsageCharacters int64 `json:"usage_characters"`
|
|
}
|
|
|
|
type MiniMaxBaseResp struct {
|
|
StatusCode int64 `json:"status_code"`
|
|
StatusMsg string `json:"status_msg"`
|
|
}
|
|
|
|
func getContentTypeByFormat(format string) string {
|
|
contentTypeMap := map[string]string{
|
|
"mp3": "audio/mpeg",
|
|
"wav": "audio/wav",
|
|
"flac": "audio/flac",
|
|
"aac": "audio/aac",
|
|
"pcm": "audio/pcm",
|
|
}
|
|
if ct, ok := contentTypeMap[format]; ok {
|
|
return ct
|
|
}
|
|
return "audio/mpeg" // default to mp3
|
|
}
|
|
|
|
func handleTTSResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage any, err *types.NewAPIError) {
|
|
body, readErr := io.ReadAll(resp.Body)
|
|
if readErr != nil {
|
|
return nil, types.NewErrorWithStatusCode(
|
|
fmt.Errorf("failed to read minimax response: %w", readErr),
|
|
types.ErrorCodeReadResponseBodyFailed,
|
|
http.StatusInternalServerError,
|
|
)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
// Parse response
|
|
var minimaxResp MiniMaxTTSResponse
|
|
if unmarshalErr := json.Unmarshal(body, &minimaxResp); unmarshalErr != nil {
|
|
return nil, types.NewErrorWithStatusCode(
|
|
fmt.Errorf("failed to unmarshal minimax TTS response: %w", unmarshalErr),
|
|
types.ErrorCodeBadResponseBody,
|
|
http.StatusInternalServerError,
|
|
)
|
|
}
|
|
|
|
// Check base_resp status code
|
|
if minimaxResp.BaseResp.StatusCode != 0 {
|
|
return nil, types.NewErrorWithStatusCode(
|
|
fmt.Errorf("minimax TTS error: %d - %s", minimaxResp.BaseResp.StatusCode, minimaxResp.BaseResp.StatusMsg),
|
|
types.ErrorCodeBadResponse,
|
|
http.StatusBadRequest,
|
|
)
|
|
}
|
|
|
|
// Check if we have audio data
|
|
if minimaxResp.Data.Audio == "" {
|
|
return nil, types.NewErrorWithStatusCode(
|
|
fmt.Errorf("no audio data in minimax TTS response"),
|
|
types.ErrorCodeBadResponse,
|
|
http.StatusBadRequest,
|
|
)
|
|
}
|
|
|
|
if strings.HasPrefix(minimaxResp.Data.Audio, "http") {
|
|
c.Redirect(http.StatusFound, minimaxResp.Data.Audio)
|
|
} else {
|
|
// Handle hex-encoded audio data
|
|
audioData, decodeErr := hex.DecodeString(minimaxResp.Data.Audio)
|
|
if decodeErr != nil {
|
|
return nil, types.NewErrorWithStatusCode(
|
|
fmt.Errorf("failed to decode hex audio data: %w", decodeErr),
|
|
types.ErrorCodeBadResponse,
|
|
http.StatusInternalServerError,
|
|
)
|
|
}
|
|
|
|
// Determine content type - default to mp3
|
|
contentType := "audio/mpeg"
|
|
|
|
c.Data(http.StatusOK, contentType, audioData)
|
|
}
|
|
|
|
usage = &dto.Usage{
|
|
PromptTokens: info.GetEstimatePromptTokens(),
|
|
CompletionTokens: 0,
|
|
TotalTokens: int(minimaxResp.ExtraInfo.UsageCharacters),
|
|
}
|
|
|
|
return usage, nil
|
|
}
|
|
|
|
func handleChatCompletionResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage any, err *types.NewAPIError) {
|
|
body, readErr := io.ReadAll(resp.Body)
|
|
if readErr != nil {
|
|
return nil, types.NewErrorWithStatusCode(
|
|
errors.New("failed to read minimax response"),
|
|
types.ErrorCodeReadResponseBodyFailed,
|
|
http.StatusInternalServerError,
|
|
)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
// Set response headers
|
|
for key, values := range resp.Header {
|
|
if !service.ShouldCopyUpstreamHeader(c, key, values) {
|
|
continue
|
|
}
|
|
for _, value := range values {
|
|
c.Header(key, value)
|
|
}
|
|
}
|
|
|
|
c.Data(resp.StatusCode, "application/json", body)
|
|
return nil, nil
|
|
}
|