[validate] Remove {input,answer}_format_validators (#443)

* remove format_validators

* rename folders

* [problem] Problem._validators: remove `assert cls.source_dir`

because all {Input,Answer,Output}Validator classes now only have source_dir, instead of source_dirs.

---------

Co-authored-by: Maarten Sijm <[email protected]>

Author: mzuenni

bin/problem.py

@@ -911,10 +911,7 @@ def _validators(
             else:
                 paths = [config.TOOLS_ROOT / "support" / "default_output_validator.cpp"]
         else:
-            assert hasattr(cls, "source_dirs")
-            paths = [
-                p for source_dir in cls.source_dirs for p in glob(problem.path / source_dir, "*")
-            ]
+            paths = list(glob(problem.path / cls.source_dir, "*"))
 
         # TODO: Instead of checking file contents, maybe specify this in generators.yaml?
         def has_constraints_checking(f):

bin/stats.py

@@ -51,7 +51,7 @@ def problem_stats(problems):
         ("yaml", "problem.yaml"),
         ("tex", str(latex.PdfType.PROBLEM.path("*")), 1),
         ("sol", str(latex.PdfType.SOLUTION.path("*")), 1),
-        ("  val: I", ["input_validators/*", "input_format_validators/*"]),
+        ("  val: I", ["input_validators/*"]),
         ("A", ["answer_validators/*"]),
         ("O", ["output_validator/"]),
         (

bin/upgrade.py

@@ -151,6 +151,22 @@ def upgrade_statement(problem_path: Path, bar: ProgressBar) -> None:
             shutil.move(f, dest)
 
 
+def upgrade_format_validators(problem_path: Path, bar: ProgressBar) -> None:
+    rename = [
+        ("input_format_validators", "input_validators"),
+        ("answer_format_validators", "answer_validators"),
+    ]
+    for old_name, new_name in rename:
+        old_path = problem_path / old_name
+        new_path = problem_path / new_name
+        if old_path.is_dir():
+            if new_path.exists():
+                bar.error(f"can't rename '{old_name}', '{new_name}' already exists", resume=True)
+                continue
+            bar.log(f"renaming '{old_name}' to '{new_name}'")
+            old_path.rename(new_path)
+
+
 def upgrade_output_validators(problem_path: Path, bar: ProgressBar) -> None:
     if (problem_path / "output_validators").is_dir():
         if (problem_path / "output_validator").exists():
@@ -370,6 +386,7 @@ def _upgrade(problem_path: Path, bar: ProgressBar) -> None:
     upgrade_testdata_yaml(problem_path, bar)
     upgrade_generators_yaml(problem_path, bar)
     upgrade_statement(problem_path, bar)
+    upgrade_format_validators(problem_path, bar)
     upgrade_output_validators(problem_path, bar)
     # update .in.statement?
     upgrade_problem_yaml(problem_path, bar)

bin/validate.py

@@ -229,7 +229,7 @@ def __init__(self, problem, path, **kwargs):
 
     validator_type: Final[str] = "input"
 
-    source_dirs: Final[list[str]] = ["input_validators", "input_format_validators"]
+    source_dir: Final[str] = "input_validators"
 
     def run(
         self,
@@ -289,7 +289,7 @@ def __init__(self, problem, path, **kwargs):
 
     validator_type: Final[str] = "answer"
 
-    source_dirs: Final[list[str]] = ["answer_validators", "answer_format_validators"]
+    source_dir: Final[str] = "answer_validators"
 
     def run(
         self,