joj3_config_generator/models/task.py

@@ -139,7 +139,7 @@ class Parser(str, Enum):
     ELF = "elf"
 
 
-class CaseBase(BaseModel):
+class Case(BaseModel):
     env: List[str] = []
     command: str = ""  # Command to run
     files: StageFiles = StageFiles()
@@ -149,13 +149,10 @@ class CaseBase(BaseModel):
         True, validation_alias=AliasChoices("copy-in-cwd", "copy_in_cwd")
     )
     limit: Limit = Limit()
-
-
-class DictCase(CaseBase):
     diff: ParserDiff = ParserDiff()
 
 
-class Stage(CaseBase):
+class Stage(Case):
     name: str = ""  # stage name
     skip: List[str] = []
 
@@ -175,9 +172,9 @@ class Stage(CaseBase):
         validation_alias=AliasChoices("result-detail", "result_detail"),
     )
     file: ParserFile = ParserFile()
-    diff: ParserDiff = ParserDiff()
+    # diff: ParserDiff = ParserDiff() # inherited from Case
 
-    cases: Dict[str, DictCase] = {}
+    cases: Dict[str, Case] = {}
 
     model_config = ConfigDict(extra="allow")
 

joj3_config_generator/transformers/task.py

@@ -276,7 +276,7 @@ def fix_diff(
 
 
 def get_unspecified_cases(
-    task_root: Path, task_path: Path, cases: Dict[str, task.DictCase]
+    task_root: Path, task_path: Path, cases: Dict[str, task.Case]
 ) -> List[str]:
     testcases = set()
     for testcases_path in (task_root / task_path).parent.glob("**/*.in"):
@@ -306,7 +306,7 @@ def get_unspecified_cases(
 
 
 def get_stdin_stdout(
-    task_root: Path, task_path: Path, case_name: str, case: task.DictCase
+    task_root: Path, task_path: Path, case_name: str, case: task.Case
 ) -> Tuple[result.Stdin, Optional[str]]:
     case_stdout_name = case.out_ if case.out_ else f"{case_name}.out"
     stdin: result.Stdin = result.MemoryFile(content="")