fix chat_history and add tests

Author: blob42

lua/codegpt/config.lua

@@ -1,6 +1,10 @@
 ---@class codegpt.Config
 local M = {}
 
+---@class codegpt.Chatmsg
+---@field role "system"|"user"|"assistant"
+---@field content string
+
 ---@class codegpt.CommandOpts
 ---@field user_message_template? string
 ---@field language_instructions? table<string, string> language instruction in the form lang = instruction
@@ -10,6 +14,7 @@ local M = {}
 ---@field max_tokens? number Custom max_tokens for this command
 ---@field append_string? string String to append to prompt -- ex: /no_think
 ---@field model? string Model to always use with this command
+---@field chat_history? codegpt.Chatmsg[]
 ---@field [string] any -- merged command parameters
 
 ---@type { [string]: codegpt.CommandOpts }

lua/codegpt/providers/messages.lua

@@ -4,6 +4,7 @@ local M = {}
 ---@param command string
 ---@param cmd_opts codegpt.CommandOpts
 ---@param command_args string
+---@param text_selection string
 function M.generate_messages(command, cmd_opts, command_args, text_selection)
 	local system_message =
 		Render.render(command, cmd_opts.system_message_template, command_args, text_selection, cmd_opts)
@@ -13,10 +14,17 @@ function M.generate_messages(command, cmd_opts, command_args, text_selection)
 	end
 
 	local messages = {}
+
 	if system_message ~= nil and system_message ~= "" then
 		table.insert(messages, { role = "system", content = system_message })
 	end
 
+	if cmd_opts.chat_history then
+		for _, msg in ipairs(cmd_opts.chat_history) do
+			table.insert(messages, msg)
+		end
+	end
+
 	if user_message ~= nil and user_message ~= "" then
 		table.insert(messages, { role = "user", content = user_message })
 	end

tests/command_spec.lua

@@ -35,7 +35,7 @@ describe("command parsing: ", function()
 	end)
 end)
 
-describe("cmd opts", function()
+describe("command options", function()
 	before_each(function()
 		codegpt.setup()
 	end)

tests/message_render_spec.lua

@@ -0,0 +1,82 @@
+local codegpt = require("codegpt")
+local config = require("codegpt.config")
+local Messages = require("codegpt.providers.messages")
+local Commands = require("codegpt.commands")
+
+local function should_fail(fun)
+	local stat = pcall(fun)
+	assert(not stat, "Function should have errored")
+end
+
+describe("message templates", function()
+	before_each(function()
+		codegpt.setup()
+	end)
+
+	it("should render default system msg", function()
+		vim.o.filetype = "lua"
+		codegpt.setup({})
+		local cmd_opts = Commands.get_cmd_opts("completion")
+
+		local messages = Messages.generate_messages("completion", cmd_opts, "", "")
+
+		assert(#messages == 2)
+		local default_systpl = config.opts.global_defaults.system_message_template
+		assert(messages[1].role == "system")
+		assert(messages[1].content == default_systpl:gsub("{{language}}", "lua"))
+	end)
+
+	it("should render user msg", function()
+		local testcmd = {
+			user_message_template = "Foo user message",
+		}
+		codegpt.setup({
+			commands = {
+				testcmd = testcmd,
+			},
+		})
+		local cmd_opts = Commands.get_cmd_opts("testcmd")
+
+		vim.o.filetype = "lua"
+
+		local messages = Messages.generate_messages("testcmd", cmd_opts, "", "")
+
+		assert(#messages == 2)
+		local default_systpl = config.opts.global_defaults.system_message_template
+		assert(messages[1].role == "system")
+		assert(messages[1].content == default_systpl:gsub("{{language}}", "lua"))
+		assert(messages[2].content == testcmd.user_message_template)
+	end)
+
+	it("should handle message history", function()
+		local testcmd = {
+			user_message_template = "Foo user message",
+			---@type codegpt.Chatmsg[]
+			chat_history = {
+				{ role = "user", content = "Hist user msg" },
+				{ role = "assistant", content = "Hist assistant response" },
+			},
+		}
+		codegpt.setup({
+			commands = {
+				testcmd = testcmd,
+			},
+			global_defaults = {
+				system_message_template = "Default system message",
+			},
+		})
+		local cmd_opts = Commands.get_cmd_opts("testcmd")
+
+		local messages = Messages.generate_messages("testcmd", cmd_opts, "", "")
+
+		assert(#messages == 4)
+		assert(messages[1].role == "system")
+		assert(messages[1].content == "Default system message")
+		assert(messages[2].role == "user")
+		assert(messages[2].content == "Hist user msg")
+		assert(messages[3].role == "assistant")
+		assert(messages[3].content == "Hist assistant response")
+		assert(messages[4].role == "user")
+		assert(messages[4].content == "Foo user message")
+	end)
+end)