sqlmesh 0.187.3.dev2__py3-none-any.whl → 0.187.4__py3-none-any.whl

sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.187.3.dev2'
-__version_tuple__ = version_tuple = (0, 187, 3, 'dev2')
+__version__ = version = '0.187.4'
+__version_tuple__ = version_tuple = (0, 187, 4)

sqlmesh/core/config/connection.py

@@ -1974,13 +1974,18 @@ def _connection_config_validator(
 ) -> ConnectionConfig | None:
     if v is None or isinstance(v, ConnectionConfig):
         return v
+
+    check_config_and_vars_msg = "\n\nVerify your config.yaml and environment variables."
+
     try:
         return parse_connection_config(v)
     except pydantic.ValidationError as e:
         raise ConfigError(
             validation_error_message(e, f"Invalid '{v['type']}' connection config:")
-            + "\n\nVerify your config.yaml and environment variables."
+            + check_config_and_vars_msg
         )
+    except ConfigError as e:
+        raise ConfigError(str(e) + check_config_and_vars_msg)
 
 
 connection_config_validator: t.Callable = field_validator(

sqlmesh/core/environment.py

@@ -250,6 +250,39 @@ class EnvironmentStatements(PydanticModel):
     python_env: t.Dict[str, Executable]
     jinja_macros: t.Optional[JinjaMacroRegistry] = None
 
+    def render_before_all(
+        self,
+        dialect: str,
+        default_catalog: t.Optional[str] = None,
+        **render_kwargs: t.Any,
+    ) -> t.List[str]:
+        return self.render(RuntimeStage.BEFORE_ALL, dialect, default_catalog, **render_kwargs)
+
+    def render_after_all(
+        self,
+        dialect: str,
+        default_catalog: t.Optional[str] = None,
+        **render_kwargs: t.Any,
+    ) -> t.List[str]:
+        return self.render(RuntimeStage.AFTER_ALL, dialect, default_catalog, **render_kwargs)
+
+    def render(
+        self,
+        runtime_stage: RuntimeStage,
+        dialect: str,
+        default_catalog: t.Optional[str] = None,
+        **render_kwargs: t.Any,
+    ) -> t.List[str]:
+        return render_statements(
+            statements=getattr(self, runtime_stage.value),
+            dialect=dialect,
+            default_catalog=default_catalog,
+            python_env=self.python_env,
+            jinja_macros=self.jinja_macros,
+            runtime_stage=runtime_stage,
+            **render_kwargs,
+        )
+
 
 def execute_environment_statements(
     adapter: EngineAdapter,
@@ -266,18 +299,15 @@ def execute_environment_statements(
         rendered_expressions = [
             expr
             for statements in environment_statements
-            for expr in render_statements(
-                statements=getattr(statements, runtime_stage.value),
+            for expr in statements.render(
+                runtime_stage=runtime_stage,
                 dialect=adapter.dialect,
                 default_catalog=default_catalog,
-                python_env=statements.python_env,
-                jinja_macros=statements.jinja_macros,
                 snapshots=snapshots,
                 start=start,
                 end=end,
                 execution_time=execution_time,
                 environment_naming_info=environment_naming_info,
-                runtime_stage=runtime_stage,
                 engine_adapter=adapter,
             )
         ]

sqlmesh/dbt/loader.py

@@ -4,7 +4,6 @@ import logging
 import sys
 import typing as t
 import sqlmesh.core.dialect as d
-from sqlglot.optimizer.simplify import gen
 from pathlib import Path
 from sqlmesh.core import constants as c
 from sqlmesh.core.config import (
@@ -17,9 +16,9 @@ from sqlmesh.core.environment import EnvironmentStatements
 from sqlmesh.core.loader import CacheBase, LoadedProject, Loader
 from sqlmesh.core.macros import MacroRegistry, macro
 from sqlmesh.core.model import Model, ModelCache
-from sqlmesh.core.model.common import make_python_env
 from sqlmesh.core.signal import signal
 from sqlmesh.dbt.basemodel import BMC, BaseModelConfig
+from sqlmesh.dbt.common import Dependencies
 from sqlmesh.dbt.context import DbtContext
 from sqlmesh.dbt.model import ModelConfig
 from sqlmesh.dbt.profile import Profile
@@ -259,22 +258,18 @@ class DbtLoader(Loader):
 
                 if statements := on_run_start + on_run_end:
                     jinja_references, used_variables = extract_macro_references_and_variables(
-                        *(gen(stmt) for stmt in statements)
+                        *statements
                     )
 
-                    jinja_registry = make_jinja_registry(
-                        context.jinja_macros, package_name, jinja_references
+                    statements_context = context.context_for_dependencies(
+                        Dependencies(
+                            variables=used_variables,
+                        )
                     )
-
-                    python_env = make_python_env(
-                        [s for stmt in statements for s in d.parse(stmt, default_dialect=dialect)],
-                        jinja_macro_references=jinja_references,
-                        module_path=self.config_path,
-                        macros=macros,
-                        variables=context.variables,
-                        used_variables=used_variables,
-                        path=self.config_path,
+                    jinja_registry = make_jinja_registry(
+                        statements_context.jinja_macros, package_name, jinja_references
                     )
+                    jinja_registry.add_globals(statements_context.jinja_globals)
 
                     hooks_by_package_name[package_name] = EnvironmentStatements(
                         before_all=[
@@ -285,7 +280,7 @@ class DbtLoader(Loader):
                             d.jinja_statement(stmt).sql(dialect=dialect)
                             for stmt in on_run_end or []
                         ],
-                        python_env=python_env,
+                        python_env={},
                         jinja_macros=jinja_registry,
                     )
                 # Project hooks should be executed first and then rest of the packages

{sqlmesh-0.187.3.dev2.dist-info → sqlmesh-0.187.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.187.3.dev2
+Version: 0.187.4
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License

{sqlmesh-0.187.3.dev2.dist-info → sqlmesh-0.187.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlmesh/__init__.py,sha256=69xw6bTmi4cW90M-sl3g6wLDgxVcLHcKg1q8GS3lqyA,7466
-sqlmesh/_version.py,sha256=qObjpA8QkbICnjYxMOO66zN-MPoOmDZgscAVZWJBDzo,528
+sqlmesh/_version.py,sha256=b9dc2xFQ0-Cz91Rw9ZLnKviHsBGFeD5AOnhNvCLTlJM,515
 sqlmesh/magics.py,sha256=JHorAZNtezf123jmTyNSoUC9yHmv-08hMP205PJmmIo,39750
 sqlmesh/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/cicd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,7 +16,7 @@ sqlmesh/core/constants.py,sha256=oqt6zjepUhQoWlgapKn_HpG7Pu9mrFwepdX5caNfJUI,249
 sqlmesh/core/context.py,sha256=gOwToFkXSQjb71Ki3cEqfxYjS64p2T2XKfZPVBtjGQA,115624
 sqlmesh/core/context_diff.py,sha256=s9toP17d4tJfOpFH91LcjGK2CM64PVuB0MPkeFgF4hQ,20415
 sqlmesh/core/dialect.py,sha256=fPTV517IOS0nWMxYznNNQnXkQkFFrPOSKe8ghsQ0o8A,49759
-sqlmesh/core/environment.py,sha256=0TTQf4C4LXwf37fm-dfYv1qyG7vtZfQI5rizgm5g0j0,11442
+sqlmesh/core/environment.py,sha256=Fsih6WZ7Tx4ec0XIlmIIspUWcmijPNW5uHPRQSWuhA8,12315
 sqlmesh/core/lineage.py,sha256=zjB0Zfamo2Fja2r5SSZPMbrEKTXr1WjozZPVqvxdybI,3143
 sqlmesh/core/loader.py,sha256=exNCHmw06-CRBtOk-Hk5Ivw3gCowDWbxcvhMJVxpDd8,35887
 sqlmesh/core/macros.py,sha256=wSKkFDZ2eIvhPENIsQ_7j27zVMHIgT-2juRjGvDeEKM,59620
@@ -41,7 +41,7 @@ sqlmesh/core/config/__init__.py,sha256=b4gFb04tpeZpowqJD-7h3U3TLgxrpQhZahVEAo6VW
 sqlmesh/core/config/base.py,sha256=t8NQmsgQoZSc-k0dlDiCb8t1jj0AMYdGZ-6se9q_Pks,4898
 sqlmesh/core/config/categorizer.py,sha256=6vzUoNLjR6GOEb_2mYVz2TwmMv2BfldgHX2u-Le5HZs,1975
 sqlmesh/core/config/common.py,sha256=-o_HoRFtR4u84frg_TLno7z7vS9II6ASiOayb59MKHo,2806
-sqlmesh/core/config/connection.py,sha256=NlTFCqRVA9S18EfdXELH3Qb79Qfj84Tt-_eW0-4P0Eg,75808
+sqlmesh/core/config/connection.py,sha256=09Wf3Ge4Moj_YebVMhfkIIr2fn19InMweGUZ2SO0GE4,75959
 sqlmesh/core/config/feature_flag.py,sha256=JRcD31OG_t2cYc24meKbHDGB0iVID0P07V2oOeB_mgA,203
 sqlmesh/core/config/format.py,sha256=6CXFbvnor56xbldKE-Vrm9k_ABRoY4v6vgIb3mCihiQ,1355
 sqlmesh/core/config/gateway.py,sha256=tYngyqwd_4Qr9lhcv2hlvLvb_2pgYYtKu6hdGsTr-4I,1931
@@ -127,7 +127,7 @@ sqlmesh/dbt/builtin.py,sha256=fyzv4qR1isfnID1oWz-r46oDQvS90DN5mMUEWgapvN8,15153
 sqlmesh/dbt/column.py,sha256=Kvj_N3D_QegcoNQG7VqRiqy-FRfupud-6ilhlykBOgE,1873
 sqlmesh/dbt/common.py,sha256=g4PAL-sEdlnfb_zT-WW3xh-oamyCUoK8dUiDEMVwDWI,7804
 sqlmesh/dbt/context.py,sha256=dxClM-G1IeMbP0v5yxC_va8QNU-uKghW2dBlSZHJOk0,10331
-sqlmesh/dbt/loader.py,sha256=dXnqs_MmbP5u1CzoCviQpA_i0XCaEvm_L3kJTWOmFJ8,16024
+sqlmesh/dbt/loader.py,sha256=H-ky9kNd7QgSvBvCXsf8le3E3v3RUhNJOwwPSH0ud1M,15760
 sqlmesh/dbt/manifest.py,sha256=iKfUWiqydIW3YnX6hqWAzRc-TmhiXfVFS7e29XJaS6E,22906
 sqlmesh/dbt/model.py,sha256=-TqeldZAqW-4g84Xi_16DpUD3atImk_9OHMbATIKYb8,26328
 sqlmesh/dbt/package.py,sha256=WM5Ve6o0QPW3rZxhw1xbr3yX2619I5KtHOKK1qe5mfU,4291
@@ -270,7 +270,7 @@ sqlmesh/utils/pydantic.py,sha256=I898jAFqa3qU6lG2uPpRebVFncOUo8ZrLWM_R3K3DHU,116
 sqlmesh/utils/rich.py,sha256=xNZyPCqEc4TAlJlsEthg-5eYUWpaizz0QjBzO7a1Yv4,1509
 sqlmesh/utils/windows.py,sha256=r7Yin4WEwbvH7sKA3hOJtRsclmscNuBeCklCfVPvtQs,611
 sqlmesh/utils/yaml.py,sha256=np-WVcwmwsKghCgAj1OBBMsK1SXSRn4wR-H37cGiFr8,2282
-sqlmesh-0.187.3.dev2.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.187.4.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
 web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web/client/dist/index.html,sha256=M50OuwjW63dRCS0Dz40Yecgvw9ecLFqizbTa6gv5Nd4,5472
 web/client/dist/assets/Audits-BPlxzqeG.js,sha256=TCx1qCjCGgmUSvH6HoPr5t8ztbRXMlOxrcW4o7hRjlA,1041
@@ -388,8 +388,8 @@ web/server/api/endpoints/models.py,sha256=ud-lRwriyI_OYg9tZchrBgeiXELiRTLNEodraf
 web/server/api/endpoints/modules.py,sha256=8hqqgonGay_mJmpCw0IdbjsPhWlQH2VLdKAqha-myac,468
 web/server/api/endpoints/plan.py,sha256=OYuQ_4dgbhG9ibTcX1a8mvYgH3ANxw9Fhbb4wg6QWqc,9222
 web/server/api/endpoints/table_diff.py,sha256=Wd5YxeKbZB7AkrDvqFgvV9ZQlnKYOF1n5W_w2EHE_Zw,2085
-sqlmesh-0.187.3.dev2.dist-info/METADATA,sha256=4XzJO3udftuJppHc31Wk97BXBIhZEFSGx9CM6w1-baU,25550
-sqlmesh-0.187.3.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sqlmesh-0.187.3.dev2.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
-sqlmesh-0.187.3.dev2.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
-sqlmesh-0.187.3.dev2.dist-info/RECORD,,
+sqlmesh-0.187.4.dist-info/METADATA,sha256=X12PmC1NFNyckJMpTXzGYCWxwUsesqz6dfv7ZuSO3AU,25545
+sqlmesh-0.187.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sqlmesh-0.187.4.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
+sqlmesh-0.187.4.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
+sqlmesh-0.187.4.dist-info/RECORD,,