Bug fixes

Author: MasloMaslane

src/sio3pack/django/sinolpack/handler.py

@@ -46,7 +46,9 @@ def _save_config(self):
         )
 
     def _save_model_solutions(self):
-        for order, (kind, solution) in enumerate(self.package.model_solutions):
+        for order, ms in enumerate(self.package.model_solutions):
+            kind = ms["kind"]
+            solution = ms["file"]
             instance = SinolpackModelSolution(
                 package=self.db_package,
                 name=solution.filename,

src/sio3pack/packages/sinolpack/model.py

@@ -1,6 +1,7 @@
 import os
 import re
 import tempfile
+from typing import Any
 
 import yaml
 
@@ -27,8 +28,8 @@ class Sinolpack(Package):
     :param dict[str, File] lang_statements: A dictionary of problem
         statements, where keys are language codes and values are files.
     :param dict[str, Any] config: Configuration of the problem.
-    :param list[tuple[ModelSolutionKind, File]] model_solutions: A list
-        of model solutions, where each element is a tuple containing
+    :param list[dict[str, Any]] model_solutions: A list
+        of model solutions, where each element is a dict containing
         a model solution kind and a file.
     :param list[File] additional_files: A list of additional files for
         the problem.
@@ -253,9 +254,9 @@ def main_model_solution_regex(self):
         extensions = self.get_submittable_extensions()
         return rf"^{self.short_name}\.({'|'.join(extensions)})"
 
-    def _get_model_solutions(self) -> list[tuple[ModelSolutionKind, File]]:
+    def _get_model_solutions(self) -> list[dict[str, Any]]:
         """
-        Returns a list of model solutions, where each element is a tuple of model solution kind and filename.
+        Returns a list of model solutions, where each element is a dict of model solution kind and filename.
         """
         if not os.path.exists(self.get_prog_dir()):
             return []
@@ -268,22 +269,23 @@ def _get_model_solutions(self) -> list[tuple[ModelSolutionKind, File]]:
             match = re.match(regex, file)
             if match and os.path.isfile(os.path.join(self.get_prog_dir(), file)):
                 file = LocalFile(os.path.join(self.get_prog_dir(), file))
-                model_solutions.append((ModelSolutionKind.from_regex(match.group(1)), file))
+                model_solutions.append({"file": file, "kind": ModelSolutionKind.from_regex(match.group(1))})
                 if re.match(main_regex, file.filename):
                     main_solution = file
 
         self.main_model_solution = main_solution
         return model_solutions
 
     def sort_model_solutions(
-        self, model_solutions: list[tuple[ModelSolutionKind, File]]
-    ) -> list[tuple[ModelSolutionKind, File]]:
+        self, model_solutions: list[dict[str, Any]]
+    ) -> list[dict[str, Any]]:
         """
         Sorts model solutions by kind.
         """
 
         def sort_key(model_solution):
-            kind, file = model_solution
+            kind: ModelSolutionKind = model_solution['kind']
+            file: LocalFile = model_solution['file']
             return kind.value, naturalsort_key(file.filename[: file.filename.index(".")])
 
         return list(sorted(model_solutions, key=sort_key))

src/sio3pack/packages/sinolpack/workflows.py

@@ -624,7 +624,7 @@ def _get_run_test_workflow(self) -> Workflow:
             reactive=True,
             input_registers=["r:run_test_res_<TEST_ID>", "r:checker_res_<TEST_ID>"],
             output_registers=["r:grade_res_<TEST_ID>"],
-            objects=[user_out_obj],
+            objects=[chk_out_obj],
             script=lua.get_script("grade_test"),
         )
         wf.add_task(grade)

src/sio3pack/test/test.py

@@ -3,7 +3,6 @@
 
 class Test:
     """
-    Represents an input or output test.
     Represents an input and output test.
     """
 
@@ -12,5 +11,3 @@ def __init__(self, test_id: str, in_file: File, out_file: File, group: str):
         self.in_file = in_file
         self.out_file = out_file
         self.group = group
-
-    pass

tests/test_django/test_sio3pack/test_sinolpack.py

@@ -55,7 +55,9 @@ def test_model_solutions(get_archived_package):
     model_solutions = package.model_solutions
     db_model_solutions = SinolpackModelSolution.objects.filter(package=db_package)
     assert len(model_solutions) == db_model_solutions.count()
-    for order, (kind, solution) in enumerate(model_solutions):
+    for order, msdict in enumerate(model_solutions):
+        kind = msdict["kind"]
+        solution = msdict["file"]
         ms = db_model_solutions.get(order_key=order)
         assert ms.name == solution.filename
         assert ms.kind == kind