Skip to content

Feat: add filter for JSON to dict conversion with examples #364

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.

Sign up for GitHub

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

Merged
0hsn merged 2 commits into from
Feb 25, 2025
Merged

Feat: add filter for JSON to dict conversion with examples #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c75dc6
refactor: update tests
0hsn Feb 22, 2025
71f0b35
feat: new jinja fromjson filter added
0hsn Feb 25, 2025
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
18 changes: 18 additions & 0 deletions chk/infrastructure/templating.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
Templating module
"""

import json
import typing

from jinja2 import TemplateError
from jinja2.environment import Template
from jinja2.nativetypes import NativeEnvironment

Expand Down Expand Up @@ -29,6 +33,8 @@ def make(template: str) -> Template:
comment_end_string="#>",
)

env.filters["fromjson"] = filter_fromjson

return env.from_string(template)


Expand All @@ -37,3 +43,15 @@ def is_template_str(tpl: str) -> bool:

_dm_sets = [("<%", "%>"), ("<@", "@>"), ("<#", "#>")]
return any([_dm_set[0] in tpl and _dm_set[1] in tpl for _dm_set in _dm_sets])

######################################
# Jinja Filters
######################################

def filter_fromjson(value: typing.Any) -> str:
"""Convert a JSON string to a Python dictionary."""

try:
return json.loads(value)
except json.JSONDecodeError as e:
raise TemplateError(f"Invalid JSON string: {e}") from e
47 changes: 20 additions & 27 deletions tests/resources/storage/spec_docs/validate/validate-asserts.chk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ data:
asserts:
- { type: Equal, actual: <% response.int %>, expected: 200 }
- { type: Equal, actual: <% response.float %>, expected: 200.23 }
- { type: Equal, actual: "[ 1, 2, 3 ]", expected: [ 1, 2, 3 ] }
- { type: Equal, actual: "{'a': 1, 'c': 3, 'b': 2}", expected: { 'a': 1, 'c': 3, 'b': 2 } }
- { type: Equal, actual: "False", expected: False }
- { type: Equal, actual: "False", expected: False }

- { type: NotEqual, actual: "False", expected: False }

Expand Down Expand Up @@ -69,29 +65,27 @@ asserts:
- { type: IntegerBetween, actual: 12, min: 11, max: 13 }
- { type: IntegerBetween, actual: 5, min: 11, max: 13 }
- { type: IntegerBetween, actual: 15, min: 11, max: 13 }
- { type: IntegerBetween, actual: "15", min: 11, max: 13 }
- { type: IntegerBetween, actual: "12", min: 11, max: 13 }
- { type: IntegerBetween, actual: <% "15" | int %>, min: 11, max: 13 }
- { type: IntegerBetween, actual: <% "12" | int %>, min: 11, max: 13 }

- { type: IntegerGreater, actual: 12, other: 11 }
- { type: IntegerGreater, actual: 5, other: 11 }
- { type: IntegerGreater, actual: "15", other: 11 }
- { type: IntegerGreater, actual: "12", other: 11 }
- { type: IntegerGreater, actual: <% "15" | int %>, other: 11 }
- { type: IntegerGreater, actual: <% "12" | int %>, other: 11 }

- { type: IntegerGreaterOrEqual, actual: 12, other: 12 }
- { type: IntegerGreaterOrEqual, actual: 5, other: 11 }
- { type: IntegerGreaterOrEqual, actual: "15", other: 15 }
- { type: IntegerGreaterOrEqual, actual: "12", other: 15 }
- { type: IntegerGreaterOrEqual, actual: "16", other: 15 }
- { type: IntegerGreaterOrEqual, actual: <% "15" | int %>, other: 15 }
- { type: IntegerGreaterOrEqual, actual: <% "12" | int %>, other: 15 }

- { type: IntegerLess, actual: 12, other: 11 }
- { type: IntegerLess, actual: 5, other: 11 }
- { type: IntegerLess, actual: "12", other: 13 }
- { type: IntegerLess, actual: <% "12" | int %>, other: 13 }

- { type: IntegerLessOrEqual, actual: 12, other: 12 }
- { type: IntegerLessOrEqual, actual: 5, other: 11 }
- { type: IntegerLessOrEqual, actual: "15", other: 15 }
- { type: IntegerLessOrEqual, actual: "12", other: 15 }
- { type: IntegerLessOrEqual, actual: "16", other: 15 }
- { type: IntegerLessOrEqual, actual: <% "15" | int %>, other: 15 }
- { type: IntegerLessOrEqual, actual: <% "12" | int %>, other: 15 }

- { type: Float, actual: 10.0 }
- { type: Float, actual: -10.00000000001 }
Expand All @@ -100,31 +94,30 @@ asserts:
- { type: FloatBetween, actual: 12.34, min: 11, max: 13 }
- { type: FloatBetween, actual: 5.0, min: 11, max: 13 }
- { type: FloatBetween, actual: 15.89, min: 11, max: 13 }
- { type: FloatBetween, actual: "15.32", min: 11, max: 13 }
- { type: FloatBetween, actual: "12.24", min: 11, max: 13 }
- { type: FloatBetween, actual: <% "15.32" | float %>, min: 11, max: 13 }
- { type: FloatBetween, actual: <% "12.24" | float %>, min: 11, max: 13 }

- { type: FloatGreater, actual: 12.0, other: 12 }
- { type: FloatGreater, actual: 5.0, other: 13 }
- { type: FloatGreater, actual: 15.89, other: 13 }
- { type: FloatGreater, actual: "15.32", other: 13 }
- { type: FloatGreater, actual: "13.24", other: 13 }
- { type: FloatGreater, actual: <% "15.32" | float %>, other: 13 }
- { type: FloatGreater, actual: <% "13.24" | float %>, other: 13 }

- { type: FloatGreaterOrEqual, actual: 12.0, other: 12 }
- { type: FloatGreaterOrEqual, actual: 5.0, other: 11 }
- { type: FloatGreaterOrEqual, actual: "15", other: 15 }
- { type: FloatGreaterOrEqual, actual: "12.23", other: 15 }
- { type: FloatGreaterOrEqual, actual: "16.56", other: 15 }
- { type: FloatGreaterOrEqual, actual: <% "15" | float %>, other: 15 }
- { type: FloatGreaterOrEqual, actual: <% "12.23" | float %>, other: 15 }
- { type: FloatGreaterOrEqual, actual: <% "16.56" | float %>, other: 15 }

- { type: FloatLess, actual: 12.9, other: 11.0 }
- { type: FloatLess, actual: 5.0, other: 11.0 }
- { type: FloatLess, actual: "12.3", other: 13.3 }
- { type: FloatLess, actual: "12.3", other: 13.3 }
- { type: FloatLess, actual: <% "12.23" | float %>, other: 13.3 }

- { type: FloatLessOrEqual, actual: 12.0, other: 12 }
- { type: FloatLessOrEqual, actual: 5.0, other: 11 }
- { type: FloatLessOrEqual, actual: "15", other: 15 }
- { type: FloatLessOrEqual, actual: "12.23", other: 15.7 }
- { type: FloatLessOrEqual, actual: "16.56", other: 15 }
- { type: FloatLessOrEqual, actual: <% "15" | float %>, other: 15 }
- { type: FloatLessOrEqual, actual: <% "12.23" | float %>, other: 15.7 }
- { type: FloatLessOrEqual, actual: <% "16.56" | float %>, other: 15 }

- { type: Str, actual: <% response.string1%> }
- { type: Str, actual: <% response.string2 %> }
Expand Down