diff --git a/airflow/www/utils.py b/airflow/www/utils.py index 8c05f378855e5..63e6921ac4eca 100644 --- a/airflow/www/utils.py +++ b/airflow/www/utils.py @@ -130,21 +130,25 @@ def get_mapped_summary(parent_instance, task_instances): def get_task_summaries(task, dag_runs: List[DagRun], session: Session) -> List[Dict[str, Any]]: - tis = session.query( - TaskInstance.dag_id, - TaskInstance.task_id, - TaskInstance.run_id, - TaskInstance.map_index, - TaskInstance.state, - TaskInstance.start_date, - TaskInstance.end_date, - TaskInstance._try_number, - ).filter( - TaskInstance.dag_id == task.dag_id, - TaskInstance.run_id.in_([dag_run.run_id for dag_run in dag_runs]), - TaskInstance.task_id == task.task_id, - # Only get normal task instances or the first mapped task - TaskInstance.map_index <= 0, + tis = ( + session.query( + TaskInstance.dag_id, + TaskInstance.task_id, + TaskInstance.run_id, + TaskInstance.map_index, + TaskInstance.state, + TaskInstance.start_date, + TaskInstance.end_date, + TaskInstance._try_number, + ) + .filter( + TaskInstance.dag_id == task.dag_id, + TaskInstance.run_id.in_([dag_run.run_id for dag_run in dag_runs]), + TaskInstance.task_id == task.task_id, + # Only get normal task instances or the first mapped task + TaskInstance.map_index <= 0, + ) + .order_by(TaskInstance.run_id.asc()) ) def _get_summary(task_instance): diff --git a/airflow/www/views.py b/airflow/www/views.py index fe8bf5c0277eb..d2623182f9095 100644 --- a/airflow/www/views.py +++ b/airflow/www/views.py @@ -3538,7 +3538,6 @@ def grid_data(self): 'groups': task_group_to_grid(dag.task_group, dag, dag_runs, session), 'dag_runs': encoded_runs, } - # avoid spaces to reduce payload size return ( htmlsafe_json_dumps(data, separators=(',', ':')), @@ -3579,7 +3578,6 @@ def audit_log(self, session=None): query = query.filter(Log.event.notin_(excluded_events)) dag_audit_logs = query.all() - content = self.render_template( 'airflow/dag_audit_log.html', dag=dag,