From f3258bb539d0ad5fb4694cda87fb165dc993b40c Mon Sep 17 00:00:00 2001 From: Younghee Kwon Date: Thu, 7 Sep 2017 14:04:11 -0700 Subject: [PATCH 1/2] [AIRFLOW-1567] Updated docs for Google ML Engine operators/hooks Closes #2573 from yk5/master --- docs/integration.rst | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/integration.rst b/docs/integration.rst index 30150ac41a3e4..99311d0433e3d 100644 --- a/docs/integration.rst +++ b/docs/integration.rst @@ -295,52 +295,52 @@ Cloud ML Engine Cloud ML Engine Operators """"""""""""""""""""""""" -- :ref:`CloudMLBatchPredictionOperator` : Start a Cloud ML Engine batch prediction job. -- :ref:`CloudMLModelOperator` : Manages a Cloud ML Engine model. -- :ref:`CloudMLTrainingOperator` : Start a Cloud ML Engine training job. -- :ref:`CloudMLVersionOperator` : Manages a Cloud ML Engine model version. +- :ref:`MLEngineBatchPredictionOperator` : Start a Cloud ML Engine batch prediction job. +- :ref:`MLEngineModelOperator` : Manages a Cloud ML Engine model. +- :ref:`MLEngineTrainingOperator` : Start a Cloud ML Engine training job. +- :ref:`MLEngineVersionOperator` : Manages a Cloud ML Engine model version. -.. _CloudMLBatchPredictionOperator: +.. _MLEngineBatchPredictionOperator: -CloudMLBatchPredictionOperator +MLEngineBatchPredictionOperator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -.. autoclass:: airflow.contrib.operators.cloudml_operator.CloudMLBatchPredictionOperator +.. autoclass:: airflow.contrib.operators.mlengine_operator.MLEngineBatchPredictionOperator :members: -.. _CloudMLModelOperator: +.. _MLEngineModelOperator: -CloudMLModelOperator +MLEngineModelOperator ^^^^^^^^^^^^^^^^^^^^ -.. autoclass:: airflow.contrib.operators.cloudml_operator.CloudMLModelOperator +.. autoclass:: airflow.contrib.operators.mlengine_operator.MLEngineModelOperator :members: -.. _CloudMLTrainingOperator: +.. _MLEngineTrainingOperator: -CloudMLTrainingOperator +MLEngineTrainingOperator ^^^^^^^^^^^^^^^^^^^^^^^ -.. autoclass:: airflow.contrib.operators.cloudml_operator.CloudMLTrainingOperator +.. autoclass:: airflow.contrib.operators.mlengine_operator.MLEngineTrainingOperator :members: -.. _CloudMLVersionOperator: +.. _MLEngineVersionOperator: -CloudMLVersionOperator +MLEngineVersionOperator ^^^^^^^^^^^^^^^^^^^^^^^ -.. autoclass:: airflow.contrib.operators.cloudml_operator.CloudMLVersionOperator +.. autoclass:: airflow.contrib.operators.mlengine_operator.MLEngineVersionOperator :members: Cloud ML Engine Hook """""""""""""""""""" -.. _CloudMLHook: +.. _MLEngineHook: -CloudMLHook +MLEngineHook ^^^^^^^^^^^ -.. autoclass:: airflow.contrib.hooks.gcp_cloudml_hook.CloudMLHook +.. autoclass:: airflow.contrib.hooks.gcp_mlengine_hook.MLEngineHook :members: From ea9ab96cb71e79e15a6330561e7bf24f6e0ea2f9 Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Fri, 8 Sep 2017 14:45:38 +0200 Subject: [PATCH 2/2] [AIRFLOW-1580] Error in string formating The string formatting should be done on the string, and not on the exception that is being raised. Closes #2583 from Fokko/AIRFLOW-1580-error-in- checkout-operator --- airflow/operators/check_operator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airflow/operators/check_operator.py b/airflow/operators/check_operator.py index 139e451c14975..1cf50da08f63b 100644 --- a/airflow/operators/check_operator.py +++ b/airflow/operators/check_operator.py @@ -214,9 +214,9 @@ def execute(self, context=None): logging.info('Executing SQL check: ' + self.sql1) row1 = hook.get_first(self.sql1) if not row2: - raise AirflowException("The query {q} returned None").format(q=self.sql2) + raise AirflowException("The query {q} returned None".format(q=self.sql2)) if not row1: - raise AirflowException("The query {q} returned None").format(q=self.sql1) + raise AirflowException("The query {q} returned None".format(q=self.sql1)) current = dict(zip(self.metrics_sorted, row1)) reference = dict(zip(self.metrics_sorted, row2)) ratios = {}