Always override the http client

Signed-off-by: David Gageot <david.gageot@docker.com>

Author: dgageot

pkg/httpclient/client.go

@@ -0,0 +1,7 @@
+package httpclient
+
+import "net/http"
+
+func NewHttpClient() *http.Client {
+	return &http.Client{}
+}

pkg/model/provider/anthropic/client.go

@@ -14,6 +14,7 @@ import (
 	"github.com/docker/cagent/pkg/chat"
 	latest "github.com/docker/cagent/pkg/config/v2"
 	"github.com/docker/cagent/pkg/environment"
+	"github.com/docker/cagent/pkg/httpclient"
 	"github.com/docker/cagent/pkg/model/provider/base"
 	"github.com/docker/cagent/pkg/model/provider/options"
 	"github.com/docker/cagent/pkg/tools"
@@ -81,6 +82,7 @@ func NewClient(ctx context.Context, cfg *latest.ModelConfig, env environment.Pro
 		slog.Debug("Anthropic API key found, creating client")
 		requestOptions := []option.RequestOption{
 			option.WithAPIKey(authToken),
+			option.WithHTTPClient(httpclient.NewHttpClient()),
 		}
 		if cfg.BaseURL != "" {
 			requestOptions = append(requestOptions, option.WithBaseURL(cfg.BaseURL))
@@ -108,6 +110,7 @@ func NewClient(ctx context.Context, cfg *latest.ModelConfig, env environment.Pro
 				option.WithAuthToken(authToken),
 				option.WithAPIKey(authToken),
 				option.WithBaseURL(gateway),
+				option.WithHTTPClient(httpclient.NewHttpClient()),
 			), nil
 		}
 	}

pkg/model/provider/gemini/client.go

@@ -14,6 +14,7 @@ import (
 	"github.com/docker/cagent/pkg/chat"
 	latest "github.com/docker/cagent/pkg/config/v2"
 	"github.com/docker/cagent/pkg/environment"
+	"github.com/docker/cagent/pkg/httpclient"
 	"github.com/docker/cagent/pkg/model/provider/base"
 	"github.com/docker/cagent/pkg/model/provider/options"
 	"github.com/docker/cagent/pkg/tools"
@@ -49,8 +50,9 @@ func NewClient(ctx context.Context, cfg *latest.ModelConfig, env environment.Pro
 		}
 
 		client, err := genai.NewClient(ctx, &genai.ClientConfig{
-			APIKey:  apiKey,
-			Backend: genai.BackendGeminiAPI,
+			APIKey:     apiKey,
+			Backend:    genai.BackendGeminiAPI,
+			HTTPClient: httpclient.NewHttpClient(),
 		})
 		if err != nil {
 			return nil, err
@@ -75,8 +77,9 @@ func NewClient(ctx context.Context, cfg *latest.ModelConfig, env environment.Pro
 			}
 
 			return genai.NewClient(ctx, &genai.ClientConfig{
-				APIKey:  authToken,
-				Backend: genai.BackendGeminiAPI,
+				APIKey:     authToken,
+				Backend:    genai.BackendGeminiAPI,
+				HTTPClient: httpclient.NewHttpClient(),
 				HTTPOptions: genai.HTTPOptions{
 					BaseURL: gateway,
 					Headers: http.Header{

pkg/model/provider/openai/client.go

@@ -14,6 +14,7 @@ import (
 	"github.com/docker/cagent/pkg/chat"
 	latest "github.com/docker/cagent/pkg/config/v2"
 	"github.com/docker/cagent/pkg/environment"
+	"github.com/docker/cagent/pkg/httpclient"
 	"github.com/docker/cagent/pkg/model/provider/base"
 	"github.com/docker/cagent/pkg/model/provider/options"
 	"github.com/docker/cagent/pkg/tools"
@@ -71,6 +72,8 @@ func NewClient(ctx context.Context, cfg *latest.ModelConfig, env environment.Pro
 			openaiConfig.BaseURL = cfg.BaseURL
 		}
 
+		openaiConfig.HTTPClient = httpclient.NewHttpClient()
+
 		// TODO: Move this logic to ProviderAliases as a config function
 		if cfg.ProviderOpts != nil {
 			switch cfg.Provider { //nolint:gocritic
@@ -106,6 +109,7 @@ func NewClient(ctx context.Context, cfg *latest.ModelConfig, env environment.Pro
 
 			openaiConfig := openai.DefaultConfig(authToken)
 			openaiConfig.BaseURL = gateway + "/v1"
+			openaiConfig.HTTPClient = httpclient.NewHttpClient()
 
 			return openai.NewClientWithConfig(openaiConfig), nil
 		}