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.

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

Jump to bottom

Fix python model parsing from meder #9162

Merged
merged 5 commits into from
Jan 31, 2024
Merged

Fix python model parsing from meder #9162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a2ece94
fix: parsing f-strings in python models
mederka May 27, 2023
b406e29
add unittest
ChenyuLInx Nov 28, 2023
3e27911
changelong
ChenyuLInx Nov 28, 2023
7854a55
pre-commit
ChenyuLInx Nov 28, 2023
2ea0538
Merge branch 'main' into fix-python-model-parsing-from-meder
aranke Jan 22, 2024
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
6 changes: 6 additions & 0 deletions .changes/unreleased/Fixes-20231128-102111.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: Fixes
body: Fix parsing f-strings in python models
time: 2023-11-28T10:21:11.596121-08:00
custom:
Author: mederka
Issue: "6976"
6 changes: 6 additions & 0 deletions core/dbt/parser/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@ def visit_Call(self, node: ast.Call) -> None:
for value in obj.values:
if isinstance(value, ast.Call):
self.visit_Call(value)
# support dbt function calls in f-strings
elif isinstance(obj, ast.JoinedStr):
for value in obj.values:
if isinstance(value, ast.FormattedValue) and isinstance(value.value, ast.Call):
self.visit_Call(value.value)
aranke marked this conversation as resolved.
Show resolved Hide resolved

# visit node.func.value if we are at an call attr
if isinstance(node.func, ast.Attribute):
self.attribute_helper(node.func)
Expand Down
21 changes: 21 additions & 0 deletions tests/unit/test_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,7 @@ def model(dbt, session):
a_dict = {'test2': dbt.ref('test2')}
df5 = {'test2': dbt.ref('test3')}
df6 = [dbt.ref("test4")]
f"{dbt.ref('test5')}"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jtcohen6 @graciegoheen With this change, now this syntax is supported to add a ref.
I don't feel like it is a bad thing, just a change

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok we should just make sure our docs our updated cc: @matthewshaver


df = df0.limit(2)
return df
Expand Down Expand Up @@ -861,6 +862,17 @@ def model(dbt, session):
return dbt.ref("some_model"), dbt.ref("some_other_model")
"""

python_model_f_string = """
# my_python_model.py
import pandas as pd

def model(dbt, fal):
dbt.config(materialized="table")
print(f"my var: {dbt.config.get('my_var')}") # Prints "my var: None"
df: pd.DataFrame = dbt.ref("some_model")
return df
"""

python_model_no_return = """
def model(dbt, session):
dbt.config(materialized='table')
Expand Down Expand Up @@ -985,6 +997,7 @@ def test_python_model_parse(self):
RefArgs("test2"),
RefArgs("test3"),
RefArgs("test4"),
RefArgs("test5"),
],
sources=[["test", "table1"]],
)
Expand All @@ -1001,6 +1014,14 @@ def test_python_model_config(self):
node = list(self.parser.manifest.nodes.values())[0]
self.assertEqual(node.config.to_dict()["config_keys_used"], ["param_1", "param_2"])

def test_python_model_f_string_config(self):
block = self.file_block_for(python_model_f_string, "nested/py_model.py")
self.parser.manifest.files[block.file.file_id] = block.file

self.parser.parse_file(block)
node = list(self.parser.manifest.nodes.values())[0]
self.assertEqual(node.config.to_dict()["config_keys_used"], ["my_var"])

def test_python_model_config_with_defaults(self):
block = self.file_block_for(python_model_config_with_defaults, "nested/py_model.py")
self.parser.manifest.files[block.file.file_id] = block.file
Expand Down
Loading