Calcium-Ion
86ac0f7745
* 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
89 lines
3.6 KiB
Go
89 lines
3.6 KiB
Go
package dto
|
|
|
|
import "github.com/QuantumNous/new-api/relaykit/types"
|
|
|
|
const (
|
|
RealtimeEventTypeError = "error"
|
|
RealtimeEventTypeSessionUpdate = "session.update"
|
|
RealtimeEventTypeConversationCreate = "conversation.item.create"
|
|
RealtimeEventTypeResponseCreate = "response.create"
|
|
RealtimeEventInputAudioBufferAppend = "input_audio_buffer.append"
|
|
)
|
|
|
|
const (
|
|
RealtimeEventTypeResponseDone = "response.done"
|
|
RealtimeEventTypeSessionUpdated = "session.updated"
|
|
RealtimeEventTypeSessionCreated = "session.created"
|
|
RealtimeEventResponseAudioDelta = "response.audio.delta"
|
|
RealtimeEventResponseAudioTranscriptionDelta = "response.audio_transcript.delta"
|
|
RealtimeEventResponseFunctionCallArgumentsDelta = "response.function_call_arguments.delta"
|
|
RealtimeEventResponseFunctionCallArgumentsDone = "response.function_call_arguments.done"
|
|
RealtimeEventConversationItemCreated = "conversation.item.created"
|
|
)
|
|
|
|
type RealtimeEvent struct {
|
|
EventId string `json:"event_id"`
|
|
Type string `json:"type"`
|
|
//PreviousItemId string `json:"previous_item_id"`
|
|
Session *RealtimeSession `json:"session,omitempty"`
|
|
Item *RealtimeItem `json:"item,omitempty"`
|
|
Error *types.OpenAIError `json:"error,omitempty"`
|
|
Response *RealtimeResponse `json:"response,omitempty"`
|
|
Delta string `json:"delta,omitempty"`
|
|
Audio string `json:"audio,omitempty"`
|
|
}
|
|
|
|
type RealtimeResponse struct {
|
|
Usage *RealtimeUsage `json:"usage"`
|
|
}
|
|
|
|
type RealtimeUsage struct {
|
|
TotalTokens int `json:"total_tokens"`
|
|
InputTokens int `json:"input_tokens"`
|
|
OutputTokens int `json:"output_tokens"`
|
|
InputTokenDetails InputTokenDetails `json:"input_token_details"`
|
|
OutputTokenDetails OutputTokenDetails `json:"output_token_details"`
|
|
}
|
|
|
|
type RealtimeSession struct {
|
|
Modalities []string `json:"modalities"`
|
|
Instructions string `json:"instructions"`
|
|
Voice string `json:"voice"`
|
|
InputAudioFormat string `json:"input_audio_format"`
|
|
OutputAudioFormat string `json:"output_audio_format"`
|
|
InputAudioTranscription InputAudioTranscription `json:"input_audio_transcription"`
|
|
TurnDetection interface{} `json:"turn_detection"`
|
|
Tools []RealTimeTool `json:"tools"`
|
|
ToolChoice string `json:"tool_choice"`
|
|
Temperature float64 `json:"temperature"`
|
|
//MaxResponseOutputTokens int `json:"max_response_output_tokens"`
|
|
}
|
|
|
|
type InputAudioTranscription struct {
|
|
Model string `json:"model"`
|
|
}
|
|
|
|
type RealTimeTool struct {
|
|
Type string `json:"type"`
|
|
Name string `json:"name"`
|
|
Description string `json:"description"`
|
|
Parameters any `json:"parameters"`
|
|
}
|
|
|
|
type RealtimeItem struct {
|
|
Id string `json:"id"`
|
|
Type string `json:"type"`
|
|
Status string `json:"status"`
|
|
Role string `json:"role"`
|
|
Content []RealtimeContent `json:"content"`
|
|
Name *string `json:"name,omitempty"`
|
|
ToolCalls any `json:"tool_calls,omitempty"`
|
|
CallId string `json:"call_id,omitempty"`
|
|
}
|
|
type RealtimeContent struct {
|
|
Type string `json:"type"`
|
|
Text string `json:"text,omitempty"`
|
|
Audio string `json:"audio,omitempty"` // Base64-encoded audio bytes.
|
|
Transcript string `json:"transcript,omitempty"`
|
|
}
|