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

14
joj3_config_generator/processers/task.py
View File

@ -1,5 +1,6 @@
import re
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 shlex
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 pathlib import Path
from typing import Any, Callable, Dict, List, Tuple
from joj3_config_generator.models import result, task
@ -34,7 +35,10 @@ def get_conf_stage(
fn(parser_model, conf_stage.parsers[idx])
jon-lee marked this conversation as resolved Outdated
张泊明518370910136 commented 2025-03-05 03:51:41 +08:00
Outdated
Review
Copy Link

Do we need to support both kinds of names?

Do we need to support both kinds of names?
李衍志523370910113 commented 2025-03-05 08:42:25 +08:00
Outdated
Review
Copy Link

probably yes, since it is easy for new ta to type it wrong

probably yes, since it is easy for new ta to type it wrong
张泊明518370910136 commented 2025-03-05 09:00:28 +08:00
Outdated
Review
Copy Link

parsers name should be a str enum, force them to use the correct names

parsers name should be a str enum, force them to use the correct names
李衍志523370910113 commented 2025-03-05 09:09:46 +08:00
Outdated
Review
Copy Link

ok, then removed.

ok, then removed.
elif parser == "diff":
jon-lee marked this conversation as resolved Outdated
张泊明518370910136 commented 2025-02-23 22:32:35 +08:00
Outdated
Review
Copy Link

underscore

underscore
李衍志523370910113 commented 2025-02-25 11:02:24 +08:00
Outdated
Review
Copy Link

fixed

fixed
fix_diff(
task_stage, task_conf, conf_stage.parsers[idx], conf_stage.executor
task_stage,
conf_stage.parsers[idx],
conf_stage.executor,
JOJ3_CONFIG_ROOT / task_conf.path.parent,
)
else:
continue
@ -154,9 +158,9 @@ def fix_file(file_parser_config: task.ParserFile, file_parser: result.Parser) ->
def fix_diff(
task_stage: task.Stage,
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.
task_conf: task.Config,
diff_parser_config: result.Parser,
diff_executor: result.Executor,
base_dir: Path,
) -> None:
skip = task_stage.skip
cases = task_stage.cases
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?
@ -180,7 +184,7 @@ def fix_diff(
stage_cases.append(
result.OptionalCmd(
stdin=result.LocalFile(
src=str(JOJ3_CONFIG_ROOT / task_conf.path.parent / stdin),
src=str(base_dir / stdin),
),
args=shlex.split(command) if command else None,
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.
cpu_limit=cpu_limit,
@ -203,9 +207,7 @@ def fix_diff(
result.DiffOutputConfig(
score=diff_output.score,
file_name="stdout",
answer_path=str(
JOJ3_CONFIG_ROOT / task_conf.path.parent / stdout
),
answer_path=str(base_dir / stdout),
force_quit_on_diff=diff_output.force_quit,
jon-lee marked this conversation as resolved Outdated
张泊明518370910136 commented 2025-03-02 02:28:53 +08:00
Outdated
Review
Copy Link

Create models for these dicts, then update them with the dict from model_dump

Create models for these dicts, then update them with the dict from `model_dump`
李衍志523370910113 commented 2025-03-02 11:38:27 +08:00
Outdated
Review
Copy Link

@bomingzh I don't think we can change it. This is to make proper alias so that we can get the content of result-status.

@bomingzh I don't think we can change it. This is to make proper alias so that we can get the content of `result-status`.
张泊明518370910136 commented 2025-03-02 12:09:26 +08:00
Outdated
Review
Copy Link
class DummyConfig(BaseModel):
    score: int
    comment: str

Then dummy_parser_.with_.update(dummy_config(...).model_dump()).

``` class DummyConfig(BaseModel): score: int comment: str ``` Then `dummy_parser_.with_.update(dummy_config(...).model_dump())`.
李衍志523370910113 commented 2025-03-02 17:38:42 +08:00
Outdated
Review
Copy Link

fixed

fixed
always_hide=diff_output.hide,
compare_space=not diff_output.ignore_spaces,