Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions dto/openai_request.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package dto

import (
"bytes"
"encoding/json"
"fmt"
"strings"
Expand Down Expand Up @@ -947,6 +948,58 @@ func (r *OpenAIResponsesRequest) GetToolsMap() []map[string]any {
return toolsMap
}

// NormalizeInputNullContent rewrites Responses API message input items whose
// `content` is explicitly null into an empty string. Some OpenAI-compatible
// chat clients emit empty assistant messages as null, while Responses-compatible
// upstreams reject null content. Non-message input items such as reasoning and
// function_call use different schemas and must be preserved.
func (r *OpenAIResponsesRequest) NormalizeInputNullContent() error {
if r == nil || len(r.Input) == 0 {
return nil
}
if common.GetJsonType(r.Input) != "array" {
return nil
}

var items []any
if err := common.Unmarshal(r.Input, &items); err != nil {
return err
}

changed := false
for _, rawItem := range items {
item, ok := rawItem.(map[string]any)
if !ok || item == nil {
continue
}
itemType := strings.TrimSpace(common.Interface2String(item["type"]))
role := strings.TrimSpace(common.Interface2String(item["role"]))
if itemType != "" && itemType != "message" {
continue
}
if itemType == "" && role == "" {
continue
}
content, exists := item["content"]
if !exists || content != nil {
continue
}
item["content"] = ""
changed = true
}

if !changed {
return nil
}

normalized, err := common.Marshal(items)
if err != nil {
return err
}
r.Input = json.RawMessage(bytes.TrimSpace(normalized))
return nil
}

type Reasoning struct {
Effort string `json:"effort,omitempty"`
Summary string `json:"summary,omitempty"`
Expand Down
24 changes: 24 additions & 0 deletions dto/openai_request_zero_value_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,27 @@ func TestOpenAIResponsesRequestPreserveExplicitZeroValues(t *testing.T) {
require.True(t, gjson.GetBytes(encoded, "stream").Exists())
require.True(t, gjson.GetBytes(encoded, "top_p").Exists())
}

func TestOpenAIResponsesRequestNormalizeInputNullContent(t *testing.T) {
raw := []byte(`{
"model":"gpt-5.4",
"input":[
{"role":"user","content":"hello"},
{"role":"assistant","content":null},
{"type":"function_call","call_id":"call_1","name":"demo","arguments":"{}"},
{"type":"reasoning","summary":[],"content":null,"encrypted_content":"secret"}
]
}`)

var req OpenAIResponsesRequest
err := common.Unmarshal(raw, &req)
require.NoError(t, err)

err = req.NormalizeInputNullContent()
require.NoError(t, err)

require.Equal(t, "\"\"", gjson.GetBytes(req.Input, "1.content").Raw)
require.Equal(t, "", gjson.GetBytes(req.Input, "1.content").String())
require.Equal(t, "hello", gjson.GetBytes(req.Input, "0.content").String())
require.Equal(t, "null", gjson.GetBytes(req.Input, "3.content").Raw)
}
3 changes: 3 additions & 0 deletions relay/responses_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ func ResponsesHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *
if err != nil {
return types.NewError(fmt.Errorf("failed to copy request to GeneralOpenAIRequest: %w", err), types.ErrorCodeInvalidRequest, types.ErrOptionWithSkipRetry())
}
if err := request.NormalizeInputNullContent(); err != nil {
return types.NewError(err, types.ErrorCodeInvalidRequest, types.ErrOptionWithSkipRetry())
}

err = helper.ModelMappedHelper(c, info, request)
if err != nil {
Expand Down
4 changes: 4 additions & 0 deletions service/openaicompat/chat_to_responses.go
Original file line number Diff line number Diff line change
Expand Up @@ -398,5 +398,9 @@ func ChatCompletionsRequestToResponsesRequest(req *dto.GeneralOpenAIRequest) (*d
}
}

if err := out.NormalizeInputNullContent(); err != nil {
return nil, err
}

return out, nil
}