PR feedback: simplify model builtin global

Author: georgesittas

sqlmesh/dbt/basemodel.py

@@ -22,12 +22,12 @@
     DbtConfig,
     Dependencies,
     GeneralConfig,
+    RAW_CODE_KEY,
     SqlStr,
     sql_str_validator,
 )
 from sqlmesh.dbt.relation import Policy, RelationType
 from sqlmesh.dbt.test import TestConfig
-from sqlmesh.dbt.util import DBT_VERSION
 from sqlmesh.utils import AttributeDict
 from sqlmesh.utils.errors import ConfigError
 from sqlmesh.utils.pydantic import field_validator
@@ -385,11 +385,9 @@ def _model_jinja_context(
                     filter(lambda kv: kv[0] in dependencies.model_attrs.attrs, attributes.items())
                 )
 
-            raw_code_key = "raw_code" if DBT_VERSION >= (1, 3, 0) else "raw_sql"  # type: ignore
-
             # We exclude the raw SQL code to reduce the payload size. It's still accessible through
             # the JinjaQuery instance stored in the resulting SQLMesh model's `query` field.
-            model_node.pop(raw_code_key, None)
+            model_node.pop(RAW_CODE_KEY, None)
         else:
             model_node = AttributeDict({})
 

sqlmesh/dbt/builtin.py

@@ -18,6 +18,7 @@
 from sqlmesh.core.engine_adapter import EngineAdapter
 from sqlmesh.core.snapshot.definition import DeployabilityIndex
 from sqlmesh.dbt.adapter import BaseAdapter, ParsetimeAdapter, RuntimeAdapter
+from sqlmesh.dbt.common import RAW_CODE_KEY
 from sqlmesh.dbt.relation import Policy
 from sqlmesh.dbt.target import TARGET_TYPE_TO_CONFIG_CLASS
 from sqlmesh.dbt.util import DBT_VERSION
@@ -256,21 +257,6 @@ def source(package: str, name: str) -> t.Optional[BaseRelation]:
     return source
 
 
-def generate_model(model: AttributeDict, raw_code: str) -> Model:
-    class Model:
-        def __init__(self, model: AttributeDict) -> None:
-            self._model = model
-            self._raw_code_key = "raw_code" if DBT_VERSION >= (1, 3, 0) else "raw_sql"  # type: ignore
-
-        def __getattr__(self, key: str) -> t.Any:
-            if key == self._raw_code_key:
-                return raw_code
-
-            return getattr(self._model, key)
-
-    return Model(model)
-
-
 def return_val(val: t.Any) -> None:
     raise MacroReturnVal(val)
 
@@ -445,7 +431,8 @@ def create_builtin_globals(
     )
 
     if (model := jinja_globals.pop("model", None)) is not None:
-        builtin_globals["model"] = generate_model(model, jinja_globals.pop("model", ""))
+        raw_code = jinja_globals.pop("raw_code", "")
+        builtin_globals["model"] = AttributeDict({**model, RAW_CODE_KEY: raw_code})
 
     if engine_adapter is not None:
         builtin_globals["flags"] = Flags(which="run")

sqlmesh/dbt/common.py

@@ -8,18 +8,20 @@
 from ruamel.yaml.constructor import DuplicateKeyError
 from sqlglot.helper import ensure_list
 
+from sqlmesh.dbt.util import DBT_VERSION
 from sqlmesh.core.config.base import BaseConfig, UpdateStrategy
+from sqlmesh.core.config.common import DBT_PROJECT_FILENAME
 from sqlmesh.utils import AttributeDict
 from sqlmesh.utils.conversions import ensure_bool, try_str_to_bool
 from sqlmesh.utils.errors import ConfigError
 from sqlmesh.utils.jinja import MacroReference
 from sqlmesh.utils.pydantic import PydanticModel, field_validator
 from sqlmesh.utils.yaml import load
-from sqlmesh.core.config.common import DBT_PROJECT_FILENAME
 
 T = t.TypeVar("T", bound="GeneralConfig")
 
 PROJECT_FILENAME = DBT_PROJECT_FILENAME
+RAW_CODE_KEY = "raw_code" if DBT_VERSION >= (1, 3, 0) else "raw_sql"  # type: ignore
 
 JINJA_ONLY = {
     "adapter",