fix bug

py-client/strategy/trend/boot.py

@@ -51,65 +51,72 @@ def StartTrend() -> None:
         config.global_config.qmt_token,
         config.HTTP_TIMEOUT,
     )
-    portfolio = client.portfolio()
-    assets = portfolio.assets
-    positions = list(portfolio.positions.values())
-    order_book = OrderBook()
-    order_book.refresh(client, portfolio.orders)
+    executor = None
+    try:
+        portfolio = client.portfolio()
+        assets = portfolio.assets
+        positions = list(portfolio.positions.values())
+        order_book = OrderBook()
+        order_book.refresh(client, portfolio.orders)
 
-    storeState = State.for_strategy(
-        config.global_config.qmt_data_dir,
-        config.account_config.strategy,
-        config.account_config.account_id,
-    )
-    storeState.reconcile(positions, order_book.data)
+        storeState = State.for_strategy(
+            config.global_config.qmt_data_dir,
+            config.account_config.strategy,
+            config.account_config.account_id,
+        )
+        storeState.reconcile(positions, order_book.data)
 
-    # 获取本策略的信号开仓数据
-    signals = init_signals(
-        config.global_config,
-        config.account_config.signal_allow,
-    )
-    log.info("[启动] 趋势策略已启动，账户=%s，信号=%d，持仓=%d", config.account_config.account_id, len(signals), len(positions))
-    run = Runtime(
-        client=client,
-        global_cfg=config.global_config,
-        account_cfg=config.account_config,
-        state=storeState,
-        orders=order_book,
-        open_watch=DipWatch(),
-        add_watch=DipWatch(),
-        profit_tracker=GridTrailingTracker(config.account_config.grid_step_pct),
-        executor=ThreadPoolExecutor(max_workers=3, thread_name_prefix="trend"),
-    )
+        # 获取本策略的信号开仓数据
+        signals = init_signals(
+            config.global_config,
+            config.account_config.signal_allow,
+        )
+        log.info("[启动] 趋势策略已启动，账户=%s，信号=%d，持仓=%d", config.account_config.account_id, len(signals), len(positions))
+        executor = ThreadPoolExecutor(max_workers=3, thread_name_prefix="trend")
+        run = Runtime(
+            client=client,
+            global_cfg=config.global_config,
+            account_cfg=config.account_config,
+            state=storeState,
+            orders=order_book,
+            open_watch=DipWatch(),
+            add_watch=DipWatch(),
+            profit_tracker=GridTrailingTracker(config.account_config.grid_step_pct),
+            executor=executor,
+        )
 
-    Overview(assets, positions, config.account_config)
+        Overview(assets, positions, config.account_config)
 
-    DEFAULT_TICK_INTERVAL = 30
-    while True:
-        lt = time.localtime()
-        if (lt.tm_hour, lt.tm_min, lt.tm_sec) >= (15, 0, 0):
-            log.info("[Trend] 已到 15:00，结束趋势策略")
-            run.client.close()
-            run.executor.shutdown()
-            return
-        current_sec = lt.tm_sec
-        
-        # 计算距离下一个目标时间点（0秒或30秒）的等待时间
-        if current_sec < DEFAULT_TICK_INTERVAL:
-            wait_seconds = DEFAULT_TICK_INTERVAL - current_sec
-        elif current_sec < 60:
-            wait_seconds = 60 - current_sec
-        else:
-            wait_seconds = DEFAULT_TICK_INTERVAL
-        
-        # 等待到目标时间点
-        time.sleep(wait_seconds)
-        
-        # 单轮失败不能杀死唯一的交易定时线程。
+        DEFAULT_TICK_INTERVAL = 30
+        while True:
+            lt = time.localtime()
+            if (lt.tm_hour, lt.tm_min, lt.tm_sec) >= (15, 0, 0):
+                log.info("[Trend] 已到 15:00，结束趋势策略")
+                return
+            current_sec = lt.tm_sec
+
+            # 计算距离下一个目标时间点（0秒或30秒）的等待时间
+            if current_sec < DEFAULT_TICK_INTERVAL:
+                wait_seconds = DEFAULT_TICK_INTERVAL - current_sec
+            elif current_sec < 60:
+                wait_seconds = 60 - current_sec
+            else:
+                wait_seconds = DEFAULT_TICK_INTERVAL
+
+            # 等待到目标时间点
+            time.sleep(wait_seconds)
+
+            # 单轮失败不能杀死唯一的交易定时线程。
+            try:
+                RunOnce(run, signals)
+            except Exception as e:
+                log.error(f"[Trend] 本 tick 执行失败，下一 tick 继续: {e}", exc_info=True)
+    finally:
         try:
-            RunOnce(run, signals)
-        except Exception as e:
-            log.error(f"[Trend] 本 tick 执行失败，下一 tick 继续: {e}", exc_info=True)
+            if executor is not None:
+                executor.shutdown(wait=True)
+        finally:
+            client.close()
 
 
 def RunOnce(run: Runtime, signals:list[SignalItem]) -> None: