#67: Moved resiliency and client packages on higher level out of prov…

…iders & routers
EinStack · Jun 24, 2024 · 27347ec · 27347ec
1 parent b861ffa
commit 27347ec
Show file tree

Hide file tree

Showing 64 changed files with 106 additions and 137 deletions.
diff --git a/pkg/providers/clients/config.go → pkg/clients/config.go b/pkg/providers/clients/config.go → pkg/clients/config.go
diff --git a/pkg/providers/clients/config_test.go → pkg/clients/config_test.go b/pkg/providers/clients/config_test.go → pkg/clients/config_test.go
diff --git a/pkg/providers/clients/errors.go → pkg/clients/errors.go b/pkg/providers/clients/errors.go → pkg/clients/errors.go
diff --git a/pkg/providers/clients/errors_test.go → pkg/clients/errors_test.go b/pkg/providers/clients/errors_test.go → pkg/clients/errors_test.go
diff --git a/pkg/providers/clients/sse.go → pkg/clients/sse.go b/pkg/providers/clients/sse.go → pkg/clients/sse.go
diff --git a/pkg/providers/clients/sse_test.go → pkg/clients/sse_test.go b/pkg/providers/clients/sse_test.go → pkg/clients/sse_test.go
diff --git a/pkg/providers/clients/stream.go → pkg/clients/stream.go b/pkg/providers/clients/stream.go → pkg/clients/stream.go
diff --git a/pkg/providers/anthropic/chat.go b/pkg/providers/anthropic/chat.go
@@ -5,12 +5,11 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/EinStack/glide/pkg/clients"
 	"io"
 	"net/http"
 	"time"
 
-	"github.com/EinStack/glide/pkg/providers/clients"
-
 	"github.com/EinStack/glide/pkg/api/schemas"
 	"go.uber.org/zap"
 )

diff --git a/pkg/providers/anthropic/chat_stream.go b/pkg/providers/anthropic/chat_stream.go
@@ -2,8 +2,7 @@ package anthropic
 
 import (
 	"context"
-
-	"github.com/EinStack/glide/pkg/providers/clients"
+	clients2 "github.com/EinStack/glide/pkg/clients"
 
 	"github.com/EinStack/glide/pkg/api/schemas"
 )
@@ -12,6 +11,6 @@ func (c *Client) SupportChatStream() bool {
 	return false
 }
 
-func (c *Client) ChatStream(_ context.Context, _ *schemas.ChatParams) (clients.ChatStream, error) {
-	return nil, clients.ErrChatStreamNotImplemented
+func (c *Client) ChatStream(_ context.Context, _ *schemas.ChatParams) (clients2.ChatStream, error) {
+	return nil, clients2.ErrChatStreamNotImplemented
 }
diff --git a/pkg/providers/anthropic/client.go b/pkg/providers/anthropic/client.go
@@ -1,13 +1,12 @@
 package anthropic
 
 import (
+	"github.com/EinStack/glide/pkg/clients"
 	"net/http"
 	"net/url"
 	"time"
 
 	"github.com/EinStack/glide/pkg/telemetry"
-
-	"github.com/EinStack/glide/pkg/providers/clients"
 )
 
 const (

diff --git a/pkg/providers/anthropic/client_test.go b/pkg/providers/anthropic/client_test.go
@@ -3,15 +3,14 @@ package anthropic
 import (
 	"context"
 	"encoding/json"
+	"github.com/EinStack/glide/pkg/clients"
 	"io"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"path/filepath"
 	"testing"
 
-	"github.com/EinStack/glide/pkg/providers/clients"
-
 	"github.com/EinStack/glide/pkg/api/schemas"
 
 	"github.com/EinStack/glide/pkg/telemetry"

diff --git a/pkg/providers/anthropic/errors.go b/pkg/providers/anthropic/errors.go
@@ -2,13 +2,13 @@ package anthropic
 
 import (
 	"fmt"
+	"github.com/EinStack/glide/pkg/clients"
 	"io"
 	"net/http"
 	"time"
 
 	"github.com/EinStack/glide/pkg/telemetry"
 
-	"github.com/EinStack/glide/pkg/providers/clients"
 	"go.uber.org/zap"
 )
 

diff --git a/pkg/providers/azureopenai/chat.go b/pkg/providers/azureopenai/chat.go
@@ -5,11 +5,10 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/EinStack/glide/pkg/clients"
 	"io"
 	"net/http"
 
-	"github.com/EinStack/glide/pkg/providers/clients"
-
 	"github.com/EinStack/glide/pkg/providers/openai"
 
 	"github.com/EinStack/glide/pkg/api/schemas"

diff --git a/pkg/providers/azureopenai/chat_stream.go b/pkg/providers/azureopenai/chat_stream.go
@@ -5,14 +5,14 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	clients2 "github.com/EinStack/glide/pkg/clients"
 	"io"
 	"net/http"
 
 	"github.com/EinStack/glide/pkg/telemetry"
 
 	"github.com/EinStack/glide/pkg/providers/openai"
 
-	"github.com/EinStack/glide/pkg/providers/clients"
 	"github.com/r3labs/sse/v2"
 
 	"go.uber.org/zap"
@@ -82,7 +82,7 @@ func (s *ChatStream) Recv() (*schemas.ChatStreamChunk, error) {
 			// if err is io.EOF, this still means that the stream is interrupted unexpectedly
 			//  because the normal stream termination is done via finding out streamDoneMarker
 
-			return nil, clients.ErrProviderUnavailable
+			return nil, clients2.ErrProviderUnavailable
 		}
 
 		s.tel.L().Debug(
@@ -91,7 +91,7 @@ func (s *ChatStream) Recv() (*schemas.ChatStreamChunk, error) {
 			zap.ByteString("rawChunk", rawEvent),
 		)
 
-		event, err := clients.ParseSSEvent(rawEvent)
+		event, err := clients2.ParseSSEvent(rawEvent)
 
 		if bytes.Equal(event.Data, openai.StreamDoneMarker) {
 			s.tel.L().Info(
@@ -155,7 +155,7 @@ func (c *Client) SupportChatStream() bool {
 	return true
 }
 
-func (c *Client) ChatStream(ctx context.Context, params *schemas.ChatParams) (clients.ChatStream, error) {
+func (c *Client) ChatStream(ctx context.Context, params *schemas.ChatParams) (clients2.ChatStream, error) {
 	// Create a new chat request
 	httpRequest, err := c.makeStreamReq(ctx, params)
 	if err != nil {

diff --git a/pkg/providers/azureopenai/chat_stream_test.go b/pkg/providers/azureopenai/chat_stream_test.go
@@ -3,6 +3,7 @@ package azureopenai
 import (
 	"context"
 	"encoding/json"
+	clients2 "github.com/EinStack/glide/pkg/clients"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -14,14 +15,12 @@ import (
 
 	"github.com/EinStack/glide/pkg/telemetry"
 
-	"github.com/EinStack/glide/pkg/providers/clients"
-
 	"github.com/stretchr/testify/require"
 )
 
 func TestAzureOpenAIClient_ChatStreamSupported(t *testing.T) {
 	providerCfg := DefaultConfig()
-	clientCfg := clients.DefaultClientConfig()
+	clientCfg := clients2.DefaultClientConfig()
 
 	client, err := NewClient(providerCfg, clientCfg, telemetry.NewTelemetryMock())
 	require.NoError(t, err)
@@ -64,7 +63,7 @@ func TestAzureOpenAIClient_ChatStreamRequest(t *testing.T) {
 
 			ctx := context.Background()
 			providerCfg := DefaultConfig()
-			clientCfg := clients.DefaultClientConfig()
+			clientCfg := clients2.DefaultClientConfig()
 
 			providerCfg.BaseURL = AzureopenAIServer.URL
 
@@ -132,7 +131,7 @@ func TestAzureOpenAIClient_ChatStreamRequestInterrupted(t *testing.T) {
 
 			ctx := context.Background()
 			providerCfg := DefaultConfig()
-			clientCfg := clients.DefaultClientConfig()
+			clientCfg := clients2.DefaultClientConfig()
 
 			providerCfg.BaseURL = openAIServer.URL
 
@@ -153,7 +152,7 @@ func TestAzureOpenAIClient_ChatStreamRequestInterrupted(t *testing.T) {
 			for {
 				chunk, err := stream.Recv()
 				if err != nil {
-					require.ErrorIs(t, err, clients.ErrProviderUnavailable)
+					require.ErrorIs(t, err, clients2.ErrProviderUnavailable)
 					return
 				}
 

diff --git a/pkg/providers/azureopenai/client.go b/pkg/providers/azureopenai/client.go
@@ -2,14 +2,13 @@ package azureopenai
 
 import (
 	"fmt"
+	"github.com/EinStack/glide/pkg/clients"
 	"net/http"
 	"time"
 
 	"github.com/EinStack/glide/pkg/providers/openai"
 
 	"github.com/EinStack/glide/pkg/telemetry"
-
-	"github.com/EinStack/glide/pkg/providers/clients"
 )
 
 const (

diff --git a/pkg/providers/azureopenai/client_test.go b/pkg/providers/azureopenai/client_test.go
@@ -3,15 +3,14 @@ package azureopenai
 import (
 	"context"
 	"encoding/json"
+	"github.com/EinStack/glide/pkg/clients"
 	"io"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"path/filepath"
 	"testing"
 
-	"github.com/EinStack/glide/pkg/providers/clients"
-
 	"github.com/EinStack/glide/pkg/api/schemas"
 
 	"github.com/EinStack/glide/pkg/telemetry"

diff --git a/pkg/providers/azureopenai/errors.go b/pkg/providers/azureopenai/errors.go
@@ -2,13 +2,13 @@ package azureopenai
 
 import (
 	"fmt"
+	"github.com/EinStack/glide/pkg/clients"
 	"io"
 	"net/http"
 	"time"
 
 	"github.com/EinStack/glide/pkg/telemetry"
 
-	"github.com/EinStack/glide/pkg/providers/clients"
 	"go.uber.org/zap"
 )
 

diff --git a/pkg/providers/bedrock/chat_stream.go b/pkg/providers/bedrock/chat_stream.go
@@ -2,8 +2,7 @@ package bedrock
 
 import (
 	"context"
-
-	"github.com/EinStack/glide/pkg/providers/clients"
+	clients2 "github.com/EinStack/glide/pkg/clients"
 
 	"github.com/EinStack/glide/pkg/api/schemas"
 )
@@ -12,6 +11,6 @@ func (c *Client) SupportChatStream() bool {
 	return false
 }
 
-func (c *Client) ChatStream(_ context.Context, _ *schemas.ChatParams) (clients.ChatStream, error) {
-	return nil, clients.ErrChatStreamNotImplemented
+func (c *Client) ChatStream(_ context.Context, _ *schemas.ChatParams) (clients2.ChatStream, error) {
+	return nil, clients2.ErrChatStreamNotImplemented
 }
diff --git a/pkg/providers/bedrock/client.go b/pkg/providers/bedrock/client.go
@@ -3,14 +3,13 @@ package bedrock
 import (
 	"context"
 	"errors"
+	"github.com/EinStack/glide/pkg/clients"
 	"net/http"
 	"net/url"
 	"time"
 
 	"github.com/EinStack/glide/pkg/telemetry"
 
-	"github.com/EinStack/glide/pkg/providers/clients"
-
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/credentials"
 	"github.com/aws/aws-sdk-go-v2/service/bedrockruntime"

diff --git a/pkg/providers/bedrock/client_test.go b/pkg/providers/bedrock/client_test.go
@@ -4,15 +4,14 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/EinStack/glide/pkg/clients"
 	"io"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"path/filepath"
 	"testing"
 
-	"github.com/EinStack/glide/pkg/providers/clients"
-
 	"github.com/EinStack/glide/pkg/api/schemas"
 
 	"github.com/EinStack/glide/pkg/telemetry"

diff --git a/pkg/providers/cohere/chat.go b/pkg/providers/cohere/chat.go
@@ -5,12 +5,11 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/EinStack/glide/pkg/clients"
 	"io"
 	"net/http"
 	"time"
 
-	"github.com/EinStack/glide/pkg/providers/clients"
-
 	"github.com/EinStack/glide/pkg/api/schemas"
 
 	"go.uber.org/zap"

diff --git a/pkg/providers/cohere/chat_stream.go b/pkg/providers/cohere/chat_stream.go
@@ -5,13 +5,12 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	clients2 "github.com/EinStack/glide/pkg/clients"
 	"io"
 	"net/http"
 
 	"github.com/EinStack/glide/pkg/telemetry"
 
-	"github.com/EinStack/glide/pkg/providers/clients"
-
 	"go.uber.org/zap"
 
 	"github.com/EinStack/glide/pkg/api/schemas"
@@ -96,7 +95,7 @@ func (s *ChatStream) Recv() (*schemas.ChatStreamChunk, error) {
 
 			// if io.EOF occurred in the middle of the stream, then the stream was interrupted
 
-			return nil, clients.ErrProviderUnavailable
+			return nil, clients2.ErrProviderUnavailable
 		}
 
 		s.tel.L().Debug(
@@ -178,7 +177,7 @@ func (c *Client) SupportChatStream() bool {
 	return true
 }
 
-func (c *Client) ChatStream(ctx context.Context, params *schemas.ChatParams) (clients.ChatStream, error) {
+func (c *Client) ChatStream(ctx context.Context, params *schemas.ChatParams) (clients2.ChatStream, error) {
 	// Create a new chat request
 	httpRequest, err := c.makeStreamReq(ctx, params)
 	if err != nil {

diff --git a/pkg/providers/cohere/chat_stream_test.go b/pkg/providers/cohere/chat_stream_test.go
@@ -3,6 +3,7 @@ package cohere
 import (
 	"context"
 	"encoding/json"
+	"github.com/EinStack/glide/pkg/clients"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -14,8 +15,6 @@ import (
 
 	"github.com/EinStack/glide/pkg/telemetry"
 
-	"github.com/EinStack/glide/pkg/providers/clients"
-
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/pkg/providers/cohere/client.go b/pkg/providers/cohere/client.go
@@ -1,13 +1,12 @@
 package cohere
 
 import (
+	"github.com/EinStack/glide/pkg/clients"
 	"net/http"
 	"net/url"
 	"time"
 
 	"github.com/EinStack/glide/pkg/telemetry"
-
-	"github.com/EinStack/glide/pkg/providers/clients"
 )
 
 const (

diff --git a/pkg/providers/cohere/client_test.go b/pkg/providers/cohere/client_test.go
@@ -4,6 +4,7 @@ package cohere
 import (
 	"context"
 	"encoding/json"
+	"github.com/EinStack/glide/pkg/clients"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -15,8 +16,6 @@ import (
 
 	"github.com/EinStack/glide/pkg/telemetry"
 
-	"github.com/EinStack/glide/pkg/providers/clients"
-
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/pkg/providers/cohere/errors.go b/pkg/providers/cohere/errors.go
@@ -2,13 +2,13 @@ package cohere
 
 import (
 	"fmt"
+	"github.com/EinStack/glide/pkg/clients"
 	"io"
 	"net/http"
 	"time"
 
 	"github.com/EinStack/glide/pkg/telemetry"
 
-	"github.com/EinStack/glide/pkg/providers/clients"
 	"go.uber.org/zap"
 )