Merge remote-tracking branch 'origin/master'

services/backend/apps/task/admin.py

@@ -31,7 +31,7 @@ class CompetitionTaskSubmissionAdmin(admin.ModelAdmin):
         "user__username",
         "user__email",
     )
-    filter = ("plagiarism_checked",)
+    list_filter = ("plagiarism_checked", "status",)
     ordering = ["-timestamp"]
 
     def has_add_permission(self, request, obj=None):

services/backend/apps/task/models.py

@@ -92,9 +92,9 @@ class CompetitionTaskAttachment(BaseModel):
 
 class CompetitionTaskSubmission(BaseModel):
     class StatusChoices(models.TextChoices):
-        SENT = "sent"
-        CHECKING = "checking"
-        CHECKED = "checked"
+        SENT = "sent", "Отправлено на проверку"
+        CHECKING = "checking", "Проверка"
+        CHECKED = "checked", "Проверено"
 
     def submission_content_upload_to(instance, filename) -> str:
         return f"submissions/{instance.id}/content/{filename}"

services/backend/apps/task/tasks.py

@@ -1,4 +1,4 @@
-import requests
+import httpx
 from celery import shared_task
 from django.core.files.base import ContentFile
 
@@ -17,7 +17,7 @@ def analyze_data_task(self, submission_id):
             for f in submission.task.attachments.filter(public=True)
         ]
 
-        response = requests.post(
+        response = httpx.post(
             f"{settings.CHECKER_API_ENDPOINT}/execute",
             files=[("files", (f.name, f)) for f in files]
             + [
@@ -40,10 +40,10 @@ def analyze_data_task(self, submission_id):
         )
         submission.status = CompetitionTaskSubmission.StatusChoices.CHECKED
 
-    except requests.exceptions.RequestException as e:
+    except httpx.RequestError as e:
         self.retry(countdown=2**self.request.retries)
     except Exception as e:
-        submission.result = {"error": str(e)}
+        submission.result = {"error": str(e), "success": False}
         submission.status = CompetitionTaskSubmission.StatusChoices.CHECKED
         submission.earned_points = 0
     finally: