Kevin Hu
commited on
Commit
·
40a792a
1
Parent(s):
6d3d3cb
fix error response disformat usage (#2213)
Browse files### What problem does this PR solve?
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
- api/apps/canvas_app.py +5 -5
api/apps/canvas_app.py
CHANGED
|
@@ -19,7 +19,7 @@ from flask import request, Response
|
|
| 19 |
from flask_login import login_required, current_user
|
| 20 |
from api.db.services.canvas_service import CanvasTemplateService, UserCanvasService
|
| 21 |
from api.utils import get_uuid
|
| 22 |
-
from api.utils.api_utils import get_json_result, server_error_response, validate_request
|
| 23 |
from agent.canvas import Canvas
|
| 24 |
from peewee import MySQLDatabase, PostgresqlDatabase
|
| 25 |
|
|
@@ -61,7 +61,7 @@ def save():
|
|
| 61 |
return server_error_response(ValueError("Duplicated title."))
|
| 62 |
req["id"] = get_uuid()
|
| 63 |
if not UserCanvasService.save(**req):
|
| 64 |
-
return
|
| 65 |
else:
|
| 66 |
UserCanvasService.update_by_id(req["id"], req)
|
| 67 |
|
|
@@ -73,7 +73,7 @@ def save():
|
|
| 73 |
def get(canvas_id):
|
| 74 |
e, c = UserCanvasService.get_by_id(canvas_id)
|
| 75 |
if not e:
|
| 76 |
-
return
|
| 77 |
return get_json_result(data=c.to_dict())
|
| 78 |
|
| 79 |
|
|
@@ -85,7 +85,7 @@ def run():
|
|
| 85 |
stream = req.get("stream", True)
|
| 86 |
e, cvs = UserCanvasService.get_by_id(req["id"])
|
| 87 |
if not e:
|
| 88 |
-
return
|
| 89 |
|
| 90 |
if not isinstance(cvs.dsl, str):
|
| 91 |
cvs.dsl = json.dumps(cvs.dsl, ensure_ascii=False)
|
|
@@ -151,7 +151,7 @@ def reset():
|
|
| 151 |
try:
|
| 152 |
e, user_canvas = UserCanvasService.get_by_id(req["id"])
|
| 153 |
if not e:
|
| 154 |
-
return
|
| 155 |
|
| 156 |
canvas = Canvas(json.dumps(user_canvas.dsl), current_user.id)
|
| 157 |
canvas.reset()
|
|
|
|
| 19 |
from flask_login import login_required, current_user
|
| 20 |
from api.db.services.canvas_service import CanvasTemplateService, UserCanvasService
|
| 21 |
from api.utils import get_uuid
|
| 22 |
+
from api.utils.api_utils import get_json_result, server_error_response, validate_request, get_data_error_result
|
| 23 |
from agent.canvas import Canvas
|
| 24 |
from peewee import MySQLDatabase, PostgresqlDatabase
|
| 25 |
|
|
|
|
| 61 |
return server_error_response(ValueError("Duplicated title."))
|
| 62 |
req["id"] = get_uuid()
|
| 63 |
if not UserCanvasService.save(**req):
|
| 64 |
+
return get_data_error_result(retmsg="Fail to save canvas.")
|
| 65 |
else:
|
| 66 |
UserCanvasService.update_by_id(req["id"], req)
|
| 67 |
|
|
|
|
| 73 |
def get(canvas_id):
|
| 74 |
e, c = UserCanvasService.get_by_id(canvas_id)
|
| 75 |
if not e:
|
| 76 |
+
return get_data_error_result(retmsg="canvas not found.")
|
| 77 |
return get_json_result(data=c.to_dict())
|
| 78 |
|
| 79 |
|
|
|
|
| 85 |
stream = req.get("stream", True)
|
| 86 |
e, cvs = UserCanvasService.get_by_id(req["id"])
|
| 87 |
if not e:
|
| 88 |
+
return get_data_error_result(retmsg="canvas not found.")
|
| 89 |
|
| 90 |
if not isinstance(cvs.dsl, str):
|
| 91 |
cvs.dsl = json.dumps(cvs.dsl, ensure_ascii=False)
|
|
|
|
| 151 |
try:
|
| 152 |
e, user_canvas = UserCanvasService.get_by_id(req["id"])
|
| 153 |
if not e:
|
| 154 |
+
return get_data_error_result(retmsg="canvas not found.")
|
| 155 |
|
| 156 |
canvas = Canvas(json.dumps(user_canvas.dsl), current_user.id)
|
| 157 |
canvas.reset()
|