chuan/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-02-03 04:50:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(image): avoid using json.Marshal

Browse Source
This commit is contained in:
TinyCoder
2025-12-25 14:21:01 +07:00
parent 671558a822
commit a7fc2ee4cf
3 changed files with 16 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/translator/antigravity/openai/chat-completions/antigravity_openai_response.go
View File

@@ -8,7 +8,6 @@ package chat_completions
import ( import (
"bytes" "bytes"
"context" "context"
"encoding/json"
"fmt" "fmt"
"strings" "strings"
"sync/atomic" "sync/atomic"
@@ -187,18 +186,11 @@ func ConvertAntigravityResponseToOpenAI(_ context.Context, _ string, originalReq
template, _ = sjson.SetRaw(template, "choices.0.delta.images", `[]`) template, _ = sjson.SetRaw(template, "choices.0.delta.images", `[]`)
} }
imageIndex := len(gjson.Get(template, "choices.0.delta.images").Array()) imageIndex := len(gjson.Get(template, "choices.0.delta.images").Array())
imagePayload, err := json.Marshal(map[string]any{ imagePayload := `{"type":"image_url","image_url":{"url":""}}`
"index": imageIndex, imagePayload, _ = sjson.Set(imagePayload, "index", imageIndex)
"type": "image_url", imagePayload, _ = sjson.Set(imagePayload, "image_url.url", imageURL)
"image_url": map[string]string{
"url": imageURL,
},
})
if err != nil {
continue
}
template, _ = sjson.Set(template, "choices.0.delta.role", "assistant") template, _ = sjson.Set(template, "choices.0.delta.role", "assistant")
template, _ = sjson.SetRaw(template, "choices.0.delta.images.-1", string(imagePayload)) template, _ = sjson.SetRaw(template, "choices.0.delta.images.-1", imagePayload)
} }
} }
} }

16
internal/translator/gemini-cli/openai/chat-completions/gemini-cli_openai_response.go
View File

@@ -8,7 +8,6 @@ package chat_completions
import ( import (
"bytes" "bytes"
"context" "context"
"encoding/json"
"fmt" "fmt"
"strings" "strings"
"sync/atomic" "sync/atomic"
@@ -176,18 +175,11 @@ func ConvertCliResponseToOpenAI(_ context.Context, _ string, originalRequestRawJ
template, _ = sjson.SetRaw(template, "choices.0.delta.images", `[]`) template, _ = sjson.SetRaw(template, "choices.0.delta.images", `[]`)
} }
imageIndex := len(gjson.Get(template, "choices.0.delta.images").Array()) imageIndex := len(gjson.Get(template, "choices.0.delta.images").Array())
imagePayload, err := json.Marshal(map[string]any{ imagePayload := `{"type":"image_url","image_url":{"url":""}}`
"index": imageIndex, imagePayload, _ = sjson.Set(imagePayload, "index", imageIndex)
"type": "image_url", imagePayload, _ = sjson.Set(imagePayload, "image_url.url", imageURL)
"image_url": map[string]string{
"url": imageURL,
},
})
if err != nil {
continue
}
template, _ = sjson.Set(template, "choices.0.delta.role", "assistant") template, _ = sjson.Set(template, "choices.0.delta.role", "assistant")
template, _ = sjson.SetRaw(template, "choices.0.delta.images.-1", string(imagePayload)) template, _ = sjson.SetRaw(template, "choices.0.delta.images.-1", imagePayload)
} }
} }
} }

31
internal/translator/gemini/openai/chat-completions/gemini_openai_response.go
View File

@@ -8,7 +8,6 @@ package chat_completions
import ( import (
"bytes" "bytes"
"context" "context"
"encoding/json"
"fmt" "fmt"
"strings" "strings"
"sync/atomic" "sync/atomic"
@@ -188,18 +187,11 @@ func ConvertGeminiResponseToOpenAI(_ context.Context, _ string, originalRequestR
template, _ = sjson.SetRaw(template, "choices.0.delta.images", `[]`) template, _ = sjson.SetRaw(template, "choices.0.delta.images", `[]`)
} }
imageIndex := len(gjson.Get(template, "choices.0.delta.images").Array()) imageIndex := len(gjson.Get(template, "choices.0.delta.images").Array())
imagePayload, err := json.Marshal(map[string]any{ imagePayload := `{"type":"image_url","image_url":{"url":""}}`
"index": imageIndex, imagePayload, _ = sjson.Set(imagePayload, "index", imageIndex)
"type": "image_url", imagePayload, _ = sjson.Set(imagePayload, "image_url.url", imageURL)
"image_url": map[string]string{
"url": imageURL,
},
})
if err != nil {
continue
}
template, _ = sjson.Set(template, "choices.0.delta.role", "assistant") template, _ = sjson.Set(template, "choices.0.delta.role", "assistant")
template, _ = sjson.SetRaw(template, "choices.0.delta.images.-1", string(imagePayload)) template, _ = sjson.SetRaw(template, "choices.0.delta.images.-1", imagePayload)
} }
} }
} }
@@ -331,18 +323,11 @@ func ConvertGeminiResponseToOpenAINonStream(_ context.Context, _ string, origina
template, _ = sjson.SetRaw(template, "choices.0.message.images", `[]`) template, _ = sjson.SetRaw(template, "choices.0.message.images", `[]`)
} }
imageIndex := len(gjson.Get(template, "choices.0.message.images").Array()) imageIndex := len(gjson.Get(template, "choices.0.message.images").Array())
imagePayload, err := json.Marshal(map[string]any{ imagePayload := `{"type":"image_url","image_url":{"url":""}}`
"index": imageIndex, imagePayload, _ = sjson.Set(imagePayload, "index", imageIndex)
"type": "image_url", imagePayload, _ = sjson.Set(imagePayload, "image_url.url", imageURL)
"image_url": map[string]string{
"url": imageURL,
},
})
if err != nil {
continue
}
template, _ = sjson.Set(template, "choices.0.message.role", "assistant") template, _ = sjson.Set(template, "choices.0.message.role", "assistant")
template, _ = sjson.SetRaw(template, "choices.0.message.images.-1", string(imagePayload)) template, _ = sjson.SetRaw(template, "choices.0.message.images.-1", imagePayload)
} }
} }
} }