Skip to content

[Fix] validate the plan when it is being generated #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DarkSharpness wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Fix] validate the plan when it is being generated #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions scheduler2/plan/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,20 @@ async def execute_compile_tasks(ctx: ParseContext):
msg = f'Cannot compile SPJ ({res.result}): {res.message}'
raise InvalidProblemException(msg)

def validate_plan(plan: JudgePlan):
given_testpoints: Set[str] = set(t.id for task in plan.judge for t in task.task.testpoints)
needed_testpoints: Set[str] = set()
for group in plan.score:
needed_testpoints.update(group.testpoints)

if given_testpoints != needed_testpoints:
msg = ''
if extra := given_testpoints - needed_testpoints:
msg += f'Extra testpoint ids: {extra}\n'
if missing := needed_testpoints - given_testpoints:
msg += f'Missing testpoint ids: {missing}\n'
msg = msg[:-1] # strip trailing newline
raise InvalidProblemException(msg)

async def generate_plan(problem_id: str) -> JudgePlan:
logger.info('generating plan for %(id)s', { 'id': problem_id }, 'plan:generate:start')
Expand All @@ -426,6 +440,7 @@ async def generate_plan(problem_id: str) -> JudgePlan:
ctx.plan.compile = await parse_compile(ctx)
ctx.plan.judge = await parse_testpoints(ctx)
ctx.plan.score = await parse_groups(ctx)
validate_plan(ctx.plan)
await upload_files(ctx)
await execute_compile_tasks(ctx)
logger.debug('generated plan for %(id)s: %(plan)s', { 'id': problem_id, 'plan': ctx.plan }, 'plan:generate:done')
Expand Down