JOJ/JOJ3-config-generator
27
1
Fork 0
Code Issues3 Pull Requests1 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 +7 -19
4 changed files with 7 additions and 19 deletions
Showing only changes of commit a38a155975 - Show all commits
joj3_config_generator
convert.py
processers
repo.pytask.py
tests/convert/basic
task.json

2
joj3_config_generator/convert.py
View File

@ -2,7 +2,7 @@ from typing import List
from joj3_config_generator.processers.repo import getHealthcheckConfig, getTeapotConfig
from joj3_config_generator.processers.task import (
fix_comment,
fix_dummy,
fix_diff,
fix_keyword,
fix_result_detail,

14
joj3_config_generator/processers/repo.py
View File

@ -3,19 +3,7 @@ import shlex
import socket
from pathlib import Path
from joj3_config_generator.models import (
Cmd,
CmdFile,
ExecutorConfig,
ExecutorWithConfig,
ParserConfig,
Repo,
ResultConfig,
Stage,
StageConfig,
Task,
TeapotConfig,
)
from joj3_config_generator.models import repo, result, task
def getGradingRepoName() -> str:

2
joj3_config_generator/processers/task.py
View File

@ -1,7 +1,7 @@
import shlex
jon-lee marked this conversation as resolved
张泊明518370910136 commented 2025-03-03 11:03:41 +08:00
Review

Path should not be relative to JOJ3_CONFIG_ROOT in this file, should be relative to task.toml dir

Path should not be relative to `JOJ3_CONFIG_ROOT` in this file, should be relative to `task.toml` dir
李衍志523370910113 commented 2025-03-03 11:11:32 +08:00
Review

I reckon you said things is relative to JOJ3_CONFIG_ROOT in JTC before. we have a task.type in task.toml to mend the path

I reckon you said things is relative to `JOJ3_CONFIG_ROOT` in JTC before. we have a `task.type` in `task.toml` to mend the path
张泊明518370910136 commented 2025-03-03 11:15:21 +08:00
Review

config.path is relative to JOJ3_CONFIG_ROOT.

`config.path` is relative to `JOJ3_CONFIG_ROOT`.
李衍志523370910113 commented 2025-03-03 13:32:29 +08:00
Review

could you explain further? I m not quite sure my understanding is clear.

could you explain further? I m not quite sure my understanding is clear.
张泊明518370910136 commented 2025-03-04 03:05:54 +08:00
Review

In joj3_config_generator/models/task.py, Config.path is relative to JOJ3_CONFIG_ROOT, so task.toml will located at JOJ3_CONFIG_ROOT / task_conf.path in JTC.

In `joj3_config_generator/models/task.py`, `Config.path` is relative to `JOJ3_CONFIG_ROOT`, so `task.toml` will located at `JOJ3_CONFIG_ROOT / task_conf.path` in JTC.
from typing import Tuple
jon-lee marked this conversation as resolved
张泊明518370910136 commented 2025-03-03 11:27:04 +08:00
Review

Some with_.update is still using raw dict, not model with model_dump.

Some `with_.update` is still using raw dict, not model with `model_dump`.
from joj3_config_generator.models import joj1, repo, result, task
from joj3_config_generator.models import result, task
def remove_nulls(d: result.Config) -> result.Config:

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

@ -1233,10 +1233,10 @@
]
},
"teapot": {
"logPath": "/home/tt/.cache/joint-teapot-debug.log",
"scoreboardPath": "scoreboard.csv",
"failedTablePath": "failed-table.md",
"gradingRepoName": "",
"logPath": "p2-m3-joint-teapot-debug.log",
"scoreboardPath": "p2-m3-scoreboard.csv",
"failedTablePath": "p2-m3-failed-table.md",
"gradingRepoName": "Nuvole-joj",
"skipIssue": false,
"skipScoreboard": false,
"skipFailedTable": false