From b0f7e3b8d92289d1a8086e3eed206f8b5757328b Mon Sep 17 00:00:00 2001 From: Martin Bielik Date: Sat, 9 Mar 2024 18:06:14 +0100 Subject: read role prompt from config --- py/chat.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'py/chat.py') diff --git a/py/chat.py b/py/chat.py index ff70904..85adfec 100644 --- a/py/chat.py +++ b/py/chat.py @@ -4,10 +4,13 @@ import vim plugin_root = vim.eval("s:plugin_root") vim.command(f"py3file {plugin_root}/py/utils.py") +prompt, role_options = parse_prompt_and_role(vim.eval("l:prompt")) config = normalize_config(vim.eval("l:config")) -config_options = config['options'] +config_options = { + **config['options'], + **role_options, +} config_ui = config['ui'] -prompt = vim.eval("l:prompt").strip() def initialize_chat_window(): lines = vim.eval('getline(1, "$")') @@ -72,7 +75,7 @@ try: **openai_options } printDebug("[chat] request: {}", request) - url = config_options['endpoint_url'] + url = options['endpoint_url'] response = openai_request(url, request, http_options) def map_chunk(resp): printDebug("[chat] response: {}", resp) -- cgit v1.2.3 From bdd1069562967bd07921e75873d54eb75d62144d Mon Sep 17 00:00:00 2001 From: Martin Bielik Date: Sat, 9 Mar 2024 18:32:45 +0100 Subject: parse role options --- py/chat.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'py/chat.py') diff --git a/py/chat.py b/py/chat.py index 85adfec..f996800 100644 --- a/py/chat.py +++ b/py/chat.py @@ -8,7 +8,8 @@ prompt, role_options = parse_prompt_and_role(vim.eval("l:prompt")) config = normalize_config(vim.eval("l:config")) config_options = { **config['options'], - **role_options, + **role_options['options_default'], + **role_options['options_chat'], } config_ui = config['ui'] -- cgit v1.2.3 From 155d0c8eda5e5effdd7a234da46db18fbe32e17a Mon Sep 17 00:00:00 2001 From: Martin Bielik Date: Sat, 9 Mar 2024 19:48:17 +0100 Subject: fix using role in existing chat --- py/chat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'py/chat.py') diff --git a/py/chat.py b/py/chat.py index f996800..67f2d5d 100644 --- a/py/chat.py +++ b/py/chat.py @@ -42,7 +42,7 @@ def initialize_chat_window(): vim.command("normal! i\n>>> user\n\n") if prompt: - vim.command("normal! a" + prompt) + vim.command("normal! i" + prompt) vim_break_undo_sequence() vim.command("redraw") -- cgit v1.2.3