diff --git a/joj3_config_generator/generator.py b/joj3_config_generator/generator.py index b822b1c..f0afc62 100644 --- a/joj3_config_generator/generator.py +++ b/joj3_config_generator/generator.py @@ -2,7 +2,7 @@ import os from typing import Dict from joj3_config_generator.models import answer, joj1, repo, result, task -from joj3_config_generator.models.const import ACTOR_CSV_PATH, JOJ3_LOG_ROOT +from joj3_config_generator.models.const import ACTOR_CSV_PATH, JOJ3_LOG_PATH from joj3_config_generator.transformers.answer import get_task_conf_from_answers from joj3_config_generator.transformers.joj1 import get_task_conf_from_joj1 from joj3_config_generator.transformers.repo import ( @@ -25,7 +25,7 @@ def convert_joj3_conf(repo_conf: repo.Config, task_conf: task.Config) -> result. result_conf = result.Config( name=task_conf.task.name, # exact folder difference specified by type - log_path=str(JOJ3_LOG_ROOT / f"{task_conf.task.type_}.log"), + log_path=str(JOJ3_LOG_PATH), expire_unix_timestamp=int(task_conf.release.end_time.timestamp()), effective_unix_timestamp=int(task_conf.release.begin_time.timestamp()), actor_csv_path=str(ACTOR_CSV_PATH), # students.csv position diff --git a/joj3_config_generator/loader.py b/joj3_config_generator/loader.py index c3aaa44..dc8b129 100644 --- a/joj3_config_generator/loader.py +++ b/joj3_config_generator/loader.py @@ -11,7 +11,6 @@ from joj3_config_generator.models import answer, joj1, repo, task def load_joj3_task_toml_answers() -> answer.Answers: questions = [ inquirer.Text(name="name", message="What's the task name?"), - inquirer.Text(name="type", message="What's the task type?"), inquirer.Checkbox( "stages", message="What kind of stages do you need?", diff --git a/joj3_config_generator/models/answer.py b/joj3_config_generator/models/answer.py index 14d540b..f29591d 100644 --- a/joj3_config_generator/models/answer.py +++ b/joj3_config_generator/models/answer.py @@ -1,7 +1,7 @@ from enum import Enum from typing import List -from pydantic import AliasChoices, BaseModel, Field +from pydantic import BaseModel class StageEnum(str, Enum): @@ -13,8 +13,4 @@ class StageEnum(str, Enum): class Answers(BaseModel): name: str - type_: str = Field( - serialization_alias="type", - validation_alias=AliasChoices("type_", "type"), - ) stages: List[str] diff --git a/joj3_config_generator/models/const.py b/joj3_config_generator/models/const.py index 501902d..fae8215 100644 --- a/joj3_config_generator/models/const.py +++ b/joj3_config_generator/models/const.py @@ -9,6 +9,6 @@ DEFAULT_FILE_LIMIT = Memory("32m") JOJ3_CONFIG_ROOT = Path("/home/tt/.config/joj") TEAPOT_CONFIG_ROOT = Path("/home/tt/.config/teapot") CACHE_ROOT = Path("/home/tt/.cache") -JOJ3_LOG_ROOT = CACHE_ROOT / "joj3" -TEAPOT_LOG_ROOT = CACHE_ROOT +JOJ3_LOG_PATH = CACHE_ROOT / "joj3.log" +TEAPOT_LOG_PATH = CACHE_ROOT / "joint-teapot-debug.log" ACTOR_CSV_PATH = JOJ3_CONFIG_ROOT / "students.csv" diff --git a/joj3_config_generator/models/task.py b/joj3_config_generator/models/task.py index 29673a6..4e99358 100644 --- a/joj3_config_generator/models/task.py +++ b/joj3_config_generator/models/task.py @@ -3,14 +3,7 @@ from enum import Enum from pathlib import Path from typing import Any, Dict, List, Type -from pydantic import ( - AliasChoices, - BaseModel, - ConfigDict, - Field, - field_validator, - model_validator, -) +from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator from joj3_config_generator.models.common import Memory, Time from joj3_config_generator.models.const import ( @@ -148,11 +141,6 @@ class Release(BaseModel): class Task(BaseModel): - type_: str = Field( - "unknown", - serialization_alias="type", - validation_alias=AliasChoices("type_", "type"), - ) name: str = "unknown" diff --git a/joj3_config_generator/transformers/answer.py b/joj3_config_generator/transformers/answer.py index e8d1b1d..0330a66 100644 --- a/joj3_config_generator/transformers/answer.py +++ b/joj3_config_generator/transformers/answer.py @@ -3,4 +3,4 @@ from joj3_config_generator.models import answer, task # TODO: implement def get_task_conf_from_answers(answers: answer.Answers) -> task.Config: - return task.Config(task=task.Task(name=answers.name, type_=answers.type_)) + return task.Config(task=task.Task(name=answers.name)) diff --git a/joj3_config_generator/transformers/repo.py b/joj3_config_generator/transformers/repo.py index af4e528..d80ba42 100644 --- a/joj3_config_generator/transformers/repo.py +++ b/joj3_config_generator/transformers/repo.py @@ -3,7 +3,7 @@ from pathlib import Path from typing import List from joj3_config_generator.models import repo, result -from joj3_config_generator.models.const import TEAPOT_CONFIG_ROOT, TEAPOT_LOG_ROOT +from joj3_config_generator.models.const import TEAPOT_CONFIG_ROOT, TEAPOT_LOG_PATH def get_teapot_stage(repo_conf: repo.Config) -> result.StageDetail: @@ -24,7 +24,7 @@ def get_teapot_stage(repo_conf: repo.Config) -> result.StageDetail: with_=result.ExecutorWith( default=result.Cmd( args=args, - env=[f"LOG_FILE_PATH={TEAPOT_LOG_ROOT}/joint-teapot-debug.log"], + env=[f"LOG_FILE_PATH={TEAPOT_LOG_PATH}"], ), cases=[], ), @@ -78,7 +78,7 @@ def get_health_check_stage(repo_conf: repo.Config) -> result.StageDetail: ), result.OptionalCmd( args=get_teapot_check_args(repo_conf), - env=[f"LOG_FILE_PATH={TEAPOT_LOG_ROOT}/joint-teapot-debug.log"], + env=[f"LOG_FILE_PATH={TEAPOT_LOG_PATH}"], ), ], ), diff --git a/tests/convert/basic/task.json b/tests/convert/basic/task.json index bc3483b..f799933 100644 --- a/tests/convert/basic/task.json +++ b/tests/convert/basic/task.json @@ -1,6 +1,6 @@ { "name": "hw7 ex2", - "logPath": "/home/tt/.cache/joj3/homework/h7/e2.log", + "logPath": "/home/tt/.cache/joj3.log", "expireUnixTimestamp": 1735574399, "effectiveUnixTimestamp": 1735487999, "actorCsvPath": "/home/tt/.config/joj/students.csv", diff --git a/tests/convert/basic/task.toml b/tests/convert/basic/task.toml index 46b8744..c1f0277 100644 --- a/tests/convert/basic/task.toml +++ b/tests/convert/basic/task.toml @@ -1,6 +1,5 @@ # general task configuration task.name = "hw7 ex2" # task name -task.type = "homework/h7/e2" # remove this task type later release.end_time = 2024-12-30 23:59:59+08:00 release.begin_time = 2024-12-29 23:59:59+08:00 diff --git a/tests/convert/clang-tidy/task.json b/tests/convert/clang-tidy/task.json index 8603816..5c9b30e 100644 --- a/tests/convert/clang-tidy/task.json +++ b/tests/convert/clang-tidy/task.json @@ -1,6 +1,6 @@ { "name": "hw7 ex2", - "logPath": "/home/tt/.cache/joj3/homework/h7/e2.log", + "logPath": "/home/tt/.cache/joj3.log", "expireUnixTimestamp": 1735574399, "effectiveUnixTimestamp": 1735487999, "actorCsvPath": "/home/tt/.config/joj/students.csv", diff --git a/tests/convert/clang-tidy/task.toml b/tests/convert/clang-tidy/task.toml index cc4f91b..507c9d0 100644 --- a/tests/convert/clang-tidy/task.toml +++ b/tests/convert/clang-tidy/task.toml @@ -1,6 +1,5 @@ # general task configuration task.name = "hw7 ex2" # task name -task.type = "homework/h7/e2" # remove this task type later release.end_time = 2024-12-30 23:59:59+08:00 release.begin_time = 2024-12-29 23:59:59+08:00 diff --git a/tests/convert/cppcheck/task.json b/tests/convert/cppcheck/task.json index f6e3f9e..bc2d317 100644 --- a/tests/convert/cppcheck/task.json +++ b/tests/convert/cppcheck/task.json @@ -1,6 +1,6 @@ { "name": "hw7 ex2", - "logPath": "/home/tt/.cache/joj3/homework/h7/e2.log", + "logPath": "/home/tt/.cache/joj3.log", "expireUnixTimestamp": 1735574399, "effectiveUnixTimestamp": 1735487999, "actorCsvPath": "/home/tt/.config/joj/students.csv", diff --git a/tests/convert/cppcheck/task.toml b/tests/convert/cppcheck/task.toml index 50c8aa7..812e95a 100644 --- a/tests/convert/cppcheck/task.toml +++ b/tests/convert/cppcheck/task.toml @@ -1,6 +1,5 @@ # general task configuration task.name = "hw7 ex2" # task name -task.type = "homework/h7/e2" # remove this task type later release.end_time = 2024-12-30 23:59:59+08:00 release.begin_time = 2024-12-29 23:59:59+08:00 diff --git a/tests/convert/cpplint/task.json b/tests/convert/cpplint/task.json index 142343b..8fdb56f 100644 --- a/tests/convert/cpplint/task.json +++ b/tests/convert/cpplint/task.json @@ -1,6 +1,6 @@ { "name": "hw7 ex2", - "logPath": "/home/tt/.cache/joj3/homework/h7/e2.log", + "logPath": "/home/tt/.cache/joj3.log", "expireUnixTimestamp": 1735574399, "effectiveUnixTimestamp": 1735487999, "actorCsvPath": "/home/tt/.config/joj/students.csv", diff --git a/tests/convert/cpplint/task.toml b/tests/convert/cpplint/task.toml index 018413d..3b2375f 100644 --- a/tests/convert/cpplint/task.toml +++ b/tests/convert/cpplint/task.toml @@ -1,6 +1,5 @@ # general task configuration task.name = "hw7 ex2" # task name -task.type = "homework/h7/e2" # remove this task type later release.end_time = 2024-12-30 23:59:59+08:00 release.begin_time = 2024-12-29 23:59:59+08:00 diff --git a/tests/convert/diff/task.json b/tests/convert/diff/task.json index 9636feb..d50060f 100644 --- a/tests/convert/diff/task.json +++ b/tests/convert/diff/task.json @@ -1,6 +1,6 @@ { "name": "hw7 ex2", - "logPath": "/home/tt/.cache/joj3/homework/h7/e2.log", + "logPath": "/home/tt/.cache/joj3.log", "expireUnixTimestamp": 1735574399, "effectiveUnixTimestamp": 1735487999, "actorCsvPath": "/home/tt/.config/joj/students.csv", diff --git a/tests/convert/diff/task.toml b/tests/convert/diff/task.toml index bfd4f76..abdd10c 100644 --- a/tests/convert/diff/task.toml +++ b/tests/convert/diff/task.toml @@ -1,6 +1,5 @@ # general task configuration task.name = "hw7 ex2" # task name -task.type = "homework/h7/e2" # remove this task type later release.end_time = 2024-12-30 23:59:59+08:00 release.begin_time = 2024-12-29 23:59:59+08:00 diff --git a/tests/convert/keyword/task.json b/tests/convert/keyword/task.json index 6265365..355db46 100644 --- a/tests/convert/keyword/task.json +++ b/tests/convert/keyword/task.json @@ -1,6 +1,6 @@ { "name": "hw7 ex2", - "logPath": "/home/tt/.cache/joj3/homework/h7/e2.log", + "logPath": "/home/tt/.cache/joj3.log", "expireUnixTimestamp": 1735574399, "effectiveUnixTimestamp": 1735487999, "actorCsvPath": "/home/tt/.config/joj/students.csv", diff --git a/tests/convert/keyword/task.toml b/tests/convert/keyword/task.toml index 12302b1..5e9f2bc 100644 --- a/tests/convert/keyword/task.toml +++ b/tests/convert/keyword/task.toml @@ -1,6 +1,5 @@ # general task configuration task.name = "hw7 ex2" # task name -task.type = "homework/h7/e2" # remove this task type later release.end_time = 2024-12-30 23:59:59+08:00 release.begin_time = 2024-12-29 23:59:59+08:00 diff --git a/tests/convert/result-detail/task.json b/tests/convert/result-detail/task.json index a9c2768..cd060e1 100644 --- a/tests/convert/result-detail/task.json +++ b/tests/convert/result-detail/task.json @@ -1,6 +1,6 @@ { "name": "hw7 ex2", - "logPath": "/home/tt/.cache/joj3/homework/h7/e2.log", + "logPath": "/home/tt/.cache/joj3.log", "expireUnixTimestamp": 1735574399, "effectiveUnixTimestamp": 1735487999, "actorCsvPath": "/home/tt/.config/joj/students.csv", diff --git a/tests/convert/result-detail/task.toml b/tests/convert/result-detail/task.toml index f6eb28c..010336d 100644 --- a/tests/convert/result-detail/task.toml +++ b/tests/convert/result-detail/task.toml @@ -1,6 +1,5 @@ # general task configuration task.name = "hw7 ex2" # task name -task.type = "homework/h7/e2" # remove this task type later release.end_time = 2024-12-30 23:59:59+08:00 release.begin_time = 2024-12-29 23:59:59+08:00 diff --git a/tests/create/basic/answers.json b/tests/create/basic/answers.json index a6eab37..d8fbbe7 100644 --- a/tests/create/basic/answers.json +++ b/tests/create/basic/answers.json @@ -1,5 +1,4 @@ { "name": "hw7 ex2", - "type": "homework/h7/e2", "stages": ["Compilation"] } diff --git a/tests/create/basic/task.toml b/tests/create/basic/task.toml index caf70a6..b6b0557 100644 --- a/tests/create/basic/task.toml +++ b/tests/create/basic/task.toml @@ -1,3 +1,2 @@ [task] name = "hw7 ex2" -type = "homework/h7/e2"