Update src/key_manager.py

src/key_manager.py

@@ -30,7 +30,9 @@ class KeyManager:
         api_keys_str = os.getenv("API_KEYS", "")
         if api_keys_str:
             try:
+                logger.info(f"尝试从环境变量加载密钥，长度: {len(api_keys_str)}")
                 env_data = json.loads(api_keys_str)
+                logger.info(f"环境变量密钥数据类型: {type(env_data)}, 包含 {len(env_data) if isinstance(env_data, list) else '未知数量'} 个项目")
                 self._process_keys_data(env_data)
                 if len(self.keys) > 0:
                     logger.info(f"已从环境变量加载 {len(self.keys)} 个密钥")
@@ -40,13 +42,14 @@ class KeyManager:
             except json.JSONDecodeError as e:
                 logger.error(f"解析环境变量API keys失败: {str(e)}")
         
-            # 如果环境变量未设置、解析失败或未加载到密钥，从文件加载
+        # 如果环境变量未设置、解析失败或未加载到密钥，从文件加载
         if not keys_loaded:
             try:
                 if os.path.exists(self.storage_file):
                     logger.info(f"尝试从文件加载密钥: {self.storage_file}")
                     with open(self.storage_file, 'r', encoding='utf-8') as f:
                         data = json.load(f)
+                        logger.info(f"文件密钥数据类型: {type(data)}, 数据: {json.dumps(data)[:100]}...")
                         keys_before = len(self.keys)
                         self._process_keys_data(data)
                         keys_loaded = len(self.keys) > keys_before
@@ -58,6 +61,8 @@ class KeyManager:
                 
         if len(self.keys) == 0:
             logger.warning("未能从环境变量或文件加载任何密钥")
+        else:
+            logger.info(f"成功加载了 {len(self.keys)} 个密钥: {', '.join([k.get('name', k.get('id', '未命名')) for k in self.keys])}")
 
         
     def _process_keys_data(self, data):
@@ -66,11 +71,12 @@ class KeyManager:
         if isinstance(data, list):
             # 旧版格式：直接是密钥列表
             raw_keys = data
-            self.keys = []
-            self.usage_stats = {}
+            processed_keys = []  # 先存储到临时列表，不直接修改self.keys
+            temp_usage_stats = {}  # 临时存储使用统计
             
             # 为每个密钥创建完整的记录
             for key_info in raw_keys:
+                logger.info(f"处理密钥: {type(key_info)}")
                 if isinstance(key_info, dict):
                     key_value = key_info.get("key")
                     if not key_value:
@@ -96,10 +102,11 @@ class KeyManager:
                         "notes": key_info.get("notes")
                     }
                     
-                    self.keys.append(key_record)
+                    processed_keys.append(key_record)
+                    logger.info(f"添加密钥: {key_record['name'] or key_id} (权重: {key_record['weight']})")
                     
                     # 初始化使用统计
-                    self.usage_stats[key_id] = {
+                    temp_usage_stats[key_id] = {
                         "total_requests": 0,
                         "successful_requests": 0,
                         "failed_requests": 0,
@@ -109,7 +116,7 @@ class KeyManager:
                 elif isinstance(key_info, str):
                     # 如果是字符串，直接作为密钥值
                     key_id = str(uuid.uuid4())
-                    self.keys.append({
+                    key_record = {
                         "id": key_id,
                         "name": "",
                         "key": key_info,
@@ -122,20 +129,33 @@ class KeyManager:
                         "created_at": time.time(),
                         "last_used": None,
                         "notes": None
-                    })
+                    }
+                    processed_keys.append(key_record)
+                    logger.info(f"添加字符串密钥: {key_id}")
                     
                     # 初始化使用统计
-                    self.usage_stats[key_id] = {
+                    temp_usage_stats[key_id] = {
                         "total_requests": 0,
                         "successful_requests": 0,
                         "failed_requests": 0,
                         "daily_usage": {},
                         "average_response_time": 0
                     }
+            
+            # 更新keys和usage_stats
+            if processed_keys:
+                self.keys = processed_keys
+                self.usage_stats = temp_usage_stats
+                logger.info(f"处理完成，共 {len(self.keys)} 个密钥")
         else:
             # 新版格式：包含keys和usage_stats的字典
-            self.keys = data.get('keys', [])
-            self.usage_stats = data.get('usage_stats', {})
+            if 'keys' in data:
+                self.keys = data.get('keys', [])
+                self.usage_stats = data.get('usage_stats', {})
+                logger.info(f"从新格式加载了 {len(self.keys)} 个密钥")
+            else:
+                logger.warning(f"未知的数据格式: {type(data)}")
+                logger.warning(f"数据内容: {str(data)[:100]}...")
     
     def _save_keys(self) -> None:
         """保存密钥到文件"""