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

22
joj3_config_generator/processers/task.py
View File

@ -33,7 +33,9 @@ def get_conf_stage(
fn, parser_model = processed_dict[parser]
fn(parser_model, conf_stage.parsers[idx])
jon-lee marked this conversation as resolved Outdated
张泊明518370910136 commented 2025-03-03 11:54:43 +08:00
Outdated
Review
Copy Link

should loop through conf_stage.parsers here and update the with field according to the parser name.

should loop through `conf_stage.parsers` here and update the `with` field according to the parser name.
李衍志523370910113 commented 2025-03-03 13:36:23 +08:00
Outdated
Review
Copy Link

I think its already implemented in each of the fix_parsers functions

I think its already implemented in each of the `fix_parsers` functions
张泊明518370910136 commented 2025-03-03 13:43:12 +08:00
Outdated
Review
Copy Link

No, do not find the parser in the fix_xxx function. Instead, iterate through the parsers here and decide how to fill in the with.

No, do not find the parser in the `fix_xxx` function. Instead, iterate through the parsers here and decide how to fill in the `with`.
李衍志523370910113 commented 2025-03-03 16:17:53 +08:00
Outdated
Review
Copy Link

resolved.

resolved.
张泊明518370910136 commented 2025-03-04 03:02:45 +08:00
Outdated
Review
Copy Link

Use a dict to store parser name, field, function to process.

    process_dict: Dict[
        str, Tuple[Callable[[result.ParserConfig, BaseModel], None], BaseModel]
    ] = {
        "clangtidy": (fix_keyword, task_stage.clangtidy),
        "keyword": (fix_keyword, task_stage.keyword),
        "diff": (fix_diff, task_stage.diff),
    }
    for i, parser in enumerate(task_stage.parsers):
        if parser in process_dict:
            func, parser_model = process_dict[parser]
            func(conf_stage.parsers[i], parser_model)
Use a dict to store parser name, field, function to process. ``` process_dict: Dict[ str, Tuple[Callable[[result.ParserConfig, BaseModel], None], BaseModel] ] = { "clangtidy": (fix_keyword, task_stage.clangtidy), "keyword": (fix_keyword, task_stage.keyword), "diff": (fix_diff, task_stage.diff), } for i, parser in enumerate(task_stage.parsers): if parser in process_dict: func, parser_model = process_dict[parser] func(conf_stage.parsers[i], parser_model) ```
李衍志523370910113 commented 2025-03-04 14:46:40 +08:00
Outdated
Review
Copy Link

resolved.

resolved.
elif parser == "diff":
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.
fix_diff(task_stage, task_conf, conf_stage.parsers[idx], conf_stage)
fix_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
task_stage, task_conf, conf_stage.parsers[idx], conf_stage.executor
)
else:
continue
return conf_stage
@ -88,7 +90,7 @@ def get_executor_with(
def fix_keyword(
keyword_config: task.ParserKeyword, keyword_parser_: result.Parser
keyword_config: task.ParserKeyword, keyword_parser: result.Parser
) -> None:
jon-lee marked this conversation as resolved Outdated
张泊明518370910136 commented 2025-03-05 03:58:08 +08:00
Outdated
Review
Copy Link

The reason for the suffix in keyword_parser_?

The reason for the suffix in `keyword_parser_`?
李衍志523370910113 commented 2025-03-05 08:42:46 +08:00
Outdated
Review
Copy Link

just forgot to remove, sorry

just forgot to remove, sorry
keyword_weight: List[result.KeywordConfig] = []
unique_weight = list(set(keyword_config.weight))
@ -102,7 +104,7 @@ def fix_keyword(
else:
continue
keyword_parser_.with_.update(
keyword_parser.with_.update(
result.KeywordMatchConfig(
matches=keyword_weight,
).model_dump(by_alias=True)
@ -134,8 +136,6 @@ def fix_dummy(
dummy_parser_config: task.ParserDummy, dummy_parser: result.Parser
) -> None:
# we don't use dummy parser in real application
if dummy_parser_config is None:
return
dummy_parser.with_.update(
result.DummyConfig(
jon-lee marked this conversation as resolved Outdated
张泊明518370910136 commented 2025-03-05 04:10:22 +08:00
Outdated
Review
Copy Link

When will it be None?

When will it be None?
score=dummy_parser_config.score,
@ -156,9 +156,8 @@ def fix_diff(
task_stage: task.Stage,
task_conf: task.Config,
diff_parser_config: result.Parser,
conf_stage: result.StageDetail,
diff_executor: result.Executor,
) -> None:
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.
diff_parser = diff_parser_config
skip = task_stage.skip
cases = task_stage.cases
finalized_cases = [case for case in cases if case not in skip]
@ -215,10 +214,9 @@ def fix_diff(
)
)
if diff_parser:
diff_parser.with_.update(
result.DiffConfig(name="diff", cases=parser_cases).model_dump(by_alias=True)
)
conf_stage.executor.with_.cases = stage_cases
diff_parser_config.with_.update(
result.DiffConfig(name="diff", cases=parser_cases).model_dump(by_alias=True)
)
diff_executor.with_.cases = stage_cases
return