Feature: nullable error_after in source

core/dbt/contracts/graph/unparsed.py

@@ -162,20 +162,25 @@ def plural(self) -> str:
 
 
 @dataclass
-class Time(dbtClassMixin, Replaceable):
- count: int
- period: TimePeriod
+class Time(dbtClassMixin, Mergeable):
+ count: Optional[int] = None
+ period: Optional[TimePeriod] = None
 
  def exceeded(self, actual_age: float) -> bool:
- kwargs = {self.period.plural(): self.count}
+ if self.period is None or self.count is None:
+ return False
+ kwargs: Dict[str, int] = {self.period.plural(): self.count}
  difference = timedelta(**kwargs).total_seconds()
  return actual_age > difference
 
+ def __bool__(self):
+ return self.count is not None and self.period is not None
+
 
 @dataclass
 class FreshnessThreshold(dbtClassMixin, Mergeable):
- warn_after: Optional[Time] = None
- error_after: Optional[Time] = None
+ warn_after: Optional[Time] = field(default_factory=Time)
+ error_after: Optional[Time] = field(default_factory=Time)
  filter: Optional[str] = None
 
  def status(self, age: float) -> "dbt.contracts.results.FreshnessStatus":
@@ -188,7 +193,7 @@ def status(self, age: float) -> "dbt.contracts.results.FreshnessStatus":
  return FreshnessStatus.Pass
 
  def __bool__(self):
- return self.warn_after is not None or self.error_after is not None
+ return bool(self.warn_after) or bool(self.error_after)
 
 
 @dataclass

core/dbt/parser/sources.py

@@ -24,6 +24,7 @@
  UnparsedSourceTableDefinition,
  FreshnessThreshold,
  UnparsedColumn,
+ Time
 )
 from dbt.exceptions import warn_or_error, InternalException
 from dbt.node_types import NodeType
@@ -344,11 +345,32 @@ def get_unused_msg(
  return '\n'.join(msg)
 
 
+def merge_freshness_time_thresholds(
+ base: Optional[Time], update: Optional[Time]
+) -> Optional[Time]:
+ if base is not None and update is not None:
+ return base.merged(update)
+ elif base is None and update is not None:
+ return update
+ elif base is not None and update is None:
+ return base
+ else:
+ # base and update are none
+ return None
+
+
 def merge_freshness(
  base: Optional[FreshnessThreshold], update: Optional[FreshnessThreshold]
 ) -> Optional[FreshnessThreshold]:
  if base is not None and update is not None:
- return base.merged(update)
+ merged_freshness = base.merged(update)
+ # merge one level deeper the error_after and warn_after thresholds
+ merged_error_after = merge_freshness_time_thresholds(base.error_after, update.error_after)
+ merged_warn_after = merge_freshness_time_thresholds(base.warn_after, update.warn_after)
+
+ merged_freshness.error_after = merged_error_after
+ merged_freshness.warn_after = merged_warn_after
+ return merged_freshness
  elif base is None and update is not None:
  return update
  else:

test/integration/029_docs_generate_tests/test_docs_generate.py

@@ -1543,7 +1543,7 @@ def expected_seeded_manifest(self, model_database=None, quote_model=False):
  'database': self.default_database,
  'description': 'My table',
  'external': None,
- 'freshness': {'error_after': None, 'warn_after': None, 'filter': None},
+ 'freshness': {'error_after': {'count': None, 'period': None}, 'warn_after': {'count': None, 'period': None}, 'filter': None},
  'identifier': 'seed',
  'loaded_at_field': None,
  'loader': 'a_loader',
@@ -1991,7 +1991,7 @@ def expected_postgres_references_manifest(self, model_database=None):
  'database': self.default_database,
  'description': 'My table',
  'external': None,
- 'freshness': {'error_after': None, 'warn_after': None, 'filter': None},
+ 'freshness': {'error_after': {'count': None, 'period': None}, 'warn_after': {'count': None, 'period': None}, 'filter': None},
  'identifier': 'seed',
  'loaded_at_field': None,
  'loader': 'a_loader',

test/unit/test_contracts_graph_parsed.py

@@ -1906,6 +1906,7 @@ def complex_parsed_source_definition_dict():
  },
  'freshness': {
  'warn_after': {'period': 'hour', 'count': 1},
+ 'error_after': {}
  },
  'loaded_at_field': 'loaded_at',
  'unrendered_config': {},

test/unit/test_contracts_graph_unparsed.py

@@ -174,8 +174,8 @@ class TestFreshnessThreshold(ContractTestCase):
  ContractType = FreshnessThreshold
 
  def test_empty(self):
- empty = self.ContractType(None, None)
- self.assert_symmetric(empty, {})
+ empty = self.ContractType()
+ self.assert_symmetric(empty, {'error_after': {}, 'warn_after': {}})
  self.assertEqual(empty.status(float('Inf')), FreshnessStatus.Pass)
  self.assertEqual(empty.status(0), FreshnessStatus.Pass)
 
@@ -209,15 +209,12 @@ def test_merged(self):
  )
  threshold = self.ContractType(
  warn_after=Time(count=18, period=TimePeriod.hour),
- error_after=Time(count=2, period=TimePeriod.day),
+ error_after=Time(count=None, period=None),
  )
  self.assertEqual(threshold, t1.merged(t2))
 
- error_seconds = timedelta(days=3).total_seconds()
  warn_seconds = timedelta(days=1).total_seconds()
  pass_seconds = timedelta(hours=3).total_seconds()
- self.assertEqual(threshold.status(
- error_seconds), FreshnessStatus.Error)
  self.assertEqual(threshold.status(warn_seconds), FreshnessStatus.Warn)
  self.assertEqual(threshold.status(pass_seconds), FreshnessStatus.Pass)
 
@@ -252,7 +249,7 @@ def test_defaults(self):
  to_dict = {
  'name': 'foo',
  'description': '',
- 'freshness': {},
+ 'freshness': {'error_after': {}, 'warn_after': {}},
  'quoting': {},
  'tables': [],
  'loader': '',
@@ -278,7 +275,7 @@ def test_contents(self):
  'description': 'a description',
  'quoting': {'database': False},
  'loader': 'some_loader',
- 'freshness': {},
+ 'freshness': {'error_after': {}, 'warn_after': {}},
  'tables': [],
  'meta': {},
  'tags': [],
@@ -312,7 +309,7 @@ def test_table_defaults(self):
  'name': 'foo',
  'description': '',
  'loader': '',
- 'freshness': {},
+ 'freshness': {'error_after': {}, 'warn_after': {}},
  'quoting': {},
  'meta': {},
  'tables': [
@@ -323,7 +320,7 @@ def test_table_defaults(self):
  'tests': [],
  'columns': [],
  'quoting': {},
- 'freshness': {},
+ 'freshness': {'error_after': {}, 'warn_after': {}},
  'meta': {},
  'tags': [],
  },
@@ -334,7 +331,7 @@ def test_table_defaults(self):
  'tests': [],
  'columns': [],
  'quoting': {'database': True},
- 'freshness': {},
+ 'freshness': {'error_after': {}, 'warn_after': {}},
  'meta': {},
  'tags': [],
  },