From 8b5b0e82bfd966feefbe590c96ea25a8f5c7b592 Mon Sep 17 00:00:00 2001 From: Pankaj Koti Date: Wed, 16 Oct 2024 20:02:09 +0530 Subject: [PATCH] Fix static check failures in PR #218 --- dagfactory/dagbuilder.py | 24 ++++++++---------------- tests/test_dagbuilder.py | 4 +++- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dagfactory/dagbuilder.py b/dagfactory/dagbuilder.py index 3328046a..a94eb5a1 100644 --- a/dagfactory/dagbuilder.py +++ b/dagfactory/dagbuilder.py @@ -237,30 +237,22 @@ def get_dag_params(self) -> Dict[str, Any]: dag_params["on_failure_callback_file"], ) - if utils.check_dict_key( - dag_params["default_args"], "on_success_callback_name" - ) and utils.check_dict_key( + if utils.check_dict_key(dag_params["default_args"], "on_success_callback_name") and utils.check_dict_key( dag_params["default_args"], "on_success_callback_file" ): - dag_params["default_args"]["on_success_callback"]: Callable = ( - utils.get_python_callable( - dag_params["default_args"]["on_success_callback_name"], - dag_params["default_args"]["on_success_callback_file"], - ) + dag_params["default_args"]["on_success_callback"]: Callable = utils.get_python_callable( + dag_params["default_args"]["on_success_callback_name"], + dag_params["default_args"]["on_success_callback_file"], ) - if utils.check_dict_key( - dag_params["default_args"], "on_failure_callback_name" - ) and utils.check_dict_key( + if utils.check_dict_key(dag_params["default_args"], "on_failure_callback_name") and utils.check_dict_key( dag_params["default_args"], "on_failure_callback_file" ): - dag_params["default_args"]["on_failure_callback"]: Callable = ( - utils.get_python_callable( - dag_params["default_args"]["on_failure_callback_name"], - dag_params["default_args"]["on_failure_callback_file"], - ) + dag_params["default_args"]["on_failure_callback"]: Callable = utils.get_python_callable( + dag_params["default_args"]["on_failure_callback_name"], + dag_params["default_args"]["on_failure_callback_file"], ) if utils.check_dict_key(dag_params, "template_searchpath"): diff --git a/tests/test_dagbuilder.py b/tests/test_dagbuilder.py index 6e40c0fe..4ef6aa29 100644 --- a/tests/test_dagbuilder.py +++ b/tests/test_dagbuilder.py @@ -417,6 +417,7 @@ def test_make_python_operator(): assert callable(actual.python_callable) assert isinstance(actual, PythonOperator) + def test_make_python_operator_with_callable_str(): td = dagbuilder.DagBuilder("test_dag", DAG_CONFIG, DEFAULT_CONFIG) operator = "airflow.operators.python_operator.PythonOperator" @@ -428,7 +429,8 @@ def test_make_python_operator_with_callable_str(): assert actual.task_id == "test_task" assert callable(actual.python_callable) assert isinstance(actual, PythonOperator) - + + def test_make_python_operator_missing_param(): td = dagbuilder.DagBuilder("test_dag", DAG_CONFIG, DEFAULT_CONFIG) operator = "airflow.operators.python_operator.PythonOperator"