xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
yuetsh
2025-10-13 12:27:21 +08:00
parent d3484c57bf
commit bfd79720a9
4 changed files with 80 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flowchart/urls/oj.py
View File

@@ -2,11 +2,13 @@ from django.urls import path
from ..views.oj import (
FlowchartSubmissionAPI,
FlowchartSubmissionListAPI,
FlowchartSubmissionRetryAPI
FlowchartSubmissionRetryAPI,
FlowchartSubmissionCurrentAPI
)
urlpatterns = [
path('flowchart/submission', FlowchartSubmissionAPI.as_view()),
path('flowchart/submissions', FlowchartSubmissionListAPI.as_view()),
path('flowchart/submission/retry', FlowchartSubmissionRetryAPI.as_view()),
path('flowchart/submission/current', FlowchartSubmissionCurrentAPI.as_view()),
]

75
flowchart/views/oj.py
View File

@@ -4,9 +4,11 @@ from flowchart.models import FlowchartSubmission, FlowchartSubmissionStatus
from flowchart.serializers import (
CreateFlowchartSubmissionSerializer,
FlowchartSubmissionSerializer,
FlowchartSubmissionListSerializer
FlowchartSubmissionListSerializer,
)
from flowchart.tasks import evaluate_flowchart_task
from problem.models import Problem
class FlowchartSubmissionAPI(APIView):
@login_required
@@ -21,7 +23,8 @@ class FlowchartSubmissionAPI(APIView):
# 验证题目存在
try:
from problem.models import Problem
problem = Problem.objects.get(_id=data['problem_id'])
problem = Problem.objects.get(id=data["problem_id"])
except Problem.DoesNotExist:
return self.error("Problem doesn't exist")
@@ -33,22 +36,19 @@ class FlowchartSubmissionAPI(APIView):
submission = FlowchartSubmission.objects.create(
user=request.user,
problem=problem,
mermaid_code=data['mermaid_code'],
flowchart_data=data.get('flowchart_data', {})
mermaid_code=data["mermaid_code"],
flowchart_data=data.get("flowchart_data", {}),
)
# 启动AI评分任务
evaluate_flowchart_task.send(submission.id)
return self.success({
'submission_id': submission.id,
'status': 'pending'
})
return self.success({"submission_id": submission.id, "status": "pending"})
@login_required
def get(self, request):
"""获取流程图提交详情"""
submission_id = request.GET.get('id')
submission_id = request.GET.get("id")
if not submission_id:
return self.error("submission_id is required")
@@ -63,16 +63,17 @@ class FlowchartSubmissionAPI(APIView):
serializer = FlowchartSubmissionSerializer(submission)
return self.success(serializer.data)
class FlowchartSubmissionListAPI(APIView):
@login_required
def get(self, request):
"""获取流程图提交列表"""
user_id = request.GET.get('user_id')
problem_id = request.GET.get('problem_id')
offset = int(request.GET.get('offset', 0))
limit = int(request.GET.get('limit', 20))
user_id = request.GET.get("user_id")
problem_id = request.GET.get("problem_id")
offset = int(request.GET.get("offset", 0))
limit = int(request.GET.get("limit", 20))
queryset = FlowchartSubmission.objects.select_related('user', 'problem')
queryset = FlowchartSubmission.objects.select_related("user", "problem")
# 权限过滤
if not request.user.is_admin_role():
@@ -89,17 +90,14 @@ class FlowchartSubmissionListAPI(APIView):
serializer = FlowchartSubmissionListSerializer(submissions, many=True)
return self.success({
'results': serializer.data,
'total': total
})
return self.success({"results": serializer.data, "total": total})
class FlowchartSubmissionRetryAPI(APIView):
@login_required
def post(self, request):
"""重新触发AI评分"""
submission_id = request.data.get('submission_id')
submission_id = request.data.get("submission_id")
if not submission_id:
return self.error("submission_id is required")
@@ -113,7 +111,10 @@ class FlowchartSubmissionRetryAPI(APIView):
return self.error("No permission for this submission")
# 检查是否可以重新评分
if submission.status not in [FlowchartSubmissionStatus.FAILED, FlowchartSubmissionStatus.COMPLETED]:
if submission.status not in [
FlowchartSubmissionStatus.FAILED,
FlowchartSubmissionStatus.COMPLETED,
]:
return self.error("Submission is not in a state that allows retry")
# 重置状态并重新启动AI评分
@@ -130,9 +131,33 @@ class FlowchartSubmissionRetryAPI(APIView):
# 重新启动AI评分任务
evaluate_flowchart_task.send(submission.id)
return self.success({
'submission_id': submission.id,
'status': 'pending',
'message': 'AI evaluation restarted'
})
return self.success(
{
"submission_id": submission.id,
"status": "pending",
"message": "AI evaluation restarted",
}
)
class FlowchartSubmissionCurrentAPI(APIView):
@login_required
def get(self, request):
"""获取当前用户对指定题目的最新流程图提交"""
problem_id = request.GET.get("problem_id")
if not problem_id:
return self.error("problem_id is required")
try:
problem = Problem.objects.get(id=problem_id)
except Problem.DoesNotExist:
return self.error("Problem doesn't exist")
submissions = FlowchartSubmission.objects.filter(
user=request.user, problem=problem
).order_by("-create_time")
count = submissions.count()
if count == 0:
return self.success({"submission": None, "count": 0})
first_submission = submissions[0]
serializer = FlowchartSubmissionSerializer(first_submission)
return self.success({"submission": serializer.data, "count": count})

1
problem/serializers.py
View File

@@ -185,6 +185,7 @@ class ProblemListSerializer(BaseProblemSerializer):
"tags",
"contest",
"rule_type",
"allow_flowchart",
]

6
utils/websocket.py
View File

@@ -89,8 +89,8 @@ def push_flowchart_evaluation_update(submission_id: str, user_id: int, data: dic
logger.warning("Channel layer is not configured, cannot push flowchart evaluation update")
return
# 构建组名，与 SubmissionConsumer 中的组名一致
group_name = f"submission_user_{user_id}"
# 构建组名，与 FlowchartConsumer 中的组名一致
group_name = f"flowchart_user_{user_id}"
try:
# 向指定用户组发送消息
@@ -98,7 +98,7 @@ def push_flowchart_evaluation_update(submission_id: str, user_id: int, data: dic
async_to_sync(channel_layer.group_send)(
group_name,
{
"type": "flowchart_evaluation_update", # 对应 SubmissionConsumer.flowchart_evaluation_update 方法
"type": "flowchart_evaluation_update", # 对应 FlowchartConsumer.flowchart_evaluation_update 方法
"data": data,
}
)