feat(config): 支持后台持久化 max_retries 配置

genz27 · genz27 · commit da72d58d5b37 · 2026-04-15T13:20:15.000+08:00
diff --git a/src/api/admin.py b/src/api/admin.py
@@ -508,8 +508,9 @@ class CaptchaScoreTestRequest(BaseModel):
 
 
 class GenerationConfigRequest(BaseModel):
-    image_timeout: int
-    video_timeout: int
+    image_timeout: Optional[int] = None
+    video_timeout: Optional[int] = None
+    max_retries: Optional[int] = None
 
 
 class CallLogicConfigRequest(BaseModel):
@@ -1132,7 +1133,8 @@ async def get_generation_config(token: str = Depends(verify_admin_token)):
         "success": True,
         "config": {
             "image_timeout": config.image_timeout,
-            "video_timeout": config.video_timeout
+            "video_timeout": config.video_timeout,
+            "max_retries": config.max_retries,
         }
     }
 
@@ -1143,7 +1145,11 @@ async def update_generation_config(
     token: str = Depends(verify_admin_token)
 ):
     """Update generation timeout configuration"""
-    await db.update_generation_config(request.image_timeout, request.video_timeout)
+    await db.update_generation_config(
+        image_timeout=request.image_timeout,
+        video_timeout=request.video_timeout,
+        max_retries=request.max_retries,
+    )
 
     # 🔥 Hot reload: sync database config to memory
     await db.reload_config_to_memory()
@@ -1390,7 +1396,11 @@ async def update_generation_timeout(
     token: str = Depends(verify_admin_token)
 ):
     """Update generation timeout configuration"""
-    await db.update_generation_config(request.image_timeout, request.video_timeout)
+    await db.update_generation_config(
+        image_timeout=request.image_timeout,
+        video_timeout=request.video_timeout,
+        max_retries=request.max_retries,
+    )
 
     # 🔥 Hot reload: sync database config to memory
     await db.reload_config_to_memory()
diff --git a/src/core/config.py b/src/core/config.py
@@ -68,6 +68,16 @@ def flow_max_retries(self) -> int:
         except Exception:
             return 3
 
+    def set_flow_max_retries(self, retries: int):
+        """Set flow max retries"""
+        if "flow" not in self._config:
+            self._config["flow"] = {}
+        try:
+            normalized = max(1, int(retries))
+        except Exception:
+            normalized = 3
+        self._config["flow"]["max_retries"] = normalized
+
     @property
     def flow_image_request_timeout(self) -> int:
         """图片生成单次 HTTP 请求超时(秒)。"""
diff --git a/src/core/database.py b/src/core/database.py
@@ -130,16 +130,24 @@ async def _ensure_config_rows(self, db, config_dict: dict = None):
         if count[0] == 0:
             image_timeout = 300
             video_timeout = 1500
+            max_retries = 3
 
             if config_dict:
                 generation_config = config_dict.get("generation", {})
+                flow_config = config_dict.get("flow", {})
                 image_timeout = generation_config.get("image_timeout", 300)
                 video_timeout = generation_config.get("video_timeout", 1500)
+                max_retries = flow_config.get("max_retries", 3)
+
+            try:
+                max_retries = max(1, int(max_retries))
+            except Exception:
+                max_retries = 3
 
             await db.execute("""
-                INSERT INTO generation_config (id, image_timeout, video_timeout)
-                VALUES (1, ?, ?)
-            """, (image_timeout, video_timeout))
+                INSERT INTO generation_config (id, image_timeout, video_timeout, max_retries)
+                VALUES (1, ?, ?, ?)
+            """, (image_timeout, video_timeout, max_retries))
 
         # Ensure call_logic_config has a row
         cursor = await db.execute("SELECT COUNT(*) FROM call_logic_config")
@@ -432,6 +440,20 @@ async def check_and_migrate_db(self, config_dict: dict = None):
                         except Exception as e:
                             print(f"  ✗ Failed to add column '{col_name}': {e}")
 
+            # Check and add missing columns to generation_config table
+            if await self._table_exists(db, "generation_config"):
+                generation_columns_to_add = [
+                    ("max_retries", "INTEGER DEFAULT 3"),
+                ]
+
+                for col_name, col_type in generation_columns_to_add:
+                    if not await self._column_exists(db, "generation_config", col_name):
+                        try:
+                            await db.execute(f"ALTER TABLE generation_config ADD COLUMN {col_name} {col_type}")
+                            print(f"  ✓ Added column '{col_name}' to generation_config table")
+                        except Exception as e:
+                            print(f"  ✗ Failed to add column '{col_name}': {e}")
+
             # Check and add missing columns to captcha_config table
             if await self._table_exists(db, "captcha_config"):
                 captcha_columns_to_add = [
@@ -647,6 +669,7 @@ async def init_db(self):
                     id INTEGER PRIMARY KEY DEFAULT 1,
                     image_timeout INTEGER DEFAULT 300,
                     video_timeout INTEGER DEFAULT 1500,
+                    max_retries INTEGER DEFAULT 3,
                     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
                 )
             """)
@@ -1292,14 +1315,49 @@ async def get_generation_config(self) -> Optional[GenerationConfig]:
                 return GenerationConfig(**dict(row))
             return None
 
-    async def update_generation_config(self, image_timeout: int, video_timeout: int):
+    async def update_generation_config(
+        self,
+        image_timeout: Optional[int] = None,
+        video_timeout: Optional[int] = None,
+        max_retries: Optional[int] = None,
+    ):
         """Update generation configuration"""
         async with self._connect(write=True) as db:
-            await db.execute("""
-                UPDATE generation_config
-                SET image_timeout = ?, video_timeout = ?, updated_at = CURRENT_TIMESTAMP
-                WHERE id = 1
-            """, (image_timeout, video_timeout))
+            db.row_factory = aiosqlite.Row
+            cursor = await db.execute("SELECT * FROM generation_config WHERE id = 1")
+            row = await cursor.fetchone()
+            current = dict(row) if row else {}
+
+            normalized_image_timeout = (
+                image_timeout
+                if image_timeout is not None
+                else current.get("image_timeout", 300)
+            )
+            normalized_video_timeout = (
+                video_timeout
+                if video_timeout is not None
+                else current.get("video_timeout", 1500)
+            )
+            try:
+                normalized_max_retries = (
+                    max(1, int(max_retries))
+                    if max_retries is not None
+                    else max(1, int(current.get("max_retries", 3)))
+                )
+            except Exception:
+                normalized_max_retries = 3
+
+            if row:
+                await db.execute("""
+                    UPDATE generation_config
+                    SET image_timeout = ?, video_timeout = ?, max_retries = ?, updated_at = CURRENT_TIMESTAMP
+                    WHERE id = 1
+                """, (normalized_image_timeout, normalized_video_timeout, normalized_max_retries))
+            else:
+                await db.execute("""
+                    INSERT INTO generation_config (id, image_timeout, video_timeout, max_retries)
+                    VALUES (1, ?, ?, ?)
+                """, (normalized_image_timeout, normalized_video_timeout, normalized_max_retries))
             await db.commit()
 
     async def get_call_logic_config(self) -> CallLogicConfig:
@@ -1531,6 +1589,7 @@ async def reload_config_to_memory(self):
         if generation_config:
             config.set_image_timeout(generation_config.image_timeout)
             config.set_video_timeout(generation_config.video_timeout)
+            config.set_flow_max_retries(generation_config.max_retries)
 
         # Reload call logic config
         call_logic_config = await self.get_call_logic_config()
diff --git a/src/core/models.py b/src/core/models.py
@@ -138,6 +138,7 @@ class GenerationConfig(BaseModel):
     id: int = 1
     image_timeout: int = 300  # seconds
     video_timeout: int = 1500  # seconds
+    max_retries: int = 3  # 请求最大重试次数
 
 
 class CallLogicConfig(BaseModel):
diff --git a/src/services/flow_client.py b/src/services/flow_client.py
@@ -631,7 +631,7 @@ async def create_project(self, st: str, title: str) -> str:
                 "toolName": "PINHOLE"
             }
         }
-        max_retries = max(2, min(4, int(getattr(config, "flow_max_retries", 3) or 3)))
+        max_retries = config.flow_max_retries
         request_timeout = max(self._get_control_plane_timeout(), min(self.timeout, 15))
         last_error: Optional[Exception] = None
 
@@ -839,7 +839,7 @@ async def upload_image(
                 "tool": "ASSET_MANAGER"
             }
         }
-        max_retries = max(1, getattr(config, "flow_max_retries", 3))
+        max_retries = config.flow_max_retries
         last_error: Optional[Exception] = None
 
         for retry_attempt in range(max_retries):
@@ -1106,8 +1106,8 @@ async def upsample_image(
         """
         url = f"{self.api_base_url}/flow/upsampleImage"
 
-        # 403/reCAPTCHA/500 重试逻辑 - 最多重试3次
-        max_retries = 3
+        # 403/reCAPTCHA/500 重试逻辑 - 使用配置的最大重试次数
+        max_retries = config.flow_max_retries
         last_error = None
 
         for retry_attempt in range(max_retries):
@@ -1226,8 +1226,8 @@ async def generate_video_text(
         """
         url = f"{self.api_base_url}/video:batchAsyncGenerateVideoText"
 
-        # 403/reCAPTCHA 重试逻辑 - 最多重试3次
-        max_retries = 3
+        # 403/reCAPTCHA 重试逻辑 - 使用配置的最大重试次数
+        max_retries = config.flow_max_retries
         last_error = None
         
         for retry_attempt in range(max_retries):
@@ -1350,8 +1350,8 @@ async def generate_video_reference_images(
         """
         url = f"{self.api_base_url}/video:batchAsyncGenerateVideoReferenceImages"
 
-        # 403/reCAPTCHA 重试逻辑 - 最多重试3次
-        max_retries = 3
+        # 403/reCAPTCHA 重试逻辑 - 使用配置的最大重试次数
+        max_retries = config.flow_max_retries
         last_error = None
         
         for retry_attempt in range(max_retries):
@@ -1483,8 +1483,8 @@ async def generate_video_start_end(
         """
         url = f"{self.api_base_url}/video:batchAsyncGenerateVideoStartAndEndImage"
 
-        # 403/reCAPTCHA 重试逻辑 - 最多重试3次
-        max_retries = 3
+        # 403/reCAPTCHA 重试逻辑 - 使用配置的最大重试次数
+        max_retries = config.flow_max_retries
         last_error = None
         
         for retry_attempt in range(max_retries):
@@ -1614,8 +1614,8 @@ async def generate_video_start_image(
         """
         url = f"{self.api_base_url}/video:batchAsyncGenerateVideoStartImage"
 
-        # 403/reCAPTCHA 重试逻辑 - 最多重试3次
-        max_retries = 3
+        # 403/reCAPTCHA 重试逻辑 - 使用配置的最大重试次数
+        max_retries = config.flow_max_retries
         last_error = None
         
         for retry_attempt in range(max_retries):
@@ -1742,8 +1742,8 @@ async def upsample_video(
         """
         url = f"{self.api_base_url}/video:batchAsyncGenerateVideoUpsampleVideo"
 
-        # 403/reCAPTCHA 重试逻辑 - 最多重试3次
-        max_retries = 3
+        # 403/reCAPTCHA 重试逻辑 - 使用配置的最大重试次数
+        max_retries = config.flow_max_retries
         last_error = None
         
         for retry_attempt in range(max_retries):
@@ -1855,7 +1855,7 @@ async def check_video_status(self, at: str, operations: List[Dict]) -> dict:
         json_data = {
             "operations": operations
         }
-        max_retries = max(1, getattr(config, "flow_max_retries", 3))
+        max_retries = config.flow_max_retries
         last_error: Optional[Exception] = None
 
         for retry_attempt in range(max_retries):
diff --git a/src/services/generation_handler.py b/src/services/generation_handler.py
@@ -1321,8 +1321,8 @@ async def _image_progress_callback(status_text: str, progress: int):
                 if stream:
                     yield self._create_stream_chunk(f"正在放大图片到 {resolution_name}...\n")
 
-                # 4K/2K 图片重试逻辑 - 最多重试3次
-                max_retries = 3
+                # 4K/2K 图片重试逻辑 - 使用配置的最大重试次数
+                max_retries = config.flow_max_retries
                 for retry_attempt in range(max_retries):
                     try:
                         # 调用 upsample API
diff --git a/static/manage.html b/static/manage.html
diff --git a/tests/testgeneration_config_max_retries.py b/tests/testgeneration_config_max_retries.py
