feat(bedrock): add support for basic auth with api key on bedrock

Author: andreynering

providers/anthropic/anthropic.go

@@ -122,7 +122,7 @@ func WithHTTPClient(client option.HTTPClient) Option {
 
 func (a *provider) LanguageModel(modelID string) (fantasy.LanguageModel, error) {
 	clientOptions := make([]option.RequestOption, 0, 5+len(a.options.headers))
-	if a.options.apiKey != "" {
+	if a.options.apiKey != "" && !a.options.useBedrock {
 		clientOptions = append(clientOptions, option.WithAPIKey(a.options.apiKey))
 	}
 	if a.options.baseURL != "" {
@@ -157,10 +157,10 @@ func (a *provider) LanguageModel(modelID string) (fantasy.LanguageModel, error)
 		)
 	}
 	if a.options.useBedrock {
-		if a.options.skipAuth {
+		if a.options.skipAuth || a.options.apiKey != "" {
 			clientOptions = append(
 				clientOptions,
-				bedrock.WithConfig(dummyBedrockConfig),
+				bedrock.WithConfig(bedrockBasicAuthConfig(a.options.apiKey)),
 			)
 		} else {
 			clientOptions = append(

providers/anthropic/bedrock.go

@@ -1,14 +1,16 @@
 package anthropic
 
 import (
-	"context"
+	"cmp"
+	"os"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/smithy-go/auth/bearer"
 )
 
-var dummyBedrockConfig = aws.Config{
-	Region: "us-east-1",
-	Credentials: aws.CredentialsProviderFunc(func(context.Context) (aws.Credentials, error) {
-		return aws.Credentials{}, nil
-	}),
+func bedrockBasicAuthConfig(apiKey string) aws.Config {
+	return aws.Config{
+		Region:                  cmp.Or(os.Getenv("AWS_REGION"), "us-east-1"),
+		BearerAuthTokenProvider: bearer.StaticTokenProvider{Token: bearer.Token{Value: apiKey}},
+	}
 }

providers/bedrock/bedrock.go

@@ -36,6 +36,13 @@ func New(opts ...Option) fantasy.Provider {
 	)
 }
 
+// WithAPIKey sets the access token for the Bedrock provider.
+func WithAPIKey(apiKey string) Option {
+	return func(o *options) {
+		o.anthropicOptions = append(o.anthropicOptions, anthropic.WithAPIKey(apiKey))
+	}
+}
+
 // WithHeaders sets the headers for the Bedrock provider.
 func WithHeaders(headers map[string]string) Option {
 	return func(o *options) {

providertests/.env.sample

@@ -1,6 +1,7 @@
 FANTASY_ANTHROPIC_API_KEY=
 FANTASY_AZURE_API_KEY=
 FANTASY_AZURE_BASE_URL=
+FANTASY_BEDROCK_API_KEY=
 FANTASY_GEMINI_API_KEY=
 FANTASY_GROQ_API_KEY=
 FANTASY_OPENAI_API_KEY=

providertests/bedrock_test.go

@@ -2,6 +2,7 @@ package providertests
 
 import (
 	"net/http"
+	"os"
 	"testing"
 
 	"charm.land/fantasy"
@@ -17,6 +18,10 @@ func TestBedrockCommon(t *testing.T) {
 	})
 }
 
+func TestBedrockBasicAuth(t *testing.T) {
+	testSimple(t, builderPair{"bedrock-anthropic-claude-3-sonnet", buildersBedrockBasicAuth, nil})
+}
+
 func builderBedrockClaude3Sonnet(r *recorder.Recorder) (fantasy.LanguageModel, error) {
 	provider := bedrock.New(
 		bedrock.WithHTTPClient(&http.Client{Transport: r}),
@@ -40,3 +45,12 @@ func builderBedrockClaude3Haiku(r *recorder.Recorder) (fantasy.LanguageModel, er
 	)
 	return provider.LanguageModel("us.anthropic.claude-3-haiku-20240307-v1:0")
 }
+
+func buildersBedrockBasicAuth(r *recorder.Recorder) (fantasy.LanguageModel, error) {
+	provider := bedrock.New(
+		bedrock.WithHTTPClient(&http.Client{Transport: r}),
+		bedrock.WithAPIKey(os.Getenv("FANTASY_BEDROCK_API_KEY")),
+		bedrock.WithSkipAuth(true),
+	)
+	return provider.LanguageModel("us.anthropic.claude-3-sonnet-20240229-v1:0")
+}