Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create replace_tmpl filter for Jinja2 #33

Merged
merged 8 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/wxflow/jinja.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import os
import sys
from functools import reduce
from pathlib import Path
from typing import Dict, List, Union

Expand Down Expand Up @@ -146,6 +147,7 @@ def get_set_env(self, loader: jinja2.BaseLoader, filters: Dict[str, callable] =
if not (isinstance(dt, SilentUndefined) or isinstance(delta, SilentUndefined))
else dt if isinstance(dt, SilentUndefined) else delta)
env.filters["to_timedelta"] = lambda delta_str: to_timedelta(delta_str) if not isinstance(delta_str, SilentUndefined) else delta_str
env.filters["replace_tmpl"] = lambda string, tmpl_dict: reduce(lambda ss, kk: ss.replace(kk, tmpl_dict[kk]), tmpl_dict, string)
DavidNew-NOAA marked this conversation as resolved.
Show resolved Hide resolved

# Add any additional filters
if filters is not None:
Expand Down
2 changes: 1 addition & 1 deletion src/wxflow/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# Create task_config with everything that is inside _config and whatever the user chooses to
# extend it with when initializing a child subclass of Task. Only task_config should be referenced
# in any application, not _config.
self.task_config = self._config.copy()
self.task_config = self._config.deepcopy()

Check warning on line 44 in src/wxflow/task.py

View check run for this annotation

Codecov / codecov/patch

src/wxflow/task.py#L44

Added line #L44 was not covered by tests

# Any other composite runtime variables that may be needed for the duration of the task
# can be constructed here
Expand Down
7 changes: 7 additions & 0 deletions tests/test_jinja.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from datetime import datetime

import jinja2
import pytest

from wxflow import Jinja, to_isotime
Expand Down Expand Up @@ -29,6 +30,12 @@ def test_render_stream():
j = Jinja(j2tmpl, data, allow_missing=False)
assert j.render == f"Hello Jane! How are you? It is: {to_isotime(current_date)}"

tmpl_dict = {"{{ name }}": "Jane", "{{ greeting }}": "How are you?", "{{ current_date | to_isotime }}": to_isotime(current_date)}
j = Jinja(j2tmpl, data, allow_missing=False)
loader = jinja2.BaseLoader()
env = j.get_set_env(loader)
assert env.filters['replace_tmpl'](j2tmpl, tmpl_dict) == f"Hello Jane! How are you? It is: {to_isotime(current_date)}"


def test_render_file(tmp_path, create_template):

Expand Down