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

chore: remove redundant import & rename folder

Browse Source
This commit is contained in:
李衍志523370910113 2024-11-12 16:47:40 +08:00
parent ec5c77782a
commit 5094507112
3 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
joj3_config_generator/lib/__init__.py → joj3_config_generator/processers/__init__.py
View File

0
joj3_config_generator/lib/repo.py → joj3_config_generator/processers/repo.py
View File

43
joj3_config_generator/lib/task.py → joj3_config_generator/processers/task.py
View File

@ -1,16 +1,7 @@
import shlex import shlex
from typing import Tuple from typing import Tuple
import rtoml from joj3_config_generator.models import joj1, repo, result, task
from joj3_config_generator.models import (
ExecutorConfig,
ExecutorWithConfig,
ParserConfig,
)
from joj3_config_generator.models.result import Cmd, CmdFile, OptionalCmd
from joj3_config_generator.models.result import Stage as ResultStage
from joj3_config_generator.models.task import Stage as TaskStage
def remove_nulls(d: result.Config) -> result.Config: def remove_nulls(d: result.Config) -> result.Config:
@ -23,9 +14,9 @@ def remove_nulls(d: result.Config) -> result.Config:
def get_conf_stage( def get_conf_stage(
task_stage: TaskStage, executor_with_config: ExecutorWithConfig task_stage: task.Stage, executor_with_config: result.ExecutorWith
) -> ResultStage: ) -> result.StageDetail:
conf_stage = ResultStage( conf_stage = result.StageDetail(
name=task_stage.name if task_stage.name is not None else "", name=task_stage.name if task_stage.name is not None else "",
# TODO: we may have cq in future # TODO: we may have cq in future
group=( group=(
@ -33,12 +24,12 @@ def get_conf_stage(
if (task_stage.name is not None) and ("judge" in task_stage.name) if (task_stage.name is not None) and ("judge" in task_stage.name)
else None else None
), ),
executor=ExecutorConfig( executor=result.Executor(
name="sandbox", name="sandbox",
with_=executor_with_config, with_=executor_with_config,
), ),
parsers=( parsers=(
[ParserConfig(name=parser, with_={}) for parser in task_stage.parsers] [result.Parser(name=parser, with_={}) for parser in task_stage.parsers]
if task_stage.parsers is not None if task_stage.parsers is not None
else [] else []
), ),
@ -47,8 +38,8 @@ def get_conf_stage(
def get_executorWithConfig( def get_executorWithConfig(
task_stage: TaskStage, cached: list[str] task_stage: task.Stage, cached: list[str]
) -> Tuple[ExecutorWithConfig, list[str]]: ) -> Tuple[result.ExecutorWith, list[str]]:
file_import = ( file_import = (
task_stage.files.import_ task_stage.files.import_
if hasattr(task_stage, "files") if hasattr(task_stage, "files")
@ -73,7 +64,7 @@ def get_executorWithConfig(
else [] else []
), ),
copy_in={ copy_in={
file: CmdFile(src=f"/home/tt/.config/joj/{file}") file: result.CmdFile(src=f"/home/tt/.config/joj/{file}")
for file in copy_in_files for file in copy_in_files
}, },
copy_in_cached={file: file for file in copy_in_files}, copy_in_cached={file: file for file in copy_in_files},
@ -93,7 +84,7 @@ def get_executorWithConfig(
if task_stage.limit is not None and task_stage.limit.mem is not None if task_stage.limit is not None and task_stage.limit.mem is not None
else 4 * 1_024 * 1_024 else 4 * 1_024 * 1_024
), ),
stderr=CmdFile( stderr=result.CmdFile(
name="stderr", name="stderr",
max=( max=(
task_stage.limit.stderr * 1_000_000_000 task_stage.limit.stderr * 1_000_000_000
@ -102,7 +93,7 @@ def get_executorWithConfig(
else 4 * 1_024 * 1_024 else 4 * 1_024 * 1_024
), ),
), ),
stdout=CmdFile( stdout=result.CmdFile(
name="stdout", name="stdout",
max=( max=(
task_stage.limit.stdout * 1_000_000_000 task_stage.limit.stdout * 1_000_000_000
@ -154,7 +145,9 @@ def fix_keyword(
return conf_stage return conf_stage
def fix_result_detail(task_stage: TaskStage, conf_stage: ResultStage) -> ResultStage: def fix_result_detail(
task_stage: task.Stage, conf_stage: result.StageDetail
) -> result.StageDetail:
if (task_stage.parsers is not None) and ("result-detail" in task_stage.parsers): if (task_stage.parsers is not None) and ("result-detail" in task_stage.parsers):
result_detail_parser = next( result_detail_parser = next(
p for p in conf_stage.parsers if p.name == "result-detail" p for p in conf_stage.parsers if p.name == "result-detail"
@ -212,7 +205,9 @@ def fix_dummy(
return conf_stage return conf_stage
def fix_diff(task_stage: TaskStage, conf_stage: ResultStage) -> ResultStage: def fix_diff(
task_stage: task.Stage, conf_stage: result.StageDetail
) -> result.StageDetail:
if task_stage.parsers is not None and "diff" in task_stage.parsers: if task_stage.parsers is not None and "diff" in task_stage.parsers:
diff_parser = next((p for p in conf_stage.parsers if p.name == "diff"), None) diff_parser = next((p for p in conf_stage.parsers if p.name == "diff"), None)
skip = task_stage.skip or [] skip = task_stage.skip or []
@ -245,8 +240,8 @@ def fix_diff(task_stage: TaskStage, conf_stage: ResultStage) -> ResultStage:
) )
stage_cases.append( stage_cases.append(
OptionalCmd( result.OptionalCmd(
stdin=CmdFile( stdin=result.CmdFile(
src=f"/home/tt/.config/joj/{conf_stage.name}/{case}.in" src=f"/home/tt/.config/joj/{conf_stage.name}/{case}.in"
), ),
cpu_limit=cpu_limit, cpu_limit=cpu_limit,