This is an automated email from the ASF dual-hosted git repository. ash pushed a commit to branch task-sdk-first-code in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 3d839412334a990f46e24d6aa0e2227d6bfeb6a7 Author: Ash Berlin-Taylor <[email protected]> AuthorDate: Tue Oct 29 14:58:17 2024 +0000 [skip-ci] --- airflow/models/baseoperator.py | 4 +++- task_sdk/src/airflow/sdk/definitions/dag.py | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/airflow/models/baseoperator.py b/airflow/models/baseoperator.py index 2730a0cd416..c1448ef9cc5 100644 --- a/airflow/models/baseoperator.py +++ b/airflow/models/baseoperator.py @@ -301,7 +301,9 @@ else: } # Inject DAG-level default args into args provided to this function. - partial_kwargs.update((k, v) for k, v in dag_default_args.items() if partial_kwargs.get(k) is NOTSET) + partial_kwargs.update( + (k, v) for k, v in dag_default_args.items() if partial_kwargs.get(k, NOTSET) is NOTSET + ) # Fill fields not provided by the user with default values. for k, v in _PARTIAL_DEFAULTS.items(): diff --git a/task_sdk/src/airflow/sdk/definitions/dag.py b/task_sdk/src/airflow/sdk/definitions/dag.py index da7a2efa6ff..b54cddb9746 100644 --- a/task_sdk/src/airflow/sdk/definitions/dag.py +++ b/task_sdk/src/airflow/sdk/definitions/dag.py @@ -447,10 +447,10 @@ class DAG: self.start_date = timezone.convert_to_utc(self.start_date) self.end_date = timezone.convert_to_utc(self.end_date) - if "start_date" in self.default_args: - self.default_args["start_date"] = self.start_date - if "end_date" in self.default_args: - self.default_args["end_date"] = self.end_date + if start_date := self.default_args.get("start_date", None): + self.default_args["start_date"] = timezone.convert_to_utc(start_date) + if end_date := self.default_args.get("end_date", None): + self.default_args["end_date"] = timezone.convert_to_utc(end_date) @params.validator def _validate_params(self, _, params: ParamsDict):
