优化应用初始化和重试机制，添加健康检查接口

app.py

@@ -1,4 +1,5 @@
 import os
+from datetime import datetime
 from fastapi import FastAPI
 from pydantic import BaseModel
 from fastapi.middleware.cors import CORSMiddleware
@@ -15,21 +16,35 @@ initialization_lock = asyncio.Lock()
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     # 启动时运行
+    print("===== Application Startup at", datetime.now().strftime('%Y-%m-%d %H:%M:%S'), "=====")
     global is_initialized
     async with initialization_lock:
         if not is_initialized:
-            await initialize_application()
+            # 非阻塞初始化 - 在后台任务中执行
+            asyncio.create_task(initialize_application())
             is_initialized = True
+    print("===== FastAPI Application Ready =====")
     yield
     # 关闭时运行
+    print("===== Application Shutdown =====")
     # cleanup_code_here()
 
 async def initialize_application():
     # 在这里进行所有需要的初始化
-    from us_stock import fetch_symbols
-
-    await fetch_symbols()
-    # 其他初始化代码...
+    print("===== Starting application initialization =====")
+    try:
+        from us_stock import fetch_symbols
+        print("Importing us_stock module...")
+        
+        print("Calling fetch_symbols...")
+        await fetch_symbols()
+        print("fetch_symbols completed")
+        
+        print("===== Application initialization completed =====")
+    except Exception as e:
+        print(f"Error during initialization: {e}")
+        print("===== Application initialization failed =====")
+        raise
 
 app = FastAPI(lifespan=lifespan)
 
@@ -90,4 +105,12 @@ async def predict(request: PredictRequest):
 async def root():
     return {"message": "Welcome to the API. Use /api/aaa or /api/bbb for processing."}
 
+@app.get("/health")
+async def health_check():
+    return {
+        "status": "healthy",
+        "initialized": is_initialized,
+        "timestamp": datetime.now().isoformat()
+    }
+
 

us_stock.py

@@ -57,27 +57,51 @@ def fetch_stock_us_spot_data_with_retries():
 
 
 async def fetch_stock_us_spot_data_with_retries_async():
-    retry_intervals = [10, 20, 60, 300, 600]
+    retry_intervals = [10, 20]  # 减少重试次数
     retry_index = 0
+    max_retries = 2  # 最多重试2次
 
-    while True:
+    for attempt in range(max_retries + 1):
         try:
-            symbols = await asyncio.to_thread(ak.stock_us_spot_em)
+            # 添加30秒超时
+            symbols = await asyncio.wait_for(
+                asyncio.to_thread(ak.stock_us_spot_em), 
+                timeout=30.0
+            )
             return symbols
+        except asyncio.TimeoutError:
+            print(f"Timeout error fetching data (attempt {attempt + 1}/{max_retries + 1})")
         except Exception as e:
-            print(f"Error fetching data: {e}")
-            wait_time = retry_intervals[retry_index]
+            print(f"Error fetching data (attempt {attempt + 1}/{max_retries + 1}): {e}")
+        
+        if attempt < max_retries:
+            wait_time = retry_intervals[min(retry_index, len(retry_intervals) - 1)]
             print(f"Retrying in {wait_time} seconds...")
             await asyncio.sleep(wait_time)
-            retry_index = min(retry_index + 1, len(retry_intervals) - 1)
+            retry_index += 1
+    
+    # 如果所有重试都失败，返回空数据
+    print("All retries failed, returning empty data")
+    return pd.DataFrame()
 
 symbols = None
 
 async def fetch_symbols():
     global symbols
-    # 异步获取数据
-    symbols = await fetch_stock_us_spot_data_with_retries_async()
-    print("Symbols initialized:", symbols)
+    try:
+        print("Starting symbols initialization...")
+        # 异步获取数据
+        symbols = await fetch_stock_us_spot_data_with_retries_async()
+        if symbols is not None and not symbols.empty:
+            print(f"Symbols initialized successfully: {len(symbols)} symbols loaded")
+        else:
+            print("Symbols initialization failed, using empty dataset")
+            symbols = pd.DataFrame()
+    except Exception as e:
+        print(f"Error in fetch_symbols: {e}")
+        symbols = pd.DataFrame()
+    finally:
+        print("Symbols initialization completed")
 
 
 # 全局变量
@@ -89,19 +113,25 @@ index_us_stock_index_NDX = None
 def update_stock_indices():
     global index_us_stock_index_INX, index_us_stock_index_DJI, index_us_stock_index_IXIC, index_us_stock_index_NDX
     try:
+        print("Starting stock indices update...")
         index_us_stock_index_INX = ak.index_us_stock_sina(symbol=".INX")
         index_us_stock_index_DJI = ak.index_us_stock_sina(symbol=".DJI")
         index_us_stock_index_IXIC = ak.index_us_stock_sina(symbol=".IXIC")
         index_us_stock_index_NDX = ak.index_us_stock_sina(symbol=".NDX")
-        print("Stock indices updated")
+        print("Stock indices updated successfully")
     except Exception as e:
         print(f"Error updating stock indices: {e}")
 
     # 设置定时器，每隔12小时更新一次
     threading.Timer(12 * 60 * 60, update_stock_indices).start()
 
-# 程序开始时立即更新一次
-update_stock_indices()
+# 程序开始时不立即更新，而是延迟启动
+def start_indices_update():
+    """延迟启动股票指数更新，避免阻塞应用启动"""
+    threading.Timer(60, update_stock_indices).start()  # 60秒后开始第一次更新
+
+# 延迟启动股票指数更新
+start_indices_update()
 
 
 # 创建列名转换的字典