You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by as...@apache.org on 2020/12/19 15:08:09 UTC
[airflow] branch master updated: User werkzeug's own type
conversion for request args (#13184)
This is an automated email from the ASF dual-hosted git repository.
ash pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/master by this push:
new 4fe9304 User werkzeug's own type conversion for request args (#13184)
4fe9304 is described below
commit 4fe9304c4f34dbc4c756850dad9457f6d5264392
Author: Ash Berlin-Taylor <as...@firemirror.com>
AuthorDate: Sat Dec 19 15:02:13 2020 +0000
User werkzeug's own type conversion for request args (#13184)
Werkzeug handles this exact behaviour for us, we don't need to do it
ourselves.
https://github.com/pallets/werkzeug/blob/daeb2d0/src/werkzeug/datastructures.py#L259-L302
---
airflow/www/views.py | 35 +++++++++--------------------------
1 file changed, 9 insertions(+), 26 deletions(-)
diff --git a/airflow/www/views.py b/airflow/www/views.py
index 5e81d70..e038ce0 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -146,8 +146,7 @@ def get_date_time_num_runs_dag_runs_form_data(www_request, session, dag):
base_date = (date_time + timedelta(seconds=1)).replace(microsecond=0)
default_dag_run = conf.getint('webserver', 'default_dag_run_display_number')
- num_runs = www_request.args.get('num_runs')
- num_runs = int(num_runs) if num_runs else default_dag_run
+ num_runs = www_request.args.get('num_runs', default=default_dag_run, type=int)
drs = (
session.query(DagRun)
@@ -443,16 +442,9 @@ class Airflow(AirflowBaseView): # noqa: D101 pylint: disable=too-many-public-m
hide_paused_dags_by_default = conf.getboolean('webserver', 'hide_paused_dags_by_default')
default_dag_run = conf.getint('webserver', 'default_dag_run_display_number')
- num_runs = request.args.get('num_runs')
- num_runs = int(num_runs) if num_runs else default_dag_run
+ num_runs = request.args.get('num_runs', default=default_dag_run, type=int)
- def get_int_arg(value, default=0):
- try:
- return int(value)
- except ValueError:
- return default
-
- arg_current_page = request.args.get('page', '0')
+ current_page = request.args.get('page', default=0, type=int)
arg_search_query = request.args.get('search')
arg_tags_filter = request.args.getlist('tags')
arg_status_filter = request.args.get('status')
@@ -482,7 +474,6 @@ class Airflow(AirflowBaseView): # noqa: D101 pylint: disable=too-many-public-m
arg_status_filter = status
dags_per_page = PAGE_SIZE
- current_page = get_int_arg(arg_current_page, default=0)
start = current_page * dags_per_page
end = start + dags_per_page
@@ -995,10 +986,7 @@ class Airflow(AirflowBaseView): # noqa: D101 pylint: disable=too-many-public-m
dag_id = request.args.get('dag_id')
task_id = request.args.get('task_id')
execution_date = request.args.get('execution_date')
- if request.args.get('try_number') is not None:
- try_number = int(request.args.get('try_number'))
- else:
- try_number = None
+ try_number = request.args.get('try_number', type=int)
metadata = request.args.get('metadata')
metadata = json.loads(metadata)
response_format = request.args.get('format', 'json')
@@ -1868,10 +1856,8 @@ class Airflow(AirflowBaseView): # noqa: D101 pylint: disable=too-many-public-m
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')
- if num_runs:
- num_runs = int(num_runs)
- else:
+ 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:
@@ -2121,8 +2107,7 @@ class Airflow(AirflowBaseView): # noqa: D101 pylint: disable=too-many-public-m
dag = None
base_date = request.args.get('base_date')
- num_runs = request.args.get('num_runs')
- num_runs = int(num_runs) if num_runs else default_dag_run
+ num_runs = request.args.get('num_runs', default=default_dag_run, type=int)
if dag is None:
flash(f'DAG "{dag_id}" seems to be missing.', "error")
@@ -2246,8 +2231,7 @@ class Airflow(AirflowBaseView): # noqa: D101 pylint: disable=too-many-public-m
dag_id = request.args.get('dag_id')
dag = current_app.dag_bag.get_dag(dag_id)
base_date = request.args.get('base_date')
- num_runs = request.args.get('num_runs')
- num_runs = int(num_runs) if num_runs else default_dag_run
+ num_runs = request.args.get('num_runs', default=default_dag_run, type=int)
if base_date:
base_date = timezone.parse(base_date)
@@ -2319,8 +2303,7 @@ class Airflow(AirflowBaseView): # noqa: D101 pylint: disable=too-many-public-m
dag_id = request.args.get('dag_id')
dag = current_app.dag_bag.get_dag(dag_id)
base_date = request.args.get('base_date')
- num_runs = request.args.get('num_runs')
- num_runs = int(num_runs) if num_runs else default_dag_run
+ num_runs = request.args.get('num_runs', default=default_dag_run, type=int)
if base_date:
base_date = timezone.parse(base_date)