JOJ/JOJ3-config-generator
27
1
Fork 0
Code Issues 3 Pull Requests 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 +17 -27
2 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5c1eede217 - Show all commits

6
joj3_config_generator/models/result.py
View File

@ -156,14 +156,14 @@ class DummyConfig(BaseModel):
score: Optional[int] = None
comment: Optional[str] = None
force_quit_on_not_accepted: Optional[bool] = Field(
False, alias="forceQuitOnNotAccepted"
False, serialization_alias="forceQuitOnNotAccepted"
)
class DiffOutputConfig(BaseModel):
score: Optional[int] = None
file_name: str = Field("", alias="fileName")
answer_path: str = Field("", alias="answerPath")
file_name: str = Field("", serialization_alias="fileName")
answer_path: str = Field("", serialization_alias="answerPath")
force_quit_on_diff: Optional[bool] = Field(
False, serialization_alias="forceQuitOnDiff"
)

38
joj3_config_generator/processers/task.py
View File

@ -137,18 +137,8 @@ def fix_result_detail(
show_exit_status=task_stage.result_detail.exitstatus,
show_runtime=task_stage.result_detail.time,
show_memory=task_stage.result_detail.mem,
).model_dump()
).model_dump(by_alias=True)
jon-lee marked this conversation as resolved Outdated
张泊明518370910136 commented 2025-03-05 04:10:22 +08:00
Outdated
Review
Copy Link

When will it be None?

When will it be None?
)
# result_detail_parser.with_.update(
# {
# "score": 0,
# "comment": "",
# "showFiles": show_files,
# "showExitStatus": task_stage.result_detail.exitstatus,
# "showRuntime": task_stage.result_detail.time,
# "showMemory": task_stage.result_detail.mem,
# }
# )
return conf_stage
@ -170,11 +160,11 @@ def fix_dummy(
if task_stage.result_status is None:
jon-lee marked this conversation as resolved Outdated
张泊明518370910136 commented 2025-03-02 02:36:32 +08:00
Outdated
Review
Copy Link

move continue to the other branch to reduce nesting

move `continue` to the other branch to reduce nesting
张泊明518370910136 commented 2025-03-02 12:15:54 +08:00
Outdated
Review
Copy Link

I mean

if parser not in keyword_parser:
    continue

if getattr(task_stage, parser, None) is None:
    continue

if score != score_:
    continue
I mean ``` if parser not in keyword_parser: continue ``` ``` if getattr(task_stage, parser, None) is None: continue ```` ``` if score != score_: continue ````
李衍志523370910113 commented 2025-03-02 17:38:50 +08:00
Outdated
Review
Copy Link

fixed.

fixed.
continue
dummy_parser_.with_.update(
{
"score": task_stage.result_status.score,
"comment": task_stage.result_status.comment,
"forceQuitOnNotAccepted": task_stage.result_status.forcequit,
}
result.DummyConfig(
score=task_stage.result_status.score,
comment=task_stage.result_status.comment,
force_quit_on_not_accepted=task_stage.result_status.forcequit,
jon-lee marked this conversation as resolved Outdated
张泊明518370910136 commented 2025-03-05 03:58:39 +08:00
Outdated
Review
Copy Link

Is it necessary to rename?

Is it necessary to rename?
).model_dump(by_alias=True)
)
return conf_stage
@ -243,14 +233,14 @@ def fix_diff(
parser_cases.append(
{
"outputs": [
{
"score": diff_output.score,
"fileName": "stdout",
"answerPath": f"/home/tt/.config/joj/{task_conf.task.type_}/{stdout}",
"forceQuitOnDiff": diff_output.forcequit,
"alwaysHide": diff_output.hide,
"compareSpace": not diff_output.ignorespaces,
}
result.DiffOutputConfig(
score=diff_output.score,
file_name="stdout",
answer_path=f"/home/tt/.config/joj/{task_conf.task.type_}/{stdout}",
force_quit_on_diff=diff_output.forcequit,
always_hide=diff_output.hide,
compare_space=not diff_output.ignorespaces,
).model_dump(by_alias=True)
]
}
)