uranusjr commented on a change in pull request #15474:
URL: https://github.com/apache/airflow/pull/15474#discussion_r618904108
##########
File path: airflow/www/views.py
##########
@@ -2036,12 +1996,63 @@ def recurse_nodes(task, visited):
node['extra_links'] = task.extra_links
return node
- data = {
+ return {
'name': '[DAG]',
'children': [recurse_nodes(t, set()) for t in dag.roots],
'instances': [dag_runs.get(d) or {'execution_date': d.isoformat()}
for d in dates],
}
+ @expose('/tree')
+ @auth.has_access(
+ [
+ (permissions.ACTION_CAN_READ, permissions.RESOURCE_DAG),
+ (permissions.ACTION_CAN_READ, permissions.RESOURCE_TASK_INSTANCE),
+ (permissions.ACTION_CAN_READ, permissions.RESOURCE_TASK_LOG),
+ ]
+ )
+ @gzipped # pylint: disable=too-many-locals
+ @action_logging # pylint: disable=too-many-locals
+ def tree(self):
+ """Get Dag as tree."""
+ dag_id = request.args.get('dag_id')
+ dag = current_app.dag_bag.get_dag(dag_id)
+ if not dag:
+ flash(f'DAG "{dag_id}" seems to be missing from DagBag.', "error")
+ return redirect(url_for('Airflow.index'))
+
+ root = request.args.get('root')
+ if root:
+ dag = dag.sub_dag(task_ids_or_regex=root,
include_downstream=False, include_upstream=True)
+
+ base_date = request.args.get('base_date')
+ num_runs = request.args.get('num_runs', type=int)
+ if num_runs is None:
+ num_runs = conf.getint('webserver',
'default_dag_run_display_number')
+
+ if base_date:
+ base_date = timezone.parse(base_date)
+ else:
+ base_date = dag.get_latest_execution_date() or timezone.utcnow()
+
+ with create_session() as session:
+ dag_runs = (
+ session.query(DagRun)
+ .filter(DagRun.dag_id == dag.dag_id, DagRun.execution_date <=
base_date)
+ .order_by(DagRun.execution_date.desc())
+ .limit(num_runs)
+ .all()
+ )
+ dag_runs = {dr.execution_date: alchemy_to_dict(dr) for dr in dag_runs}
+
+ dates = sorted(dag_runs.keys())
+ max_date = max(dates) if dates else None
+ min_date = min(dates) if dates else None
Review comment:
```suggestion
max_date = max(dag_runs, default=None)
min_date = min(dag_runs, default=None)
```
##########
File path: airflow/www/views.py
##########
@@ -2036,12 +1996,63 @@ def recurse_nodes(task, visited):
node['extra_links'] = task.extra_links
return node
- data = {
+ return {
'name': '[DAG]',
'children': [recurse_nodes(t, set()) for t in dag.roots],
'instances': [dag_runs.get(d) or {'execution_date': d.isoformat()}
for d in dates],
}
+ @expose('/tree')
+ @auth.has_access(
+ [
+ (permissions.ACTION_CAN_READ, permissions.RESOURCE_DAG),
+ (permissions.ACTION_CAN_READ, permissions.RESOURCE_TASK_INSTANCE),
+ (permissions.ACTION_CAN_READ, permissions.RESOURCE_TASK_LOG),
+ ]
+ )
+ @gzipped # pylint: disable=too-many-locals
+ @action_logging # pylint: disable=too-many-locals
+ def tree(self):
+ """Get Dag as tree."""
+ dag_id = request.args.get('dag_id')
+ dag = current_app.dag_bag.get_dag(dag_id)
+ if not dag:
+ flash(f'DAG "{dag_id}" seems to be missing from DagBag.', "error")
+ return redirect(url_for('Airflow.index'))
+
+ root = request.args.get('root')
+ if root:
+ dag = dag.sub_dag(task_ids_or_regex=root,
include_downstream=False, include_upstream=True)
+
+ base_date = request.args.get('base_date')
+ num_runs = request.args.get('num_runs', type=int)
+ if num_runs is None:
+ num_runs = conf.getint('webserver',
'default_dag_run_display_number')
+
+ if base_date:
+ base_date = timezone.parse(base_date)
+ else:
+ base_date = dag.get_latest_execution_date() or timezone.utcnow()
+
+ with create_session() as session:
+ dag_runs = (
+ session.query(DagRun)
+ .filter(DagRun.dag_id == dag.dag_id, DagRun.execution_date <=
base_date)
+ .order_by(DagRun.execution_date.desc())
+ .limit(num_runs)
+ .all()
+ )
+ dag_runs = {dr.execution_date: alchemy_to_dict(dr) for dr in dag_runs}
+
+ dates = sorted(dag_runs.keys())
+ max_date = max(dates) if dates else None
+ min_date = min(dates) if dates else None
+
+ tis = dag.get_task_instances(start_date=min_date, end_date=base_date)
+ task_instances: Dict[Tuple[str, datetime], models.TaskInstance] = {}
+ for ti in tis:
+ task_instances[(ti.task_id, ti.execution_date)] = ti
Review comment:
```suggestion
task_instances = {
(ti.task_id, ti.execution_date): ti
for ti in dag.get_task_instances(start_date=min_date,
end_date=base_date)
}
```
##########
File path: airflow/www/views.py
##########
@@ -2036,12 +1996,63 @@ def recurse_nodes(task, visited):
node['extra_links'] = task.extra_links
return node
- data = {
+ return {
'name': '[DAG]',
'children': [recurse_nodes(t, set()) for t in dag.roots],
'instances': [dag_runs.get(d) or {'execution_date': d.isoformat()}
for d in dates],
}
+ @expose('/tree')
+ @auth.has_access(
+ [
+ (permissions.ACTION_CAN_READ, permissions.RESOURCE_DAG),
+ (permissions.ACTION_CAN_READ, permissions.RESOURCE_TASK_INSTANCE),
+ (permissions.ACTION_CAN_READ, permissions.RESOURCE_TASK_LOG),
+ ]
+ )
+ @gzipped # pylint: disable=too-many-locals
+ @action_logging # pylint: disable=too-many-locals
+ def tree(self):
+ """Get Dag as tree."""
+ dag_id = request.args.get('dag_id')
+ dag = current_app.dag_bag.get_dag(dag_id)
+ if not dag:
+ flash(f'DAG "{dag_id}" seems to be missing from DagBag.', "error")
+ return redirect(url_for('Airflow.index'))
+
+ root = request.args.get('root')
+ if root:
+ dag = dag.sub_dag(task_ids_or_regex=root,
include_downstream=False, include_upstream=True)
+
+ base_date = request.args.get('base_date')
+ num_runs = request.args.get('num_runs', type=int)
+ if num_runs is None:
+ num_runs = conf.getint('webserver',
'default_dag_run_display_number')
+
+ if base_date:
+ base_date = timezone.parse(base_date)
+ else:
+ base_date = dag.get_latest_execution_date() or timezone.utcnow()
Review comment:
```suggestion
try:
base_date = timezone.parse(request.args["base_date"])
except (KeyError, ValueError):
base_date = dag.get_latest_execution_date() or timezone.utcnow()
```
and remove the `base_date` line above. There’s a similar one in the other
view as well.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
