🔧 #238 Implements human readable durations in config (#253)

EinStack · May 22, 2024 · 03f1805 · 03f1805
1 parent 8986edb
commit 03f1805
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 22 deletions.
diff --git a/pkg/providers/anthropic/client.go b/pkg/providers/anthropic/client.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"net/http"
 	"net/url"
+	"time"
 
 	"github.com/EinStack/glide/pkg/telemetry"
 
@@ -46,7 +47,7 @@ func NewClient(providerConfig *Config, clientConfig *clients.ClientConfig, tel *
 		chatRequestTemplate: NewChatRequestFromConfig(providerConfig),
 		errMapper:           NewErrorMapper(tel),
 		httpClient: &http.Client{
-			Timeout: *clientConfig.Timeout,
+			Timeout: time.Duration(*clientConfig.Timeout),
 			Transport: &http.Transport{
 				MaxIdleConns:        *clientConfig.MaxIdleConns,
 				MaxIdleConnsPerHost: *clientConfig.MaxIdleConnsPerHost,

diff --git a/pkg/providers/azureopenai/client.go b/pkg/providers/azureopenai/client.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/EinStack/glide/pkg/providers/openai"
 
@@ -50,7 +51,7 @@ func NewClient(providerConfig *Config, clientConfig *clients.ClientConfig, tel *
 		finishReasonMapper:  openai.NewFinishReasonMapper(tel),
 		errMapper:           NewErrorMapper(tel),
 		httpClient: &http.Client{
-			Timeout: *clientConfig.Timeout,
+			Timeout: time.Duration(*clientConfig.Timeout),
 			Transport: &http.Transport{
 				MaxIdleConns:        *clientConfig.MaxIdleConns,
 				MaxIdleConnsPerHost: *clientConfig.MaxIdleConnsPerHost,

diff --git a/pkg/providers/bedrock/client.go b/pkg/providers/bedrock/client.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"net/http"
 	"net/url"
+	"time"
 
 	"github.com/EinStack/glide/pkg/telemetry"
 
@@ -56,7 +57,7 @@ func NewClient(providerConfig *Config, clientConfig *clients.ClientConfig, tel *
 		config:              providerConfig,
 		chatRequestTemplate: NewChatRequestFromConfig(providerConfig),
 		httpClient: &http.Client{
-			Timeout: *clientConfig.Timeout,
+			Timeout: time.Duration(*clientConfig.Timeout),
 			Transport: &http.Transport{
 				MaxIdleConns:        *clientConfig.MaxIdleConns,
 				MaxIdleConnsPerHost: *clientConfig.MaxIdleConnsPerHost,

diff --git a/pkg/providers/clients/config.go b/pkg/providers/clients/config.go
@@ -1,11 +1,15 @@
 package clients
 
-import "time"
+import (
+	"time"
+
+	"github.com/EinStack/glide/pkg/config/fields"
+)
 
 type ClientConfig struct {
-	Timeout             *time.Duration `yaml:"timeout,omitempty" json:"timeout" swaggertype:"primitive,string"`
-	MaxIdleConns        *int           `yaml:"max_idle_connections,omitempty" json:"max_idle_connections" swaggertype:"primitive,integer"`
-	MaxIdleConnsPerHost *int           `yaml:"max_idle_connections_per_host,omitempty" json:"max_idle_connections_per_host" swaggertype:"primitive,integer"`
+	Timeout             *fields.Duration `yaml:"timeout,omitempty" json:"timeout" swaggertype:"primitive,string"`
+	MaxIdleConns        *int             `yaml:"max_idle_connections,omitempty" json:"max_idle_connections" swaggertype:"primitive,integer"`
+	MaxIdleConnsPerHost *int             `yaml:"max_idle_connections_per_host,omitempty" json:"max_idle_connections_per_host" swaggertype:"primitive,integer"`
 }
 
 func DefaultClientConfig() *ClientConfig {
@@ -14,7 +18,7 @@ func DefaultClientConfig() *ClientConfig {
 	maxIdleConnsPerHost := 2
 
 	return &ClientConfig{
-		Timeout:             &defaultTimeout,
+		Timeout:             (*fields.Duration)(&defaultTimeout),
 		MaxIdleConns:        &maxIdleConns,
 		MaxIdleConnsPerHost: &maxIdleConnsPerHost,
 	}

diff --git a/pkg/providers/clients/config_test.go b/pkg/providers/clients/config_test.go
@@ -1,10 +1,13 @@
 package clients
 
 import (
+	"encoding/json"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
+
+	"github.com/EinStack/glide/pkg/config/fields"
 )
 
 func TestClientConfig_DefaultConfig(t *testing.T) {
@@ -13,6 +16,21 @@ func TestClientConfig_DefaultConfig(t *testing.T) {
 	require.NotEmpty(t, config.Timeout)
 }
 
+func TestClientConfig_JSONMarshal(t *testing.T) {
+	defaultConfig := DefaultClientConfig()
+
+	expectedJSON := `{
+        "timeout": "10s",
+		"max_idle_connections": 100,
+		"max_idle_connections_per_host": 2	
+	}`
+
+	marshaledJSON, err := json.MarshalIndent(defaultConfig, "", "\t")
+
+	require.NoError(t, err)
+	require.JSONEq(t, expectedJSON, string(marshaledJSON))
+}
+
 func TestDefaultClientConfig(t *testing.T) {
 	config := DefaultClientConfig()
 
@@ -22,7 +40,7 @@ func TestDefaultClientConfig(t *testing.T) {
 	require.NotNil(t, config.MaxIdleConnsPerHost, "MaxIdleConnsPerHost must not be nil")
 
 	// Check default timeout
-	expectedTimeout := 10 * time.Second
+	expectedTimeout := fields.Duration(10 * time.Second)
 	require.Equal(t, expectedTimeout, *config.Timeout)
 
 	// Check MaxIdleConns

diff --git a/pkg/providers/cohere/client.go b/pkg/providers/cohere/client.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"net/http"
 	"net/url"
+	"time"
 
 	"github.com/EinStack/glide/pkg/telemetry"
 
@@ -44,7 +45,7 @@ func NewClient(providerConfig *Config, clientConfig *clients.ClientConfig, tel *
 		config:              providerConfig,
 		chatRequestTemplate: NewChatRequestFromConfig(providerConfig),
 		httpClient: &http.Client{
-			Timeout: *clientConfig.Timeout,
+			Timeout: time.Duration(*clientConfig.Timeout),
 			Transport: &http.Transport{
 				MaxIdleConns:        *clientConfig.MaxIdleConns,
 				MaxIdleConnsPerHost: *clientConfig.MaxIdleConnsPerHost,

diff --git a/pkg/providers/octoml/client.go b/pkg/providers/octoml/client.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"net/http"
 	"net/url"
+	"time"
 
 	"github.com/EinStack/glide/pkg/telemetry"
 
@@ -44,7 +45,7 @@ func NewClient(providerConfig *Config, clientConfig *clients.ClientConfig, tel *
 		chatRequestTemplate: NewChatRequestFromConfig(providerConfig),
 		errMapper:           NewErrorMapper(tel),
 		httpClient: &http.Client{
-			Timeout: *clientConfig.Timeout,
+			Timeout: time.Duration(*clientConfig.Timeout),
 			Transport: &http.Transport{
 				MaxIdleConns:        *clientConfig.MaxIdleConns,
 				MaxIdleConnsPerHost: *clientConfig.MaxIdleConnsPerHost,

diff --git a/pkg/providers/ollama/client.go b/pkg/providers/ollama/client.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"net/http"
 	"net/url"
+	"time"
 
 	"github.com/EinStack/glide/pkg/telemetry"
 
@@ -42,7 +43,7 @@ func NewClient(providerConfig *Config, clientConfig *clients.ClientConfig, tel *
 		config:              providerConfig,
 		chatRequestTemplate: NewChatRequestFromConfig(providerConfig),
 		httpClient: &http.Client{
-			Timeout: *clientConfig.Timeout,
+			Timeout: time.Duration(*clientConfig.Timeout),
 			Transport: &http.Transport{
 				MaxIdleConns:        *clientConfig.MaxIdleConns,
 				MaxIdleConnsPerHost: *clientConfig.MaxIdleConnsPerHost,

diff --git a/pkg/providers/openai/client.go b/pkg/providers/openai/client.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"net/http"
 	"net/url"
+	"time"
 
 	"go.uber.org/zap"
 
@@ -53,7 +54,7 @@ func NewClient(providerConfig *Config, clientConfig *clients.ClientConfig, tel *
 		finishReasonMapper:  NewFinishReasonMapper(tel),
 		errMapper:           NewErrorMapper(tel),
 		httpClient: &http.Client{
-			Timeout: *clientConfig.Timeout,
+			Timeout: time.Duration(*clientConfig.Timeout),
 			Transport: &http.Transport{
 				MaxIdleConns:        *clientConfig.MaxIdleConns,
 				MaxIdleConnsPerHost: *clientConfig.MaxIdleConnsPerHost,

diff --git a/pkg/routers/config.go b/pkg/routers/config.go
@@ -2,6 +2,7 @@ package routers
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/EinStack/glide/pkg/telemetry"
 
@@ -164,12 +165,13 @@ func (c *LangRouterConfig) BuildModels(tel *telemetry.Telemetry) ([]*providers.L
 
 func (c *LangRouterConfig) BuildRetry() *retry.ExpRetry {
 	retryConfig := c.Retry
+	maxDelay := time.Duration(*retryConfig.MaxDelay)
 
 	return retry.NewExpRetry(
 		retryConfig.MaxRetries,
 		retryConfig.BaseMultiplier,
-		retryConfig.MinDelay,
-		retryConfig.MaxDelay,
+		time.Duration(retryConfig.MinDelay),
+		&maxDelay,
 	)
 }
 

diff --git a/pkg/routers/retry/config.go b/pkg/routers/retry/config.go
@@ -1,21 +1,25 @@
 package retry
 
-import "time"
+import (
+	"time"
+
+	"github.com/EinStack/glide/pkg/config/fields"
+)
 
 type ExpRetryConfig struct {
-	MaxRetries     int            `yaml:"max_retries,omitempty" json:"max_retries"`
-	BaseMultiplier int            `yaml:"base_multiplier,omitempty" json:"base_multiplier"`
-	MinDelay       time.Duration  `yaml:"min_delay,omitempty" json:"min_delay" swaggertype:"primitive,integer"`
-	MaxDelay       *time.Duration `yaml:"max_delay,omitempty" json:"max_delay" swaggertype:"primitive,integer"`
+	MaxRetries     int              `yaml:"max_retries,omitempty" json:"max_retries"`
+	BaseMultiplier int              `yaml:"base_multiplier,omitempty" json:"base_multiplier"`
+	MinDelay       fields.Duration  `yaml:"min_delay,omitempty" json:"min_delay" swaggertype:"primitive,string"`
+	MaxDelay       *fields.Duration `yaml:"max_delay,omitempty" json:"max_delay" swaggertype:"primitive,string"`
 }
 
 func DefaultExpRetryConfig() *ExpRetryConfig {
-	maxDelay := 5 * time.Second
+	maxDelay := fields.Duration(5 * time.Second)
 
 	return &ExpRetryConfig{
 		MaxRetries:     3,
 		BaseMultiplier: 2,
-		MinDelay:       2 * time.Second,
+		MinDelay:       fields.Duration(2 * time.Second),
 		MaxDelay:       &maxDelay,
 	}
 }
diff --git a/pkg/routers/retry/config_test.go b/pkg/routers/retry/config_test.go
@@ -1,6 +1,7 @@
 package retry
 
 import (
+	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -11,3 +12,18 @@ func TestRetryConfig_DefaultConfig(t *testing.T) {
 
 	require.NotNil(t, config)
 }
+
+func TestRetryConfig_JSONMarshal(t *testing.T) {
+	defaultConfig := DefaultExpRetryConfig()
+
+	expectedJSON := `{
+		"max_retries": 3,
+		"base_multiplier": 2,
+		"min_delay": "2s",
+		"max_delay": "5s"
+	}`
+
+	marshaledJSON, err := json.MarshalIndent(defaultConfig, "", "\t")
+	require.NoError(t, err)
+	require.JSONEq(t, expectedJSON, string(marshaledJSON))
+}