Enable CEDARScript edit format

aider/coders/__init__.py

@@ -1,6 +1,7 @@
 from .architect_coder import ArchitectCoder
 from .ask_coder import AskCoder
 from .base_coder import Coder
+from .cedarscript_coder import CedarCoderRW, CedarCoderW, CedarCoderGrammar
 from .editblock_coder import EditBlockCoder
 from .editblock_fenced_coder import EditBlockFencedCoder
 from .editor_editblock_coder import EditorEditBlockCoder
@@ -19,6 +20,9 @@
     EditBlockFencedCoder,
     WholeFileCoder,
     UnifiedDiffCoder,
+    CedarCoderGrammar,
+    CedarCoderRW,
+    CedarCoderW,
     #    SingleWholeFileFunctionCoder,
     ArchitectCoder,
     EditorEditBlockCoder,

aider/coders/base_coder.py

@@ -125,7 +125,7 @@ def create(
 
             # If the edit format changes, we can't leave old ASSISTANT
             # messages in the chat history. The old edit format will
-            # confused the new LLM. It may try and imitate it, disobeying
+            # confuse the new LLM. It may try and imitate it, disobeying
             # the system prompt.
             done_messages = from_coder.done_messages
             if edit_format != from_coder.edit_format and done_messages and summarize_from_coder:
@@ -933,6 +933,8 @@ def fmt_system_prompt(self, prompt):
             fence=self.fence,
             lazy_prompt=lazy_prompt,
             platform=platform_text,
+            cedarscript_training=self.gpt_prompts.cedarscript_training,
+            final_remarks=self.gpt_prompts.final_remarks,
             shell_cmd_prompt=shell_cmd_prompt,
             shell_cmd_reminder=shell_cmd_reminder,
         )

aider/coders/base_prompts.py

@@ -1,5 +1,7 @@
 class CoderPrompts:
     system_reminder = ""
+    final_remarks = ""
+    cedarscript_training=""
 
     files_content_gpt_edits = "I committed the changes with git hash {hash} & commit msg: {message}"
 

aider/coders/cedarscript_coder.py

@@ -0,0 +1,83 @@
+import re
+import xml.etree.ElementTree as ET
+
+from cedarscript_editor import PythonCEDARScriptEditor
+from cedarscript_ast_parser import CEDARScriptASTParser, Command
+from aider.coders.base_coder import Coder
+from aider.coders.cedarscript_prompts_w import CedarPromptsW
+from aider.coders.cedarscript_prompts_rw import CedarPromptsRW
+from aider.coders.cedarscript_prompts_g import CedarPromptsGrammar
+import os
+
+
+class CedarCoder(Coder):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.cedarscript_parser = CEDARScriptASTParser()
+        self.cedar_editor = PythonCEDARScriptEditor(os.getcwd())
+
+    def find_cedar_commands(self, content):
+        # Regex pattern to match Cedar blocks
+        pattern = r'```CEDARScript\n(.*?)```'
+        cedar_script_blocks = re.findall(pattern, content, re.DOTALL)
+        print(f'[find_cedar_commands] Script block count: {len(cedar_script_blocks)}')
+        if len(cedar_script_blocks) == 0:
+            raise ValueError("No CEDARScript block detected. Perhaps you forgot to enclose the block using ```CEDARScript and ``` ? Or was that intentional?")
+        for cedar_script in cedar_script_blocks:
+            parsed_commands, parse_errors = self.cedarscript_parser.parse_script(cedar_script)
+            if parse_errors:
+                raise ValueError(f"CEDARScript parsing errors: {[str(pe) for pe in parse_errors]}")
+            for cedar_command in parsed_commands:
+                yield cedar_command
+
+
+    def get_edits(self):
+        # Note: it should be allowed for the editor to change any file in the project, as changing the file
+        # doesn't require the full file contents to be sent to the LLM.
+        content = self.partial_response_content
+        cedar_commands: list[Command] = list(self.find_cedar_commands(content))
+        # TODO Handle shell commands
+        # self.shell_commands = [edit for edit in edits if edit[0] is None]
+        for files_to_change in [cedar_command.files_to_change for cedar_command in cedar_commands]:
+            print(f'[get_edits] "{files_to_change}"')
+        result = [(cedar_command.files_to_change[0], cedar_command) for cedar_command in cedar_commands if cedar_command.files_to_change]
+        return result
+
+    def apply_edits(self, file_and_cedar_commands):
+        """
+        Apply the edits (expressed as Cedar commands) to the files
+        """
+        cedar_commands = [x[1] for x in file_and_cedar_commands]
+        print(f"[apply_edits] Command count: {len(cedar_commands)}")
+        for i, applied_command_result in enumerate(self.cedar_editor.apply_commands(cedar_commands)):
+            print(f"[apply_edits]   (#{i+1}) {applied_command_result}")
+
+
+    def _format_cedar_output(self, operation: str, status: str, result: list[str]) -> str:
+        """Format the output according to CEDAR specification"""
+        root = ET.Element("cedar-operation")
+        ET.SubElement(root, "type").text = operation
+        ET.SubElement(root, "status").text = status
+        params = ET.SubElement(root, "parameters")
+        # Add parameters here if needed
+        result_elem = ET.SubElement(root, "result")
+        for item in result:
+            ET.SubElement(result_elem, "item").text = item
+        ET.SubElement(root, "execution-time").text = "0.05s"  # Example execution time
+        return ET.tostring(root, encoding="unicode")
+
+
+class CedarCoderGrammar(CedarCoder):
+    gpt_prompts = CedarPromptsGrammar()
+    edit_format = gpt_prompts.edit_format_name()
+
+
+class CedarCoderRW(CedarCoder):
+    gpt_prompts = CedarPromptsRW()
+    edit_format = gpt_prompts.edit_format_name()
+
+
+class CedarCoderW(CedarCoder):
+    gpt_prompts = CedarPromptsW()
+    edit_format = gpt_prompts.edit_format_name()
+