.interaction file is based on output_validator

Author: mzuenni

bin/generate.py

@@ -217,7 +217,7 @@ def run(self, bar, cwd):
             bar.log("stderr", result.err)
         return result
 
-    def run_interaction(self, bar, cwd, t):
+    def generate_interaction(self, bar, cwd, t):
         in_path = cwd / "testcase.in"
         interaction_path = cwd / "testcase.interaction"
         interaction_path.unlink(missing_ok=True)
@@ -787,6 +787,7 @@ def init_meta():
                     "generated_extensions": [],
                     "input_validator_hashes": dict(),
                     "solution_hash": dict(),
+                    "interactor_hash": dict(),
                     "ans_out_validator_hashes": dict(),
                     "visualizer_hash": dict(),
                 }
@@ -924,7 +925,7 @@ def generate_from_rule():
             assert t._has_required_in(infile), f"Failed to generate in file: {infile.name}"
             return True
 
-        def generate_from_solution(testcase: Testcase):
+        def generate_from_solution(testcase: Testcase, bar: ProgressBar):
             nonlocal meta_yaml
 
             if testcase.root in [*config.INVALID_CASE_DIRECTORIES, "valid_output"]:
@@ -943,11 +944,16 @@ def generate_from_solution(testcase: Testcase):
                     "solution": None,
                 }
 
-            def needed(ext):
+            def needed(ext, interactor_hash=None):
                 if ext in meta_yaml["generated_extensions"]:
                     return False
                 if not infile.with_suffix(ext).is_file():
                     return True
+                if (
+                    interactor_hash is not None
+                    and meta_yaml.get("interactor_hash") != interactor_hash
+                ):
+                    return True
                 return meta_yaml.get("solution_hash") != solution_hash
 
             used_solution = False
@@ -959,19 +965,21 @@ def needed(ext):
                         ansfile.write_text("")
                         changed_ans = True
                 # For interactive/multi-pass problems, run the solution and generate a .interaction if necessary.
-                if (
-                    (problem.interactive or problem.multi_pass)
-                    and t.config.solution
-                    and (testcase.root == "sample" or config.args.interaction)
-                    and needed(".interaction")
-                    and not any(
-                        infile.with_suffix(ext).is_file()
-                        for ext in [".out", ".in.statement", ".ans.statement"]
-                    )
-                ):
-                    if not t.config.solution.run_interaction(bar, cwd, t):
-                        return False
-                    used_solution = True
+                if problem.interactive or problem.multi_pass:
+                    interactor_hash = testcase.validator_hashes(validate.OutputValidator, bar)
+                    if (
+                        t.config.solution
+                        and (testcase.root == "sample" or config.args.interaction)
+                        and needed(".interaction", interactor_hash)
+                        and not any(
+                            infile.with_suffix(ext).is_file()
+                            for ext in [".out", ".in.statement", ".ans.statement"]
+                        )
+                    ):
+                        if not t.config.solution.generate_interaction(bar, cwd, t):
+                            return False
+                        used_solution = True
+                        meta_yaml["interactor_hash"] = interactor_hash
             else:
                 # Generate a .ans if not already generated by earlier steps.
                 if needed(".ans"):
@@ -1212,7 +1220,7 @@ def add_testdata_to_cache():
                 return
 
             # Step 4: generate .ans and .interaction if needed
-            if not generate_from_solution(testcase):
+            if not generate_from_solution(testcase, bar):
                 return
 
             # Step 5: validate .ans (and .out if it exists)