From d53a2ea7d256a08ba96c90807dd4ed9e3172abe2 Mon Sep 17 00:00:00 2001 From: CJACK Date: Mon, 13 Apr 2026 01:59:51 +0800 Subject: [PATCH] refactor: remove unused purpose parameter from upload and upstream empty output handlers --- internal/adapter/openai/handler_chat.go | 2 +- internal/adapter/openai/responses_handler.go | 2 +- internal/adapter/openai/upstream_empty.go | 2 +- internal/deepseek/client_upload.go | 4 ++-- internal/deepseek/client_upload_test.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/adapter/openai/handler_chat.go b/internal/adapter/openai/handler_chat.go index 22f882a..9b242bb 100644 --- a/internal/adapter/openai/handler_chat.go +++ b/internal/adapter/openai/handler_chat.go @@ -131,7 +131,7 @@ func (h *Handler) handleNonStream(w http.ResponseWriter, ctx context.Context, re stripReferenceMarkers := h.compatStripReferenceMarkers() finalThinking := cleanVisibleOutput(result.Thinking, stripReferenceMarkers) finalText := cleanVisibleOutput(result.Text, stripReferenceMarkers) - if writeUpstreamEmptyOutputError(w, finalThinking, finalText, result.ContentFilter) { + if writeUpstreamEmptyOutputError(w, finalText, result.ContentFilter) { return } respBody := openaifmt.BuildChatCompletion(completionID, model, finalPrompt, finalThinking, finalText, toolNames) diff --git a/internal/adapter/openai/responses_handler.go b/internal/adapter/openai/responses_handler.go index c154a2c..f77f725 100644 --- a/internal/adapter/openai/responses_handler.go +++ b/internal/adapter/openai/responses_handler.go @@ -121,7 +121,7 @@ func (h *Handler) handleResponsesNonStream(w http.ResponseWriter, resp *http.Res stripReferenceMarkers := h.compatStripReferenceMarkers() sanitizedThinking := cleanVisibleOutput(result.Thinking, stripReferenceMarkers) sanitizedText := cleanVisibleOutput(result.Text, stripReferenceMarkers) - if writeUpstreamEmptyOutputError(w, sanitizedThinking, sanitizedText, result.ContentFilter) { + if writeUpstreamEmptyOutputError(w, sanitizedText, result.ContentFilter) { return } textParsed := toolcall.ParseStandaloneToolCallsDetailed(sanitizedText, toolNames) diff --git a/internal/adapter/openai/upstream_empty.go b/internal/adapter/openai/upstream_empty.go index 7cabc3e..9c21adc 100644 --- a/internal/adapter/openai/upstream_empty.go +++ b/internal/adapter/openai/upstream_empty.go @@ -2,7 +2,7 @@ package openai import "net/http" -func writeUpstreamEmptyOutputError(w http.ResponseWriter, thinking, text string, contentFilter bool) bool { +func writeUpstreamEmptyOutputError(w http.ResponseWriter, text string, contentFilter bool) bool { if text != "" { return false } diff --git a/internal/deepseek/client_upload.go b/internal/deepseek/client_upload.go index 0673712..16272e5 100644 --- a/internal/deepseek/client_upload.go +++ b/internal/deepseek/client_upload.go @@ -51,7 +51,7 @@ func (c *Client) UploadFile(ctx context.Context, a *auth.RequestAuth, req Upload contentType = "application/octet-stream" } purpose := strings.TrimSpace(req.Purpose) - body, contentTypeHeader, err := buildUploadMultipartBody(filename, contentType, purpose, req.Data) + body, contentTypeHeader, err := buildUploadMultipartBody(filename, contentType, req.Data) if err != nil { return nil, err } @@ -142,7 +142,7 @@ func (c *Client) UploadFile(ctx context.Context, a *auth.RequestAuth, req Upload return nil, errors.New("upload file failed") } -func buildUploadMultipartBody(filename, contentType, purpose string, data []byte) ([]byte, string, error) { +func buildUploadMultipartBody(filename, contentType string, data []byte) ([]byte, string, error) { var buf bytes.Buffer writer := multipart.NewWriter(&buf) partHeader := textproto.MIMEHeader{} diff --git a/internal/deepseek/client_upload_test.go b/internal/deepseek/client_upload_test.go index d505b4f..6532f8d 100644 --- a/internal/deepseek/client_upload_test.go +++ b/internal/deepseek/client_upload_test.go @@ -15,7 +15,7 @@ import ( ) func TestBuildUploadMultipartBodyOmitsPurposeAndIncludesFilePart(t *testing.T) { - body, contentType, err := buildUploadMultipartBody(`../demo.txt`, "text/plain", "assistants", []byte("hello")) + body, contentType, err := buildUploadMultipartBody(`../demo.txt`, "text/plain", []byte("hello")) if err != nil { t.Fatalf("buildUploadMultipartBody error: %v", err) }