Skip to content

extend using temp file to workaround cURL message encoding issue #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yorik1984 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

extend using temp file to workaround cURL message encoding issue #330

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b4c9c8a
Update api.lua
yorik1984 May 2, 2024
6512fef
Update api.lua
yorik1984 May 2, 2024
8ce4c2d
Merge branch 'jackMort:main' into main
yorik1984 Sep 20, 2024
b689d56
Merge branch 'jackMort:main' into main
yorik1984 Oct 11, 2024
c3b3132
Merge branch 'jackMort:main' into main
yorik1984 Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions lua/chatgpt/api.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ local Utils = require("chatgpt.utils")

local Api = {}

local function tmpMsgFileName(params)
local temp_file = os.tmpname()
local f = io.open(temp_file, "w+")
if f == nil then
vim.notify("Cannot open temporary message file: " .. temp_file, vim.log.levels.ERROR)
return
end
f:write(vim.fn.json_encode(params))
f:close()
return temp_file
end

function Api.completions(custom_params, cb)
local openai_params = Utils.collapsed_openai_params(Config.options.openai_params)
local params = vim.tbl_extend("keep", custom_params, openai_params)
Expand All @@ -26,6 +38,8 @@ function Api.chat_completions(custom_params, cb, should_stop)

cb = vim.schedule_wrap(cb)

local TMP_MSG_FILENAME = tmpMsgFileName(params)

local extra_curl_params = Config.options.extra_curl_params
local args = {
"--silent",
Expand All @@ -37,7 +51,7 @@ function Api.chat_completions(custom_params, cb, should_stop)
"-H",
Api.AUTHORIZATION_HEADER,
"-d",
vim.json.encode(params),
"@" .. TMP_MSG_FILENAME,
}

if extra_curl_params ~= nil then
Expand Down Expand Up @@ -110,15 +124,7 @@ function Api.edits(custom_params, cb)
end

function Api.make_call(url, params, cb)
TMP_MSG_FILENAME = os.tmpname()
local f = io.open(TMP_MSG_FILENAME, "w+")
if f == nil then
vim.notify("Cannot open temporary message file: " .. TMP_MSG_FILENAME, vim.log.levels.ERROR)
return
end
f:write(vim.fn.json_encode(params))
f:close()

local TMP_MSG_FILENAME = tmpMsgFileName(params)
local args = {
url,
"-H",
Expand All @@ -141,14 +147,14 @@ function Api.make_call(url, params, cb)
command = "curl",
args = args,
on_exit = vim.schedule_wrap(function(response, exit_code)
Api.handle_response(response, exit_code, cb)
Api.handle_response(response, exit_code, cb, TMP_MSG_FILENAME)
end),
})
:start()
end

Api.handle_response = vim.schedule_wrap(function(response, exit_code, cb)
os.remove(TMP_MSG_FILENAME)
Api.handle_response = vim.schedule_wrap(function(response, exit_code, cb, tmpFile)
os.remove(tmpFile)
if exit_code ~= 0 then
vim.notify("An Error Occurred ...", vim.log.levels.ERROR)
cb("ERROR: API Error")
Expand Down