From 7e7d2128e7713cdd3bf24210b9c3a77b8cfaf089 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 3 Mar 2023 01:41:12 +0000 Subject: [PATCH 1/3] feat: add sql error message --- src/app.py | 28 ++++++++++++++++++++-------- web/index.html | 7 ++++++- web/index.js | 20 ++++++++++++++++++++ 3 files changed, 46 insertions(+), 9 deletions(-) diff --git a/src/app.py b/src/app.py index a1c61a2..e7b28bc 100644 --- a/src/app.py +++ b/src/app.py @@ -66,10 +66,16 @@ def try_pipeline_standardization_task(): for task in config["standard"]: if task_name == task['name']: print("start standardization task: "+task_name) - cddp.start_standard_job(spark, config, task, False, True, timeout) - result, df = cddp.get_dataset_as_json(spark, config, "standard", task, limit) - data_str = json.dumps(result) - return jsonify({"data": data_str}) + try: + cddp.start_standard_job(spark, config, task, False, True, timeout) + result, df = cddp.get_dataset_as_json(spark, config, "standard", task, limit) + data_str = json.dumps(result) + if not result: + return jsonify({'error': 'Dataframe not found'}), 404 + return jsonify({"data": data_str}) + except Exception as e: + error = str(e) + return jsonify({'error': error}), 500 return jsonify({'status': 'error', 'message':'task not found'}) @@ -103,10 +109,16 @@ def try_pipeline_serving_task(): for task in config["serving"]: if task_name == task['name']: print("start serving task: "+task['name']) - cddp.start_serving_job(spark, config, task, False, True, timeout) - result, df = cddp.get_dataset_as_json(spark, config, "serving", task, limit) - data_str = json.dumps(result) - return jsonify({"data": data_str}) + try: + cddp.start_serving_job(spark, config, task, False, True, timeout) + result, df = cddp.get_dataset_as_json(spark, config, "serving", task, limit) + data_str = json.dumps(result) + if not result: + return jsonify({'error': 'Dataframe not found'}), 404 + return jsonify({"data": data_str}) + except Exception as e: + error = str(e) + return jsonify({'error': error}), 500 return jsonify({'status': 'error', 'message':'task not found'}) diff --git a/web/index.html b/web/index.html index bb9c32e..91caedc 100644 --- a/web/index.html +++ b/web/index.html @@ -627,6 +627,9 @@

+
+
+
@@ -792,8 +795,10 @@

-

+ +
+
diff --git a/web/index.js b/web/index.js index 848067d..025ec43 100644 --- a/web/index.js +++ b/web/index.js @@ -208,6 +208,9 @@ var app = new Vue({ timeout: 10 }) .then(function (response) { + var errorElement = document.getElementById('standard-sql-error-message'); + errorElement.innerHTML = ''; + errorElement.style.display = 'none'; that.results["standard"] = that.results["standard"] || {} that.results["standard"][task['name']] = JSON.parse(response.data.data) that.currentPipelineStandardTaskIsRunning = false @@ -216,6 +219,13 @@ var app = new Vue({ }) .catch(function (error) { console.log(error); + var errorMessage = error.message; + if (error.response) { + errorMessage = error.response.data.error; + } + var errorElement = document.getElementById('standard-sql-error-message'); + errorElement.innerHTML = errorMessage; + errorElement.style.display = 'block'; that.currentPipelineStandardTaskIsRunning = false }); }, @@ -229,6 +239,9 @@ var app = new Vue({ timeout: 10 }) .then(function (response) { + var errorElement = document.getElementById('serving-sql-error-message'); + errorElement.innerHTML = ''; + errorElement.style.display = 'none'; that.results["serving"] = that.results["serving"] || {} that.results["serving"][task['name']] = JSON.parse(response.data.data) that.currentPipelineServingTaskIsRunning = false @@ -237,6 +250,13 @@ var app = new Vue({ }) .catch(function (error) { console.log(error); + var errorMessage = error.message; + if (error.response) { + errorMessage = error.response.data.error; + } + var errorElement = document.getElementById('serving-sql-error-message'); + errorElement.innerHTML = errorMessage; + errorElement.style.display = 'block'; that.currentPipelineServingTaskIsRunning = false }); }, From 8424318d1703b5f1bcbcf8a54ddca44e81bb1be8 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 3 Mar 2023 05:41:08 +0000 Subject: [PATCH 2/3] feat: add sql and python error message --- web/index.html | 4 ++-- web/index.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/index.html b/web/index.html index 91caedc..c38c911 100644 --- a/web/index.html +++ b/web/index.html @@ -627,7 +627,7 @@

-
+
@@ -797,7 +797,7 @@

-
+
diff --git a/web/index.js b/web/index.js index 025ec43..e72c9c1 100644 --- a/web/index.js +++ b/web/index.js @@ -208,7 +208,7 @@ var app = new Vue({ timeout: 10 }) .then(function (response) { - var errorElement = document.getElementById('standard-sql-error-message'); + var errorElement = document.getElementById('standard-error-message'); errorElement.innerHTML = ''; errorElement.style.display = 'none'; that.results["standard"] = that.results["standard"] || {} @@ -223,7 +223,7 @@ var app = new Vue({ if (error.response) { errorMessage = error.response.data.error; } - var errorElement = document.getElementById('standard-sql-error-message'); + var errorElement = document.getElementById('standard-error-message'); errorElement.innerHTML = errorMessage; errorElement.style.display = 'block'; that.currentPipelineStandardTaskIsRunning = false @@ -239,7 +239,7 @@ var app = new Vue({ timeout: 10 }) .then(function (response) { - var errorElement = document.getElementById('serving-sql-error-message'); + var errorElement = document.getElementById('serving-error-message'); errorElement.innerHTML = ''; errorElement.style.display = 'none'; that.results["serving"] = that.results["serving"] || {} @@ -254,7 +254,7 @@ var app = new Vue({ if (error.response) { errorMessage = error.response.data.error; } - var errorElement = document.getElementById('serving-sql-error-message'); + var errorElement = document.getElementById('serving-error-message'); errorElement.innerHTML = errorMessage; errorElement.style.display = 'block'; that.currentPipelineServingTaskIsRunning = false From 617e030556fad53748ce3867d97d1b7c581ca91d Mon Sep 17 00:00:00 2001 From: root Date: Fri, 3 Mar 2023 05:48:18 +0000 Subject: [PATCH 3/3] delete whitespace --- web/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/index.html b/web/index.html index c38c911..d988d5b 100644 --- a/web/index.html +++ b/web/index.html @@ -795,7 +795,7 @@

-

+