VaalaCat/go-openai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make linter happy (#661)

Browse Source
This commit is contained in:
Alexander Baranov
2024-02-15 16:02:48 +04:00
committed by GitHub
parent a7954c854c
commit 11ad4b69d0
7 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
embeddings_test.go
View File

@@ -169,7 +169,7 @@ func TestAzureEmbeddingEndpoint(t *testing.T) {
server.RegisterHandler( server.RegisterHandler(
"/openai/deployments/text-embedding-ada-002/embeddings", "/openai/deployments/text-embedding-ada-002/embeddings",
func(w http.ResponseWriter, r *http.Request) { func(w http.ResponseWriter, _ *http.Request) {
resBytes, _ := json.Marshal(openai.EmbeddingResponse{Data: sampleEmbeddings}) resBytes, _ := json.Marshal(openai.EmbeddingResponse{Data: sampleEmbeddings})
fmt.Fprintln(w, string(resBytes)) fmt.Fprintln(w, string(resBytes))
}, },

10
files_api_test.go
View File

@@ -86,7 +86,7 @@ func handleCreateFile(w http.ResponseWriter, r *http.Request) {
func TestDeleteFile(t *testing.T) { func TestDeleteFile(t *testing.T) {
client, server, teardown := setupOpenAITestServer() client, server, teardown := setupOpenAITestServer()
defer teardown() defer teardown()
server.RegisterHandler("/v1/files/deadbeef", func(w http.ResponseWriter, r *http.Request) {}) server.RegisterHandler("/v1/files/deadbeef", func(http.ResponseWriter, *http.Request) {})
err := client.DeleteFile(context.Background(), "deadbeef") err := client.DeleteFile(context.Background(), "deadbeef")
checks.NoError(t, err, "DeleteFile error") checks.NoError(t, err, "DeleteFile error")
} }
@@ -94,7 +94,7 @@ func TestDeleteFile(t *testing.T) {
func TestListFile(t *testing.T) { func TestListFile(t *testing.T) {
client, server, teardown := setupOpenAITestServer() client, server, teardown := setupOpenAITestServer()
defer teardown() defer teardown()
server.RegisterHandler("/v1/files", func(w http.ResponseWriter, r *http.Request) { server.RegisterHandler("/v1/files", func(w http.ResponseWriter, _ *http.Request) {
resBytes, _ := json.Marshal(openai.FilesList{}) resBytes, _ := json.Marshal(openai.FilesList{})
fmt.Fprintln(w, string(resBytes)) fmt.Fprintln(w, string(resBytes))
}) })
@@ -105,7 +105,7 @@ func TestListFile(t *testing.T) {
func TestGetFile(t *testing.T) { func TestGetFile(t *testing.T) {
client, server, teardown := setupOpenAITestServer() client, server, teardown := setupOpenAITestServer()
defer teardown() defer teardown()
server.RegisterHandler("/v1/files/deadbeef", func(w http.ResponseWriter, r *http.Request) { server.RegisterHandler("/v1/files/deadbeef", func(w http.ResponseWriter, _ *http.Request) {
resBytes, _ := json.Marshal(openai.File{}) resBytes, _ := json.Marshal(openai.File{})
fmt.Fprintln(w, string(resBytes)) fmt.Fprintln(w, string(resBytes))
}) })
@@ -151,7 +151,7 @@ func TestGetFileContentReturnError(t *testing.T) {
}` }`
client, server, teardown := setupOpenAITestServer() client, server, teardown := setupOpenAITestServer()
defer teardown() defer teardown()
server.RegisterHandler("/v1/files/deadbeef/content", func(w http.ResponseWriter, r *http.Request) { server.RegisterHandler("/v1/files/deadbeef/content", func(w http.ResponseWriter, _ *http.Request) {
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
fmt.Fprint(w, wantErrorResp) fmt.Fprint(w, wantErrorResp)
}) })
@@ -178,7 +178,7 @@ func TestGetFileContentReturnError(t *testing.T) {
func TestGetFileContentReturnTimeoutError(t *testing.T) { func TestGetFileContentReturnTimeoutError(t *testing.T) {
client, server, teardown := setupOpenAITestServer() client, server, teardown := setupOpenAITestServer()
defer teardown() defer teardown()
server.RegisterHandler("/v1/files/deadbeef/content", func(w http.ResponseWriter, r *http.Request) { server.RegisterHandler("/v1/files/deadbeef/content", func(http.ResponseWriter, *http.Request) {
time.Sleep(10 * time.Nanosecond) time.Sleep(10 * time.Nanosecond)
}) })
ctx := context.Background() ctx := context.Background()

10
image_test.go
View File

@@ -60,7 +60,7 @@ func TestImageFormBuilderFailures(t *testing.T) {
_, err := client.CreateEditImage(ctx, req) _, err := client.CreateEditImage(ctx, req)
checks.ErrorIs(t, err, mockFailedErr, "CreateImage should return error if form builder fails") checks.ErrorIs(t, err, mockFailedErr, "CreateImage should return error if form builder fails")
mockBuilder.mockCreateFormFile = func(name string, file *os.File) error { mockBuilder.mockCreateFormFile = func(name string, _ *os.File) error {
if name == "mask" { if name == "mask" {
return mockFailedErr return mockFailedErr
} }
@@ -69,12 +69,12 @@ func TestImageFormBuilderFailures(t *testing.T) {
_, err = client.CreateEditImage(ctx, req) _, err = client.CreateEditImage(ctx, req)
checks.ErrorIs(t, err, mockFailedErr, "CreateImage should return error if form builder fails") checks.ErrorIs(t, err, mockFailedErr, "CreateImage should return error if form builder fails")
mockBuilder.mockCreateFormFile = func(name string, file *os.File) error { mockBuilder.mockCreateFormFile = func(string, *os.File) error {
return nil return nil
} }
var failForField string var failForField string
mockBuilder.mockWriteField = func(fieldname, value string) error { mockBuilder.mockWriteField = func(fieldname, _ string) error {
if fieldname == failForField { if fieldname == failForField {
return mockFailedErr return mockFailedErr
} }
@@ -125,12 +125,12 @@ func TestVariImageFormBuilderFailures(t *testing.T) {
_, err := client.CreateVariImage(ctx, req) _, err := client.CreateVariImage(ctx, req)
checks.ErrorIs(t, err, mockFailedErr, "CreateVariImage should return error if form builder fails") checks.ErrorIs(t, err, mockFailedErr, "CreateVariImage should return error if form builder fails")
mockBuilder.mockCreateFormFile = func(name string, file *os.File) error { mockBuilder.mockCreateFormFile = func(string, *os.File) error {
return nil return nil
} }
var failForField string var failForField string
mockBuilder.mockWriteField = func(fieldname, value string) error { mockBuilder.mockWriteField = func(fieldname, _ string) error {
if fieldname == failForField { if fieldname == failForField {
return mockFailedErr return mockFailedErr
} }

4
messages.go
View File

@@ -18,7 +18,7 @@ type Message struct {
ThreadID string `json:"thread_id"` ThreadID string `json:"thread_id"`
Role string `json:"role"` Role string `json:"role"`
Content []MessageContent `json:"content"` Content []MessageContent `json:"content"`
FileIds []string `json:"file_ids"` FileIds []string `json:"file_ids"` //nolint:revive //backwards-compatibility
AssistantID *string `json:"assistant_id,omitempty"` AssistantID *string `json:"assistant_id,omitempty"`
RunID *string `json:"run_id,omitempty"` RunID *string `json:"run_id,omitempty"`
Metadata map[string]any `json:"metadata"` Metadata map[string]any `json:"metadata"`
@@ -54,7 +54,7 @@ type ImageFile struct {
type MessageRequest struct { type MessageRequest struct {
Role string `json:"role"` Role string `json:"role"`
Content string `json:"content"` Content string `json:"content"`
FileIds []string `json:"file_ids,omitempty"` FileIds []string `json:"file_ids,omitempty"` //nolint:revive // backwards-compatibility
Metadata map[string]any `json:"metadata,omitempty"` Metadata map[string]any `json:"metadata,omitempty"`
} }

2
models_test.go
View File

@@ -64,7 +64,7 @@ func handleGetModelEndpoint(w http.ResponseWriter, _ *http.Request) {
func TestGetModelReturnTimeoutError(t *testing.T) { func TestGetModelReturnTimeoutError(t *testing.T) {
client, server, teardown := setupOpenAITestServer() client, server, teardown := setupOpenAITestServer()
defer teardown() defer teardown()
server.RegisterHandler("/v1/models/text-davinci-003", func(w http.ResponseWriter, r *http.Request) { server.RegisterHandler("/v1/models/text-davinci-003", func(http.ResponseWriter, *http.Request) {
time.Sleep(10 * time.Nanosecond) time.Sleep(10 * time.Nanosecond)
}) })
ctx := context.Background() ctx := context.Background()

2
run.go
View File

@@ -24,7 +24,7 @@ type Run struct {
Model string `json:"model"` Model string `json:"model"`
Instructions string `json:"instructions,omitempty"` Instructions string `json:"instructions,omitempty"`
Tools []Tool `json:"tools"` Tools []Tool `json:"tools"`
FileIDS []string `json:"file_ids"` FileIDS []string `json:"file_ids"` //nolint:revive // backwards-compatibility
Metadata map[string]any `json:"metadata"` Metadata map[string]any `json:"metadata"`
Usage Usage `json:"usage,omitempty"` Usage Usage `json:"usage,omitempty"`

14
stream_test.go
View File

@@ -34,7 +34,7 @@ func TestCompletionsStreamWrongModel(t *testing.T) {
func TestCreateCompletionStream(t *testing.T) { func TestCreateCompletionStream(t *testing.T) {
client, server, teardown := setupOpenAITestServer() client, server, teardown := setupOpenAITestServer()
defer teardown() defer teardown()
server.RegisterHandler("/v1/completions", func(w http.ResponseWriter, r *http.Request) { server.RegisterHandler("/v1/completions", func(w http.ResponseWriter, _ *http.Request) {
w.Header().Set("Content-Type", "text/event-stream") w.Header().Set("Content-Type", "text/event-stream")
// Send test responses // Send test responses
@@ -106,7 +106,7 @@ func TestCreateCompletionStream(t *testing.T) {
func TestCreateCompletionStreamError(t *testing.T) { func TestCreateCompletionStreamError(t *testing.T) {
client, server, teardown := setupOpenAITestServer() client, server, teardown := setupOpenAITestServer()
defer teardown() defer teardown()
server.RegisterHandler("/v1/completions", func(w http.ResponseWriter, r *http.Request) { server.RegisterHandler("/v1/completions", func(w http.ResponseWriter, _ *http.Request) {
w.Header().Set("Content-Type", "text/event-stream") w.Header().Set("Content-Type", "text/event-stream")
// Send test responses // Send test responses
@@ -151,7 +151,7 @@ func TestCreateCompletionStreamError(t *testing.T) {
func TestCreateCompletionStreamRateLimitError(t *testing.T) { func TestCreateCompletionStreamRateLimitError(t *testing.T) {
client, server, teardown := setupOpenAITestServer() client, server, teardown := setupOpenAITestServer()
defer teardown() defer teardown()
server.RegisterHandler("/v1/completions", func(w http.ResponseWriter, r *http.Request) { server.RegisterHandler("/v1/completions", func(w http.ResponseWriter, _ *http.Request) {
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
w.WriteHeader(429) w.WriteHeader(429)
@@ -182,7 +182,7 @@ func TestCreateCompletionStreamRateLimitError(t *testing.T) {
func TestCreateCompletionStreamTooManyEmptyStreamMessagesError(t *testing.T) { func TestCreateCompletionStreamTooManyEmptyStreamMessagesError(t *testing.T) {
client, server, teardown := setupOpenAITestServer() client, server, teardown := setupOpenAITestServer()
defer teardown() defer teardown()
server.RegisterHandler("/v1/completions", func(w http.ResponseWriter, r *http.Request) { server.RegisterHandler("/v1/completions", func(w http.ResponseWriter, _ *http.Request) {
w.Header().Set("Content-Type", "text/event-stream") w.Header().Set("Content-Type", "text/event-stream")
// Send test responses // Send test responses
@@ -228,7 +228,7 @@ func TestCreateCompletionStreamTooManyEmptyStreamMessagesError(t *testing.T) {
func TestCreateCompletionStreamUnexpectedTerminatedError(t *testing.T) { func TestCreateCompletionStreamUnexpectedTerminatedError(t *testing.T) {
client, server, teardown := setupOpenAITestServer() client, server, teardown := setupOpenAITestServer()
defer teardown() defer teardown()
server.RegisterHandler("/v1/completions", func(w http.ResponseWriter, r *http.Request) { server.RegisterHandler("/v1/completions", func(w http.ResponseWriter, _ *http.Request) {
w.Header().Set("Content-Type", "text/event-stream") w.Header().Set("Content-Type", "text/event-stream")
// Send test responses // Send test responses
@@ -263,7 +263,7 @@ func TestCreateCompletionStreamUnexpectedTerminatedError(t *testing.T) {
func TestCreateCompletionStreamBrokenJSONError(t *testing.T) { func TestCreateCompletionStreamBrokenJSONError(t *testing.T) {
client, server, teardown := setupOpenAITestServer() client, server, teardown := setupOpenAITestServer()
defer teardown() defer teardown()
server.RegisterHandler("/v1/completions", func(w http.ResponseWriter, r *http.Request) { server.RegisterHandler("/v1/completions", func(w http.ResponseWriter, _ *http.Request) {
w.Header().Set("Content-Type", "text/event-stream") w.Header().Set("Content-Type", "text/event-stream")
// Send test responses // Send test responses
@@ -305,7 +305,7 @@ func TestCreateCompletionStreamBrokenJSONError(t *testing.T) {
func TestCreateCompletionStreamReturnTimeoutError(t *testing.T) { func TestCreateCompletionStreamReturnTimeoutError(t *testing.T) {
client, server, teardown := setupOpenAITestServer() client, server, teardown := setupOpenAITestServer()
defer teardown() defer teardown()
server.RegisterHandler("/v1/completions", func(w http.ResponseWriter, r *http.Request) { server.RegisterHandler("/v1/completions", func(http.ResponseWriter, *http.Request) {
time.Sleep(10 * time.Nanosecond) time.Sleep(10 * time.Nanosecond)
}) })
ctx := context.Background() ctx := context.Background()