diff options
Diffstat (limited to 'py')
| -rw-r--r-- | py/chat.py | 48 | ||||
| -rw-r--r-- | py/complete.py | 4 | ||||
| -rw-r--r-- | py/utils.py | 8 |
3 files changed, 33 insertions, 27 deletions
@@ -4,7 +4,7 @@ import openai plugin_root = vim.eval("s:plugin_root") vim.command(f"py3file {plugin_root}/py/utils.py") -options = make_options() +options = vim.eval("options") request_options = make_request_options() openai.api_key = load_api_key() @@ -16,26 +16,38 @@ prompt = f"{initial_prompt}\n{file_content}" lines = prompt.splitlines() messages = [] -with open('/tmp/prompt.aichat', 'w') as f: - f.write(prompt) +def parse_messages(): + file_content = vim.eval('trim(join(getline(1, "$"), "\n"))') + lines = file_content.splitlines() + messages = [] + for line in lines: + if line.startswith(">>> system"): + messages.append({"role": "system", "content": ""}) + continue + if line.startswith(">>> user"): + messages.append({"role": "user", "content": ""}) + continue + if line.startswith("<<< assistant"): + messages.append({"role": "assistant", "content": ""}) + continue + if not messages: + continue + messages[-1]["content"] += "\n" + line + return messages -for line in lines: - if line.startswith(">>> system"): - messages.append({"role": "system", "content": ""}) - continue - if line.startswith(">>> user"): - messages.append({"role": "user", "content": ""}) - continue - if line.startswith("<<< assistant"): - messages.append({"role": "assistant", "content": ""}) - continue - if not messages: - continue - messages[-1]["content"] += "\n" + line +messages = parse_messages() if not messages: - file_content = ">>> user\n\n" + file_content - messages.append({"role": "user", "content": file_content }) + # roles not found, put whole file content as an user prompt + vim.command("normal! ggO>>> user\n") + vim.command("normal! G") + vim.command("let &ul=&ul") # breaks undo sequence (https://vi.stackexchange.com/a/29087) + vim.command("redraw") + messages = parse_messages() + +for message in messages: + # strip newlines from the content as it causes empty responses + message["content"] = message["content"].strip() try: if messages[-1]["content"].strip(): diff --git a/py/complete.py b/py/complete.py index 40f6efb..bddd8e6 100644 --- a/py/complete.py +++ b/py/complete.py @@ -4,13 +4,13 @@ import openai plugin_root = vim.eval("s:plugin_root") vim.command(f"py3file {plugin_root}/py/utils.py") -prompt = vim.eval("prompt") +prompt = vim.eval("prompt").strip() request_options = make_request_options() openai.api_key = load_api_key() try: - if prompt.strip(): + if prompt: print('Completing...') vim.command("redraw") diff --git a/py/utils.py b/py/utils.py index 3e5295a..02ecfef 100644 --- a/py/utils.py +++ b/py/utils.py @@ -11,14 +11,8 @@ def load_api_key(): pass return api_key.strip() -def make_options(): - options_default = vim.eval("options_default") - options_user = vim.eval("options") - options = {**options_default, **options_user} - return options - def make_request_options(): - options = make_options() + options = vim.eval("options") request_options = {} request_options['model'] = options['model'] request_options['max_tokens'] = int(options['max_tokens']) |