From ce4605a22a91fefac578f6e62f86ae0a18ad4d8e Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Sat, 15 Mar 2025 02:51:40 -0400 Subject: [PATCH] chore: rename files --- joj3_config_generator/create.py | 5 ----- .../{convert.py => generator.py} | 22 ++++++++++++------- joj3_config_generator/{load.py => loader.py} | 0 joj3_config_generator/main.py | 12 +++++----- .../{processers => transformers}/__init__.py | 0 .../{processers => transformers}/repo.py | 0 .../{processers => transformers}/task.py | 0 tests/convert/utils.py | 6 ++--- tests/convert_joj1/utils.py | 6 ++--- tests/create/utils.py | 4 ++-- 10 files changed, 29 insertions(+), 26 deletions(-) delete mode 100644 joj3_config_generator/create.py rename joj3_config_generator/{convert.py => generator.py} (72%) rename joj3_config_generator/{load.py => loader.py} (100%) rename joj3_config_generator/{processers => transformers}/__init__.py (100%) rename joj3_config_generator/{processers => transformers}/repo.py (100%) rename joj3_config_generator/{processers => transformers}/task.py (100%) diff --git a/joj3_config_generator/create.py b/joj3_config_generator/create.py deleted file mode 100644 index e603d3d..0000000 --- a/joj3_config_generator/create.py +++ /dev/null @@ -1,5 +0,0 @@ -from joj3_config_generator.models import answer, task - - -def create(answers: answer.Answers) -> task.Config: - return task.Config(task=task.Task(name=answers.name, type_=answers.type_)) diff --git a/joj3_config_generator/convert.py b/joj3_config_generator/generator.py similarity index 72% rename from joj3_config_generator/convert.py rename to joj3_config_generator/generator.py index 28791b0..a0723f6 100644 --- a/joj3_config_generator/convert.py +++ b/joj3_config_generator/generator.py @@ -1,16 +1,26 @@ import os from typing import Dict -from joj3_config_generator.models import joj1, repo, result, task +from joj3_config_generator.models import answer, joj1, repo, result, task from joj3_config_generator.models.const import CACHE_ROOT, JOJ3_CONFIG_ROOT -from joj3_config_generator.processers.repo import ( +from joj3_config_generator.transformers.repo import ( get_health_check_stage, get_teapot_stage, ) -from joj3_config_generator.processers.task import get_conf_stage +from joj3_config_generator.transformers.task import get_conf_stage -def convert(repo_conf: repo.Config, task_conf: task.Config) -> result.Config: +# TODO: implement +def create_joj3_task_conf(answers: answer.Answers) -> task.Config: + return task.Config(task=task.Task(name=answers.name, type_=answers.type_)) + + +# TODO: implement +def convert_joj1_conf(joj1_conf: joj1.Config) -> task.Config: + return task.Config() + + +def convert_joj3_conf(repo_conf: repo.Config, task_conf: task.Config) -> result.Config: # Create the base ResultConf object result_conf = result.Config( name=task_conf.task.name, @@ -35,7 +45,3 @@ def convert(repo_conf: repo.Config, task_conf: task.Config) -> result.Config: result_conf.stage.post_stages.append(get_teapot_stage(repo_conf)) return result_conf - - -def convert_joj1(joj1_conf: joj1.Config) -> task.Config: - return task.Config() diff --git a/joj3_config_generator/load.py b/joj3_config_generator/loader.py similarity index 100% rename from joj3_config_generator/load.py rename to joj3_config_generator/loader.py diff --git a/joj3_config_generator/main.py b/joj3_config_generator/main.py index 6300b9d..2049475 100644 --- a/joj3_config_generator/main.py +++ b/joj3_config_generator/main.py @@ -6,10 +6,12 @@ import rtoml import typer from typing_extensions import Annotated -from joj3_config_generator.convert import convert as convert_conf -from joj3_config_generator.convert import convert_joj1 as convert_joj1_conf -from joj3_config_generator.create import create as create_joj3_task_conf -from joj3_config_generator.load import ( +from joj3_config_generator.generator import ( + convert_joj1_conf, + convert_joj3_conf, + create_joj3_task_conf, +) +from joj3_config_generator.loader import ( load_joj1_yaml, load_joj3_task_toml_answers, load_joj3_toml, @@ -78,7 +80,7 @@ def convert( f"Converting {repo_toml_path} & {task_toml_path} to {result_json_path}" ) repo_conf, task_conf = load_joj3_toml(root, repo_toml_path, task_toml_path) - result_model = convert_conf(repo_conf, task_conf) + result_model = convert_joj3_conf(repo_conf, task_conf) result_dict = result_model.model_dump( mode="json", by_alias=True, exclude_none=True ) diff --git a/joj3_config_generator/processers/__init__.py b/joj3_config_generator/transformers/__init__.py similarity index 100% rename from joj3_config_generator/processers/__init__.py rename to joj3_config_generator/transformers/__init__.py diff --git a/joj3_config_generator/processers/repo.py b/joj3_config_generator/transformers/repo.py similarity index 100% rename from joj3_config_generator/processers/repo.py rename to joj3_config_generator/transformers/repo.py diff --git a/joj3_config_generator/processers/task.py b/joj3_config_generator/transformers/task.py similarity index 100% rename from joj3_config_generator/processers/task.py rename to joj3_config_generator/transformers/task.py diff --git a/tests/convert/utils.py b/tests/convert/utils.py index 79d6723..de694c2 100644 --- a/tests/convert/utils.py +++ b/tests/convert/utils.py @@ -1,8 +1,8 @@ import json from pathlib import Path -from joj3_config_generator.convert import convert -from joj3_config_generator.load import load_joj3_toml +from joj3_config_generator.generator import convert_joj3_conf +from joj3_config_generator.loader import load_joj3_toml def load_case(case_name: str) -> None: @@ -12,7 +12,7 @@ def load_case(case_name: str) -> None: repo_conf, task_conf = load_joj3_toml(root, repo_toml_path, task_toml_path) result_json_path = root / case_name / "task.json" expected_result = json.loads(result_json_path.read_text()) - result = convert(repo_conf, task_conf).model_dump( + result = convert_joj3_conf(repo_conf, task_conf).model_dump( mode="json", by_alias=True, exclude_none=True ) assert result == expected_result diff --git a/tests/convert_joj1/utils.py b/tests/convert_joj1/utils.py index 5352a84..436ee18 100644 --- a/tests/convert_joj1/utils.py +++ b/tests/convert_joj1/utils.py @@ -2,8 +2,8 @@ from pathlib import Path import rtoml -from joj3_config_generator.convert import convert_joj1 -from joj3_config_generator.load import load_joj1_yaml +from joj3_config_generator.generator import convert_joj1_conf +from joj3_config_generator.loader import load_joj1_yaml def load_case(case_name: str) -> None: @@ -13,7 +13,7 @@ def load_case(case_name: str) -> None: task_toml_path = root / case_name / "task.toml" task_toml = task_toml_path.read_text() expected_result = rtoml.loads(task_toml) - result = convert_joj1(task_yaml).model_dump( + result = convert_joj1_conf(task_yaml).model_dump( mode="json", by_alias=True, exclude_none=True ) assert result == expected_result diff --git a/tests/create/utils.py b/tests/create/utils.py index 5f0783d..1cac87b 100644 --- a/tests/create/utils.py +++ b/tests/create/utils.py @@ -3,7 +3,7 @@ from pathlib import Path import rtoml -from joj3_config_generator.create import create +from joj3_config_generator.generator import create_joj3_task_conf from joj3_config_generator.models import answer @@ -14,7 +14,7 @@ def load_case(case_name: str) -> None: answers = answer.Answers(**json.loads(answers_json_path.read_text())) print(answers) expected_result = rtoml.loads(task_toml_path.read_text()) - result = create(answers).model_dump( + result = create_joj3_task_conf(answers).model_dump( mode="json", by_alias=True, exclude_none=True, exclude_unset=True ) print(result)