Fix: Extraction of variables that belong to the target package (#1012)

Author: izeigerman

sqlmesh/dbt/context.py

@@ -107,7 +107,13 @@ def _var(name: str, default: t.Optional[t.Any] = None) -> t.Any:
 
         jinja_environment.globals["var"] = _var
 
-        rendered_variables = {k: _render_var(v) for k, v in variables.items()}
+        rendered_variables = {}
+        for k, v in variables.items():
+            try:
+                rendered_variables[k] = _render_var(v)
+            except Exception as ex:
+                raise ConfigError(f"Failed to render variable '{k}', value '{v}': {ex}") from ex
+
         self.variables = rendered_variables
 
     @property

sqlmesh/dbt/package.py

@@ -70,10 +70,12 @@ def load(self, package_root: Path) -> Package:
 
         # Only include globally-scoped variables (i.e. filter out the package-scoped ones)
         logger.debug("Processing project variables.")
-        variables = {
-            var: value
-            for var, value in project_yaml.get("vars", {}).items()
-            if not isinstance(value, dict)
+
+        all_variables = project_yaml.get("vars", {})
+        all_variables.update(all_variables.pop(package_name, {}))
+
+        package_variables = {
+            var: value for var, value in all_variables.items() if not isinstance(value, dict)
         }
 
         tests = _fix_paths(self._context.manifest.tests(package_name), package_root)
@@ -96,7 +98,7 @@ def load(self, package_root: Path) -> Package:
             models=models,
             sources=sources,
             seeds=seeds,
-            variables=variables,
+            variables=package_variables,
             macros=macros,
             files=config_paths,
         )