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

fix: total score overwrite
All checks were successful
build / build (push) Successful in 1m52s
Details
build / trigger-build-image (push) Successful in 10s
Details

Browse Source
This commit is contained in:
张泊明518370910136 2025-06-17 02:15:10 -04:00
parent 0b39aa7112
commit d8073e4eb6
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
joj3_config_generator/models/repo.py
View File

@ -1,6 +1,6 @@
import os import os
from pathlib import Path from pathlib import Path
from typing import List, Optional from typing import List
from pydantic import AliasChoices, BaseModel, Field, model_validator from pydantic import AliasChoices, BaseModel, Field, model_validator
@ -32,8 +32,8 @@ class Config(BaseModel):
"", validation_alias=AliasChoices("gitea-token", "gitea_token") "", validation_alias=AliasChoices("gitea-token", "gitea_token")
) )
gitea_org: str = Field("", validation_alias=AliasChoices("gitea-org", "gitea_org")) gitea_org: str = Field("", validation_alias=AliasChoices("gitea-org", "gitea_org"))
max_total_score: Optional[int] = Field( max_total_score: int = Field(
None, validation_alias=AliasChoices("max-total-score", "max_total_score") 100, validation_alias=AliasChoices("max-total-score", "max_total_score")
) )
force_skip_health_check_on_test: bool = Field( force_skip_health_check_on_test: bool = Field(
False, False,

6
joj3_config_generator/models/task.py
View File

@ -1,7 +1,7 @@
from datetime import datetime, timezone from datetime import datetime, timezone
from enum import Enum from enum import Enum
from pathlib import Path from pathlib import Path
from typing import Any, Dict, List, Type from typing import Any, Dict, List, Optional, Type
from pydantic import ( from pydantic import (
AliasChoices, AliasChoices,
@ -222,6 +222,6 @@ class Config(BaseModel):
release: Release = Release() # Release configuration release: Release = Release() # Release configuration
stages: List[Stage] = [] # list of stage configurations stages: List[Stage] = [] # list of stage configurations
groups: Groups = Groups() groups: Groups = Groups()
max_total_score: int = Field( max_total_score: Optional[int] = Field(
100, validation_alias=AliasChoices("max-total-score", "max_total_score") None, validation_alias=AliasChoices("max-total-score", "max_total_score")
) )

6
joj3_config_generator/transformers/repo.py
View File

@ -33,9 +33,9 @@ def get_teapot_post_stage(
repo_conf.grading_repo_name, repo_conf.grading_repo_name,
"--max-total-score", "--max-total-score",
( (
str(repo_conf.max_total_score) str(task_conf.max_total_score)
if repo_conf.max_total_score is not None if task_conf.max_total_score is not None
else str(task_conf.max_total_score) else str(repo_conf.max_total_score)
), ),
] ]
if not repo_conf.submitter_in_issue_title: if not repo_conf.submitter_in_issue_title:

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

@ -806,7 +806,7 @@
"--grading-repo-name", "--grading-repo-name",
"ece280-joj", "ece280-joj",
"--max-total-score", "--max-total-score",
"1000" "10245871"
], ],
"env": [ "env": [
"REPOS_DIR=/home/tt/.cache", "REPOS_DIR=/home/tt/.cache",