This commit is contained in:
rngsurrounded
2025-03-04 05:32:47 +09:00
7 changed files with 819 additions and 13 deletions
+6 -6
View File
@@ -5,21 +5,21 @@
## Запуск ## Запуск
Склонируйте репозиторий и пропишите Склонируйте репозиторий и пропишите.
```bash ```bash
docker compose up docker compose up
``` ```
## Основные ручки ## Важные эндпоинты
* `/` - основное приложение * `/` - интерфейс
* `/api/v1/docs` - swagger-ui документация * `/api/v1/docs` - swagger-ui документация
* `/admin` - админка * `/admin/` - админка
* `/admin/grafana` - графана * `/admin/grafana` - графана
* `/docs` - гайд по анализу данных * `/docs` - обучающие материалы по анализу данных
После запуска по методу выше создается пользователь в админке (`/admin`) с данными ниже:`admin` После запуска по методу выше создается пользователь в админке (`/admin/`) с данными ниже:`admin`
- `admin` - логин - `admin` - логин
- `proooooood` - пароль - `proooooood` - пароль
+768
View File
@@ -0,0 +1,768 @@
{
"info": {
"_postman_id": "fd33ed4f-84b5-4045-b926-22d989876fb0",
"name": "Datarush tests",
"schema": "https://schema.getpostman.com/json/collection/v2.0.0/collection.json",
"_exporter_id": "29887339"
},
"item": [
{
"name": "User",
"item": [
{
"name": "Correct registration",
"event": [
{
"listen": "prerequest",
"script": {
"exec": [
"// Генерация случайных данных\r",
"const randomNamePrefix = `company_${Math.random().toString(36).substring(2, 8)}`;\r",
"const randomUsername = `${Math.random().toString(36).substring(3, 9)}`\r",
"const randomEmail = `${Math.random().toString(36).substring(2, 8)}@timka.test`;\r",
"const randomPassword = `${Math.random().toString(36).substring(2, 12)}!A1`;\r",
"\r",
"// Формирование тела запроса\r",
"const requestData = {\r",
" username: randomUsername,\r",
" email: randomEmail,\r",
" password: randomPassword\r",
"};\r",
"\r",
"// Сохранение данных в переменные окружения\r",
"pm.environment.set(\"randomNamePrefix\", randomNamePrefix);\r",
"pm.environment.set(\"randomEmail\", randomEmail);\r",
"pm.environment.set(\"randomPassword\", randomPassword);\r",
"pm.environment.set(\"randomUsername\", randomUsername)\r",
"\r",
"// Сохранение JSON-объекта в переменную для дальнейшего использования\r",
"pm.environment.set(\"requestData\", JSON.stringify(requestData));\r",
"pm.environment.set(\"requestNameREGISTRATION\", JSON.stringify(randomNamePrefix));\r",
"pm.environment.set(\"requestEmailREGISTRATION\", JSON.stringify(randomEmail));\r",
"pm.environment.set(\"requestusernameREGISTRATION\", JSON.stringify(randomUsername))\r",
"pm.environment.set(\"requestPasswordREGISTRATION\", JSON.stringify(randomPassword));"
],
"type": "text/javascript",
"packages": {}
}
},
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 201', function () {\r",
" pm.response.to.have.status(201);\r",
"});\r",
"\r",
"pm.test('Response has token', function () {\r",
" const jsonData = pm.response.json();\r",
" pm.expect(jsonData.token).to.be.a('string');\r",
"});"
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"method": "POST",
"header": [],
"body": {
"mode": "raw",
"raw": "{{requestData}}",
"options": {
"raw": {
"language": "json"
}
}
},
"url": "{{BASE_HOST}}/v1/sign-up"
},
"response": []
},
{
"name": "Correct sign in",
"event": [
{
"listen": "prerequest",
"script": {
"exec": [
"const email = pm.environment.get(\"randomEmail\")\r",
"const password = pm.environment.get(\"randomPassword\")\r",
"\r",
"const requestData = {\r",
" email: email,\r",
" password: password\r",
"}\r",
"pm.environment.set(\"requestData\", JSON.stringify(requestData));\r",
""
],
"type": "text/javascript",
"packages": {}
}
},
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 200', function () {\r",
" pm.response.to.have.status(200);\r",
"});\r",
"\r",
"pm.test('Response has token', function () {\r",
" const jsonData = pm.response.json();\r",
" pm.expect(jsonData.token).to.be.a('string');\r",
" pm.environment.set(\"token\", jsonData.token)\r",
"});"
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"method": "POST",
"header": [],
"body": {
"mode": "raw",
"raw": "{{requestData}}",
"options": {
"raw": {
"language": "json"
}
}
},
"url": "{{BASE_HOST}}/v1/sign-in"
},
"response": []
},
{
"name": "Duplicated reg data",
"event": [
{
"listen": "prerequest",
"script": {
"exec": [
"const email = pm.environment.get(\"randomEmail\")\r",
"const password = pm.environment.get(\"randomPassword\")\r",
"const username = pm.environment.get(\"randomUsername\")\r",
"\r",
"const requestData = {\r",
" email: email,\r",
" password: password,\r",
" username: username\r",
"}\r",
"pm.environment.set(\"requestData\", JSON.stringify(requestData));\r",
""
],
"type": "text/javascript",
"packages": {}
}
},
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 409', function () {\r",
" pm.response.to.have.status(409);\r",
"});\r",
""
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"method": "POST",
"header": [],
"body": {
"mode": "raw",
"raw": "{{requestData}}",
"options": {
"raw": {
"language": "json"
}
}
},
"url": "{{BASE_HOST}}/v1/sign-up"
},
"response": []
},
{
"name": "Reg without username",
"event": [
{
"listen": "prerequest",
"script": {
"exec": [
"const email = pm.environment.get(\"randomEmail\")\r",
"const password = pm.environment.get(\"randomPassword\")\r",
"\r",
"const requestData = {\r",
" email: email,\r",
" password: password\r",
"}\r",
"pm.environment.set(\"requestData\", JSON.stringify(requestData));\r",
""
],
"type": "text/javascript",
"packages": {}
}
},
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 400', function () {\r",
" pm.response.to.have.status(400);\r",
"});\r",
""
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"method": "POST",
"header": [],
"body": {
"mode": "raw",
"raw": "{{requestData}}",
"options": {
"raw": {
"language": "json"
}
}
},
"url": "{{BASE_HOST}}/v1/sign-up"
},
"response": []
}
]
},
{
"name": "Competitions",
"item": [
{
"name": "Get competition with no partipication",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 200', function () {\r",
" pm.response.to.have.status(200);\r",
"});\r",
"\r",
"pm.test('Response has only 2 elements', function () {\r",
" const jsonData = pm.response.json();\r",
" pm.expect(jsonData).to.has.length(2,\"Response has non-2 length, try to reset to only test data state\");\r",
" pm.environment.set(\"competition_id\", jsonData[0].id)\r",
"});"
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": {
"token": "{{token}}"
}
},
"method": "GET",
"header": [],
"url": {
"raw": "{{BASE_HOST}}/v1/competitions?is_participating=false",
"host": [
"{{BASE_HOST}}"
],
"path": [
"v1",
"competitions"
],
"query": [
{
"key": "is_participating",
"value": "false"
}
]
}
},
"response": []
},
{
"name": "Get competition with partipication",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 200', function () {\r",
" pm.response.to.have.status(200);\r",
"});\r",
"\r",
"pm.test('Response has only 2 elements', function () {\r",
" const jsonData = pm.response.json();\r",
" pm.expect(jsonData).to.has.length(0,\"Response has non-0 length, try to reset to only test data state\");\r",
"});"
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": {
"token": "{{token}}"
}
},
"method": "GET",
"header": [],
"url": {
"raw": "{{BASE_HOST}}/v1/competitions?is_participating=true",
"host": [
"{{BASE_HOST}}"
],
"path": [
"v1",
"competitions"
],
"query": [
{
"key": "is_participating",
"value": "true"
}
]
}
},
"response": []
},
{
"name": "Get tasks without partipicating in test",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 403', function () {\r",
" pm.response.to.have.status(403);\r",
"});"
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": {
"token": "{{token}}"
}
},
"method": "GET",
"header": [],
"url": "{{BASE_HOST}}/v1/competitions/{{competition_id}}/tasks"
},
"response": []
},
{
"name": "Submit task sol without partipicaating",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 403', function () {\r",
" pm.response.to.have.status(403);\r",
"});\r",
""
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": {
"token": "{{token}}"
}
},
"method": "POST",
"header": [],
"body": {
"mode": "formdata",
"formdata": [
{
"key": "file",
"type": "file",
"src": "/C:/Users/timka/AppData/Local/Postman/app-11.33.4/libGLESv2.dll"
}
]
},
"url": "{{BASE_HOST}}/v1/competitions/{{competition_id}}/tasks/{{task_id}}/submit"
},
"response": []
},
{
"name": "Partipicate in competition",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 200', function () {\r",
" pm.response.to.have.status(200);\r",
"});"
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": {
"token": "{{token}}"
}
},
"method": "POST",
"header": [],
"url": "{{BASE_HOST}}/v1/competitions/{{competition_id}}/start"
},
"response": []
},
{
"name": "Get competition tasks",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 200', function () {\r",
" pm.response.to.have.status(200);\r",
"});\r",
"\r",
"pm.test('Response has tasks', function () {\r",
" const jsonData = pm.response.json();\r",
" pm.environment.set(\"task_id\", jsonData[0].id)\r",
" pm.expect(jsonData).to.has.length(9)\r",
"});"
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": {
"token": "{{token}}"
}
},
"method": "GET",
"header": [],
"url": "{{BASE_HOST}}/v1/competitions/{{competition_id}}/tasks"
},
"response": []
},
{
"name": "Get task history",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 200', function () {\r",
" pm.response.to.have.status(200);\r",
"});\r",
"\r",
"pm.test('Response has token', function () {\r",
" const jsonData = pm.response.json();\r",
" pm.expect(jsonData).to.has.length(0);\r",
"});"
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": {
"token": "{{token}}"
}
},
"method": "GET",
"header": [],
"url": "{{BASE_HOST}}/v1/competitions/{{competition_id}}/tasks/{{task_id}}/history"
},
"response": []
},
{
"name": "Submit task sol",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 200', function () {\r",
" pm.response.to.have.status(200);\r",
"});\r",
"\r",
"pm.test('Response has submission id', function () {\r",
" const jsonData = pm.response.json();\r",
" pm.expect(jsonData.submission_id).to.be.a('string');\r",
" pm.environment.set(\"sub_id\", jsonData.submission_id)\r",
"});"
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": {
"token": "{{token}}"
}
},
"method": "POST",
"header": [],
"body": {
"mode": "formdata",
"formdata": [
{
"key": "file",
"type": "file",
"src": "/C:/Users/timka/AppData/Local/Postman/app-11.33.4/libGLESv2.dll"
}
]
},
"url": "{{BASE_HOST}}/v1/competitions/{{competition_id}}/tasks/{{task_id}}/submit"
},
"response": []
},
{
"name": "Get task attachments",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 200', function () {\r",
" pm.response.to.have.status(200);\r",
"});\r",
"\r",
"pm.test('Response has empty array', function () {\r",
" const jsonData = pm.response.json();\r",
" pm.expect(jsonData).to.has.length(0);\r",
"});"
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": {
"token": "{{token}}"
}
},
"method": "GET",
"header": [],
"url": "{{BASE_HOST}}/v1/competitions/{{competition_id}}/tasks/{{task_id}}/attachments"
},
"response": []
}
]
},
{
"name": "Revieews",
"item": [
{
"name": "Get reviewer profile",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 200', function () {\r",
" pm.response.to.have.status(200);\r",
"});\r",
"\r",
"pm.test('Response has correct data', function () {\r",
" const jsonData = pm.response.json();\r",
" pm.expect(jsonData.name).to.eq(pm.environment.get(\"reviewer_name\"));\r",
" pm.expect(jsonData.surname).to.eq(pm.environment.get(\"reviewer_surname\"))\r",
"});\r",
""
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"method": "GET",
"header": [],
"url": "{{BASE_HOST}}/v1/review/{{reviewer_key}}"
},
"response": []
},
{
"name": "Get submissions",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 200', function () {\r",
" pm.response.to.have.status(200);\r",
"});\r",
"\r",
"pm.test('Response has correct data', function () {\r",
" const jsonData = pm.response.json();\r",
" pm.expect(jsonData).to.has.length(0)\r",
"});\r",
"\r",
""
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"method": "GET",
"header": [],
"url": "{{BASE_HOST}}/v1/review/{{reviewer_key}}/submissions/{{sub_id}}"
},
"response": []
}
]
},
{
"name": "Healthcheck",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 200', function () {\r",
" pm.response.to.have.status(200);\r",
"});\r",
""
],
"type": "text/javascript",
"packages": {}
}
}
],
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "{{BASE_HOST}}/health?format=json",
"host": [
"{{BASE_HOST}}"
],
"path": [
"health"
],
"query": [
{
"key": "format",
"value": "json"
}
]
}
},
"response": []
}
],
"event": [
{
"listen": "prerequest",
"script": {
"type": "text/javascript",
"packages": {},
"exec": [
""
]
}
},
{
"listen": "test",
"script": {
"type": "text/javascript",
"packages": {},
"exec": [
""
]
}
}
],
"variable": [
{
"key": "BASE_HOST",
"value": "https://prod-team-15-2pc0i3lc.final.prodcontest.ru/api",
"type": "string"
},
{
"key": "requestData",
"value": "",
"type": "string"
},
{
"key": "token",
"value": "",
"type": "string"
},
{
"key": "competition_id",
"value": "",
"type": "string"
},
{
"key": "task_id",
"value": "",
"type": "string"
},
{
"key": "reviewer_key",
"value": "",
"type": "string"
},
{
"key": "reviewer_name",
"value": "",
"type": "string"
},
{
"key": "reviewer_surname",
"value": "",
"type": "string"
},
{
"key": "sub_id",
"value": "",
"type": "string"
}
]
}
+32
View File
@@ -1,7 +1,9 @@
from sys import stdout
from uuid import uuid4 from uuid import uuid4
from django.db import models from django.db import models
from django.db.models import Count, Q from django.db.models import Count, Q
from django.core.exceptions import ValidationError
from mdeditor.fields import MDTextField from mdeditor.fields import MDTextField
from apps.competition.models import Competition from apps.competition.models import Competition
@@ -78,6 +80,36 @@ class CompetitionTask(BaseModel):
verbose_name="кол-во проверяющих для зачета задачи", verbose_name="кол-во проверяющих для зачета задачи",
) )
def clean(self):
super().clean()
# if self.correct_answer_file and self.type not in ["checker", "input"]:
# raise ValidationError({
# "type": "Если загружен файл правильного ответа, то тип проверки не может быть ручным"
# })
if not self.correct_answer_file and self.type != "review":
raise ValidationError({
"correct_answer_file": "Загрузите правильный ответ"
})
# if self.answer_file_path and not self.type == "checker":
# raise ValidationError({
# "type": "Укажите другой тип задания: этот не совместим с путем правильного ответа"
# })
if not self.answer_file_path and self.type == "checker":
raise ValidationError({
"answer_file_path": "Введите путь правильного ответа - это нужно для корректной работы чекера"
})
if not self.reviewers and self.type == "review":
raise ValidationError({
"reviewers": "Загрузите ревьюверов - кто будет проверять задания, если не они?"
})
# elif self.reviewers and not self.type == "review":
# raise ValidationError({
# "type": "Проверьте тип - вы ввели ревьюверов, но задание не является ручным"
# })
def __str__(self): def __str__(self):
return self.title return self.title
+2 -2
View File
@@ -15,7 +15,6 @@ def analyze_data_task(self, submission_id):
submission = CompetitionTaskSubmission.objects.get(id=submission_id) submission = CompetitionTaskSubmission.objects.get(id=submission_id)
try: try:
code = submission.content.read() code = submission.content.read()
print("YA SSF")
files = [ files = [
{ {
"url": ( "url": (
@@ -43,7 +42,7 @@ def analyze_data_task(self, submission_id):
) )
response.raise_for_status() response.raise_for_status()
result = response.json() result = response.json()
print("HOHOHO") print(result, response.request)
submission.stdout.save("output.txt", ContentFile(result["output"])) submission.stdout.save("output.txt", ContentFile(result["output"]))
submission.result = { submission.result = {
@@ -59,6 +58,7 @@ def analyze_data_task(self, submission_id):
except httpx.RequestError: except httpx.RequestError:
self.retry(countdown=2**self.request.retries) self.retry(countdown=2**self.request.retries)
except Exception as e: except Exception as e:
print(e)
submission.result = {"error": str(e), "success": False} submission.result = {"error": str(e), "success": False}
submission.status = CompetitionTaskSubmission.StatusChoices.CHECKED submission.status = CompetitionTaskSubmission.StatusChoices.CHECKED
submission.earned_points = 0 submission.earned_points = 0
+9 -3
View File
@@ -88,7 +88,9 @@ async def download_file(
session: aiohttp.ClientSession, url: str, dest_path: str session: aiohttp.ClientSession, url: str, dest_path: str
) -> None: ) -> None:
try: try:
async with session.get(url, timeout=aiohttp.ClientTimeout(total=30)) as resp: async with session.get(
url, timeout=aiohttp.ClientTimeout(total=30)
) as resp:
if resp.status != 200: if resp.status != 200:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST, status_code=status.HTTP_400_BAD_REQUEST,
@@ -266,15 +268,19 @@ async def execute_code(request: ExecutionRequest) -> ExecutionResponse:
result_hash = hashlib.sha256(output.encode()).hexdigest() result_hash = hashlib.sha256(output.encode()).hexdigest()
return ExecutionResponse( response = ExecutionResponse(
success=success, success=success,
hash_match=( hash_match=(
result_hash == request.expected_hash if request.expected_hash else None result_hash == request.expected_hash
if request.expected_hash
else None
), ),
output=output[:5000], output=output[:5000],
result_hash=result_hash, result_hash=result_hash,
error=error[:5000], error=error[:5000],
) )
print(response.model_dump_json())
return response
@app.get("/health", response_model=HealthCheckResponse) @app.get("/health", response_model=HealthCheckResponse)
@@ -2,7 +2,7 @@ import { User } from "@/shared/types/user";
export const UserInfo = ({ user }: { user: User }) => { export const UserInfo = ({ user }: { user: User }) => {
return ( return (
<section className="flex flex-1 flex-col items-center gap-6 text-center md:max-w-[420px] md:items-start md:text-ellipsis"> <section className="flex flex-1 flex-col items-center gap-6 text-center md:max-w-[420px] md:items-start md:text-left md:text-ellipsis">
{user.avatar && ( {user.avatar && (
<div className="aspect-square h-auto w-full max-w-[300px] overflow-hidden rounded-full border"> <div className="aspect-square h-auto w-full max-w-[300px] overflow-hidden rounded-full border">
<img <img
@@ -163,7 +163,7 @@ const ReviewContent = ({ review }: { review: Review }) => {
<div className="flex flex-col gap-5"> <div className="flex flex-col gap-5">
<h2 className="text-3xl font-semibold">Ответ</h2> <h2 className="text-3xl font-semibold">Ответ</h2>
<div className="bg-background rounded-xl px-5 py-3 text-lg"> <div className="bg-background rounded-xl px-5 py-3 text-lg break-words">
{extension === "txt" ? ( {extension === "txt" ? (
content content
) : ( ) : (