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

Compare commits

base: JOJ:c36e710668cdd19db9cedf829e630eb661d3f157
Branches Tags
JOJ:master
...
compare: JOJ:b7b7a93677e4b2edf7661bb0b7dfa199210bb738
Branches Tags
JOJ:master

2 Commits
c36e710668 ... b7b7a93677

Author SHA1 Message Date
李衍志523370910113
b7b7a93677 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
All checks were successful
build / build (push) Successful in 2m33s
Details
build / build (pull_request) Successful in 2m36s
Details
2025-03-03 12:47:49 +08:00
李衍志523370910113
7e58220d2f fix(processors/task): remove all getattr 2025-03-03 12:47:41 +08:00
3 changed files with 25 additions and 26 deletions
Show Stats Expand all files Collapse all files

1
joj3_config_generator/models/result.py
View File

@ -58,7 +58,6 @@ class Cmd(BaseModel):
copy_in: Dict[str, InputFile] = Field({}, serialization_alias="copyIn") copy_in: Dict[str, InputFile] = Field({}, serialization_alias="copyIn")
copy_in_cached: Dict[str, str] = Field({}, serialization_alias="copyInCached") copy_in_cached: Dict[str, str] = Field({}, serialization_alias="copyInCached")
copy_in_dir: str = Field(".", serialization_alias="copyInDir") copy_in_dir: str = Field(".", serialization_alias="copyInDir")
# reconsider this default situation
copy_out: List[str] = Field(["stdout", "stderr"], serialization_alias="copyOut") copy_out: List[str] = Field(["stdout", "stderr"], serialization_alias="copyOut")
copy_out_cached: List[str] = Field([], serialization_alias="copyOutCached") copy_out_cached: List[str] = Field([], serialization_alias="copyOutCached")
copy_out_max: int = Field(0, serialization_alias="copyOutMax") copy_out_max: int = Field(0, serialization_alias="copyOutMax")

10
joj3_config_generator/processers/task.py
View File

@ -78,16 +78,16 @@ def fix_keyword(
if parser in keyword_parser: if parser in keyword_parser:
keyword_parser_ = next(p for p in conf_stage.parsers if p.name == parser) keyword_parser_ = next(p for p in conf_stage.parsers if p.name == parser)
keyword_weight = [] keyword_weight = []
if getattr(task_stage, parser, None) is not None: if parser in task_stage.__dict__:
unique_weight = list(set(getattr(task_stage, parser).weight)) unique_weight = list(set(task_stage.__dict__[parser].weight))
for score in unique_weight: for score in unique_weight:
keyword_weight.append({"keywords": [], "score": score}) keyword_weight.append({"keywords": [], "score": score})
for idx, score in enumerate(unique_weight): for idx, score in enumerate(unique_weight):
for idx_, score_ in enumerate(getattr(task_stage, parser).weight): for idx_, score_ in enumerate(task_stage.__dict__[parser].weight):
if score == score_: if score == score_:
keyword_weight[idx]["keywords"].append( keyword_weight[idx]["keywords"].append(
getattr(task_stage, parser).keyword[idx_] task_stage.__dict__[parser].keyword[idx_]
) )
else: else:
continue continue
@ -134,7 +134,7 @@ def fix_dummy(task_stage: task.Stage, conf_stage: result.StageDetail) -> None:
if parser not in dummy_parser: if parser not in dummy_parser:
continue continue
dummy_parser_ = next(p for p in conf_stage.parsers if p.name == parser) dummy_parser_ = next(p for p in conf_stage.parsers if p.name == parser)
if getattr(task_stage, parser.replace("-", "_"), None) is None: if parser.replace("-", "_") not in task_stage.__dict__:
continue continue
if task_stage.result_status is None: if task_stage.result_status is None:
continue continue

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

@ -222,11 +222,11 @@
} }
}, },
"copyInCached": { "copyInCached": {
"h7/build/ex2-msan": "h7/build/ex2-msan", "h7/build/ex2-ubsan": "h7/build/ex2-ubsan",
"h7/build/ex2-asan": "h7/build/ex2-asan",
"h7/build/compile_commands.json": "h7/build/compile_commands.json", "h7/build/compile_commands.json": "h7/build/compile_commands.json",
"h7/build/ex2": "h7/build/ex2", "h7/build/ex2-asan": "h7/build/ex2-asan",
"h7/build/ex2-ubsan": "h7/build/ex2-ubsan" "h7/build/ex2-msan": "h7/build/ex2-msan",
"h7/build/ex2": "h7/build/ex2"
}, },
"copyInDir": ".", "copyInDir": ".",
"copyOut": [ "copyOut": [
@ -322,11 +322,11 @@
} }
}, },
"copyInCached": { "copyInCached": {
"h7/build/ex2-msan": "h7/build/ex2-msan", "h7/build/ex2-ubsan": "h7/build/ex2-ubsan",
"h7/build/ex2-asan": "h7/build/ex2-asan",
"h7/build/compile_commands.json": "h7/build/compile_commands.json", "h7/build/compile_commands.json": "h7/build/compile_commands.json",
"h7/build/ex2": "h7/build/ex2", "h7/build/ex2-asan": "h7/build/ex2-asan",
"h7/build/ex2-ubsan": "h7/build/ex2-ubsan" "h7/build/ex2-msan": "h7/build/ex2-msan",
"h7/build/ex2": "h7/build/ex2"
}, },
"copyInDir": ".", "copyInDir": ".",
"copyOut": [ "copyOut": [
@ -444,11 +444,11 @@
"cpuSetLimit": "", "cpuSetLimit": "",
"copyIn": {}, "copyIn": {},
"copyInCached": { "copyInCached": {
"h7/build/ex2-msan": "h7/build/ex2-msan", "h7/build/ex2-ubsan": "h7/build/ex2-ubsan",
"h7/build/ex2-asan": "h7/build/ex2-asan",
"h7/build/compile_commands.json": "h7/build/compile_commands.json", "h7/build/compile_commands.json": "h7/build/compile_commands.json",
"h7/build/ex2": "h7/build/ex2", "h7/build/ex2-asan": "h7/build/ex2-asan",
"h7/build/ex2-ubsan": "h7/build/ex2-ubsan" "h7/build/ex2-msan": "h7/build/ex2-msan",
"h7/build/ex2": "h7/build/ex2"
}, },
"copyInDir": ".", "copyInDir": ".",
"copyOut": [ "copyOut": [
@ -542,11 +542,11 @@
"cpuSetLimit": "", "cpuSetLimit": "",
"copyIn": {}, "copyIn": {},
"copyInCached": { "copyInCached": {
"h7/build/ex2-msan": "h7/build/ex2-msan", "h7/build/ex2-ubsan": "h7/build/ex2-ubsan",
"h7/build/ex2-asan": "h7/build/ex2-asan",
"h7/build/compile_commands.json": "h7/build/compile_commands.json", "h7/build/compile_commands.json": "h7/build/compile_commands.json",
"h7/build/ex2": "h7/build/ex2", "h7/build/ex2-asan": "h7/build/ex2-asan",
"h7/build/ex2-ubsan": "h7/build/ex2-ubsan" "h7/build/ex2-msan": "h7/build/ex2-msan",
"h7/build/ex2": "h7/build/ex2"
}, },
"copyInDir": ".", "copyInDir": ".",
"copyOut": [ "copyOut": [
@ -639,11 +639,11 @@
"cpuSetLimit": "", "cpuSetLimit": "",
"copyIn": {}, "copyIn": {},
"copyInCached": { "copyInCached": {
"h7/build/ex2-msan": "h7/build/ex2-msan", "h7/build/ex2-ubsan": "h7/build/ex2-ubsan",
"h7/build/ex2-asan": "h7/build/ex2-asan",
"h7/build/compile_commands.json": "h7/build/compile_commands.json", "h7/build/compile_commands.json": "h7/build/compile_commands.json",
"h7/build/ex2": "h7/build/ex2", "h7/build/ex2-asan": "h7/build/ex2-asan",
"h7/build/ex2-ubsan": "h7/build/ex2-ubsan" "h7/build/ex2-msan": "h7/build/ex2-msan",
"h7/build/ex2": "h7/build/ex2"
}, },
"copyInDir": ".", "copyInDir": ".",
"copyOut": [ "copyOut": [