* 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
264 lines
7.0 KiB
Go
264 lines
7.0 KiB
Go
package oairesponses
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
kitutil "github.com/QuantumNous/new-api/relaykit/relayconvert/kitutil"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
)
|
|
|
|
func openAIResponsesRequestFromAny(request any) (*dto.OpenAIResponsesRequest, error) {
|
|
responsesRequest, ok := request.(*dto.OpenAIResponsesRequest)
|
|
if !ok {
|
|
if value, ok := request.(dto.OpenAIResponsesRequest); ok {
|
|
responsesRequest = &value
|
|
}
|
|
}
|
|
if responsesRequest == nil {
|
|
return nil, fmt.Errorf("expected OpenAI responses request, got %T", request)
|
|
}
|
|
return responsesRequest, nil
|
|
}
|
|
|
|
func OpenAIResponsesRequestFromAny(request any) (*dto.OpenAIResponsesRequest, error) {
|
|
return openAIResponsesRequestFromAny(request)
|
|
}
|
|
|
|
func responsesInputItems(raw []byte) ([]map[string]any, error) {
|
|
if !rawJSONPresent(raw) {
|
|
return nil, nil
|
|
}
|
|
|
|
switch kitutil.GetJsonType(raw) {
|
|
case "string":
|
|
input, err := responsesJSONString(raw)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("invalid input string: %w", err)
|
|
}
|
|
return []map[string]any{
|
|
{
|
|
"role": "user",
|
|
"content": input,
|
|
},
|
|
}, nil
|
|
case "array":
|
|
var items []map[string]any
|
|
if err := kitutil.Unmarshal(raw, &items); err != nil {
|
|
return nil, fmt.Errorf("invalid input array: %w", err)
|
|
}
|
|
return items, nil
|
|
default:
|
|
return nil, fmt.Errorf("unsupported responses input type %q", kitutil.GetJsonType(raw))
|
|
}
|
|
}
|
|
|
|
func InputItems(raw []byte) ([]map[string]any, error) {
|
|
return responsesInputItems(raw)
|
|
}
|
|
|
|
func responsesContentParts(content any) ([]map[string]any, error) {
|
|
switch typed := content.(type) {
|
|
case nil:
|
|
return nil, nil
|
|
case string:
|
|
return []map[string]any{{"type": "input_text", "text": typed}}, nil
|
|
case []map[string]any:
|
|
return typed, nil
|
|
case []any:
|
|
parts := make([]map[string]any, 0, len(typed))
|
|
for _, item := range typed {
|
|
switch part := item.(type) {
|
|
case string:
|
|
parts = append(parts, map[string]any{"type": "input_text", "text": part})
|
|
case map[string]any:
|
|
parts = append(parts, part)
|
|
default:
|
|
raw, err := kitutil.Marshal(part)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
parts = append(parts, map[string]any{"type": "input_text", "text": string(raw)})
|
|
}
|
|
}
|
|
return parts, nil
|
|
default:
|
|
raw, err := kitutil.Marshal(typed)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return []map[string]any{{"type": "input_text", "text": string(raw)}}, nil
|
|
}
|
|
}
|
|
|
|
func ContentParts(content any) ([]map[string]any, error) {
|
|
return responsesContentParts(content)
|
|
}
|
|
|
|
func responsesRequestFunctionDeclarations(raw []byte) ([]dto.FunctionRequest, error) {
|
|
if !rawJSONPresent(raw) {
|
|
return nil, nil
|
|
}
|
|
|
|
var tools []map[string]any
|
|
if err := kitutil.Unmarshal(raw, &tools); err != nil {
|
|
return nil, fmt.Errorf("invalid tools: %w", err)
|
|
}
|
|
|
|
functions := make([]dto.FunctionRequest, 0, len(tools))
|
|
for _, tool := range tools {
|
|
if strings.TrimSpace(kitutil.Interface2String(tool["type"])) != "function" {
|
|
continue
|
|
}
|
|
name := strings.TrimSpace(kitutil.Interface2String(tool["name"]))
|
|
if name == "" {
|
|
continue
|
|
}
|
|
functions = append(functions, dto.FunctionRequest{
|
|
Name: name,
|
|
Description: kitutil.Interface2String(tool["description"]),
|
|
Parameters: tool["parameters"],
|
|
})
|
|
}
|
|
return functions, nil
|
|
}
|
|
|
|
func RequestFunctionDeclarations(raw []byte) ([]dto.FunctionRequest, error) {
|
|
return responsesRequestFunctionDeclarations(raw)
|
|
}
|
|
|
|
func responsesReasoningEffort(req *dto.OpenAIResponsesRequest) string {
|
|
if req == nil || req.Reasoning == nil {
|
|
return ""
|
|
}
|
|
return req.Reasoning.Effort
|
|
}
|
|
|
|
func ReasoningEffort(req *dto.OpenAIResponsesRequest) string {
|
|
return responsesReasoningEffort(req)
|
|
}
|
|
|
|
func responsesObjectValue(value any, fallbackKey string) map[string]any {
|
|
switch typed := value.(type) {
|
|
case nil:
|
|
return map[string]any{}
|
|
case map[string]any:
|
|
return typed
|
|
case string:
|
|
var object map[string]any
|
|
if err := kitutil.Unmarshal([]byte(typed), &object); err == nil {
|
|
return object
|
|
}
|
|
var array []any
|
|
if err := kitutil.Unmarshal([]byte(typed), &array); err == nil {
|
|
return map[string]any{fallbackKey: array}
|
|
}
|
|
return map[string]any{fallbackKey: typed}
|
|
case []any:
|
|
return map[string]any{fallbackKey: typed}
|
|
default:
|
|
return map[string]any{fallbackKey: typed}
|
|
}
|
|
}
|
|
|
|
func ObjectValue(value any, fallbackKey string) map[string]any {
|
|
return responsesObjectValue(value, fallbackKey)
|
|
}
|
|
|
|
func responsesGeminiResponseMap(value any) map[string]interface{} {
|
|
switch typed := value.(type) {
|
|
case nil:
|
|
return map[string]interface{}{}
|
|
case map[string]any:
|
|
return typed
|
|
case string:
|
|
var object map[string]interface{}
|
|
if err := kitutil.Unmarshal([]byte(typed), &object); err == nil {
|
|
return object
|
|
}
|
|
var array []interface{}
|
|
if err := kitutil.Unmarshal([]byte(typed), &array); err == nil {
|
|
return map[string]interface{}{"result": array}
|
|
}
|
|
return map[string]interface{}{"content": typed}
|
|
case []any:
|
|
return map[string]interface{}{"result": typed}
|
|
default:
|
|
return map[string]interface{}{"content": typed}
|
|
}
|
|
}
|
|
|
|
func GeminiResponseMap(value any) map[string]interface{} {
|
|
return responsesGeminiResponseMap(value)
|
|
}
|
|
|
|
func responsesParallelToolCalls(raw []byte) *bool {
|
|
if !rawJSONPresent(raw) || kitutil.GetJsonType(raw) != "boolean" {
|
|
return nil
|
|
}
|
|
var parallelToolCalls bool
|
|
if err := kitutil.Unmarshal(raw, ¶llelToolCalls); err != nil {
|
|
return nil
|
|
}
|
|
return ¶llelToolCalls
|
|
}
|
|
|
|
func ParallelToolCalls(raw []byte) *bool {
|
|
return responsesParallelToolCalls(raw)
|
|
}
|
|
|
|
func ContentPartToFileSource(part map[string]any) types.FileSource {
|
|
partType := strings.TrimSpace(kitutil.Interface2String(part["type"]))
|
|
var data string
|
|
var mimeType string
|
|
|
|
switch partType {
|
|
case "input_image":
|
|
data, mimeType = responsesPartDataAndMime(part, "image_url", "url")
|
|
case "input_file":
|
|
data, mimeType = responsesPartDataAndMime(part, "file", "file_data", "file_url", "url")
|
|
case "input_audio":
|
|
data, mimeType = responsesPartDataAndMime(part, "input_audio", "data", "url")
|
|
if mimeType == "" {
|
|
if payload, ok := part["input_audio"].(map[string]any); ok {
|
|
if format := strings.TrimSpace(kitutil.Interface2String(payload["format"])); format != "" {
|
|
mimeType = "audio/" + format
|
|
}
|
|
}
|
|
}
|
|
case "input_video":
|
|
data, mimeType = responsesPartDataAndMime(part, "video_url", "url")
|
|
}
|
|
if data == "" {
|
|
return nil
|
|
}
|
|
return types.NewFileSourceFromData(data, mimeType)
|
|
}
|
|
|
|
func responsesPartDataAndMime(part map[string]any, keys ...string) (string, string) {
|
|
mimeType := strings.TrimSpace(kitutil.Interface2String(part["mime_type"]))
|
|
for _, key := range keys {
|
|
value, ok := part[key]
|
|
if !ok {
|
|
continue
|
|
}
|
|
switch typed := value.(type) {
|
|
case string:
|
|
if typed != "" {
|
|
return typed, mimeType
|
|
}
|
|
case map[string]any:
|
|
if mimeType == "" {
|
|
mimeType = strings.TrimSpace(kitutil.Interface2String(typed["mime_type"]))
|
|
}
|
|
for _, nestedKey := range []string{"url", "file_data", "file_url", "data"} {
|
|
if data := strings.TrimSpace(kitutil.Interface2String(typed[nestedKey])); data != "" {
|
|
return data, mimeType
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return "", mimeType
|
|
}
|