From 307f53dae8bf712ac6ee9363eec15f39060de104 Mon Sep 17 00:00:00 2001 From: Jin Hai Date: Fri, 7 Nov 2025 15:44:57 +0800 Subject: [PATCH] Minor tweaks (#11106) ### What problem does this PR solve? Refactor ### Type of change - [x] Refactoring Signed-off-by: Jin Hai --- api/apps/api_app.py | 8 ++------ api/apps/canvas_app.py | 27 +++++++++++++-------------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/api/apps/api_app.py b/api/apps/api_app.py index 14dae2641..1ab1c462a 100644 --- a/api/apps/api_app.py +++ b/api/apps/api_app.py @@ -466,10 +466,7 @@ def upload(): if "run" in form_data.keys(): if request.form.get("run").strip() == "1": try: - info = {"run": 1, "progress": 0} - info["progress_msg"] = "" - info["chunk_num"] = 0 - info["token_num"] = 0 + info = {"run": 1, "progress": 0, "progress_msg": "", "chunk_num": 0, "token_num": 0} DocumentService.update_by_id(doc["id"], info) # if str(req["run"]) == TaskStatus.CANCEL.value: tenant_id = DocumentService.get_tenant_id(doc["id"]) @@ -726,8 +723,7 @@ def completion_faq(): if "quote" not in req: req["quote"] = True - msg = [] - msg.append({"role": "user", "content": req["word"]}) + msg = [{"role": "user", "content": req["word"]}] if not msg[-1].get("id"): msg[-1]["id"] = get_uuid() message_id = msg[-1]["id"] diff --git a/api/apps/canvas_app.py b/api/apps/canvas_app.py index e9097c898..bd72e15b1 100644 --- a/api/apps/canvas_app.py +++ b/api/apps/canvas_app.py @@ -410,22 +410,22 @@ def test_db_connect(): ibm_db.close(conn) return get_json_result(data="Database Connection Successful!") elif req["db_type"] == 'trino': - def _parse_catalog_schema(db: str): - if not db: + def _parse_catalog_schema(db_name: str): + if not db_name: return None, None - if "." in db: - c, s = db.split(".", 1) - elif "/" in db: - c, s = db.split("/", 1) + if "." in db_name: + catalog_name, schema_name = db_name.split(".", 1) + elif "/" in db_name: + catalog_name, schema_name = db_name.split("/", 1) else: - c, s = db, "default" - return c, s + catalog_name, schema_name = db_name, "default" + return catalog_name, schema_name try: import trino import os from trino.auth import BasicAuthentication - except Exception: - return server_error_response("Missing dependency 'trino'. Please install: pip install trino") + except Exception as e: + return server_error_response(f"Missing dependency 'trino'. Please install: pip install trino, detail: {e}") catalog, schema = _parse_catalog_schema(req["database"]) if not catalog: @@ -479,7 +479,6 @@ def getlistversion(canvas_id): @login_required def getversion( version_id): try: - e, version = UserCanvasVersionService.get_by_id(version_id) if version: return get_json_result(data=version.to_dict()) @@ -546,11 +545,11 @@ def trace(): cvs_id = request.args.get("canvas_id") msg_id = request.args.get("message_id") try: - bin = REDIS_CONN.get(f"{cvs_id}-{msg_id}-logs") - if not bin: + binary = REDIS_CONN.get(f"{cvs_id}-{msg_id}-logs") + if not binary: return get_json_result(data={}) - return get_json_result(data=json.loads(bin.encode("utf-8"))) + return get_json_result(data=json.loads(binary.encode("utf-8"))) except Exception as e: logging.exception(e)