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 +5 -7
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e5530ae580 - Show all commits

12
joj3_config_generator/processers/task.py
View File

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

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
Copy Link

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
Copy Link

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
Copy Link

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
Copy Link

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.
import re
jon-lee marked this conversation as resolved
张泊明518370910136 commented 2025-03-03 11:27:04 +08:00
Review
Copy Link

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 typing import List, Tuple
from joj3_config_generator.models import result, task
@ -9,12 +10,10 @@ def get_conf_stage(
) -> result.StageDetail:
conf_stage = result.StageDetail(
name=task_stage.name if task_stage.name is not None else "",
# TODO: we may have cq in future
group=(
"joj"
if (task_stage.name is not None)
and (("joj" in task_stage.name) or ("run" in task_stage.name))
else None
re.search(r'\[([^\[\]]+)\]', task_stage.name).group(1)
if (task_stage.name is not None and re.search(r'\[([^\[\]]+)\]', task_stage.name))
else ""
jon-lee marked this conversation as resolved Outdated
李衍志523370910113 commented 2025-03-03 11:12:45 +08:00
Outdated
Review
Copy Link

BTW, is this outdated?

BTW, is this outdated?
张泊明518370910136 commented 2025-03-03 11:17:54 +08:00
Outdated
Review
Copy Link

Never heard about this rule.

Never heard about this rule.
李衍志523370910113 commented 2025-03-03 11:19:19 +08:00
Outdated
Review
Copy Link

@manuel what would be the current intended rule for group?

@manuel what would be the current intended rule for `group`?
李衍志523370910113 commented 2025-03-03 16:18:13 +08:00
Outdated
Review
Copy Link

seems current strategy is fine, resolved.

seems current strategy is fine, resolved.
),
executor=result.Executor(
name="sandbox",
@ -62,7 +61,7 @@ def get_executorWithConfig(
result.CmdFile(src=f"/home/tt/.config/joj/{file}")
if not file.endswith("main.cpp")
else result.CmdFile(
jon-lee marked this conversation as resolved Outdated
张泊明518370910136 commented 2025-03-03 11:25:43 +08:00
Outdated
Review
Copy Link

not necessary

not necessary
李衍志523370910113 commented 2025-03-03 12:51:37 +08:00
Outdated
Review
Copy Link

resolved.

resolved.
src=f"/home/tt/.config/joj/tests/homework/h7/e3/ex3-main.cpp"
src=f"/home/tt/.config/joj/homework/h7/e3/ex3-main.cpp"
)
)
for file in copy_in_files
@ -188,7 +187,6 @@ def fix_dummy(
dummy_parser = [
"dummy",
"result-status",
jon-lee marked this conversation as resolved Outdated
张泊明518370910136 commented 2025-03-05 04:08:07 +08:00
Outdated
Review
Copy Link

Pass JOJ3_CONFIG_ROOT / task_conf.path.parent as base_dir in parameters.

Pass `JOJ3_CONFIG_ROOT / task_conf.path.parent` as `base_dir` in parameters.
李衍志523370910113 commented 2025-03-05 08:53:49 +08:00
Outdated
Review
Copy Link

resolved.

resolved.
"cpplint",
]
if task_stage.parsers is not None:
for parser in task_stage.parsers: