329c4da · crush · git.iko.soy

on main help sign in

fix: fix region detection for bedrock

329c4daKujtim Hoxha1 year ago

internal/config/load.go+4

@@ -189,6 +189,10 @@ func (c *Config) configureProviders(env env.Env, resolver VariableResolver, know

189 }

190 continue

191 }

192+ prepared.ExtraParams["region"] = env.Get("AWS_REGION")

193+ if prepared.ExtraParams["region"] == "" {

194+ prepared.ExtraParams["region"] = env.Get("AWS_DEFAULT_REGION")

195+ }

192 for _, model := range p.Models {

196 for _, model := range p.Models {

193 if !strings.HasPrefix(model.ID, "anthropic.") {

197 if !strings.HasPrefix(model.ID, "anthropic.") {

194 return fmt.Errorf("bedrock provider only supports anthropic models for now, found: %s", model.ID)

198 return fmt.Errorf("bedrock provider only supports anthropic models for now, found: %s", model.ID)

internal/llm/provider/provider.go+1

@@ -160,6 +160,7 @@ func NewProvider(cfg config.ProviderConfig, opts ...ProviderClientOption) (Provi

160 apiKey: resolvedAPIKey,

161 extraHeaders: resolvedExtraHeaders,

162 extraBody: cfg.ExtraBody,

163+ extraParams: cfg.ExtraParams,

163 systemPromptPrefix: cfg.SystemPromptPrefix,

164 systemPromptPrefix: cfg.SystemPromptPrefix,

164 model: func(tp config.SelectedModelType) catwalk.Model {

165 model: func(tp config.SelectedModelType) catwalk.Model {

165 return *config.Get().GetModelByType(tp)

166 return *config.Get().GetModelByType(tp)