Added prepare_implementation_information and prepare_conformance_test_fix actions.

Author: VitjanZ

codeplain_REST_api.py

@@ -366,6 +366,54 @@ def generate_folder_name_from_functional_requirement(
 
         return self.post_request(endpoint_url, headers, payload, run_state)
 
+    def prepare_conformance_test_fix(
+        self,
+        frid,
+        functional_requirement_id,
+        plain_source_tree,
+        linked_resources,
+        existing_files_content,
+        memory_files_content,
+        module_name: str,
+        conformance_tests_module_name: str,
+        required_modules,
+        code_diff,
+        conformance_tests_files,
+        acceptance_tests,
+        conformance_tests_issue,
+        implementation_fix_count,
+        conformance_tests_folder_name,
+        current_testing_frid_high_level_implementation_plan: Optional[str],
+        run_state: RunState,
+        prepare_conformance_test_fix_script: str,
+    ) -> dict:
+        endpoint_url = f"{self.api_url}/prepare_conformance_test_fix"
+        headers = {"X-API-Key": self.api_key, "Content-Type": "application/json"}
+
+        payload = {
+            "frid": frid,
+            "functional_requirement_id": functional_requirement_id,
+            "plain_source_tree": plain_source_tree,
+            "linked_resources": linked_resources,
+            "existing_files_content": existing_files_content,
+            "memory_files_content": memory_files_content,
+            "module_name": module_name,
+            "conformance_tests_module_name": conformance_tests_module_name,
+            "required_modules": required_modules,
+            "code_diff": code_diff,
+            "conformance_tests_files": conformance_tests_files,
+            "conformance_tests_issue": conformance_tests_issue,
+            "implementation_fix_count": implementation_fix_count,
+            "conformance_tests_folder_name": conformance_tests_folder_name,
+            "current_testing_frid_high_level_implementation_plan": current_testing_frid_high_level_implementation_plan,
+            "prepare_conformance_test_fix_script": prepare_conformance_test_fix_script,
+        }
+
+        if acceptance_tests is not None:
+            payload["acceptance_tests"] = acceptance_tests
+
+        return self.post_request(endpoint_url, headers, payload, run_state)
+
     def fix_conformance_tests_issue(
         self,
         frid,
@@ -385,6 +433,7 @@ def fix_conformance_tests_issue(
         conformance_tests_folder_name,
         current_testing_frid_high_level_implementation_plan: Optional[str],
         run_state: RunState,
+        conformance_test_fix_information: Optional[str] = None,
     ):
         endpoint_url = f"{self.api_url}/fix_conformance_tests_issue"
         headers = {"X-API-Key": self.api_key, "Content-Type": "application/json"}
@@ -410,6 +459,9 @@ def fix_conformance_tests_issue(
         if acceptance_tests is not None:
             payload["acceptance_tests"] = acceptance_tests
 
+        if conformance_test_fix_information is not None:
+            payload["conformance_test_fix_information"] = conformance_test_fix_information
+
         return self.post_request(endpoint_url, headers, payload, run_state)
 
     def render_acceptance_tests(

module_renderer.py

@@ -175,6 +175,7 @@ def _build_render_context_for_module(
             prepare_environment_script=self.args.prepare_environment_script,
             prepare_implementation_script=self.args.prepare_implementation_script,
             copy_build=self.args.copy_build,
+            prepare_conformance_test_fix_script=self.args.prepare_conformance_test_fix_script,
             copy_conformance_tests=self.args.copy_conformance_tests,
             render_range=render_range,
             render_conformance_tests=self.args.render_conformance_tests,

plain2code_arguments.py

@@ -19,6 +19,7 @@
 DEFAULT_LOG_FILE_NAME = "codeplain.log"
 PREPARE_ENVIRONMENT_SCRIPT_NAME = "prepare_environment_script"
 PREPARE_IMPLEMENTATION_SCRIPT_NAME = "prepare_implementation_script"
+PREPARE_CONFORMANCE_TEST_FIX_SCRIPT_NAME = "prepare_conformance_test_fix_script"
 
 
 def process_test_script_path(script_arg_name, config):
@@ -261,6 +262,14 @@ def create_parser():
         "and should print the LLM response to stdout.",
     )
 
+    parser.add_argument(
+        "--prepare-conformance-test-fix-script",
+        type=str,
+        help="Path to a shell script that queries an LLM to produce additional information before fixing a conformance test. "
+        "The script receives a path to a file containing LLM query instructions as its first argument "
+        "and should print the LLM response to stdout.",
+    )
+
     parser.add_argument(
         "--test-script-timeout",
         type=int,
@@ -380,7 +389,13 @@ def parse_arguments():
     if args.full_plain and args.dry_run:
         parser.error("--full-plain and --dry-run are mutually exclusive")
 
-    script_arg_names = [UNIT_TESTS_SCRIPT_NAME, CONFORMANCE_TESTS_SCRIPT_NAME, PREPARE_ENVIRONMENT_SCRIPT_NAME, PREPARE_IMPLEMENTATION_SCRIPT_NAME]
+    script_arg_names = [
+        UNIT_TESTS_SCRIPT_NAME,
+        CONFORMANCE_TESTS_SCRIPT_NAME,
+        PREPARE_ENVIRONMENT_SCRIPT_NAME,
+        PREPARE_IMPLEMENTATION_SCRIPT_NAME,
+        PREPARE_CONFORMANCE_TEST_FIX_SCRIPT_NAME,
+    ]
     for script_name in script_arg_names:
         args = process_test_script_path(script_name, args)
 

render_machine/actions/fix_conformance_test.py

@@ -100,6 +100,7 @@ def execute(self, render_context: RenderContext, previous_action_payload: Any |
                 render_context.conformance_tests_running_context.get_current_conformance_test_folder_name(),
                 render_context.conformance_tests_running_context.current_testing_frid_high_level_implementation_plan,
                 run_state=render_context.run_state,
+                conformance_test_fix_information=render_context.conformance_tests_running_context.conformance_test_fix_information,
             )
         code_diff_files_content = {}
 

render_machine/actions/prepare_implementation_information.py

@@ -1,10 +1,7 @@
-import os
-import tempfile
 from typing import Any
 
 import render_machine.render_utils as render_utils
 from memory_management import MemoryManager
-from plain2code_console import console
 from render_machine.actions.base_action import BaseAction
 from render_machine.implementation_code_helpers import ImplementationCodeHelpers
 from render_machine.render_context import RenderContext
@@ -16,12 +13,6 @@ class PrepareImplementationInformation(BaseAction):
     FAILED_OUTCOME = "implementation_information_preparation_failed"
 
     def execute(self, render_context: RenderContext, _previous_action_payload: Any | None):
-        if render_context.verbose:
-            console.info(
-                f"Running prepare_implementation_script {render_context.prepare_implementation_script} "
-                f"for FRID {render_context.frid_context.frid}."
-            )
-
         _, existing_files_content = ImplementationCodeHelpers.fetch_existing_files(render_context.build_folder)
         _, memory_files_content = MemoryManager.fetch_memory_files(render_context.memory_manager.memory_folder)
 
@@ -42,36 +33,27 @@ def execute(self, render_context: RenderContext, _previous_action_payload: Any |
         )
         instructions = api_response.get("instructions", "")
 
-        tmp_path = None
-        try:
-            with tempfile.NamedTemporaryFile(mode="w", suffix=".txt", delete=False, encoding="utf-8") as tmp:
-                tmp.write(instructions)
-                tmp_path = tmp.name
-
-            exit_code, implementation_information, script_output_path = render_utils.execute_script(
-                render_context.prepare_implementation_script,
-                [tmp_path],
-                render_context.verbose,
-                "Prepare Implementation Information",
-                timeout=render_context.test_script_timeout,
-                stop_event=render_context.stop_event,
-            )
-        finally:
-            if tmp_path and os.path.exists(tmp_path):
-                os.unlink(tmp_path)
+        exit_code, implementation_information, script_output_path = render_utils.execute_script(
+            render_context.prepare_implementation_script,
+            [instructions],
+            render_context.verbose,
+            "Prepare Implementation Information",
+            timeout=render_context.test_script_timeout,
+            stop_event=render_context.stop_event,
+        )
 
-        if exit_code == 0:
+        if exit_code == 0 or exit_code == render_utils.TIMEOUT_ERROR_EXIT_CODE:
             render_context.frid_context.implementation_information = implementation_information
             render_context.script_execution_history.latest_prepare_implementation_output_path = script_output_path
             render_context.script_execution_history.should_update_script_outputs = True
             return self.SUCCESSFUL_OUTCOME, None
-        else:
-            return (
-                self.FAILED_OUTCOME,
-                RenderError.encode(
-                    message="Prepare implementation information failed. Please check the prepare_implementation_script.",
-                    error_type="PREPARE_IMPLEMENTATION_ERROR",
-                    exit_code=exit_code,
-                    script=render_context.prepare_implementation_script,
-                ).to_payload(),
-            )
+
+        return (
+            self.FAILED_OUTCOME,
+            RenderError.encode(
+                message="Prepare implementation information failed. Please check the prepare_implementation_script.",
+                error_type="PREPARE_IMPLEMENTATION_ERROR",
+                exit_code=exit_code,
+                script=render_context.prepare_implementation_script,
+            ).to_payload(),
+        )

render_machine/actions/render_conformance_tests.py

@@ -37,8 +37,8 @@ def _render_conformance_tests(self, render_context: RenderContext):
                 f"[{console.INFO_STYLE}]Generating folder name for conformance tests for functionality {render_context.conformance_tests_running_context.current_testing_frid}...\n"
             ):
                 fr_subfolder_name = render_context.codeplain_api.generate_folder_name_from_functional_requirement(
-                    frid=render_context.conformance_tests_running_context.current_testing_frid,
-                    module_name=render_context.conformance_tests_running_context.current_testing_module_name,
+                    frid=render_context.frid_context.frid,
+                    module_name=render_context.module_name,
                     functional_requirement=render_context.conformance_tests_running_context.current_testing_frid_specifications[
                         plain_spec.FUNCTIONAL_REQUIREMENTS
                     ][

render_machine/render_context.py

@@ -56,6 +56,7 @@ def __init__(
         test_script_timeout: Optional[int] = None,
         stop_event: Optional[threading.Event] = None,
         enter_pause_event: Optional[threading.Event] = None,
+        prepare_conformance_test_fix_script: Optional[str] = None,
     ):
         self.codeplain_api: CodeplainAPI = codeplain_api
         self.memory_manager = memory_manager
@@ -71,6 +72,7 @@ def __init__(
         self.conformance_tests_script = conformance_tests_script
         self.prepare_environment_script = prepare_environment_script
         self.prepare_implementation_script = prepare_implementation_script
+        self.prepare_conformance_test_fix_script = prepare_conformance_test_fix_script
         self.copy_build = copy_build
         self.copy_conformance_tests = copy_conformance_tests
         self.render_range = render_range
@@ -348,6 +350,10 @@ def start_prepare_implementation_information(self):
         if self.prepare_implementation_script is None:
             self.machine.dispatch(triggers.MARK_IMPLEMENTATION_INFORMATION_PREPARED)
 
+    def start_prepare_conformance_test_fix(self):
+        if self.prepare_conformance_test_fix_script is None:
+            self.machine.dispatch(triggers.MARK_CONFORMANCE_TEST_FIX_PREPARED)
+
     def start_testing_environment_preparation(self):
         if (
             self.prepare_environment_script is None
@@ -399,10 +405,15 @@ def start_conformance_tests_for_frid(self):
                 ) or self.conformance_tests_running_context.conformance_test_phase_index == len(
                     self.frid_context.specifications[plain_spec.ACCEPTANCE_TESTS]
                 ):
-                    self.machine.dispatch(triggers.MARK_ALL_CONFORMANCE_TESTS_PASSED)
-                    return
-                if self.conformance_tests_running_context.conformance_test_phase_index == 0:
-                    self.conformance_tests_running_context.current_testing_frid_high_level_implementation_plan = None
+                    # All phases done — start regression run over earlier FRIDs
+                    self.conformance_tests_running_context.regression_run_started = True
+                    self.conformance_tests_running_context.current_testing_frid = None
+                    # fall through to get_first below
+                else:
+                    if self.conformance_tests_running_context.conformance_test_phase_index == 0:
+                        self.conformance_tests_running_context.current_testing_frid_high_level_implementation_plan = (
+                            None
+                        )
 
                 self.conformance_tests_running_context.conformance_test_phase_index += 1
                 current_acceptance_tests = self.frid_context.specifications[plain_spec.ACCEPTANCE_TESTS][

render_machine/render_types.py

@@ -52,6 +52,7 @@ def __init__(
         self.previous_conformance_tests_issue_frid: Optional[str] = None
         self.previous_conformance_tests_issue_module: Optional[str] = None
         self.code_diff_files: Optional[dict[str, str]] = None
+        self.conformance_test_fix_information: Optional[str] = None
 
     def get_conformance_tests_json(self, module_name: str) -> dict:
         return self._conformance_tests_json[module_name]
@@ -109,6 +110,7 @@ class ScriptExecutionHistory:
     latest_conformance_test_output_path: Optional[str] = None
     latest_testing_environment_output_path: Optional[str] = None
     latest_prepare_implementation_output_path: Optional[str] = None
+    latest_prepare_conformance_test_fix_output_path: Optional[str] = None
     should_update_script_outputs: bool = False
 
 

render_machine/state_machine_config.py

@@ -18,8 +18,9 @@
 from render_machine.actions.finish_functional_requirement import FinishFunctionalRequirement
 from render_machine.actions.fix_conformance_test import FixConformanceTest
 from render_machine.actions.fix_unit_tests import FixUnitTests
-from render_machine.actions.prepare_repositories import PrepareRepositories
+from render_machine.actions.prepare_conformance_test_fix import PrepareConformanceTestFix
 from render_machine.actions.prepare_implementation_information import PrepareImplementationInformation
+from render_machine.actions.prepare_repositories import PrepareRepositories
 from render_machine.actions.prepare_testing_environment import PrepareTestingEnvironment
 from render_machine.actions.refactor_code import RefactorCode
 from render_machine.actions.render_conformance_tests import RenderConformanceTests
@@ -94,6 +95,7 @@ def get_action_map(self) -> Dict[str, Any]:
             f"{States.IMPLEMENTING_FRID.value}_{States.PROCESSING_CONFORMANCE_TESTS.value}_{States.CONFORMANCE_TESTING_INITIALISED.value}": RenderConformanceTests(),
             f"{States.IMPLEMENTING_FRID.value}_{States.PROCESSING_CONFORMANCE_TESTS.value}_{States.CONFORMANCE_TEST_GENERATED.value}": PrepareTestingEnvironment(),
             f"{States.IMPLEMENTING_FRID.value}_{States.PROCESSING_CONFORMANCE_TESTS.value}_{States.CONFORMANCE_TEST_ENV_PREPARED.value}": RunConformanceTests(),
+            f"{States.IMPLEMENTING_FRID.value}_{States.PROCESSING_CONFORMANCE_TESTS.value}_{States.PREPARE_CONFORMANCE_TEST_FIX.value}": PrepareConformanceTestFix(),
             f"{States.IMPLEMENTING_FRID.value}_{States.PROCESSING_CONFORMANCE_TESTS.value}_{States.CONFORMANCE_TEST_FAILED.value}": FixConformanceTest(),
             f"{States.IMPLEMENTING_FRID.value}_{States.PROCESSING_CONFORMANCE_TESTS.value}_{States.POSTPROCESSING_CONFORMANCE_TESTS.value}_{States.CONFORMANCE_TESTS_READY_FOR_SUMMARY.value}": SummarizeConformanceTests(),
             f"{States.IMPLEMENTING_FRID.value}_{States.PROCESSING_CONFORMANCE_TESTS.value}_{States.POSTPROCESSING_CONFORMANCE_TESTS.value}_{States.CONFORMANCE_TESTS_READY_FOR_COMMIT.value}": CommitConformanceTestsChanges(
@@ -133,6 +135,8 @@ def get_action_result_triggers_map(self) -> Dict[str, str]:
             RunConformanceTests.SUCCESSFUL_OUTCOME: triggers.MOVE_TO_NEXT_CONFORMANCE_TEST,
             RunConformanceTests.FAILED_OUTCOME: triggers.MARK_CONFORMANCE_TESTS_FAILED,
             RunConformanceTests.UNRECOVERABLE_ERROR_OUTCOME: triggers.HANDLE_ERROR,
+            PrepareConformanceTestFix.SUCCESSFUL_OUTCOME: triggers.MARK_CONFORMANCE_TEST_FIX_PREPARED,
+            PrepareConformanceTestFix.FAILED_OUTCOME: triggers.HANDLE_ERROR,
             FixConformanceTest.IMPLEMENTATION_CODE_NOT_UPDATED: triggers.MARK_CONFORMANCE_TESTS_READY,
             FixConformanceTest.IMPLEMENTATION_CODE_UPDATED: triggers.MARK_UNIT_TESTS_READY,
             CommitConformanceTestsChanges.SUCCESSFUL_OUTCOME_IMPLEMENTATION_UPDATED: triggers.MARK_NEXT_CONFORMANCE_TESTS_POSTPROCESSING_STEP,
@@ -190,6 +194,10 @@ def get_processing_conformance_tests_states(self, render_context: RenderContext)
                     "on_enter": "start_testing_environment_preparation",
                 },
                 States.CONFORMANCE_TEST_ENV_PREPARED.value,
+                {
+                    "name": States.PREPARE_CONFORMANCE_TEST_FIX.value,
+                    "on_enter": "start_prepare_conformance_test_fix",
+                },
                 {
                     "name": States.CONFORMANCE_TEST_FAILED.value,
                     "on_enter": "start_fixing_conformance_tests",
@@ -403,6 +411,11 @@ def get_transitions(self) -> List[Dict[str, Any]]:
             {
                 "source": f"{States.IMPLEMENTING_FRID.value}_{States.PROCESSING_CONFORMANCE_TESTS.value}_{States.CONFORMANCE_TEST_ENV_PREPARED.value}",
                 "trigger": triggers.MARK_CONFORMANCE_TESTS_FAILED,
+                "dest": f"{States.IMPLEMENTING_FRID.value}_{States.PROCESSING_CONFORMANCE_TESTS.value}_{States.PREPARE_CONFORMANCE_TEST_FIX.value}",
+            },
+            {
+                "source": f"{States.IMPLEMENTING_FRID.value}_{States.PROCESSING_CONFORMANCE_TESTS.value}_{States.PREPARE_CONFORMANCE_TEST_FIX.value}",
+                "trigger": triggers.MARK_CONFORMANCE_TEST_FIX_PREPARED,
                 "dest": f"{States.IMPLEMENTING_FRID.value}_{States.PROCESSING_CONFORMANCE_TESTS.value}_{States.CONFORMANCE_TEST_FAILED.value}",
             },
             {

render_machine/states.py

@@ -41,6 +41,7 @@ class States(Enum):
     CONFORMANCE_TESTING_INITIALISED = "conformanceTestingInitialised"
     CONFORMANCE_TEST_GENERATED = "conformanceTestGenerated"
     CONFORMANCE_TEST_ENV_PREPARED = "conformanceTestEnvironmentPrepared"
+    PREPARE_CONFORMANCE_TEST_FIX = "prepareConformanceTestFix"
     CONFORMANCE_TEST_FAILED = "conformanceTestFailed"
 
     # Postprocessing conformance tests states