oadmin/sub2api
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(lint): remove embedded response selectors in openai images

Browse Source
This commit is contained in:
IanShaw027
2026-04-22 17:51:45 +08:00
parent 0bc3a521b5
commit 66b3acc274
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
backend/internal/service/openai_images.go
View File

@@ -1157,9 +1157,9 @@ func uploadOpenAIImageFiles(ctx context.Context, client *req.Client, headers htt
if err != nil { if err != nil {
return nil, err return nil, err
} }
if putResp.Response != nil && putResp.Response.Body != nil { if putResp.Response != nil && putResp.Body != nil {
_, _ = io.Copy(io.Discard, putResp.Response.Body) _, _ = io.Copy(io.Discard, putResp.Body)
_ = putResp.Response.Body.Close() _ = putResp.Body.Close()
} }
if putResp.StatusCode < 200 || putResp.StatusCode >= 300 { if putResp.StatusCode < 200 || putResp.StatusCode >= 300 {
return nil, newOpenAIImageStatusError(putResp, "upload image bytes failed") return nil, newOpenAIImageStatusError(putResp, "upload image bytes failed")
@@ -1294,10 +1294,10 @@ type openAIImageToolMessage struct {
} }
func readOpenAIImageConversationStream(resp *req.Response, startTime time.Time) (string, []openAIImagePointerInfo, OpenAIUsage, *int, error) { func readOpenAIImageConversationStream(resp *req.Response, startTime time.Time) (string, []openAIImagePointerInfo, OpenAIUsage, *int, error) {
if resp == nil || resp.Response == nil || resp.Response.Body == nil { if resp == nil || resp.Response == nil || resp.Body == nil {
return "", nil, OpenAIUsage{}, nil, fmt.Errorf("empty conversation response") return "", nil, OpenAIUsage{}, nil, fmt.Errorf("empty conversation response")
} }
reader := bufio.NewReader(resp.Response.Body) reader := bufio.NewReader(resp.Body)
var ( var (
conversationID string conversationID string
firstTokenMs *int firstTokenMs *int
@@ -1529,8 +1529,8 @@ func pollOpenAIImageConversation(ctx context.Context, client *req.Client, header
lastErr = err lastErr = err
} else { } else {
if resp.StatusCode >= 200 && resp.StatusCode < 300 { if resp.StatusCode >= 200 && resp.StatusCode < 300 {
body, readErr := io.ReadAll(resp.Response.Body) body, readErr := io.ReadAll(resp.Body)
_ = resp.Response.Body.Close() _ = resp.Body.Close()
if readErr != nil { if readErr != nil {
lastErr = readErr lastErr = readErr
goto waitNextPoll goto waitNextPoll
@@ -1750,14 +1750,14 @@ func newOpenAIImageStatusError(resp *req.Response, fallback string) error {
body := []byte(nil) body := []byte(nil)
if resp.Response != nil { if resp.Response != nil {
headers = resp.Response.Header.Clone() headers = resp.Header.Clone()
requestID = strings.TrimSpace(resp.Response.Header.Get("x-request-id")) requestID = strings.TrimSpace(resp.Header.Get("x-request-id"))
if resp.Response.Request != nil && resp.Response.Request.URL != nil { if resp.Response.Request != nil && resp.Response.Request.URL != nil {
requestURL = resp.Response.Request.URL.String() requestURL = resp.Response.Request.URL.String()
} }
if resp.Response.Body != nil { if resp.Body != nil {
body, _ = io.ReadAll(io.LimitReader(resp.Response.Body, 2<<20)) body, _ = io.ReadAll(io.LimitReader(resp.Body, 2<<20))
_ = resp.Response.Body.Close() _ = resp.Body.Close()
} }
} }