Skip to content

feat: add sql error message #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cchenshu wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

feat: add sql error message #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e7d212
feat: add sql error message
cchenshu Mar 3, 2023
8424318
feat: add sql and python error message
cchenshu Mar 3, 2023
617e030
delete whitespace
cchenshu Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions src/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'})

Expand Down Expand Up @@ -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'})

Expand Down
5 changes: 5 additions & 0 deletions web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,9 @@ <h2 class="accordion-header" id="flush-headingServing">
</div>
</div>

<div class="mb-3" id="standard-error-message">
</div>

<div class="row m-2">
<div class="col-10">
</div>
Expand Down Expand Up @@ -794,6 +797,8 @@ <h2 class="accordion-header" id="flush-headingServing">
</div>
</div>

<div class="mb-3" id="serving-error-message">
</div>

<div class="row m-2">
<div class="col-10">
Expand Down
20 changes: 20 additions & 0 deletions web/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@ var app = new Vue({
timeout: 10
})
.then(function (response) {
var errorElement = document.getElementById('standard-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
Expand All @@ -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-error-message');
errorElement.innerHTML = errorMessage;
errorElement.style.display = 'block';
that.currentPipelineStandardTaskIsRunning = false
});
},
Expand All @@ -229,6 +239,9 @@ var app = new Vue({
timeout: 10
})
.then(function (response) {
var errorElement = document.getElementById('serving-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
Expand All @@ -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-error-message');
errorElement.innerHTML = errorMessage;
errorElement.style.display = 'block';
that.currentPipelineServingTaskIsRunning = false
});
},
Expand Down