add timeout in problem model and testing

Author: zdszero

judge/testing.py

@@ -28,7 +28,10 @@ def create_new_problem_from_template(new_problem_id: str, old_problem_id: str):
     new_path = PathManager.problem_dir(new_problem_id)
     os.makedirs(new_path, exist_ok=True)
     for filename in os.listdir(old_path):
-        shutil.copy2(join(old_path, filename), new_path)
+        filepath = join(old_path, filename)
+        if isdir(filepath):
+            continue
+        shutil.copy2(filepath, new_path)
     print(f'create problem instance {new_path}')
 
 def make_file_executable(file_path):
@@ -49,12 +52,12 @@ def make_file_executable(file_path):
 def run_command_with_timeout(command: list, timeout: float) -> int:
     try:
         # Use the 'sudo' command to execute the given command with elevated privileges.
-        result = subprocess.run(['sudo'] + command, capture_output=True, text=True, check=True, timeout=timeout)
+        result = subprocess.run(["/usr/bin/python3"] + command, capture_output=False, text=True, check=True, timeout=timeout)
         print("Command output:")
         print(result.stdout)
         return TestResult.Succeed
     except subprocess.TimeoutExpired:
-        print('program timeout')
+        print(f'program timeout after {timeout} seconds')
         return TestResult.Timeout
     except subprocess.CalledProcessError as e:
         print("Command execution failed.")
@@ -109,6 +112,9 @@ def check_files_in_dir(self, dir_path: str) -> bool:
         if "testcases.json" not in filenames:
             self._error_message = "testcases.json not in zipfile uploaded"
             return False
+        if "logs" in filenames and isdir(join(dir_path, "logs")):
+            self._error_message = "lab zip cannot include logs directory"
+            return False
         return True
 
     def upload(self) -> bool:
@@ -163,7 +169,10 @@ def __init__(self, submission: Submission):
         if not exists(prob_dir):
             raise Exception("problem dir {} not exists".format(prob_dir))
         for filename in os.listdir(prob_dir):
-            shutil.copy2(join(prob_dir, filename), self.sub_dirpath)
+            filepath = join(prob_dir, filename)
+            if isdir(filepath):
+                continue
+            shutil.copy2(filepath, self.sub_dirpath)
         for index, codename in enumerate(problem.code_names):
             filecontent = submission.code_list[index]
             codepath = join(self.sub_dirpath, codename)
@@ -176,7 +185,7 @@ def judge(self):
         if not exists(tester_path):
             raise Exception("running submission: tester {} not exists".format(tester_path))
         print(f"running {tester_path}")
-        res = run_command_with_timeout([tester_path, "--log", "--json"], 1)
+        res = run_command_with_timeout([tester_path, "--log", "--json"], self.sub.problem.timeout)
         if res == TestResult.Timeout:
             self.sub.result = JudgeStatus.PROGRAM_TIMEOUT
             self.sub.save()

problem/models.py

@@ -22,15 +22,13 @@ class Problem(models.Model):
     # lab_config = models.JSONField(default=dict)
     is_public = models.BooleanField(default=True)
     title = models.TextField()
+    timeout = models.IntegerField()
     # code segment filenames to be substituded
     description = RichTextField()
     # hint = RichTextField(null=True)
     languages = JSONField(default=["python"])
-    #需要的节点数量
     vm_num = models.IntegerField(default=1)
-    #各个节点所需要的端口数量
     port_num = models.JSONField(default=list)
-    #学生需要编写的代码段数量
     code_num = models.IntegerField()
     code_names = models.JSONField()
     template = JSONField(null=True)

problem/views/admin.py

@@ -41,6 +41,7 @@ def post(self, request):
         for field in str_fields:
             problem_data[field] = request.POST.get(field)
         problem_data["code_num"] = int(request.POST.get("code_num"))
+        problem_data["timeout"] = int(request.POST.get("timeout"))
         problem_data["code_names"] = request.POST.getlist("code_names")
         # print(problem_data)
         tags = request.POST.getlist("tags")
@@ -154,10 +155,7 @@ def post(self, request):
         if "description" not in data:
             data["description"] = problem.description
         data["visible"] = True
-        if "hint" not in data:
-            data["hint"] = problem.hint
         lab_config = data["lab_config"]
-        data["lab_config"] = problem.lab_config
         if lab_config:
             for k, v in lab_config.items():
                 if k in data["lab_config"].keys():
@@ -318,6 +316,7 @@ def post(self, request):
         data["is_public"] = True
         data["code_num"] = old_problem.code_num
         data["code_names"] = old_problem.code_names
+        data["timeout"] = old_problem.timeout
 
         tags = old_problem.tags.all()
         data["_id"] = data.pop("display_id")

run.sh

@@ -5,6 +5,14 @@
 cmd=$1
 apps=("account" "announcement" "conf" "contest" "options" "problem" "submission")
 
+clean() {
+  rm -rf ./data/zips
+  rm -rf ./data/problems
+  rm -rf ./data/submissions
+  find . -type d -name 'migrations' -not -path './venv/*' | xargs rm -r;
+  rm onl.db
+}
+
 if [[ $cmd == "make" || $cmd == "makemigrations" ]]; then
   for app in "${apps[@]}"; do
     python3 manage.py makemigrations $app
@@ -13,14 +21,9 @@ elif [[ $cmd == "migrate" ]]; then
   python3 manage.py migrate
   python manage.py inituser --username=root --password=rootroot --action=create_super_admin
 elif [[ $cmd == "clean" ]]; then
-  find . -type d -name 'migrations' -not -path './venv/*' | xargs rm -r;
-  rm onl.db
+  clean
 elif [[ $cmd == "rebuild" ]]; then
-  rm -rf ./data/zips
-  rm -rf ./data/problems
-  rm -rf ./data/submissions
-  find . -type d -name 'migrations' -not -path './venv/*' | xargs rm -r;
-  rm onl.db
+  clean
   for app in "${apps[@]}"; do
     python3 manage.py makemigrations $app
   done