From 0068613bcbf29bea172af383d6ae3b0f6b2193ab Mon Sep 17 00:00:00 2001 From: Aleksandr Bortnikov Date: Mon, 2 Mar 2026 07:25:59 +0300 Subject: [PATCH] refactor: NewHTTPProvider - now accept more params, removed long names NewHTTPProvider* --- pkg/providers/factory_provider.go | 6 +++--- pkg/providers/http_provider.go | 27 +-------------------------- 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/pkg/providers/factory_provider.go b/pkg/providers/factory_provider.go index dd795c1e6..818c09bea 100644 --- a/pkg/providers/factory_provider.go +++ b/pkg/providers/factory_provider.go @@ -85,7 +85,7 @@ func CreateProviderFromConfig(cfg *config.ModelConfig) (LLMProvider, string, err apiBase = getDefaultAPIBase(protocol) } - return NewHTTPProviderWithMaxTokensFieldAndRequestTimeoutAndUsePromptCaching( + return NewHTTPProvider( cfg.APIKey, apiBase, cfg.Proxy, @@ -105,7 +105,7 @@ func CreateProviderFromConfig(cfg *config.ModelConfig) (LLMProvider, string, err if apiBase == "" { apiBase = getDefaultAPIBase(protocol) } - return NewHTTPProviderWithMaxTokensFieldAndRequestTimeoutAndUsePromptCaching( + return NewHTTPProvider( cfg.APIKey, apiBase, cfg.Proxy, @@ -131,7 +131,7 @@ func CreateProviderFromConfig(cfg *config.ModelConfig) (LLMProvider, string, err if cfg.APIKey == "" { return nil, "", fmt.Errorf("api_key is required for anthropic protocol (model: %s)", cfg.Model) } - return NewHTTPProviderWithMaxTokensFieldAndRequestTimeoutAndUsePromptCaching( + return NewHTTPProvider( cfg.APIKey, apiBase, cfg.Proxy, diff --git a/pkg/providers/http_provider.go b/pkg/providers/http_provider.go index 71ff94506..6d548418b 100644 --- a/pkg/providers/http_provider.go +++ b/pkg/providers/http_provider.go @@ -17,32 +17,7 @@ type HTTPProvider struct { delegate *openai_compat.Provider } -func NewHTTPProvider(apiKey, apiBase, proxy string) *HTTPProvider { - return &HTTPProvider{ - delegate: openai_compat.NewProvider(apiKey, apiBase, proxy), - } -} - -func NewHTTPProviderWithMaxTokensField(apiKey, apiBase, proxy, maxTokensField string) *HTTPProvider { - return NewHTTPProviderWithMaxTokensFieldAndRequestTimeout(apiKey, apiBase, proxy, maxTokensField, 0) -} - -func NewHTTPProviderWithMaxTokensFieldAndRequestTimeout( - apiKey, apiBase, proxy, maxTokensField string, - requestTimeoutSeconds int, -) *HTTPProvider { - return &HTTPProvider{ - delegate: openai_compat.NewProvider( - apiKey, - apiBase, - proxy, - openai_compat.WithMaxTokensField(maxTokensField), - openai_compat.WithRequestTimeout(time.Duration(requestTimeoutSeconds)*time.Second), - ), - } -} - -func NewHTTPProviderWithMaxTokensFieldAndRequestTimeoutAndUsePromptCaching( +func NewHTTPProvider( apiKey, apiBase, proxy, maxTokensField string, requestTimeoutSeconds int, usePromptCaching bool,