fix: python model macros (#3435)

TobikoData · Nov 27, 2024 · 0db0af5 · 0db0af5
1 parent 4662acd
commit 0db0af5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/examples/sushi/macros/__init__.py b/examples/sushi/macros/__init__.py
@@ -0,0 +1,6 @@
+from sqlmesh import macro
+
+
+@macro()
+def noop(context):
+    return "SELECT 1"
diff --git a/examples/sushi/models/waiters.py b/examples/sushi/models/waiters.py
@@ -12,6 +12,7 @@
     kind=dict(name=ModelKindName.EMBEDDED),
     owner="jen",
     cron="@daily",
+    pre_statements=["@noop()"],
 )
 def entrypoint(evaluator: MacroEvaluator) -> exp.Select:
     """

diff --git a/sqlmesh/core/model/definition.py b/sqlmesh/core/model/definition.py
@@ -1871,6 +1871,7 @@ def create_python_model(
         depends_on=depends_on,
         entrypoint=entrypoint,
         python_env=python_env,
+        macros=macros,
         jinja_macros=jinja_macros,
         module_path=module_path,
         variables=variables,

diff --git a/tests/integrations/jupyter/test_magics.py b/tests/integrations/jupyter/test_magics.py
@@ -550,15 +550,15 @@ def test_info(notebook, sushi_context, convert_all_html_output_to_text, get_all_
     assert len(output.outputs) == 6
     assert convert_all_html_output_to_text(output) == [
         "Models: 17",
-        "Macros: 6",
+        "Macros: 7",
         "",
         "Connection:\n  type: duckdb\n  concurrent_tasks: 1\n  register_comments: true\n  pre_ping: false\n  extensions: []\n  connector_config: {}",
         "Test Connection:\n  type: duckdb\n  concurrent_tasks: 1\n  register_comments: true\n  pre_ping: false\n  extensions: []\n  connector_config: {}",
         "Data warehouse connection succeeded",
     ]
     assert get_all_html_output(output) == [
         "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\">Models: <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">17</span></pre>",
-        "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\">Macros: <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span></pre>",
+        "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\">Macros: <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">7</span></pre>",
         "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"></pre>",
         '<pre style="white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,\'DejaVu Sans Mono\',consolas,\'Courier New\',monospace">Connection:  type: duckdb  concurrent_tasks: <span style="color: #008080; text-decoration-color: #008080; font-weight: bold">1</span>  register_comments: true  pre_ping: false  extensions: <span style="font-weight: bold">[]</span>  connector_config: <span style="font-weight: bold">{}</span></pre>',
         '<pre style="white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,\'DejaVu Sans Mono\',consolas,\'Courier New\',monospace">Test Connection:  type: duckdb  concurrent_tasks: <span style="color: #008080; text-decoration-color: #008080; font-weight: bold">1</span>  register_comments: true  pre_ping: false  extensions: <span style="font-weight: bold">[]</span>  connector_config: <span style="font-weight: bold">{}</span></pre>',