judge in dramatiq

Author: zdszero

judge/tasks.py

@@ -1,7 +1,8 @@
 import dramatiq
 
-from account.models import User
+from account.models import User, UserProfile
 from submission.models import Submission
+from problem.models import Problem
 from utils.shortcuts import DRAMATIQ_WORKER_ARGS
 
 from .dispatcher import JudgeDispatcher
@@ -17,8 +18,34 @@ def judge_task(submission_id, problem_id):
 
 
 @dramatiq.actor(**DRAMATIQ_WORKER_ARGS())
-def local_judge_task(submission_id, problem_id):
-    uid = Submission.objects.get(id=submission_id).user_id
-    if User.objects.get(id=uid).is_disabled:
-        return
-    SubmissionTester(submission_id, problem_id).judge()
+def local_judge_task(submission_id, problem_id, user_id):
+    submission = Submission.objects.get(id=submission_id)
+
+    problem = Problem.objects.get(_id=problem_id)
+    problem.submission_number += 1
+    try:
+        if SubmissionTester(submission).judge():
+            problem.accepted_number += 1
+    except Exception as e:
+        raise
+    problem.save()
+
+    score = submission.grade
+    user = User.objects.get(id=user_id)
+    assert user
+    profile = UserProfile.objects.get(user=user)
+    assert profile
+    profile.total_submissions += 1
+    if problem._id not in profile.problems_status:
+        profile.problems_status[problem._id] = score
+        profile.total_score += score
+        if score == 100:
+            profile.accepted_number += 1
+    else:
+        prev_score = profile.problems_status[problem._id]
+        if score > prev_score:
+            profile.problems_status[problem._id] = score
+            profile.total_score += (score - prev_score)
+            if score == 100:
+                profile.accepted_number += 1
+    profile.save()

run.sh

@@ -11,6 +11,7 @@ clean() {
   rm -rf ./data/submissions
   find . -type d -name 'migrations' -not -path './venv/*' | xargs rm -r;
   rm onl.db
+  docker rm -f oj-redis-dev
 }
 
 if [[ $cmd == "make" || $cmd == "makemigrations" ]]; then
@@ -29,4 +30,24 @@ elif [[ $cmd == "rebuild" ]]; then
   done
   python3 manage.py migrate
   python manage.py inituser --username=root --password=rootroot --action=create_super_admin
+elif [[ $cmd == "run" ]]; then
+  # run dramatiq
+  pgrep dramatiq > /dev/null
+  
+  if [[ $? -ne 0 ]]; then
+    echo "running dramatiq ..."
+    python3 manage.py rundramatiq &>data/log/dramatiq.log &
+  else
+    echo "dramatiq is already running ..."
+  fi
+  docker container ls > /dev/null
+  
+  if [[ $? -ne 0 ]]; then
+    echo "running redis in docker ..."
+    docker run -it -d -p 6380:6379 --name oj-redis-dev redis:4.0-alpine
+  else
+    echo "redis is already running"
+  fi
+
+  python3 manage.py runserver 0.0.0.0:7890
 fi

submission/views/user.py

@@ -115,42 +115,16 @@ def post(self, request):
             contest=contest,
             problem=problem,
             username=request.user.username,
-            result=JudgeStatus.PENDING,
+            result=JudgeStatus.JUDGING,
             language=data["language"],
             code_list=data["code_list"],
             ip=request.session["ip"],
         )
 
-        # execute judge task in dramatiq
-        # local_judge_task.send(submission.id, problem._id)
+        submission.save()
 
-        problem.submission_number += 1
-        try:
-            if SubmissionTester(submission).judge():
-                problem.accepted_number += 1
-        except Exception as e:
-            self.error(str(e))
-        problem.save()
-
-        score = submission.grade
-        user = User.objects.get(id=request.user.id)
-        assert user
-        profile = UserProfile.objects.get(user=user)
-        assert profile
-        profile.total_submissions += 1
-        if problem._id not in profile.problems_status:
-            profile.problems_status[problem._id] = score
-            profile.total_score += score
-            if score == 100:
-                profile.accepted_number += 1
-        else:
-            prev_score = profile.problems_status[problem._id]
-            if score > prev_score:
-                profile.problems_status[problem._id] = score
-                profile.total_score += (score - prev_score)
-                if score == 100:
-                    profile.accepted_number += 1
-        profile.save()
+        # execute judge task in dramatiq
+        local_judge_task.send(submission.id, problem._id, str(request.user.id))
 
         return self.success(SubmissionModelSerializer(submission).data)