From 1688452f3f14c93db32312a1c6dc3c85d88cbb51 Mon Sep 17 00:00:00 2001
From: dekun <dekun@local>
Date: Wed, 24 Jun 2026 10:27:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=81=E4=BB=93=E8=BD=AE?=
 =?UTF-8?q?=E8=AF=A2=E6=97=B6=20SQLite=20database=20is=20locked=20?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

单连接复用并提交风控写入，启用 WAL 与 busy_timeout，缓存风控表 schema 初始化。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 app.py                   |  7 ++++-
 install_trading.py       | 68 ++++++++++++++++++++++------------------
 risk/account_risk_lib.py |  8 +++++
 3 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/app.py b/app.py
index 7c55abe..435c928 100644
--- a/app.py
+++ b/app.py
@@ -158,8 +158,13 @@ def expire_old_plans():
 # —————————————— 设置读写 ——————————————
 
 def get_db():
-    conn = sqlite3.connect(DB_PATH)
+    conn = sqlite3.connect(DB_PATH, timeout=30)
     conn.row_factory = sqlite3.Row
+    conn.execute("PRAGMA busy_timeout=30000")
+    try:
+        conn.execute("PRAGMA journal_mode=WAL")
+    except sqlite3.OperationalError:
+        pass
     return conn
 
 
diff --git a/install_trading.py b/install_trading.py
index e03878d..a426613 100644
--- a/install_trading.py
+++ b/install_trading.py
@@ -326,18 +326,23 @@ def install_trading(app, *, login_required, get_db, get_setting, set_setting, fe
     @login_required
     def api_trading_live():
         conn = get_db()
-        init_strategy_tables(conn)
-        mode = get_trading_mode(get_setting)
-        ctp_st = ctp_status(mode)
-        rows = _build_trading_live_rows(conn)
-        conn.close()
-        return jsonify({
-            "rows": rows,
-            "capital": _capital(get_db()),
-            "ctp_status": ctp_st,
-            "trading_mode_label": trading_mode_label(get_setting),
-            "risk_status": get_risk_status(get_db()),
-        })
+        try:
+            init_strategy_tables(conn)
+            mode = get_trading_mode(get_setting)
+            ctp_st = ctp_status(mode)
+            rows = _build_trading_live_rows(conn)
+            capital = _capital(conn)
+            risk = get_risk_status(conn)
+            conn.commit()
+            return jsonify({
+                "rows": rows,
+                "capital": capital,
+                "ctp_status": ctp_st,
+                "trading_mode_label": trading_mode_label(get_setting),
+                "risk_status": risk,
+            })
+        finally:
+            conn.close()
 
     @app.route("/api/trading/close", methods=["POST"])
     @login_required
@@ -595,24 +600,27 @@ def install_trading(app, *, login_required, get_db, get_setting, set_setting, fe
     @login_required
     def api_account_snapshot():
         conn = get_db()
-        init_strategy_tables(conn)
-        mode = get_trading_mode(get_setting)
-        ctp_st = ctp_status(mode)
-        capital = _capital(conn)
-        risk = get_risk_status(conn)
-        ctp_acc = _ctp_account(mode) if ctp_st.get("connected") else {}
-        positions = _ctp_positions(mode) if ctp_st.get("connected") else []
-        conn.close()
-        return jsonify({
-            "capital": capital,
-            "trading_mode": mode,
-            "trading_mode_label": trading_mode_label(get_setting),
-            "sizing_mode": get_sizing_mode(get_setting),
-            "risk_status": risk,
-            "ctp_status": ctp_st,
-            "ctp_account": ctp_acc,
-            "positions": positions,
-        })
+        try:
+            init_strategy_tables(conn)
+            mode = get_trading_mode(get_setting)
+            ctp_st = ctp_status(mode)
+            capital = _capital(conn)
+            risk = get_risk_status(conn)
+            conn.commit()
+            ctp_acc = _ctp_account(mode) if ctp_st.get("connected") else {}
+            positions = _ctp_positions(mode) if ctp_st.get("connected") else []
+            return jsonify({
+                "capital": capital,
+                "trading_mode": mode,
+                "trading_mode_label": trading_mode_label(get_setting),
+                "sizing_mode": get_sizing_mode(get_setting),
+                "risk_status": risk,
+                "ctp_status": ctp_st,
+                "ctp_account": ctp_acc,
+                "positions": positions,
+            })
+        finally:
+            conn.close()
 
     @app.route("/api/recommend/list")
     @login_required
diff --git a/risk/account_risk_lib.py b/risk/account_risk_lib.py
index 1c18639..a9c1050 100644
--- a/risk/account_risk_lib.py
+++ b/risk/account_risk_lib.py
@@ -76,7 +76,13 @@ def trading_day_reset_hour() -> int:
         return 8
 
 
+_SCHEMA_READY = False
+
+
 def ensure_account_risk_schema(conn) -> None:
+    global _SCHEMA_READY
+    if _SCHEMA_READY:
+        return
     conn.execute(
         """CREATE TABLE IF NOT EXISTS account_risk_state (
             id INTEGER PRIMARY KEY CHECK (id = 1),
@@ -93,6 +99,8 @@ def ensure_account_risk_schema(conn) -> None:
         conn.execute(
             "INSERT INTO account_risk_state (id, trading_day, manual_close_count, daily_frozen) VALUES (1, '', 0, 0)"
         )
+    conn.commit()
+    _SCHEMA_READY = True
 
 
 def _row_get(row, key, default=None):