From 6afe4ef9a950004b690d1052a8b950c873016c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CNaeel=E2=80=9D?= Date: Mon, 27 Jul 2026 16:56:35 +0400 Subject: [PATCH] =?UTF-8?q?v1.0.82:=20=5Fget=5Finstance=5Fdisplay=5Fname()?= =?UTF-8?q?=20=E2=80=94=20fetch=20real=20name=20from=20API=20for=20non-cre?= =?UTF-8?q?ate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site/app.py | 2 +- site/routes/api_test.py | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/site/app.py b/site/app.py index 179c804..b91a925 100644 --- a/site/app.py +++ b/site/app.py @@ -6,7 +6,7 @@ from routes.main import bp as main_bp from routes.api import bp as api_bp from routes.api_test import bp as api_test_bp -VERSION = "1.0.81" +VERSION = "1.0.82" app = Flask(__name__, template_folder="templates", static_folder="static") app.config["NUBES_API_ENDPOINT"] = os.getenv("NUBES_API_ENDPOINT", "https://lk-api-gateway-dev.ngcloud.ru/api/v1/svc") diff --git a/site/routes/api_test.py b/site/routes/api_test.py index 2499c15..8af7913 100644 --- a/site/routes/api_test.py +++ b/site/routes/api_test.py @@ -242,7 +242,9 @@ def api_test(): # фоном ждать завершения is_delete = (op_name == "delete") - display_name = display_name or instance_uid or f"instance-{svc_id}" + # Получить реальное имя инстанса из API (не UUID!) + if not display_name: + display_name = _get_instance_display_name(client, instance_uid) threading.Thread(target=_finish_op, args=(client, op_uid, instance_uid, svc_id, display_name, op_name, svc_op_id, False, is_delete), daemon=True).start() return jsonify({"status": "RUNNING", "opUid": op_uid, "instanceUid": instance_uid, "displayName": display_name}) @@ -255,6 +257,16 @@ def api_test(): _op_results = {} +def _get_instance_display_name(client, instance_uid): + """Получить displayName инстанса из GET /instances/{uid}.""" + try: + data = client.get(f"/instances/{instance_uid}") + name = data.get("instance", {}).get("displayName", "") + return name or instance_uid # fallback — UUID если имя пустое + except Exception: + return instance_uid + + def _finish_op(client, op_uid, instance_uid, svc_id, display_name, op_name, svc_op_id, is_create, is_delete=False): """Фоном ждать dtFinish и сохранить результат.""" import time