[skel] Read type instead of validation

Author: mpsijm

bin/config.py

@@ -96,7 +96,7 @@
 grep -Ev '^(h|jobs|time|verbose)$' | sed "s/^/'/;s/$/',/" | tr '\n' ' ' | sed 's/^/ARGS_LIST: Final = [/;s/, $/]\n/'
 """
 # fmt: off
-ARGS_LIST: Final = ['1', 'add', 'all', 'answer', 'api', 'author', 'check_deterministic', 'clean', 'colors', 'contest', 'contest_id', 'contestname', 'cp', 'default_solution', 'depth', 'directory', 'error', 'force', 'force_build', 'input', 'interaction', 'interactive', 'invalid', 'kattis', 'language', 'memory', 'more', 'move_to', 'no_bar', 'no_generate', 'no_solution', 'no_solutions', 'no_testcase_sanity_checks', 'no_time_limit', 'no_validators', 'no_visualizer', 'open', 'order', 'order_from_ccs', 'overview', 'password', 'post_freeze', 'problem', 'problemname', 'remove', 'reorder', 'samples', 'sanitizer', 'skel', 'skip', 'sort', 'submissions', 'table', 'testcases', 'time_limit', 'timeout', 'token', 'tree', 'username', 'validation', 'watch', 'web', 'write']
+ARGS_LIST: Final = ['1', 'add', 'all', 'answer', 'api', 'author', 'check_deterministic', 'clean', 'colors', 'contest', 'contest_id', 'contestname', 'cp', 'default_solution', 'depth', 'directory', 'error', 'force', 'force_build', 'input', 'interaction', 'interactive', 'invalid', 'kattis', 'language', 'memory', 'more', 'move_to', 'no_bar', 'no_generate', 'no_solution', 'no_solutions', 'no_testcase_sanity_checks', 'no_time_limit', 'no_validators', 'no_visualizer', 'open', 'order', 'order_from_ccs', 'overview', 'password', 'post_freeze', 'problem', 'problemname', 'remove', 'reorder', 'samples', 'sanitizer', 'skel', 'skip', 'sort', 'submissions', 'table', 'testcases', 'time_limit', 'timeout', 'token', 'tree', 'type', 'username', 'watch', 'web', 'write']
 # fmt: on
 
 

bin/problem.py

@@ -22,6 +22,23 @@
 from colorama import Fore, Style
 
 
+# Parse validation mode (only for legacy problem format version)
+def parse_legacy_validation(mode: str) -> set[str]:
+    if mode == "default":
+        return {mode}
+    else:
+        ok = True
+        parsed = set()
+        for part in mode.split():
+            if part in ["custom", "interactive", "multi-pass"] and part not in parsed:
+                parsed.add(part)
+            else:
+                ok = False
+        if "custom" not in parsed or not ok:
+            fatal(f"Unrecognised validation mode {mode}.")
+        return parsed
+
+
 class ProblemLimits:
     def __init__(
         self,
@@ -127,7 +144,7 @@ def __init__(
             fatal(f"problem_format_version {self.problem_format_version} not supported")
 
         if self.is_legacy():
-            mode = parse_validation(parse_setting(yamldata, "validation", "default"))
+            mode = parse_legacy_validation(parse_setting(yamldata, "validation", "default"))
         else:
             if "validation" in yamldata:
                 warn(

bin/skel.py

@@ -153,20 +153,29 @@ def new_problem():
     author = config.args.author if config.args.author else _ask_variable_string("author")
 
     validator_flags = ""
-    if config.args.validation:
-        parse_validation(config.args.validation)
-        validation = config.args.validation
+    custom_output = False
+    if config.args.type:
+        problem_type = config.args.type
     else:
-        validation = _ask_variable_choice("validation", ["default", "float", "custom"])
-        if validation == "float":
-            validation = "default"
-            validator_flags = "validator_flags:\n  float_tolerance 1e-6\n"
-            log("Using default float tolerance of 1e-6")
-        if validation == "custom":
-            if _ask_variable_bool("interactive", False):
-                validation += " interactive"
-            if _ask_variable_bool("multi-pass", False):
-                validation += " multi-pass"
+        problem_type = _ask_variable_choice("type", ["default", "float", "custom"])
+    # TODO Maybe remove command-line option "default" and replace it with "pass-fail"?
+    if problem_type == "default":
+        problem_type = "pass-fail"
+    if problem_type == "float":
+        problem_type = "pass-fail"
+        validator_flags = "validator_flags:\n  float_tolerance 1e-6\n"
+        log("Using default float tolerance of 1e-6")
+    if problem_type == "custom":
+        custom_output = True
+        problem_type = "pass-fail"
+    # If we're interactively determining the problem type, and the user selected "custom":
+    if not config.args.type and problem_type == "custom":
+        custom_types = []
+        if _ask_variable_bool("interactive", False):
+            custom_types.append("interactive")
+        if _ask_variable_bool("multi-pass", False):
+            custom_types.append("multi-pass")
+        problem_type = " ".join(custom_types) if custom_types else "pass-fail"
 
     # Read settings from the contest-level yaml file.
     variables = contest.contest_yaml()
@@ -175,7 +184,7 @@ def new_problem():
         "problemname": "\n".join(f"  {lang}: {name}" for lang, name in problemname.items()),
         "dirname": dirname,
         "author": author,
-        "validation": validation,
+        "type": problem_type,
         "validator_flags": validator_flags,
     }.items():
         variables[k] = v
@@ -229,7 +238,7 @@ def new_problem():
         variables,
         exist_ok=True,
         preserve_symlinks=preserve_symlinks,
-        skip=[skeldir / "output_validators"] if validation == "default" else None,
+        skip=[skeldir / "output_validators"] if not custom_output else None,
     )
 
     # Warn about missing problem statement skeletons for non-en languages

bin/tools.py

@@ -368,14 +368,16 @@ def build_parser():
     problemparser.add_argument("problemname", nargs="?", help="The name of the problem,")
     problemparser.add_argument("--author", help="The author of the problem,")
     problemparser.add_argument(
-        "--validation",
-        help="Use validation to use for this problem.",
+        "--type",
+        help="The type of the problem.",
         choices=[
             "default",
+            "pass-fail",
+            "float",
             "custom",
-            "custom interactive",
-            "custom multi-pass",
-            "custom interactive multi-pass",
+            "interactive",
+            "multi-pass",
+            "interactive multi-pass",
         ],
     )
     problemparser.add_argument("--skel", help="Skeleton problem directory to copy from.")

bin/util.py

@@ -675,23 +675,6 @@ def parse_setting(yamldata: dict[str, Any], key: str, default: T) -> T:
     return default if value is None else value
 
 
-# Parse validation mode
-def parse_validation(mode: str) -> set[str]:
-    if mode == "default":
-        return {mode}
-    else:
-        ok = True
-        parsed = set()
-        for part in mode.split():
-            if part in ["custom", "interactive", "multi-pass"] and part not in parsed:
-                parsed.add(part)
-            else:
-                ok = False
-        if "custom" not in parsed or not ok:
-            fatal(f"Unrecognised validation mode {mode}.")
-        return parsed
-
-
 # glob, but without hidden files
 def glob(path: Path, expression: str, include_hidden=False) -> list[Path]:
     def keep(p: Path):

skel/problem/problem.yaml

@@ -3,6 +3,8 @@ problem_format_version: 2023-07-draft
 name:
   #lang: name
 {%problemname%}
+# 'pass-fail', 'interactive', 'multi-pass', or 'interactive multi-pass'
+type: {%type%}
 author: {%author%}
 # Contest name and year
 source: {%source%}
@@ -11,8 +13,6 @@ source_url: {%source_url%}
 uuid: {%uuid%}
 license: {%license%}
 rights_owner: {%rights_owner%}
-# 'default', 'custom', or 'custom interactive'
-validation: {%validation%}
 
 # One or more of:
 # case_sensitive

test/test_problems.py

@@ -192,8 +192,8 @@ def test_new_contest_problem(self, monkeypatch):
                 "Problem One",
                 "--author",
                 "Ragnar Groot Koerkamp",
-                "--validation",
-                "default",
+                "--type",
+                "pass-fail",
             ]
         )
         os.chdir("contest_name")