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

fix(copilot): support credentials saved with copilot.vim (#404)

Browse Source 
Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
This commit is contained in:
Aaron Pham 2024-08-30 15:12:20 -04:00 committed by GitHub
parent 5ff5dcf72b
commit b09ff856b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/avante/llm.lua
View File

@ -85,7 +85,7 @@ Your task is to modify the provided code according to the user's request. Follow
8. Only return the new code snippets to be updated, DO NOT return the entire file content.
Remember: Your response should contain nothing but ONLY the modified code, ready to be used as a direct replacement for the original file.
Remember: Your response should contain ONLY the modified code, ready to be used as a direct replacement for the original file.
]]
local group = api.nvim_create_augroup("avante_llm", { clear = true })

22
lua/avante/providers/copilot.lua
View File

@ -52,10 +52,20 @@ H.get_oauth_token = function()
config_dir = vim.fn.expand("~/AppData/Local")
end
local yason = Path:new(config_dir):joinpath("github-copilot", "hosts.json")
if not yason:exists() then
--- hosts.json (copilot.lua), apps.json (copilot.vim)
---@type Path[]
local paths = vim.iter({ "hosts.json", "apps.json" }):fold({}, function(acc, path)
local yason = Path:new(config_dir):joinpath("github-copilot", path)
if yason:exists() then
table.insert(acc, yason)
end
return acc
end)
if #paths == 0 then
error("You must setup copilot with either copilot.lua or copilot.vim", 2)
end
local yason = paths[1]
return vim
.iter(
---@type table<string, OAuthToken>
@ -119,16 +129,12 @@ M.state = nil
M.api_key_name = P.AVANTE_INTERNAL_KEY
M.parse_message = function(opts)
local user_prompt = ""
for _, user_prompt_ in ipairs(opts.user_prompts) do
user_prompt = user_prompt .. "\n\n" .. user_prompt_
end
return {
{ role = "system", content = opts.system_prompt },
{ role = "user", content = user_prompt },
{ role = "user", content = table.concat(opts.user_prompts, "\n\n") },
}
end
M.parse_response = O.parse_response
M.parse_curl_args = function(provider, code_opts)