CarGDev/avante.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: do not ask for API key for bedrock if aws_profile was set (#2564)

Browse Source
This commit is contained in:
brook hong
2025-08-02 13:00:00 +08:00
committed by GitHub
parent b225094dca
commit 7965546a34
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lua/avante/providers/bedrock.lua
View File

@@ -52,6 +52,13 @@ function M.load_model_handler()
error(error_msg) error(error_msg)
end end
function M.is_env_set()
local provider_conf, _ = P.parse_config(P["bedrock"])
---@diagnostic disable-next-line: undefined-field
local profile = provider_conf.aws_profile
return profile ~= nil and profile ~= ""
end
function M:parse_messages(prompt_opts) function M:parse_messages(prompt_opts)
local model_handler = M.load_model_handler() local model_handler = M.load_model_handler()
return model_handler.parse_messages(self, prompt_opts) return model_handler.parse_messages(self, prompt_opts)
@@ -103,21 +110,11 @@ function M:parse_curl_args(prompt_opts)
local access_key_id, secret_access_key, session_token, region local access_key_id, secret_access_key, session_token, region
-- try to parse credentials from api key ---@diagnostic disable-next-line: undefined-field
local api_key = self.parse_api_key() local profile = provider_conf.aws_profile
if api_key ~= nil then if profile ~= nil and profile ~= "" then
local parts = vim.split(api_key, ",")
access_key_id = parts[1]
secret_access_key = parts[2]
region = parts[3]
session_token = parts[4]
else
-- alternatively parse credentials from default AWS credentials provider chain
---@diagnostic disable-next-line: undefined-field ---@diagnostic disable-next-line: undefined-field
region = provider_conf.aws_region region = provider_conf.aws_region
---@diagnostic disable-next-line: undefined-field
local profile = provider_conf.aws_profile
local awsCreds = M:get_aws_credentials(region, profile) local awsCreds = M:get_aws_credentials(region, profile)
if not region or region == "" then error("No aws_region specified in bedrock config") end if not region or region == "" then error("No aws_region specified in bedrock config") end
@@ -125,6 +122,18 @@ function M:parse_curl_args(prompt_opts)
access_key_id = awsCreds.access_key_id access_key_id = awsCreds.access_key_id
secret_access_key = awsCreds.secret_access_key secret_access_key = awsCreds.secret_access_key
session_token = awsCreds.session_token session_token = awsCreds.session_token
else
-- try to parse credentials from api key
local api_key = self.parse_api_key()
if api_key ~= nil then
local parts = vim.split(api_key, ",")
access_key_id = parts[1]
secret_access_key = parts[2]
region = parts[3]
session_token = parts[4]
else
error("API key not set correctly")
end
end end
local endpoint local endpoint