feat: cancel current request

Signed-off-by: blob42 <contact@blob42.xyz>

Author: blob42

README.md

@@ -11,6 +11,7 @@ This fork does the following:
 - **Streaming mode** for real-time popup responses
 - [**New table-based configuration**](#example-configuration) instead of global variables
 - [**New commands**](#other-available-commands) and added support to the `%` range modifier
+- **Ability to cancel** current request.
 - **UI Query and select** local or remote model
 - **Strips thinking tokens** from replies if the model forgets to use codeblocks
 - **Refactored for idiomatic Lua** and neovim plugin style

TODO.md

@@ -1,4 +1,5 @@
 ## High
+- [ ] cancel current request
 - [ ] implement streaming for OpenAI APIs. 
 - [ ] list/select with telescope picker
 - [ ] model definition inheritance: define model from previous one

lua/codegpt/commands.lua

@@ -7,23 +7,23 @@ local models = require("codegpt.models")
 
 local M = {}
 
-local text_popup_stream = function(stream, bufnr, start_row, start_col, end_row, end_col)
+local text_popup_stream = function(job, stream, bufnr, start_row, start_col, end_row, end_col)
 	local popup_filetype = Config.opts.ui.text_popup_filetype
-	Ui.popup_stream(stream, popup_filetype, bufnr, start_row, start_col, end_row, end_col)
+	Ui.popup_stream(job, stream, popup_filetype, bufnr, start_row, start_col, end_row, end_col)
 end
 
 M.CallbackTypes = {
 	["text_popup_stream"] = text_popup_stream,
-	["text_popup"] = function(lines, bufnr, start_row, start_col, end_row, end_col)
+	["text_popup"] = function(job, lines, bufnr, start_row, start_col, end_row, end_col)
 		local popup_filetype = Config.opts.ui.text_popup_filetype
-		Ui.popup(lines, popup_filetype, bufnr, start_row, start_col, end_row, end_col)
+		Ui.popup(job, lines, popup_filetype, bufnr, start_row, start_col, end_row, end_col)
 	end,
-	["code_popup"] = function(lines, bufnr, start_row, start_col, end_row, end_col)
+	["code_popup"] = function(job, lines, bufnr, start_row, start_col, end_row, end_col)
 		lines = Utils.trim_to_code_block(lines)
 		Utils.fix_indentation(bufnr, start_row, end_row, lines)
-		Ui.popup(lines, Utils.get_filetype(), bufnr, start_row, start_col, end_row, end_col)
+		Ui.popup(job, lines, Utils.get_filetype(), bufnr, start_row, start_col, end_row, end_col)
 	end,
-	["replace_lines"] = function(lines, bufnr, start_row, start_col, end_row, end_col)
+	["replace_lines"] = function(job, lines, bufnr, start_row, start_col, end_row, end_col)
 		lines = Utils.strip_reasoning(lines, "<think>", "</think>")
 		lines = Utils.trim_to_code_block(lines)
 		lines = Utils.remove_trailing_whitespace(lines)
@@ -32,7 +32,7 @@ M.CallbackTypes = {
 			Utils.replace_lines(lines, bufnr, start_row, start_col, end_row, end_col)
 		else
 			-- if the buffer is not valid, open a popup. This can happen when the user closes the previous popup window before the request is finished.
-			Ui.popup(lines, Utils.get_filetype(), bufnr, start_row, start_col, end_row, end_col)
+			Ui.popup(job, lines, Utils.get_filetype(), bufnr, start_row, start_col, end_row, end_col)
 		end
 	end,
 	["custom"] = nil,
@@ -51,7 +51,7 @@ local function get_cmd_opts(cmd)
 	local is_stream = false
 
 	local model
-	if opts.model then
+	if opts ~= nil and opts.model then
 		_, model = models.get_model_by_name(opts.model)
 	else
 		_, model = models.get_model()
@@ -96,12 +96,12 @@ function M.run_cmd(command, command_args, text_selection, bounds)
 	local new_callback = nil
 
 	if is_stream then
-		new_callback = function(stream)
-			cmd_opts.callback(stream, bufnr, unpack(bounds))
+		new_callback = function(stream, job)
+			cmd_opts.callback(job, stream, bufnr, unpack(bounds))
 		end
 	else
-		new_callback = function(lines) -- called from Provider.handle_response
-			cmd_opts.callback(lines, bufnr, unpack(bounds))
+		new_callback = function(lines, job) -- called from Provider.handle_response
+			cmd_opts.callback(job, lines, bufnr, unpack(bounds))
 		end
 	end
 

lua/codegpt/config.lua

@@ -210,6 +210,7 @@ local defaults = {
 			quit = "q", -- key to quit the popup
 			use_as_output = "<c-o>", -- key to use the popup content as output and replace the original lines
 			use_as_input = "<c-i>", -- key to use the popup content as input for a new API request
+			cancel = "<c-c>", -- cancel current request
 			custom = {}, -- define your custom mappings here
 		},
 	},

lua/codegpt/errors.lua

@@ -1,3 +1,4 @@
+local Api = require("codegpt.api")
 local M = {}
 
 ---@param provider string
@@ -11,4 +12,13 @@ function M.err(msg)
 	vim.notify(msg, vim.log.levels.ERROR)
 end
 
+function M.curl_error(err)
+	if err.exit ~= nil then
+		vim.defer_fn(function()
+			vim.notify("curl error: " .. err.message, vim.log.levels.ERROR)
+		end, 0)
+	end
+	Api.run_finished_hook()
+end
+
 return M

lua/codegpt/ui.lua

@@ -77,7 +77,7 @@ local function create_window()
 	return ui_elem
 end
 
-function M.popup(lines, filetype, bufnr, start_row, start_col, end_row, end_col)
+function M.popup(job, lines, filetype, bufnr, start_row, start_col, end_row, end_col)
 	local ui_elem = create_window()
 	-- mount/open the component
 	ui_elem:mount()
@@ -93,6 +93,11 @@ function M.popup(lines, filetype, bufnr, start_row, start_col, end_row, end_col)
 	ui_elem:map("n", config.opts.ui.actions.quit, function()
 		ui_elem:unmount()
 	end, { noremap = true, silent = true })
+	--
+	-- cancel job if actions.cancel is called
+	ui_elem:map("n", config.opts.ui.actions.cancel, function()
+		job:shutdown()
+	end, { noremap = true, silent = true })
 
 	-- set content
 	vim.api.nvim_set_option_value("filetype", filetype, { buf = ui_elem.bufnr })
@@ -119,7 +124,7 @@ end
 local streaming = false
 local stream_ui_elem = nil
 
-function M.popup_stream(stream, filetype, bufnr, start_row, start_col, end_row, end_col)
+function M.popup_stream(job, stream, filetype, bufnr, start_row, start_col, end_row, end_col)
 	if not streaming then
 		streaming = true
 		stream_ui_elem = create_window()
@@ -139,6 +144,11 @@ function M.popup_stream(stream, filetype, bufnr, start_row, start_col, end_row,
 			stream_ui_elem:unmount()
 		end, { noremap = true, silent = true })
 
+		-- cancel job if actions.cancel is called
+		stream_ui_elem:map("n", config.opts.ui.actions.cancel, function()
+			job:shutdown()
+		end, { noremap = true, silent = true })
+
 		vim.api.nvim_set_option_value("filetype", filetype, { buf = stream_ui_elem.bufnr })
 		vim.api.nvim_set_option_value("wrap", true, { win = stream_ui_elem.winid })
 	end
@@ -156,7 +166,13 @@ function M.popup_stream(stream, filetype, bufnr, start_row, start_col, end_row,
 		streaming = false
 		return
 	else
-		local payload = vim.fn.json_decode(stream)
+		local ok, payload = pcall(function()
+			return vim.fn.json_decode(stream)
+		end)
+		if not ok then
+			streaming = false
+			return
+		end
 		local content = payload.message.content
 		local content_lines = vim.split(content, "\n")
 		if #content_lines == 1 then

tests/parsing_spec.lua

@@ -1,7 +1,7 @@
 local utils = require("codegpt.utils")
 
 describe("parsing llm response", function()
-	it("should extract code", function()
+	it("should extract code from reasoning", function()
 		local input = [[
 <think>
 Okay, the user is asking how to get the first element of an array in Lua, and they just want the code. Let me think.