JOJ/JOJ3-config-generator
27
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

chore: better code style
All checks were successful
build / build (push) Successful in 2m23s
Details
build / build (pull_request) Successful in 2m21s
Details

Browse Source
This commit is contained in:
张泊明518370910136 2025-03-02 15:33:44 -05:00
parent 8baca08696
commit 0c2baf67bd
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
3 changed files with 103 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

216
joj3_config_generator/processers/task.py
View File

@ -10,7 +10,7 @@ def get_conf_stage(
task_stage: task.Stage, executor_with_config: result.ExecutorWith task_stage: task.Stage, executor_with_config: result.ExecutorWith
) -> result.StageDetail: ) -> result.StageDetail:
conf_stage = result.StageDetail( conf_stage = result.StageDetail(
name=task_stage.name if task_stage.name is not None else "", name=task_stage.name,
# group is determined by adding between "[]" in the name of the task # group is determined by adding between "[]" in the name of the task
# FIXME: this is probably outdated # FIXME: this is probably outdated
group=( group=(
@ -27,8 +27,6 @@ def get_conf_stage(
result.ParserConfig(name=parser, with_={}) result.ParserConfig(name=parser, with_={})
for parser in task_stage.parsers for parser in task_stage.parsers
] ]
if task_stage.parsers is not None
else []
), ),
) )
return conf_stage return conf_stage
@ -43,11 +41,7 @@ def get_executor_with_config(
copy_out_files = ["stdout", "stderr"] copy_out_files = ["stdout", "stderr"]
executor_with_config = result.ExecutorWith( executor_with_config = result.ExecutorWith(
default=result.Cmd( default=result.Cmd(
args=( args=shlex.split(task_stage.command),
shlex.split(task_stage.command)
if task_stage.command is not None
else []
),
copy_in={ copy_in={
file: result.LocalFile(src=str(JOJ3_CONFIG_ROOT / file)) file: result.LocalFile(src=str(JOJ3_CONFIG_ROOT / file))
# all copyin files store in this tools folder # all copyin files store in this tools folder
@ -56,7 +50,7 @@ def get_executor_with_config(
}, },
copy_out=copy_out_files, copy_out=copy_out_files,
copy_in_cached={file: file for file in cached}, copy_in_cached={file: file for file in cached},
copy_out_cached=file_export or [], copy_out_cached=file_export,
cpu_limit=task_stage.limit.cpu, cpu_limit=task_stage.limit.cpu,
clock_limit=2 * task_stage.limit.cpu, clock_limit=2 * task_stage.limit.cpu,
memory_limit=task_stage.limit.mem, memory_limit=task_stage.limit.mem,
@ -65,10 +59,9 @@ def get_executor_with_config(
), ),
cases=[], cases=[],
) )
if file_export is not None: for file in file_export:
for file in file_export: if file not in cached:
if file not in cached: cached.append(file)
cached.append(file)
return (executor_with_config, cached) return (executor_with_config, cached)
@ -76,7 +69,7 @@ def fix_keyword(
task_stage: task.Stage, conf_stage: result.StageDetail task_stage: task.Stage, conf_stage: result.StageDetail
) -> result.StageDetail: ) -> result.StageDetail:
keyword_parser = ["clangtidy", "keyword", "cppcheck", "cpplint"] keyword_parser = ["clangtidy", "keyword", "cppcheck", "cpplint"]
for parser in task_stage.parsers or []: for parser in task_stage.parsers:
if parser in keyword_parser: if parser in keyword_parser:
keyword_parser_ = next(p for p in conf_stage.parsers if p.name == parser) keyword_parser_ = next(p for p in conf_stage.parsers if p.name == parser)
keyword_weight = [] keyword_weight = []
@ -107,26 +100,26 @@ def fix_keyword(
def fix_result_detail( def fix_result_detail(
task_stage: task.Stage, conf_stage: result.StageDetail task_stage: task.Stage, conf_stage: result.StageDetail
) -> result.StageDetail: ) -> result.StageDetail:
if (task_stage.parsers is not None) and ("result-detail" in task_stage.parsers): if "result-detail" not in task_stage.parsers:
result_detail_parser = next( return conf_stage
p for p in conf_stage.parsers if p.name == "result-detail" result_detail_parser = next(
) p for p in conf_stage.parsers if p.name == "result-detail"
if task_stage.result_detail is not None: )
show_files = [] show_files = []
if task_stage.result_detail.stdout: if task_stage.result_detail.stdout:
show_files.append("stdout") show_files.append("stdout")
if task_stage.result_detail.stderr: if task_stage.result_detail.stderr:
show_files.append("stderr") show_files.append("stderr")
result_detail_parser.with_.update( result_detail_parser.with_.update(
result.ResultDetailConfig( result.ResultDetailConfig(
score=0, score=0,
comment="", comment="",
show_files=show_files, show_files=show_files,
show_exit_status=task_stage.result_detail.exitstatus, show_exit_status=task_stage.result_detail.exitstatus,
show_runtime=task_stage.result_detail.time, show_runtime=task_stage.result_detail.time,
show_memory=task_stage.result_detail.mem, show_memory=task_stage.result_detail.mem,
).model_dump(by_alias=True) ).model_dump(by_alias=True)
) )
return conf_stage return conf_stage
@ -138,22 +131,21 @@ def fix_dummy(
"dummy", "dummy",
"result-status", "result-status",
] ]
if task_stage.parsers is not None: for parser in task_stage.parsers:
for parser in task_stage.parsers: if parser not in dummy_parser:
if parser not in dummy_parser: continue
continue dummy_parser_ = next(p for p in conf_stage.parsers if p.name == parser)
dummy_parser_ = next(p for p in conf_stage.parsers if p.name == parser) if getattr(task_stage, parser.replace("-", "_"), None) is None:
if getattr(task_stage, parser.replace("-", "_"), None) is None: continue
continue if task_stage.result_status is None:
if task_stage.result_status is None: continue
continue dummy_parser_.with_.update(
dummy_parser_.with_.update( result.DummyConfig(
result.DummyConfig( score=task_stage.result_status.score,
score=task_stage.result_status.score, comment=task_stage.result_status.comment,
comment=task_stage.result_status.comment, force_quit_on_not_accepted=task_stage.result_status.force_quit,
force_quit_on_not_accepted=task_stage.result_status.force_quit, ).model_dump(by_alias=True)
).model_dump(by_alias=True) )
)
return conf_stage return conf_stage
@ -161,14 +153,11 @@ def fix_file(
task_stage: task.Stage, conf_stage: result.StageDetail task_stage: task.Stage, conf_stage: result.StageDetail
) -> result.StageDetail: ) -> result.StageDetail:
file_parser = ["file"] file_parser = ["file"]
if task_stage.parsers is not None: for parser in task_stage.parsers:
for parser in task_stage.parsers: if parser not in file_parser:
if parser in file_parser: continue
file_parser_ = next(p for p in conf_stage.parsers if p.name == parser) file_parser_ = next(p for p in conf_stage.parsers if p.name == parser)
if task_stage.file is not None: file_parser_.with_.update({"name": task_stage.file.name})
file_parser_.with_.update({"name": task_stage.file.name})
else:
continue
return conf_stage return conf_stage
@ -177,66 +166,67 @@ def fix_diff(
conf_stage: result.StageDetail, conf_stage: result.StageDetail,
task_conf: task.Config, task_conf: task.Config,
) -> result.StageDetail: ) -> result.StageDetail:
if task_stage.parsers is not None and "diff" in task_stage.parsers: if "diff" not in task_stage.parsers:
diff_parser = next((p for p in conf_stage.parsers if p.name == "diff"), None) return conf_stage
skip = task_stage.skip or [] diff_parser = next((p for p in conf_stage.parsers if p.name == "diff"), None)
cases = task_stage.cases or {} skip = task_stage.skip
finalized_cases = [case for case in cases if case not in skip] cases = task_stage.cases
finalized_cases = [case for case in cases if case not in skip]
stage_cases = [] stage_cases = []
parser_cases = [] parser_cases = []
for case in finalized_cases: for case in finalized_cases:
case_stage = task_stage.cases.get(case) if task_stage.cases else None case_stage = task_stage.cases.get(case) if task_stage.cases else None
if not case_stage: if not case_stage:
continue continue
cpu_limit = case_stage.limit.cpu cpu_limit = case_stage.limit.cpu
clock_limit = 2 * case_stage.limit.cpu clock_limit = 2 * case_stage.limit.cpu
memory_limit = case_stage.limit.mem memory_limit = case_stage.limit.mem
command = case_stage.command if case_stage.command is not None else None command = case_stage.command
stdin = case_stage.in_ if case_stage.in_ != "" else f"{case}.in" stdin = case_stage.in_ if case_stage.in_ != "" else f"{case}.in"
stdout = case_stage.out_ if case_stage.out_ != "" else f"{case}.out" stdout = case_stage.out_ if case_stage.out_ != "" else f"{case}.out"
stage_cases.append( stage_cases.append(
result.OptionalCmd( result.OptionalCmd(
stdin=result.LocalFile( stdin=result.LocalFile(
src=str(JOJ3_CONFIG_ROOT / task_conf.task.type_ / stdin), src=str(JOJ3_CONFIG_ROOT / task_conf.task.type_ / stdin),
), ),
args=(shlex.split(command) if command is not None else None), args=shlex.split(command) if command else None,
cpu_limit=cpu_limit, cpu_limit=cpu_limit,
clock_limit=clock_limit, clock_limit=clock_limit,
memory_limit=memory_limit, memory_limit=memory_limit,
proc_limit=50, proc_limit=50,
) )
)
# Ensure case_stage.diff and case_stage.diff.output are defined
diff_output = (
case_stage.diff.output
if case_stage.diff and case_stage.diff.output
else None
)
if diff_output:
parser_cases.append(
{
"outputs": [
result.DiffOutputConfig(
score=diff_output.score,
file_name="stdout",
answer_path=str(
JOJ3_CONFIG_ROOT / task_conf.task.type_ / stdout
),
force_quit_on_diff=diff_output.force_quit,
always_hide=diff_output.hide,
compare_space=not diff_output.ignore_spaces,
).model_dump(by_alias=True)
]
}
) )
# Ensure case_stage.diff and case_stage.diff.output are defined if diff_parser:
diff_output = ( diff_parser.with_.update({"name": "diff", "cases": parser_cases})
case_stage.diff.output conf_stage.executor.with_.cases = stage_cases
if case_stage.diff and case_stage.diff.output
else None
)
if diff_output:
parser_cases.append(
{
"outputs": [
result.DiffOutputConfig(
score=diff_output.score,
file_name="stdout",
answer_path=str(
JOJ3_CONFIG_ROOT / task_conf.task.type_ / stdout
),
force_quit_on_diff=diff_output.force_quit,
always_hide=diff_output.hide,
compare_space=not diff_output.ignore_spaces,
).model_dump(by_alias=True)
]
}
)
if diff_parser and task_stage.diff is not None:
diff_parser.with_.update({"name": "diff", "cases": parser_cases})
conf_stage.executor.with_.cases = stage_cases
return conf_stage return conf_stage

2
tests/convert/basic/task.json
View File

@ -660,7 +660,6 @@
}, },
"cases": [ "cases": [
{ {
"args": [],
"stdin": { "stdin": {
"src": "/home/tt/.config/joj/homework/h7/e2/case0.in" "src": "/home/tt/.config/joj/homework/h7/e2/case0.in"
}, },
@ -670,7 +669,6 @@
"procLimit": 50 "procLimit": 50
}, },
{ {
"args": [],
"stdin": { "stdin": {
"src": "/home/tt/.config/joj/homework/h7/e2/case1.in" "src": "/home/tt/.config/joj/homework/h7/e2/case1.in"
}, },

2
tests/convert/diff/task.json
View File

@ -63,7 +63,6 @@
}, },
"cases": [ "cases": [
{ {
"args": [],
"stdin": { "stdin": {
"src": "/home/tt/.config/joj/homework/h7/e2/case0.in" "src": "/home/tt/.config/joj/homework/h7/e2/case0.in"
}, },
@ -73,7 +72,6 @@
"procLimit": 50 "procLimit": 50
}, },
{ {
"args": [],
"stdin": { "stdin": {
"src": "/home/tt/.config/joj/homework/h7/e2/case1.in" "src": "/home/tt/.config/joj/homework/h7/e2/case1.in"
}, },