From 9cad10c4fa334940c2a5e2b0ca2af23768398cd1 Mon Sep 17 00:00:00 2001 From: Roman Glushko Date: Sun, 17 Mar 2024 20:08:37 +0200 Subject: [PATCH] #170: Refactored the error tests --- pkg/providers/azureopenai/client_test.go | 22 ++++++++++------------ pkg/providers/octoml/client_test.go | 22 ++++++++++------------ 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/pkg/providers/azureopenai/client_test.go b/pkg/providers/azureopenai/client_test.go index 8f5de037..be98c316 100644 --- a/pkg/providers/azureopenai/client_test.go +++ b/pkg/providers/azureopenai/client_test.go @@ -106,21 +106,19 @@ func TestDoChatRequest_ErrorResponse(t *testing.T) { defer mockServer.Close() - // Create a new client with the mock server URL - client := &Client{ - httpClient: http.DefaultClient, - chatURL: mockServer.URL, - config: &Config{APIKey: "dummy_key"}, - telemetry: telemetry.NewTelemetryMock(), - } + ctx := context.Background() + providerCfg := DefaultConfig() + clientCfg := clients.DefaultClientConfig() + + providerCfg.BaseURL = mockServer.URL + + client, err := NewClient(providerCfg, clientCfg, telemetry.NewTelemetryMock()) + require.NoError(t, err) // Create a chat request payload - payload := &ChatRequest{ - Messages: []ChatMessage{{Role: "human", Content: "Hello"}}, - } + payload := schemas.NewChatFromStr("What's the dealio?") - // Call the doChatRequest function - _, err := client.doChatRequest(context.Background(), payload) + _, err = client.Chat(ctx, payload) require.Error(t, err) require.Contains(t, err.Error(), "provider is not available") diff --git a/pkg/providers/octoml/client_test.go b/pkg/providers/octoml/client_test.go index 20c336c7..b6f41b95 100644 --- a/pkg/providers/octoml/client_test.go +++ b/pkg/providers/octoml/client_test.go @@ -112,21 +112,19 @@ func TestDoChatRequest_ErrorResponse(t *testing.T) { defer mockServer.Close() // Create a new client with the mock server URL - client := &Client{ - httpClient: http.DefaultClient, - chatURL: mockServer.URL, - config: &Config{APIKey: "dummy_key"}, - telemetry: telemetry.NewTelemetryMock(), - } + ctx := context.Background() + providerCfg := DefaultConfig() + clientCfg := clients.DefaultClientConfig() + + providerCfg.BaseURL = mockServer.URL + + client, err := NewClient(providerCfg, clientCfg, telemetry.NewTelemetryMock()) + require.NoError(t, err) // Create a chat request payload - payload := &ChatRequest{ - Model: "dummy_model", - Messages: []ChatMessage{{Role: "human", Content: "Hello"}}, - } + payload := schemas.NewChatFromStr("What's the dealio?") - // Call the doChatRequest function - _, err := client.doChatRequest(context.Background(), payload) + _, err = client.Chat(ctx, payload) require.Error(t, err) require.Contains(t, err.Error(), "provider is not available")