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

dev #10

Merged
李衍志523370910113 merged 238 commits from dev into master 2025-03-05 16:20:39 +08:00
Conversation 16 Commits 238 Files Changed 42 +12 -12
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8baca08696 - Show all commits

6
joj3_config_generator/models/task.py
View File

@ -33,7 +33,7 @@ class ParserLog(BaseModel):
class ParserDummy(BaseModel):
comment: str = ""
score: int = 0
forcequit: bool = False
force_quit: bool = False
class ParserKeyword(BaseModel):
@ -43,9 +43,9 @@ class ParserKeyword(BaseModel):
class Outputs(BaseModel):
score: int = 0
ignorespaces: bool = True
ignore_spaces: bool = True
hide: bool = False
forcequit: bool = False
force_quit: bool = False
class ParserDiff(BaseModel):

6
joj3_config_generator/processers/task.py
View File

@ -151,7 +151,7 @@ def fix_dummy(
result.DummyConfig(
score=task_stage.result_status.score,
comment=task_stage.result_status.comment,
force_quit_on_not_accepted=task_stage.result_status.forcequit,
force_quit_on_not_accepted=task_stage.result_status.force_quit,
).model_dump(by_alias=True)
bomingzh marked this conversation as resolved Outdated
张泊明518370910136 commented 2025-03-02 02:23:09 +08:00
Outdated
Review
Copy Link

these fields do not exist now

these fields do not exist now
李衍志523370910113 commented 2025-03-02 11:09:34 +08:00
Outdated
Review
Copy Link

resolved

resolved
张泊明518370910136 commented 2025-03-02 12:15:34 +08:00
Outdated
Review
Copy Link
No description provided.
)
return conf_stage
@ -227,9 +227,9 @@ def fix_diff(
answer_path=str(
jon-lee marked this conversation as resolved Outdated
张泊明518370910136 commented 2025-03-05 04:07:34 +08:00
Outdated
Review
Copy Link

Just pass conf_stage.executor to this function rather then the whole conf_stage.

Just pass `conf_stage.executor` to this function rather then the whole `conf_stage`.
JOJ3_CONFIG_ROOT / task_conf.task.type_ / stdout
),
force_quit_on_diff=diff_output.forcequit,
force_quit_on_diff=diff_output.force_quit,
always_hide=diff_output.hide,
compare_space=not diff_output.ignorespaces,
compare_space=not diff_output.ignore_spaces,
).model_dump(by_alias=True)
]
}

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

@ -11,7 +11,7 @@
"outputPath": "/tmp/joj3_result.json",
"stages": [
{
"name": "healthcheck",
"name": "Health Check",
"group": "",
"executor": {
"name": "local",

6
tests/convert/basic/task.toml
View File

@ -19,7 +19,7 @@ result-detail.exitstatus = true
result-detail.stderr = true
result-detail.time = false
result-detail.mem = false
result-status.forcequit = true
result-status.force_quit = true
[[stages]]
name = "[cq] Filelength"
@ -88,7 +88,7 @@ result-detail.stderr = true
case0.diff.output.score = 5
case0.limit.cpu = "0.5s"
case0.limit.mem = "5m"
case0.diff.output.ignorespaces = true
case0.diff.output.ignore_spaces = true
#case0.limit.stdout = 8
#case0.command = "./h7/build/ex2"
case0.in = "case0.in"
@ -96,7 +96,7 @@ case0.in = "case0.in"
case1.diff.output.score = 5
case1.limit.cpu = 1234567890
case1.limit.mem = 9876543210
case1.diff.output.ignorespaces = true
case1.diff.output.ignore_spaces = true
#case1.limit.stdout = 8
#case1.command = "./h7/build/ex2"
case1.in = "case1.in"

4
tests/convert/diff/task.toml
View File

@ -19,7 +19,7 @@ result-detail.stderr = true
case0.diff.output.score = 5
case0.limit.cpu = "1s"
case0.limit.mem = "2m"
case0.diff.output.ignorespaces = true
case0.diff.output.ignore_spaces = true
#case0.limit.stdout = 8
#case0.command = "./h7/build/ex2"
case0.in = "case0.in"
@ -27,7 +27,7 @@ case0.in = "case0.in"
case1.diff.output.score = 5
case1.limit.cpu = "2s"
case1.limit.mem = "4m"
case1.diff.output.ignorespaces = true
case1.diff.output.ignore_spaces = true
#case1.limit.stdout = 8
#case1.command = "./h7/build/ex2"
case1.in = "case1.in"