fix running tester

Author: zdszero

judge/testing.py

@@ -23,9 +23,34 @@ 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.copyfile(join(old_path, filename), join(new_path, filename))
+        shutil.copy2(join(old_path, filename), new_path)
     print(f'create problem instance {new_path}')
 
+def make_file_executable(file_path):
+    try:
+        # Define the executable permission in octal format (e.g., 0o755).
+        # This gives read, write, and execute permissions to the owner,
+        # and read and execute permissions to the group and others.
+        executable_permission = 0o755
+
+        # Change the file's permission to make it executable.
+        os.chmod(file_path, executable_permission)
+        return True
+    except Exception as e:
+        print(f"Error: {e}")
+        return False
+
+
+def run_command_with_sudo(command):
+    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)
+        return result
+    except subprocess.CalledProcessError as e:
+        print(f"Error: {e}")
+        return None
+
+
 class PathManager:
     @staticmethod
     def problem_dir(problem_id: str) -> str:
@@ -111,6 +136,8 @@ def upload(self) -> bool:
         shutil.rmtree(dirname(self.zip_file_path))
         print(f"remove {dirname(self.zip_file_path)}")
 
+        make_file_executable(join(self.problem_dir_path, TESTER_NAME))
+
         return valid
 
 
@@ -121,22 +148,31 @@ def __init__(self, submission: Submission):
         if not exists(self.sub_dirpath):
             os.makedirs(self.sub_dirpath, exist_ok=True)
         prob_dir = PathManager.problem_dir(submission.problem._id) # use display id
+        print('problem id:', submission.problem._id)
+        print('problem dir:', prob_dir)
         if not exists(prob_dir):
             raise Exception("problem dir {} not exists".format(prob_dir))
         for filename in os.listdir(prob_dir):
-            shutil.copyfile(join(prob_dir, filename), self.sub_dirpath)
+            print(f'copy {join(prob_dir, filename)} to {self.sub_dirpath}')
+            shutil.copy2(join(prob_dir, filename), self.sub_dirpath)
 
     def judge(self):
         tester_path = join(self.sub_dirpath, TESTER_NAME)
         if not exists(tester_path):
             raise Exception("running submission: tester {} not exists".format(tester_path))
         print(f"running {tester_path}")
-        subprocess.run([tester_path, '--log', '--json'])
+        result = run_command_with_sudo([tester_path, "--log", "--json"])
+        if result:
+            print("Command output:")
+            print(result.stdout)
+        else:
+            print("Command execution failed.")
+
         log_path = join(self.sub_dirpath, 'logs')
         if not exists(log_path):
             raise Exception(f"logs path {log_path} not exists")
         failed_info = []
-        with open(join(log_path, "results.txt")) as fp:
+        with open(join(log_path, "results.json")) as fp:
             res = json.load(fp)
             self.sub.grade = res['grade']
             for idx in res['failed']:

submission/serializers.py

@@ -41,7 +41,7 @@ def __init__(self, *args, **kwargs):
 
     class Meta:
         model = Submission
-        exclude = ("info", "contest", "code_list", "ip")
+        exclude = ("contest", "code_list", "ip")
 
     def get_show_link(self, obj):
         # 没传user或为匿名user

submission/views/user.py

@@ -2,21 +2,18 @@
 import hashlib
 import requests
 import logging
-import json
-from os import path
-from datetime import datetime
 from django.db import transaction
 
 from account.decorators import login_required, check_contest_permission
 from account.models import User, UserProfile
 from conf.models import JudgeServer
 from contest.models import Contest, ContestStatus
+from judge.testing import SubmissionTester
 from options.options import SysOptions
 from problem.models import Problem
 from judge.tasks import local_judge_task
 from judge.dispatcher import process_pending_task
 from judge.dispatcher import JudgeStatus
-from judge.testing import PathManager
 from utils.api import APIView, validate_serializer, CSRFExemptAPIView
 from utils.cache import cache
 from utils.throttling import TokenBucket
@@ -31,23 +28,6 @@
 
 logger = logging.getLogger(__name__)
 
-def update_submission_status(submission: Submission):
-    log_path = path.join(PathManager.submission_dir(submission.id), 'logs')
-    if path.exists(log_path):
-        submission.result = JudgeStatus.FINISHED
-        failed_info = []
-        with open(path.join(log_path, "results.txt")) as fp:
-            res = json.load(fp)
-            submission.grade = res['grade']
-            for idx in res['failed']:
-                with open(path.join(log_path, f"testcase{idx}.log")) as log_fp:
-                    failed_info.append({
-                        'testcase_index': idx,
-                        'log': log_fp.read()
-                    })
-        submission.failed_info = failed_info
-        submission.save()
-
 class SubmissionAPI(APIView):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -143,6 +123,8 @@ def post(self, request):
 
         # execute judge task in dramatiq
         # local_judge_task.send(submission.id, problem._id)
+        tester = SubmissionTester(submission)
+        tester.judge()
 
         if hide_id:
             return self.success()
@@ -166,7 +148,8 @@ def get(self, request):
             return self.error("No permission for this submission")
 
         if submission.result in [JudgeStatus.PENDING, JudgeStatus.JUDGING]:
-            update_submission_status(submission)
+            # update_submission_status(submission)
+            pass
 
         submission_data = SubmissionSafeModelSerializer(submission).data
         submission_data["can_unshare"] = submission.check_user_permission(
@@ -216,7 +199,8 @@ def get(self, request):
 
         for submission in submissions:
             if submission.result in [JudgeStatus.PENDING, JudgeStatus.JUDGING]:
-                update_submission_status(submission)
+                # update_submission_status(submission)
+                pass
 
         problem_id = request.GET.get("problem_id")
         result = request.GET.get("result")
@@ -266,7 +250,8 @@ def get(self, request):
         )
         for submission in submissions:
             if submission.result in [JudgeStatus.PENDING, JudgeStatus.JUDGING]:
-                update_submission_status(submission)
+                # update_submission_status(submission)
+                pass
 
         problem_id = request.GET.get("problem_id")
         result = request.GET.get("result")