DBT/clawgo
1
0
Fork 0
mirror of https://github.com/YspCoder/clawgo.git synced 2026-05-18 01:17:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

normalize-policy phase-7: reduce content-field trim usage in HTTP provider message mapping

Browse Source
This commit is contained in:
DBT
2026-02-28 01:40:32 +00:00
parent cd1057a5aa
commit 63b35fae9b
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/providers/http_provider.go
View File

@@ -207,7 +207,7 @@ func toChatCompletionsContent(msg Message) []map[string]interface{} {
for _, part := range msg.ContentParts { for _, part := range msg.ContentParts {
switch strings.ToLower(strings.TrimSpace(part.Type)) { switch strings.ToLower(strings.TrimSpace(part.Type)) {
case "input_text": case "input_text":
if strings.TrimSpace(part.Text) == "" { if part.Text == "" {
continue continue
} }
content = append(content, map[string]interface{}{ content = append(content, map[string]interface{}{
@@ -215,7 +215,7 @@ func toChatCompletionsContent(msg Message) []map[string]interface{} {
"text": part.Text, "text": part.Text,
}) })
case "input_image": case "input_image":
if strings.TrimSpace(part.ImageURL) == "" { if part.ImageURL == "" {
continue continue
} }
content = append(content, map[string]interface{}{ content = append(content, map[string]interface{}{
@@ -225,11 +225,11 @@ func toChatCompletionsContent(msg Message) []map[string]interface{} {
}, },
}) })
case "input_file": case "input_file":
fileLabel := strings.TrimSpace(part.Filename) fileLabel := part.Filename
if fileLabel == "" { if fileLabel == "" {
fileLabel = "attached file" fileLabel = "attached file"
} }
mimeType := strings.TrimSpace(part.MIMEType) mimeType := part.MIMEType
if mimeType == "" { if mimeType == "" {
mimeType = "application/octet-stream" mimeType = "application/octet-stream"
} }
@@ -260,21 +260,21 @@ func toResponsesInputItemsWithState(msg Message, pendingCalls map[string]struct{
return []map[string]interface{}{responsesMessageItem(role, msg.Content, "input_text")} return []map[string]interface{}{responsesMessageItem(role, msg.Content, "input_text")}
case "assistant": case "assistant":
items := make([]map[string]interface{}, 0, 1+len(msg.ToolCalls)) items := make([]map[string]interface{}, 0, 1+len(msg.ToolCalls))
if strings.TrimSpace(msg.Content) != "" || len(msg.ToolCalls) == 0 { if msg.Content != "" || len(msg.ToolCalls) == 0 {
items = append(items, responsesMessageItem(role, msg.Content, "output_text")) items = append(items, responsesMessageItem(role, msg.Content, "output_text"))
} }
for _, tc := range msg.ToolCalls { for _, tc := range msg.ToolCalls {
callID := strings.TrimSpace(tc.ID) callID := tc.ID
if callID == "" { if callID == "" {
continue continue
} }
name := strings.TrimSpace(tc.Name) name := tc.Name
argsRaw := "" argsRaw := ""
if tc.Function != nil { if tc.Function != nil {
if strings.TrimSpace(tc.Function.Name) != "" { if tc.Function.Name != "" {
name = strings.TrimSpace(tc.Function.Name) name = tc.Function.Name
} }
argsRaw = strings.TrimSpace(tc.Function.Arguments) argsRaw = tc.Function.Arguments
} }
if name == "" { if name == "" {
continue continue
@@ -302,7 +302,7 @@ func toResponsesInputItemsWithState(msg Message, pendingCalls map[string]struct{
} }
return items return items
case "tool": case "tool":
callID := strings.TrimSpace(msg.ToolCallID) callID := msg.ToolCallID
if callID == "" { if callID == "" {
return nil return nil
} }
@@ -328,7 +328,7 @@ func responsesMessageContent(msg Message) []map[string]interface{} {
for _, part := range msg.ContentParts { for _, part := range msg.ContentParts {
switch strings.ToLower(strings.TrimSpace(part.Type)) { switch strings.ToLower(strings.TrimSpace(part.Type)) {
case "input_text": case "input_text":
if strings.TrimSpace(part.Text) == "" { if part.Text == "" {
continue continue
} }
content = append(content, map[string]interface{}{ content = append(content, map[string]interface{}{
@@ -336,7 +336,7 @@ func responsesMessageContent(msg Message) []map[string]interface{} {
"text": part.Text, "text": part.Text,
}) })
case "input_image": case "input_image":
if strings.TrimSpace(part.ImageURL) == "" { if part.ImageURL == "" {
continue continue
} }
content = append(content, map[string]interface{}{ content = append(content, map[string]interface{}{
@@ -344,14 +344,14 @@ func responsesMessageContent(msg Message) []map[string]interface{} {
"image_url": part.ImageURL, "image_url": part.ImageURL,
}) })
case "input_file": case "input_file":
if strings.TrimSpace(part.FileData) == "" { if part.FileData == "" {
continue continue
} }
entry := map[string]interface{}{ entry := map[string]interface{}{
"type": "input_file", "type": "input_file",
"file_data": part.FileData, "file_data": part.FileData,
} }
if strings.TrimSpace(part.Filename) != "" { if part.Filename != "" {
entry["filename"] = part.Filename entry["filename"] = part.Filename
} }
content = append(content, entry) content = append(content, entry)
@@ -361,7 +361,7 @@ func responsesMessageContent(msg Message) []map[string]interface{} {
} }
func responsesMessageItem(role, text, contentType string) map[string]interface{} { func responsesMessageItem(role, text, contentType string) map[string]interface{} {
ct := strings.TrimSpace(contentType) ct := contentType
if ct == "" { if ct == "" {
ct = "input_text" ct = "input_text"
} }