v1.0.99: fix all Flask-proxy in background thread — user_email + app_version as params

This commit is contained in:
2026-07-28 10:49:21 +04:00
parent 3dbddda858
commit 5a20962015
2 changed files with 22 additions and 4 deletions
+6 -4
View File
@@ -235,7 +235,8 @@ def api_test():
# фоном ждать завершения
user_email = get_token_info().get("email", "")
threading.Thread(target=_finish_op, args=(client, op_uid, instance_uid, svc_id, display_name, op_name, svc_op_id, True, get_client_id(), get_stand(), params, user_email), daemon=True).start()
app_version = current_app.config.get("VERSION", "")
threading.Thread(target=_finish_op, args=(client, op_uid, instance_uid, svc_id, display_name, op_name, svc_op_id, True, get_client_id(), get_stand(), params, user_email, app_version), daemon=True).start()
return jsonify({"status": "RUNNING", "opUid": op_uid, "instanceUid": instance_uid, "displayName": display_name})
else:
@@ -265,7 +266,8 @@ def api_test():
if not display_name:
display_name = _get_instance_display_name(client, instance_uid)
user_email = get_token_info().get("email", "")
threading.Thread(target=_finish_op, args=(client, op_uid, instance_uid, svc_id, display_name, op_name, svc_op_id, False, get_client_id(), get_stand(), is_delete, params, user_email), daemon=True).start()
app_version = current_app.config.get("VERSION", "")
threading.Thread(target=_finish_op, args=(client, op_uid, instance_uid, svc_id, display_name, op_name, svc_op_id, False, get_client_id(), get_stand(), is_delete, params, user_email, app_version), daemon=True).start()
return jsonify({"status": "RUNNING", "opUid": op_uid, "instanceUid": instance_uid, "displayName": display_name})
except Exception as e:
@@ -304,7 +306,7 @@ def _get_instance_display_name(client, instance_uid):
return instance_uid
def _finish_op(client, op_uid, instance_uid, svc_id, display_name, op_name, svc_op_id, is_create, client_id, stand, is_delete=False, params=None, user_email=""):
def _finish_op(client, op_uid, instance_uid, svc_id, display_name, op_name, svc_op_id, is_create, client_id, stand, is_delete=False, params=None, user_email="", app_version=""):
"""Фоном ждать dtFinish и сохранить результат."""
import time
_cleanup_op_results() # очистить старые записи перед добавлением новой
@@ -354,7 +356,7 @@ def _finish_op(client, op_uid, instance_uid, svc_id, display_name, op_name, svc_
str(err) if err else "",
params or {},
op.get("stages", []),
current_app.config.get("VERSION", ""))
app_version)
except Exception as e:
import traceback
print(f"[DB] save_run FAILED: {e}", flush=True)