-
Notifications
You must be signed in to change notification settings - Fork 233
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
feat: Add current_user variable and slugify filter to Jinja #1436
Open
baumandm
wants to merge
2
commits into
pinterest:master
Choose a base branch
from
baumandm:external/jinja-current-user
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -7,9 +7,13 @@ | |||||
from jinja2.sandbox import SandboxedEnvironment | ||||||
from jinja2 import meta | ||||||
|
||||||
from slugify import slugify | ||||||
|
||||||
from app.db import with_session | ||||||
from lib import metastore | ||||||
from logic import admin as admin_logic | ||||||
from logic import user as user_logic | ||||||
from models.user import User | ||||||
|
||||||
_DAG = Dict[str, Set[str]] | ||||||
|
||||||
|
@@ -164,12 +168,19 @@ def get_latest_partition( | |||||
return get_latest_partition | ||||||
|
||||||
|
||||||
def get_templated_query_env(engine_id: int, session=None): | ||||||
def get_templated_query_env(engine_id: int, user: User, session=None): | ||||||
jinja_env = SandboxedEnvironment() | ||||||
|
||||||
# Inject helper functions | ||||||
jinja_env.globals.update( | ||||||
latest_partition=create_get_latest_partition(engine_id, session=session) | ||||||
latest_partition=create_get_latest_partition(engine_id, session=session), | ||||||
current_user=user.username if user else None, | ||||||
current_user_email=user.email if user else None, | ||||||
) | ||||||
|
||||||
# Inject filters | ||||||
jinja_env.filters.update( | ||||||
slugify=lambda x: slugify(x, separator="_"), | ||||||
) | ||||||
|
||||||
# Template rendering config | ||||||
|
@@ -315,7 +326,7 @@ def get_templated_query_variables(variables_provided, jinja_env): | |||||
|
||||||
|
||||||
def render_templated_query( | ||||||
query: str, variables: Dict[str, str], engine_id: int, session=None | ||||||
query: str, variables: Dict[str, str], engine_id: int, uid: int, session=None | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
) -> str: | ||||||
"""Renders the templated query, with global variables such as today/yesterday | ||||||
and functions such as `latest_partition`. | ||||||
|
@@ -326,6 +337,8 @@ def render_templated_query( | |||||
Arguments: | ||||||
query {str} -- The query string that would get rendered | ||||||
raw_variables {Dict[str, str]} -- The variable name, variable value string pair | ||||||
engine_id {int} -- The engine id that the query is running on | ||||||
uid {int} -- The id of the user running the query | ||||||
|
||||||
Raises: | ||||||
UndefinedVariableException: If the variable refers to a variable that does not exist | ||||||
|
@@ -334,7 +347,9 @@ def render_templated_query( | |||||
Returns: | ||||||
str -- The rendered string | ||||||
""" | ||||||
jinja_env = get_templated_query_env(engine_id, session=session) | ||||||
user = user_logic.get_user_by_id(uid, session=session) if uid else None | ||||||
|
||||||
jinja_env = get_templated_query_env(engine_id, user, session=session) | ||||||
try: | ||||||
escaped_query = _escape_sql_comments(query) | ||||||
variables_in_query = get_templated_variables_in_string(escaped_query, jinja_env) | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,6 +19,7 @@ | |
|
||
class TemplatingTestCase(TestCase): | ||
DEFAULT_ENGINE_ID = 1 | ||
DEFAULT_USER_ID = 1 | ||
|
||
def setUp(self): | ||
self.engine_mock = mock.Mock() | ||
|
@@ -35,6 +36,14 @@ def setUp(self): | |
self.addCleanup(get_metastore_loader_patch.stop) | ||
self.get_metastore_loader_mock.return_value = self.metastore_loader_mock | ||
|
||
self.user_mock = mock.Mock() | ||
self.user_mock.username = "test_user" | ||
self.user_mock.email = "[email protected]" | ||
get_user_by_id_patch = mock.patch("logic.user.get_user_by_id") | ||
self.get_user_by_id_mock = get_user_by_id_patch.start() | ||
self.addCleanup(get_user_by_id_patch.stop) | ||
self.get_user_by_id_mock.return_value = self.user_mock | ||
|
||
|
||
class DetectCycleTestCase(TemplatingTestCase): | ||
def test_simple_no_cycle(self): | ||
|
@@ -212,7 +221,9 @@ def test_basic(self): | |
query = 'select * from table where dt="{{ date }}"' | ||
variable = {"date": "1970-01-01"} | ||
self.assertEqual( | ||
render_templated_query(query, variable, self.DEFAULT_ENGINE_ID), | ||
render_templated_query( | ||
query, variable, self.DEFAULT_ENGINE_ID, self.DEFAULT_USER_ID | ||
), | ||
'select * from table where dt="1970-01-01"', | ||
) | ||
|
||
|
@@ -224,7 +235,9 @@ def test_recursion(self): | |
"date3": "01", | ||
} | ||
self.assertEqual( | ||
render_templated_query(query, variable, self.DEFAULT_ENGINE_ID), | ||
render_templated_query( | ||
query, variable, self.DEFAULT_ENGINE_ID, self.DEFAULT_USER_ID | ||
), | ||
'select * from table where dt="1970-01-01"', | ||
) | ||
|
||
|
@@ -235,7 +248,10 @@ def test_global_vars(self): | |
query = 'select * from table where dt="{{ date }}"' | ||
self.assertEqual( | ||
render_templated_query( | ||
query, {"date": "{{ today }}"}, self.DEFAULT_ENGINE_ID | ||
query, | ||
{"date": "{{ today }}"}, | ||
self.DEFAULT_ENGINE_ID, | ||
self.DEFAULT_USER_ID, | ||
), | ||
'select * from table where dt="1970-01-01"', | ||
) | ||
|
@@ -248,6 +264,7 @@ def test_exception(self): | |
'select * from {{ table }} where dt="{{ date }}"', | ||
{"table": "foo"}, | ||
self.DEFAULT_ENGINE_ID, | ||
self.DEFAULT_USER_ID, | ||
) | ||
|
||
# Missing variable but recursive | ||
|
@@ -257,6 +274,7 @@ def test_exception(self): | |
'select * from {{ table }} where dt="{{ date }}"', | ||
{"table": "foo", "date": "{{ bar }}"}, | ||
self.DEFAULT_ENGINE_ID, | ||
self.DEFAULT_USER_ID, | ||
) | ||
|
||
# Circular dependency | ||
|
@@ -266,6 +284,7 @@ def test_exception(self): | |
'select * from {{ table }} where dt="{{ date }}"', | ||
{"date": "{{ date2 }}", "date2": "{{ date }}"}, | ||
self.DEFAULT_ENGINE_ID, | ||
self.DEFAULT_USER_ID, | ||
) | ||
|
||
# Invalid template usage | ||
|
@@ -275,6 +294,7 @@ def test_exception(self): | |
'select * from {{ table where dt="{{ date }}"', | ||
{"table": "foo", "date": "{{ bar }}"}, | ||
self.DEFAULT_ENGINE_ID, | ||
self.DEFAULT_USER_ID, | ||
) | ||
|
||
def test_escape_comments(self): | ||
|
@@ -291,7 +311,10 @@ def test_escape_comments(self): | |
{{ end_date}}*/ | ||
-- {{ end_date }}""" | ||
self.assertEqual( | ||
render_templated_query(query, {}, self.DEFAULT_ENGINE_ID), query | ||
render_templated_query( | ||
query, {}, self.DEFAULT_ENGINE_ID, self.DEFAULT_USER_ID | ||
), | ||
query, | ||
) | ||
|
||
def test_escape_comments_non_greedy(self): | ||
|
@@ -306,7 +329,10 @@ def test_escape_comments_non_greedy(self): | |
""" | ||
self.assertEqual( | ||
render_templated_query( | ||
query_non_greedy, {"test": "render"}, self.DEFAULT_ENGINE_ID | ||
query_non_greedy, | ||
{"test": "render"}, | ||
self.DEFAULT_ENGINE_ID, | ||
self.DEFAULT_USER_ID, | ||
), | ||
"""select * from | ||
/* | ||
|
@@ -390,6 +416,7 @@ def test_invalid_engine_id(self): | |
'select * from table where dt="{{ latest_partition("default.table", "dt") }}"', | ||
{}, | ||
self.DEFAULT_ENGINE_ID, | ||
self.DEFAULT_USER_ID, | ||
) | ||
|
||
def test_invalid_table_name(self): | ||
|
@@ -399,6 +426,7 @@ def test_invalid_table_name(self): | |
'select * from table where dt="{{ latest_partition("table", "dt") }}"', | ||
{}, | ||
self.DEFAULT_ENGINE_ID, | ||
self.DEFAULT_USER_ID, | ||
) | ||
|
||
def test_invalid_partition_name(self): | ||
|
@@ -411,6 +439,7 @@ def test_invalid_partition_name(self): | |
'select * from table where dt="{{ latest_partition("default.table", "date") }}"', | ||
{}, | ||
self.DEFAULT_ENGINE_ID, | ||
self.DEFAULT_USER_ID, | ||
) | ||
|
||
def test_no_latest_partition(self): | ||
|
@@ -421,6 +450,7 @@ def test_no_latest_partition(self): | |
'select * from table where dt="{{ latest_partition("default.table", "dt") }}"', | ||
{}, | ||
self.DEFAULT_ENGINE_ID, | ||
self.DEFAULT_USER_ID, | ||
) | ||
|
||
def test_multiple_partition_columns(self): | ||
|
@@ -444,6 +474,7 @@ def test_render_templated_query(self): | |
'select * from table where dt="{{ latest_partition("default.table", "dt") }}"', | ||
{}, | ||
self.DEFAULT_ENGINE_ID, | ||
self.DEFAULT_USER_ID, | ||
) | ||
self.assertEqual(templated_query, 'select * from table where dt="2021-01-01"') | ||
|
||
|
@@ -452,6 +483,7 @@ def test_recursive_get_latest_partition_variable(self): | |
'select * from table where dt="{{ latest_part }}"', | ||
{"latest_part": '{{latest_partition("default.table", "dt")}}'}, | ||
self.DEFAULT_ENGINE_ID, | ||
self.DEFAULT_USER_ID, | ||
) | ||
self.assertEqual(templated_query, 'select * from table where dt="2021-01-01"') | ||
|
||
|
@@ -465,4 +497,93 @@ def test_multiple_partition_columns_partition_not_provided(self): | |
'select * from table where dt="{{ latest_partition("default.table") }}"', | ||
{}, | ||
self.DEFAULT_ENGINE_ID, | ||
self.DEFAULT_USER_ID, | ||
) | ||
|
||
|
||
class CurrentUserTestCase(TemplatingTestCase): | ||
def test_current_user(self): | ||
query = 'select * from table where user="{{ current_user }}"' | ||
self.assertEqual( | ||
render_templated_query( | ||
query, {}, self.DEFAULT_ENGINE_ID, self.DEFAULT_USER_ID | ||
), | ||
f'select * from table where user="{self.user_mock.username}"', | ||
) | ||
|
||
def test_current_user_email(self): | ||
query = 'select * from table where user="{{ current_user_email }}"' | ||
self.assertEqual( | ||
render_templated_query( | ||
query, {}, self.DEFAULT_ENGINE_ID, self.DEFAULT_USER_ID | ||
), | ||
f'select * from table where user="{self.user_mock.email}"', | ||
) | ||
|
||
|
||
class SlugifyTestCase(TemplatingTestCase): | ||
def test_simple(self): | ||
query = 'select "{{ "Hello World" | slugify }}"' | ||
self.assertEqual( | ||
render_templated_query( | ||
query, {}, self.DEFAULT_ENGINE_ID, self.DEFAULT_USER_ID | ||
), | ||
'select "hello_world"', | ||
) | ||
|
||
def test_remove_special_characters(self): | ||
query = 'select "{{ "Hello World #2024" | slugify }}"' | ||
self.assertEqual( | ||
render_templated_query( | ||
query, {}, self.DEFAULT_ENGINE_ID, self.DEFAULT_USER_ID | ||
), | ||
'select "hello_world_2024"', | ||
) | ||
|
||
def test_trim_leading_and_trailing_spaces(self): | ||
query = 'select "{{ " Hello World " | slugify }}"' | ||
self.assertEqual( | ||
render_templated_query( | ||
query, {}, self.DEFAULT_ENGINE_ID, self.DEFAULT_USER_ID | ||
), | ||
'select "hello_world"', | ||
) | ||
|
||
def test_chinese(self): | ||
query = 'select "{{ "你好世界" | slugify }}"' | ||
self.assertEqual( | ||
render_templated_query( | ||
query, {}, self.DEFAULT_ENGINE_ID, self.DEFAULT_USER_ID | ||
), | ||
'select "ni_hao_shi_jie"', | ||
) | ||
|
||
def test_empty_string(self): | ||
query = 'select "{{ "" | slugify }}"' | ||
self.assertEqual( | ||
render_templated_query( | ||
query, {}, self.DEFAULT_ENGINE_ID, self.DEFAULT_USER_ID | ||
), | ||
'select ""', | ||
) | ||
|
||
def test_non_alphanumeric_characters(self): | ||
query = 'select "{{ "!@#$%^&*()" | slugify }}"' | ||
self.assertEqual( | ||
render_templated_query( | ||
query, {}, self.DEFAULT_ENGINE_ID, self.DEFAULT_USER_ID | ||
), | ||
'select ""', | ||
) | ||
|
||
def test_today(self): | ||
query = "select * from report_{{ today | slugify }}" | ||
self.assertEqual( | ||
render_templated_query( | ||
query, | ||
{"today": "2024-01-01"}, | ||
self.DEFAULT_ENGINE_ID, | ||
self.DEFAULT_USER_ID, | ||
), | ||
"select * from report_2024_01_01", | ||
) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.