address comments

Author: izeigerman

sqlmesh/core/renderer.py

@@ -648,9 +648,8 @@ def _optimize_query(self, query: exp.Query, all_deps: t.Set[str]) -> exp.Query:
 def _prepare_python_env_for_jinja(
     evaluator: MacroEvaluator,
     python_env: t.Dict[str, Executable],
-    env: t.Optional[t.Dict[str, t.Any]] = None,
 ) -> t.Dict[str, t.Any]:
-    prepared_env = prepare_env(python_env, env=env)
+    prepared_env = prepare_env(python_env)
     # Pass the evaluator to all macro functions
     return {
         key: partial(value, evaluator) if callable(value) else value

tests/core/test_model.py

@@ -9054,8 +9054,12 @@ def test_formatting_flag_serde():
 
 
 def test_call_python_macro_from_jinja():
+    def noop() -> None:
+        print("noop")
+
     @macro()
     def test_runtime_stage(evaluator):
+        noop()
         return evaluator.runtime_stage
 
     expressions = d.parse(
@@ -9083,3 +9087,4 @@ def test_runtime_stage(evaluator):
 
     model = load_sql_based_model(expressions, jinja_macros=jinja_macros)
     assert model.render_query().sql() == "SELECT 'loading' AS a, 'loading_bla' AS b"
+    assert set(model.python_env) == {"noop", "test_runtime_stage"}