feat: show date time and additional information on end separator (CopilotC-Nvim#53)

* feat: show date time and addition information on end separator

* refactor: merge system prompts to one file

Author: jellydn

rplugin/python3/handlers/chat_handler.py

@@ -1,6 +1,7 @@
+from datetime import datetime
 from typing import Optional, cast
 
-import prompts as prompts
+import prompts as system_prompts
 from copilot import Copilot
 from mypynvim.core.buffer import MyBuffer
 from mypynvim.core.nvim import MyNvim
@@ -52,18 +53,18 @@ def chat(
         self.nvim.exec_lua('require("CopilotChat.spinner").hide()')
 
         if not disable_end_separator:
-            self._add_end_separator()
+            self._add_end_separator(model)
 
     # private
 
     def _construct_system_prompt(self, prompt: str):
-        system_prompt = prompts.COPILOT_INSTRUCTIONS
-        if prompt == prompts.FIX_SHORTCUT:
-            system_prompt = prompts.COPILOT_FIX
-        elif prompt == prompts.TEST_SHORTCUT:
-            system_prompt = prompts.COPILOT_TESTS
-        elif prompt == prompts.EXPLAIN_SHORTCUT:
-            system_prompt = prompts.COPILOT_EXPLAIN
+        system_prompt = system_prompts.COPILOT_INSTRUCTIONS
+        if prompt == system_prompts.FIX_SHORTCUT:
+            system_prompt = system_prompts.COPILOT_FIX
+        elif prompt == system_prompts.TEST_SHORTCUT:
+            system_prompt = system_prompts.COPILOT_TESTS
+        elif prompt == system_prompts.EXPLAIN_SHORTCUT:
+            system_prompt = system_prompts.COPILOT_EXPLAIN
         return system_prompt
 
     def _add_start_separator(
@@ -204,6 +205,13 @@ def _add_chat_messages(
                 token.split("\n"),
             )
 
-    def _add_end_separator(self):
-        end_separator = "\n---\n"
-        self.buffer.append(end_separator.split("\n"))
+    def _add_end_separator(self, model: str):
+        current_datetime = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        model_info = f"\n#### Answer provided by Copilot (Model: `{model}`) on {current_datetime}."
+        additional_instructions = (
+            "\n> For additional queries, please use the `CopilotChat` command."
+        )
+        disclaimer = "\n> Please be aware that the AI's output may not always be accurate. Always cross-verify the output.\n---\n"
+
+        end_message = model_info + additional_instructions + disclaimer
+        self.buffer.append(end_message.split("\n"))

rplugin/python3/handlers/inplace_chat_handler.py

@@ -5,8 +5,6 @@
 from mypynvim.ui_components.layout import Box, Layout
 from mypynvim.ui_components.popup import PopUp
 
-from . import prompts
-
 # Define constants for the models
 MODEL_GPT4 = "gpt-4"
 MODEL_GPT35_TURBO = "gpt-3.5-turbo"
@@ -243,10 +241,10 @@ def _set_keymaps(self):
         self.prompt_popup.map("n", "<C-m>", lambda cb=self._toggle_system_model: cb())
 
         self.prompt_popup.map(
-            "n", "'", lambda: self._set_prompt(prompts.PROMPT_SIMPLE_DOCSTRING)
+            "n", "'", lambda: self._set_prompt(system_prompts.PROMPT_SIMPLE_DOCSTRING)
         )
         self.prompt_popup.map(
-            "n", "s", lambda: self._set_prompt(prompts.PROMPT_SEPARATE)
+            "n", "s", lambda: self._set_prompt(system_prompts.PROMPT_SEPARATE)
         )
 
         self.prompt_popup.map(

rplugin/python3/handlers/prompts.py

@@ -247,3 +247,5 @@
 Your code output should keep the same level of indentation as the user's code.
 You MUST add whitespace in the beginning of each line as needed to match the user's code.
 """
+PROMPT_SIMPLE_DOCSTRING = "add simple docstring to this code"
+PROMPT_SEPARATE = "add comments separating the code into sections"