Skip to content

Commit 92c00e3

Browse files
committed
Share deadline alert interval decoding between DagRun creation and clear
Move the decode and interval resolution into decode_deadline_alert_model() and resolve_deadline_alert_interval() in serialization/decoders.py, so the deadline recalculation on clear does not need its own copy or an airflow.sdk import. SerializedDAG._process_dagrun_deadline_alerts was doing the same two steps inline and now calls the helpers, dropping its VariableInterval import. closes: apache#70368
1 parent a7278dc commit 92c00e3

4 files changed

Lines changed: 42 additions & 39 deletions

File tree

‎airflow-core/src/airflow/models/taskinstance.py‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -248,25 +248,13 @@ def _recalculate_dagrun_queued_at_deadlines(
248248
if not results:
249249
return
250250

251-
# Local imports to avoid a circular import between models and serialization.
252-
from airflow.sdk.definitions.deadline import VariableInterval
253-
from airflow.serialization.decoders import decode_deadline_alert
254-
from airflow.serialization.definitions.deadline import DeadlineAlertFields
251+
# Local import to avoid a circular import between models and serialization.
252+
from airflow.serialization.decoders import decode_deadline_alert_model, resolve_deadline_alert_interval
255253

256254
for deadline, deadline_alert in results:
257-
# We can't use evaluate_with() since the new queued_at is not written to the DB yet, but
258-
# interval is stored as JSON (a serialized timedelta or VariableInterval), so decode it the
259-
# same way DagRun creation does instead of passing the raw value to timedelta().
260-
deserialized_alert = decode_deadline_alert(
261-
{
262-
DeadlineAlertFields.REFERENCE: deadline_alert.reference,
263-
DeadlineAlertFields.INTERVAL: deadline_alert.interval,
264-
DeadlineAlertFields.CALLBACK: deadline_alert.callback_def,
265-
}
266-
)
267-
interval = deserialized_alert.interval
268-
if isinstance(interval, VariableInterval):
269-
interval = interval.resolve()
255+
# We can't use evaluate_with() since the new queued_at is not written to the DB yet, and
256+
# interval is stored as JSON, so it has to be decoded rather than passed to timedelta().
257+
interval = resolve_deadline_alert_interval(decode_deadline_alert_model(deadline_alert))
270258
new_deadline_time = new_queued_at + interval
271259

272260
log.debug(

‎airflow-core/src/airflow/serialization/decoders.py‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import dateutil.relativedelta
2525

2626
from airflow._shared.module_loading import import_string
27+
from airflow.sdk.definitions.deadline import VariableInterval
2728
from airflow.serialization.definitions.assets import (
2829
SerializedAsset,
2930
SerializedAssetAlias,
@@ -52,6 +53,7 @@
5253
)
5354

5455
if TYPE_CHECKING:
56+
from airflow.models.deadline_alert import DeadlineAlert as DeadlineAlertModel
5557
from airflow.partition_mappers.base import PartitionMapper
5658
from airflow.partition_mappers.wait_policy import WaitPolicy
5759
from airflow.partition_mappers.window import Window
@@ -181,13 +183,12 @@ def decode_deadline_reference(reference_data: dict):
181183
return reference_class.deserialize_reference(reference_data)
182184

183185

184-
def decode_deadline_alert(encoded_data: dict):
186+
def decode_deadline_alert(encoded_data: dict) -> SerializedDeadlineAlert:
185187
"""
186188
Decode a previously serialized deadline alert.
187189
188190
:meta private:
189191
"""
190-
from airflow.sdk.definitions.deadline import VariableInterval
191192
from airflow.sdk.serde import deserialize
192193

193194
data = encoded_data.get(Encoding.VAR, encoded_data)
@@ -224,6 +225,35 @@ def decode_deadline_alert(encoded_data: dict):
224225
)
225226

226227

228+
def decode_deadline_alert_model(deadline_alert: DeadlineAlertModel) -> SerializedDeadlineAlert:
229+
"""
230+
Decode a ``DeadlineAlert`` ORM row into its serialized representation.
231+
232+
:meta private:
233+
"""
234+
return decode_deadline_alert(
235+
{
236+
DeadlineAlertFields.REFERENCE: deadline_alert.reference,
237+
DeadlineAlertFields.INTERVAL: deadline_alert.interval,
238+
DeadlineAlertFields.CALLBACK: deadline_alert.callback_def,
239+
}
240+
)
241+
242+
243+
def resolve_deadline_alert_interval(alert: SerializedDeadlineAlert) -> datetime.timedelta:
244+
"""
245+
Resolve a decoded alert's interval to a ``timedelta``.
246+
247+
A ``VariableInterval`` reads its Airflow Variable here, so this is only called at the point
248+
a deadline is actually calculated.
249+
250+
:meta private:
251+
"""
252+
if isinstance(alert.interval, VariableInterval):
253+
return alert.interval.resolve()
254+
return alert.interval
255+
256+
227257
def decode_timetable(var: dict[str, Any]) -> CoreTimetable:
228258
"""
229259
Decode a previously serialized timetable.

‎airflow-core/src/airflow/serialization/definitions/dag.py‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,9 @@
5050
from airflow.models.deadline_alert import DeadlineAlert as DeadlineAlertModel
5151
from airflow.models.taskinstancekey import TaskInstanceKey
5252
from airflow.models.tasklog import LogTemplate
53-
from airflow.sdk.definitions.deadline import VariableInterval
54-
from airflow.serialization.decoders import decode_deadline_alert
55-
from airflow.serialization.definitions.deadline import DeadlineAlertFields, SerializedReferenceModels
53+
from airflow.serialization.decoders import decode_deadline_alert_model, resolve_deadline_alert_interval
54+
from airflow.serialization.definitions.deadline import SerializedReferenceModels
5655
from airflow.serialization.definitions.param import SerializedParamsDict
57-
from airflow.serialization.enums import DagAttributeTypes as DAT, Encoding
5856
from airflow.timetables.base import DagRunInfo, DataInterval, TimeRestriction
5957
from airflow.utils.helpers import prune_dict
6058
from airflow.utils.session import NEW_SESSION, provide_session
@@ -741,21 +739,8 @@ def _process_dagrun_deadline_alerts(
741739
if not deadline_alert:
742740
continue
743741

744-
deserialized_deadline_alert = decode_deadline_alert(
745-
{
746-
Encoding.TYPE: DAT.DEADLINE_ALERT,
747-
Encoding.VAR: {
748-
DeadlineAlertFields.REFERENCE: deadline_alert.reference,
749-
DeadlineAlertFields.INTERVAL: deadline_alert.interval,
750-
DeadlineAlertFields.CALLBACK: deadline_alert.callback_def,
751-
},
752-
}
753-
)
754-
755-
interval = deserialized_deadline_alert.interval
756-
757-
if isinstance(interval, VariableInterval):
758-
interval = interval.resolve()
742+
deserialized_deadline_alert = decode_deadline_alert_model(deadline_alert)
743+
interval = resolve_deadline_alert_interval(deserialized_deadline_alert)
759744

760745
if isinstance(deserialized_deadline_alert.reference, SerializedReferenceModels.TYPES.DAGRUN):
761746
deadline_time = deserialized_deadline_alert.reference.evaluate_with(

‎generated/known_sdk_imports_in_core.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ airflow-core/src/airflow/providers_manager.py::5
2525
airflow-core/src/airflow/secrets/__init__.py::1
2626
airflow-core/src/airflow/serialization/decoders.py::2
2727
airflow-core/src/airflow/serialization/definitions/baseoperator.py::1
28-
airflow-core/src/airflow/serialization/definitions/dag.py::2
28+
airflow-core/src/airflow/serialization/definitions/dag.py::1
2929
airflow-core/src/airflow/serialization/definitions/deadline.py::1
3030
airflow-core/src/airflow/serialization/definitions/mappedoperator.py::5
3131
airflow-core/src/airflow/serialization/encoders.py::11

0 commit comments

Comments
 (0)