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

Compare commits

base: JOJ:99ccbbd113a0bb3ab88b31c6fd4a127be646a3a8
Branches Tags
JOJ:master
...
compare: JOJ:1a1ed96c238317a8707023ffe3255e0cfc36355b
Branches Tags
JOJ:master

4 Commits
99ccbbd113 ... 1a1ed96c23

Author SHA1 Message Date
李衍志523370910113
1a1ed96c23 fix: merge master
Some checks failed
build / build (push) Failing after 2m28s
Details
build / build (pull_request) Failing after 2m29s
Details
2025-02-27 14:28:21 +08:00
张泊明518370910136
723705b94f
fix: store path for both conf objs
All checks were successful
build / build (push) Successful in 2m21s
Details
2025-02-27 01:17:14 -05:00
张泊明518370910136
4c12bf9a34
fix: store root path
Some checks failed
build / build (push) Has been cancelled
Details
2025-02-27 01:14:40 -05:00
张泊明518370910136
c4639aef76
fix: store relative path to root
All checks were successful
build / build (push) Successful in 2m46s
Details
2025-02-27 00:24:43 -05:00
4 changed files with 12 additions and 8 deletions
Show Stats Expand all files Collapse all files

6
joj3_config_generator/main.py
View File

@ -73,9 +73,11 @@ def convert(
) )
task_obj = rtoml.loads(task_toml_path.read_text()) task_obj = rtoml.loads(task_toml_path.read_text())
repo_conf = repo.Config(**repo_obj) repo_conf = repo.Config(**repo_obj)
repo_conf.path = (root / repo_toml_path.relative_to(root)).resolve() repo_conf.root = root
repo_conf.path = repo_toml_path.relative_to(root)
task_conf = task.Config(**task_obj) task_conf = task.Config(**task_obj)
task_conf.path = (root / task_toml_path.relative_to(root)).resolve() task_conf.root = root
task_conf.path = task_toml_path.relative_to(root)
result_model = convert_conf(repo_conf, task_conf) result_model = convert_conf(repo_conf, task_conf)
result_dict = result_model.model_dump(by_alias=True, exclude_none=True) result_dict = result_model.model_dump(by_alias=True, exclude_none=True)
with result_json_path.open("w") as result_file: with result_json_path.open("w") as result_file:

3
joj3_config_generator/models/repo.py
View File

@ -22,4 +22,5 @@ class Config(BaseModel):
max_total_score: int = Field(100) max_total_score: int = Field(100)
force_skip_heatlh_check_on_test: bool = False force_skip_heatlh_check_on_test: bool = False
groups: Groups = Groups() groups: Groups = Groups()
path: Path = Path(".") root: Path = Path(".")
path: Path = Path("repo.toml")

5
joj3_config_generator/models/task.py
View File

@ -108,7 +108,8 @@ class Task(BaseModel):
class Config(BaseModel): class Config(BaseModel):
root: Path = Path(".")
path: Path = Path("conf.toml")
task: Task task: Task
release: Release release: Release # Release configuration
path: Path = Path(".")
stages: List[Stage] # list of stage configurations stages: List[Stage] # list of stage configurations

6
tests/convert/utils.py
View File

@ -12,11 +12,11 @@ def read_convert_files(
case_name: str, case_name: str,
) -> Tuple[repo.Config, task.Config, Dict[str, Any]]: ) -> Tuple[repo.Config, task.Config, Dict[str, Any]]:
root = Path(__file__).resolve().parent root = Path(__file__).resolve().parent
repo_toml_path = root / case_name / "repo.toml" repo_toml_path = root.absolute() / case_name / "repo.toml"
repo_toml = repo_toml_path.read_text() if repo_toml_path.exists() else "" repo_toml = repo_toml_path.read_text() if repo_toml_path.exists() else ""
task_toml_path = root / case_name / "task.toml" task_toml_path = root.absolute() / case_name / "task.toml"
task_toml = task_toml_path.read_text() if task_toml_path.exists() else "" task_toml = task_toml_path.read_text() if task_toml_path.exists() else ""
result = json.loads((root / case_name / "task.json").read_text()) result = json.loads((root.absolute() / case_name / "task.json").read_text())
return ( return (
repo.Config(**rtoml.loads(repo_toml)), repo.Config(**rtoml.loads(repo_toml)),
task.Config(**rtoml.loads(task_toml)), task.Config(**rtoml.loads(task_toml)),