[visualize] Rename InputVisualizer to TestCaseVisualizer

Author: mpsijm

bin/export.py

@@ -13,7 +13,7 @@
 from latex import PdfType
 from problem import Problem
 from validate import InputValidator, AnswerValidator, OutputValidator
-from visualize import InputVisualizer, OutputVisualizer
+from visualize import TestCaseVisualizer, OutputVisualizer
 
 
 def select_languages(problems: list[Problem]) -> list[str]:
@@ -126,7 +126,7 @@ def build_problem_zip(problem: Problem, output: Path) -> bool:
         ("submissions/accepted/**/*", True),
         ("submissions/*/**/*", False),
         ("attachments/**/*", problem.interactive or problem.multi_pass),
-        (f"{InputVisualizer.source_dir}/**/*", False),
+        (f"{TestCaseVisualizer.source_dir}/**/*", False),
         (f"{OutputVisualizer.source_dir}/**/*", False),
     ]
 
@@ -215,7 +215,7 @@ def add_testcase(in_file: Path) -> None:
             f"{OutputValidator.source_dir}/**/*",
             # "statement/*", "solution/*", "problem_slide/*", use \constant{} commands
             # "submissions/*/**/*", removed support?
-            f"{InputVisualizer.source_dir}/**/*",
+            f"{TestCaseVisualizer.source_dir}/**/*",
             f"{OutputVisualizer.source_dir}/**/*",
         ]
         for pattern in constants_supported:

bin/generate.py

@@ -1026,7 +1026,7 @@ def use_feedback_image(feedbackdir: Path, source: str) -> None:
                         return
 
             visualizer: Optional[visualize.AnyVisualizer] = problem.visualizer(
-                visualize.InputVisualizer
+                visualize.TestCaseVisualizer
             )
             output_visualizer = problem.visualizer(visualize.OutputVisualizer)
             if output_visualizer is not None:
@@ -1055,7 +1055,7 @@ def use_feedback_image(feedbackdir: Path, source: str) -> None:
             for ext in config.KNOWN_VISUALIZER_EXTENSIONS:
                 in_path.with_suffix(ext).unlink(True)
 
-            if isinstance(visualizer, visualize.InputVisualizer):
+            if isinstance(visualizer, visualize.TestCaseVisualizer):
                 result = visualizer.run(in_path, ans_path, cwd, visualizer_args)
             else:
                 feedbackcopy = in_path.with_suffix(".feedbackcopy")
@@ -1933,7 +1933,7 @@ def build_program(p):
         build_programs(program.Generator, generators_used)
         build_programs(run.Submission, solutions_used)
         if build_visualizers:
-            self.problem.visualizer(visualize.InputVisualizer)
+            self.problem.visualizer(visualize.TestCaseVisualizer)
             self.problem.visualizer(visualize.OutputVisualizer)
 
         self.problem.validators(validate.InputValidator)

bin/problem.py

@@ -472,7 +472,7 @@ def _parse_testdata_yaml(p, path, bar):
                             case (
                                 validate.OutputValidator.args_key
                                 | validate.AnswerValidator.args_key
-                                | visualize.InputVisualizer.args_key
+                                | visualize.TestCaseVisualizer.args_key
                                 | visualize.OutputVisualizer.args_key
                             ):
                                 if not isinstance(flags[k], list):
@@ -544,7 +544,7 @@ def get_testdata_yaml(
             validate.InputValidator.args_key,
             validate.OutputValidator.args_key,
             validate.AnswerValidator.args_key,
-            visualize.InputVisualizer.args_key,
+            visualize.TestCaseVisualizer.args_key,
             visualize.OutputVisualizer.args_key,
         ]
         if key not in known_args_keys:
@@ -891,8 +891,8 @@ def build_program(p):
 
     @overload
     def visualizer(
-        problem, cls: type[visualize.InputVisualizer]
-    ) -> Optional[visualize.InputVisualizer]: ...
+        problem, cls: type[visualize.TestCaseVisualizer]
+    ) -> Optional[visualize.TestCaseVisualizer]: ...
     @overload
     def visualizer(
         problem, cls: type[visualize.OutputVisualizer]

bin/upgrade.py

@@ -151,7 +151,7 @@ def upgrade_generators_yaml(problem_path: Path, bar: ProgressBar) -> None:
 
     if "visualizer" in yaml_data:
         warn(
-            "Cannot automatically upgrade 'visualizer'.\n - move visualizer to 'input_visualizer/'\n - first argument is the in_file\n - second argument is the ans_file"
+            "Cannot automatically upgrade 'visualizer'.\n - move visualizer to 'test_case_visualizer/'\n - first argument is the in_file\n - second argument is the ans_file"
         )
 
     if "data" in yaml_data and isinstance(yaml_data["data"], dict):

bin/visualize.py

@@ -9,25 +9,25 @@
     from problem import Problem
 
 
-class InputVisualizer(program.Program):
+class TestCaseVisualizer(program.Program):
     """
-    Visualizes a testcase, called as:
+    Visualizes a test case, called as:
 
         ./visualizer input answer [args]
 
     """
 
-    visualizer_type: Final[str] = "input"
+    visualizer_type: Final[str] = "test case"
 
-    source_dir: Final[str] = "input_visualizer"
+    source_dir: Final[str] = "test_case_visualizer"
 
-    args_key: Final[str] = "input_visualizer_args"
+    args_key: Final[str] = "test_case_visualizer_args"
 
     def __init__(self, problem: "Problem", path: Path, **kwargs: Any):
         super().__init__(
             problem,
             path,
-            InputVisualizer.source_dir,
+            TestCaseVisualizer.source_dir,
             limits={"timeout": problem.limits.visualizer_time},
             substitute_constants=True,
             **kwargs,
@@ -37,7 +37,9 @@ def __init__(self, problem: "Problem", path: Path, **kwargs: Any):
     def run(
         self, in_path: Path, ans_path: Path, cwd: Path, args: Optional[list[str]] = None
     ) -> ExecResult:
-        assert self.run_command is not None, "Input Visualizer should be built before running it"
+        assert self.run_command is not None, (
+            "Test Case Visualizer should be built before running it"
+        )
 
         return self._exec_command(
             self.run_command + [in_path, ans_path] + (args or []),
@@ -92,4 +94,4 @@ def run(
             return self._exec_command(command, cwd=cwd)
 
 
-AnyVisualizer = InputVisualizer | OutputVisualizer
+AnyVisualizer = TestCaseVisualizer | OutputVisualizer

skel/problem/input_visualizer/readme.md

@@ -0,0 +1,2 @@
+This test case visualizer is intended for use with BAPCtools' `bt generate`.
+The visualizer should be invoked as `./visualizer <input_file_path> <answer_file_path> <...test_case_visualizer_args>` and should write a `testcase.<ext>` file.

skel/problem/input_visualizer/example_input_visualizer.py renamed to skel/problem/test_case_visualizer/example_test_case_visualizer.py

@@ -91,12 +91,12 @@
           },
           "description": "Defines arguments passed to the output validator for the test case/group."
         },
-        "input_visualizer_args": {
+        "test_case_visualizer_args": {
           "type": "array",
           "items": {
             "type": "string"
           },
-          "description": "Defines arguments passed to the input visualizer for the test case/group."
+          "description": "Defines arguments passed to the test case visualizer for the test case/group."
         },
         "output_visualizer_args": {
           "type": "array",
@@ -113,7 +113,7 @@
         "output_validator_flags": {
           "type": "string",
           "deprecated": true,
-          "description": "With 'problem_format_version: 2023-07-draft' in problem.yaml, use input_validator_args instead."
+          "description": "With 'problem_format_version: 2023-07-draft' in problem.yaml, use output_validator_args instead."
         },
         "accept_score": {
           "type": "string"

skel/problem/test_case_visualizer/readme.md

@@ -25,7 +25,7 @@ let filename = "[A-Za-z0-9][A-Za-z0-9_.-]{0,253}[A-Za-z0-9]"
 #testdata_settings: {
 	input_validator_args?: *[] | [string] | {[string]: [string]}
 	output_validator_args?: *[] | [string]
-	input_visualizer_args?: *[] | [string]
+	test_case_visualizer_args?: *[] | [string]
 	output_visualizer_args?: *[] | [string]
 	grading?: {
 		score?:       >0