From 108c5b0c80285c81ff5f9b1ffd788b4291cf3d30 Mon Sep 17 00:00:00 2001 From: ITQ Date: Mon, 3 Mar 2025 19:39:52 +0300 Subject: [PATCH] (scope): [body] [footer(s)] --- services/backend/api/v1/task/views.py | 1 - services/backend/apps/task/tasks.py | 8 +++----- services/backend/apps/user/apps.py | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/services/backend/api/v1/task/views.py b/services/backend/api/v1/task/views.py index e0f83cc..7e16558 100644 --- a/services/backend/api/v1/task/views.py +++ b/services/backend/api/v1/task/views.py @@ -120,7 +120,6 @@ def submit_task( user_input = content.read() correct_answer = task.correct_answer_file.read() verdict = user_input == correct_answer - print(user_input, correct_answer) submission = CompetitionTaskSubmission.objects.create( user=user, task=task, diff --git a/services/backend/apps/task/tasks.py b/services/backend/apps/task/tasks.py index 0b866f9..e5fd7cd 100644 --- a/services/backend/apps/task/tasks.py +++ b/services/backend/apps/task/tasks.py @@ -5,6 +5,7 @@ from celery import shared_task from django.conf import settings from django.core.files.base import ContentFile from urllib.parse import urlparse +import base64 from apps.task.models import CompetitionTaskSubmission @@ -13,10 +14,7 @@ from apps.task.models import CompetitionTaskSubmission def analyze_data_task(self, submission_id): submission = CompetitionTaskSubmission.objects.get(id=submission_id) try: - code_url = ( - f"{settings.MINIO_DEFAULT_CUSTOM_ENDPOINT_URL}/" - f"{urlparse(submission.content.url).path}" - ) + code = submission.content.read() files = [ { "url": ( @@ -34,7 +32,7 @@ def analyze_data_task(self, submission_id): f"{settings.CHECKER_API_ENDPOINT}/execute", json={ "files": files, - "code_url": code_url, + "code": base64.encode(code), "answer_file_path": submission.task.answer_file_path, "expected_hash": hashlib.sha256( submission.task.correct_answer_file.read() diff --git a/services/backend/apps/user/apps.py b/services/backend/apps/user/apps.py index 21a3488..5a1c14f 100644 --- a/services/backend/apps/user/apps.py +++ b/services/backend/apps/user/apps.py @@ -2,10 +2,9 @@ from django.apps import AppConfig class UsersConfig(AppConfig): - default_auto_field = "django.db.models.BigAutoField" name = "apps.user" label = "user" - verbose_name = "Пользователи (веб)" + verbose_name = "контестанты" def ready(self): import apps.user.signals