From c1de3932c9a3f4d74a349590b8ce4254aba55b0e Mon Sep 17 00:00:00 2001 From: gadorlhiac Date: Tue, 26 Mar 2024 13:00:48 -0700 Subject: [PATCH 1/2] MNT Rename TemplateConfig attributes and associated uses. --- lute/io/models/base.py | 14 +++++++++++--- lute/io/models/smd.py | 6 +++--- lute/tasks/task.py | 6 +++--- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/lute/io/models/base.py b/lute/io/models/base.py index 106e17b0..5e8c84ae 100644 --- a/lute/io/models/base.py +++ b/lute/io/models/base.py @@ -143,7 +143,15 @@ def extra_fields_to_thirdparty(cls, values): class TemplateConfig(BaseModel): - """Parameters used for templating of third party configuration files.""" + """Parameters used for templating of third party configuration files. - template_dir: str - output_dir: str + Attributes: + template_name (str): The name of the template to use. This template must + live in `config/templates`. + + output_path (str): The FULL path, including filename to write the + rendered template to. + """ + + template_name: str + output_path: str diff --git a/lute/io/models/smd.py b/lute/io/models/smd.py index 277baeac..260fe11e 100644 --- a/lute/io/models/smd.py +++ b/lute/io/models/smd.py @@ -130,7 +130,7 @@ class SubmitSMDParameters(BaseBinaryParameters): False, description="Whether to not use archiver data.", flag_type="--" ) - lute_template_cfg: TemplateConfig = TemplateConfig(template_dir="", output_dir="") + lute_template_cfg: TemplateConfig = TemplateConfig(template_name="", output_path="") @validator("producer", always=True) def validate_producer_path(cls, producer: str) -> str: @@ -140,8 +140,8 @@ def validate_producer_path(cls, producer: str) -> str: def use_producer( cls, lute_template_cfg: TemplateConfig, values: Dict[str, Any] ) -> TemplateConfig: - if not lute_template_cfg.output_dir: - lute_template_cfg.output_dir = values["producer"] + if not lute_template_cfg.output_path: + lute_template_cfg.output_path = values["producer"] return lute_template_cfg # detnames: ThirdPartyParameters = ThirdPartyParameters({}) diff --git a/lute/tasks/task.py b/lute/tasks/task.py index e728fdf0..c53c1825 100644 --- a/lute/tasks/task.py +++ b/lute/tasks/task.py @@ -213,8 +213,8 @@ def _template_to_config_file(self) -> None: """ from jinja2 import Environment, FileSystemLoader, Template - out_file: str = self._task_parameters.lute_template_cfg.output_dir - template_file: str = self._task_parameters.lute_template_cfg.template_dir + out_file: str = self._task_parameters.lute_template_cfg.output_path + template_name: str = self._task_parameters.lute_template_cfg.template_name lute_path: Optional[str] = os.getenv("LUTE_PATH") template_dir: str @@ -227,7 +227,7 @@ def _template_to_config_file(self) -> None: else: template_dir = f"{lute_path}/config/templates" environment: Environment = Environment(loader=FileSystemLoader(template_dir)) - template: Template = environment.get_template(template_file) + template: Template = environment.get_template(template_name) with open(out_file, "w", encoding="utf-8") as cfg_out: cfg_out.write(template.render(self._template_context)) From 02029cceb2cbbea6884cba2b4ae4bdfad7f6b8fc Mon Sep 17 00:00:00 2001 From: gadorlhiac Date: Tue, 26 Mar 2024 13:26:37 -0700 Subject: [PATCH 2/2] BUG Skip rest of parsing after adding ThirdPartyParameters to jinja context --- lute/tasks/task.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lute/tasks/task.py b/lute/tasks/task.py index c53c1825..239c475a 100644 --- a/lute/tasks/task.py +++ b/lute/tasks/task.py @@ -276,6 +276,7 @@ def _pre_run(self) -> None: if isinstance(self._task_parameters.__dict__[param], ThirdPartyParameters): # ThirdPartyParameters objects have a single parameter `params` self._add_to_jinja_context(param_name=param, value=value.params) + continue param_attributes: Dict[str, Any] = full_schema["properties"][param] # Some model params do not match the commnad-line parameter names