Avoid SourceConfig has no freshness error

Author: treysp

sqlmesh/dbt/manifest.py

@@ -154,16 +154,21 @@ def _load_all(self) -> None:
     def _load_sources(self) -> None:
         for source in self._manifest.sources.values():
             # starting in dbt-core 1.9.5, freshness can be set in both source and source config
-            freshness = merge_freshness(source.freshness, source.config.freshness)
-
-            config_source_dict = _config(source)
-            config_source_dict.pop("freshness", None)
-
             source_dict = source.to_dict()
             source_dict.pop("freshness", None)
 
+            source_config_dict = _config(source)
+            source_config_dict.pop("freshness", None)
+
+            source_config_freshness = getattr(source.config, "freshness", None)
+            freshness = (
+                merge_freshness(source.freshness, source_config_freshness)
+                if source_config_freshness
+                else source.freshness
+            )
+
             source_config = SourceConfig(
-                **config_source_dict,
+                **source_config_dict,
                 **source_dict,
                 freshness=freshness.to_dict() if freshness else None,
             )

tests/dbt/test_manifest.py

@@ -9,6 +9,7 @@
 from sqlmesh.dbt.manifest import ManifestHelper
 from sqlmesh.dbt.profile import Profile
 from sqlmesh.dbt.builtin import Api, _relation_info_to_relation
+from sqlmesh.dbt.util import DBT_VERSION
 from sqlmesh.utils.jinja import MacroReference
 
 pytestmark = pytest.mark.dbt
@@ -113,10 +114,11 @@ def test_manifest_helper(caplog):
     assert sources["streaming.orders"].schema_ == "raw"
     assert sources["streaming.order_items"].table_name == "order_items"
     assert sources["streaming.order_items"].schema_ == "raw"
+
     assert sources["streaming.order_items"].freshness == {
-        "error_after": {"count": 13, "period": "hour"},
+        "warn_after": {"count": 10 if DBT_VERSION < (1, 9, 5) else 12, "period": "hour"},
+        "error_after": {"count": 11 if DBT_VERSION < (1, 9, 5) else 13, "period": "hour"},
         "filter": None,
-        "warn_after": {"count": 12, "period": "hour"},
     }