fix: 修复打码配置热加载和模型转换问题

- 修复热加载缺少 ezcaptcha/capmonster/capsolver 配置同步

- EZ-Captcha 改用 ReCaptchaV3TaskProxylessS9 高分值版本

- 获取不到 reCAPTCHA token 时直接返回错误

- 修复 TIER_TWO portrait 模型名称转换错误

Co-Authored-By: Warp <agent@warp.dev>

src/core/database.py

@@ -1100,6 +1100,12 @@ class Database:
             config.set_captcha_method(captcha_config.captcha_method)
             config.set_yescaptcha_api_key(captcha_config.yescaptcha_api_key)
             config.set_yescaptcha_base_url(captcha_config.yescaptcha_base_url)
+            config.set_capmonster_api_key(captcha_config.capmonster_api_key)
+            config.set_capmonster_base_url(captcha_config.capmonster_base_url)
+            config.set_ezcaptcha_api_key(captcha_config.ezcaptcha_api_key)
+            config.set_ezcaptcha_base_url(captcha_config.ezcaptcha_base_url)
+            config.set_capsolver_api_key(captcha_config.capsolver_api_key)
+            config.set_capsolver_base_url(captcha_config.capsolver_base_url)
 
     # Cache config operations
     async def get_cache_config(self) -> CacheConfig:

src/services/flow_client.py

@@ -503,7 +503,8 @@ class FlowClient:
         for retry_attempt in range(max_retries):
             # 每次重试都重新获取 reCAPTCHA token
             recaptcha_token, browser_id = await self._get_recaptcha_token(project_id, action="IMAGE_GENERATION")
-            recaptcha_token = recaptcha_token or ""
+            if not recaptcha_token:
+                raise Exception("Failed to obtain reCAPTCHA token")
             session_id = self._generate_session_id()
 
             # 构建请求 - clientContext 只在外层，requests 内不重复
@@ -576,7 +577,8 @@ class FlowClient:
 
         # 获取 reCAPTCHA token - 使用 IMAGE_GENERATION action
         recaptcha_token, _ = await self._get_recaptcha_token(project_id, action="IMAGE_GENERATION")
-        recaptcha_token = recaptcha_token or ""
+        if not recaptcha_token:
+            raise Exception("Failed to obtain reCAPTCHA token")
         session_id = self._generate_session_id()
 
         json_data = {
@@ -646,7 +648,8 @@ class FlowClient:
         for retry_attempt in range(max_retries):
             # 每次重试都重新获取 reCAPTCHA token - 视频使用 VIDEO_GENERATION action
             recaptcha_token, browser_id = await self._get_recaptcha_token(project_id, action="VIDEO_GENERATION")
-            recaptcha_token = recaptcha_token or ""
+            if not recaptcha_token:
+                raise Exception("Failed to obtain reCAPTCHA token")
             session_id = self._generate_session_id()
             scene_id = str(uuid.uuid4())
 
@@ -731,7 +734,8 @@ class FlowClient:
         for retry_attempt in range(max_retries):
             # 每次重试都重新获取 reCAPTCHA token - 视频使用 VIDEO_GENERATION action
             recaptcha_token, browser_id = await self._get_recaptcha_token(project_id, action="VIDEO_GENERATION")
-            recaptcha_token = recaptcha_token or ""
+            if not recaptcha_token:
+                raise Exception("Failed to obtain reCAPTCHA token")
             session_id = self._generate_session_id()
             scene_id = str(uuid.uuid4())
 
@@ -819,7 +823,8 @@ class FlowClient:
         for retry_attempt in range(max_retries):
             # 每次重试都重新获取 reCAPTCHA token - 视频使用 VIDEO_GENERATION action
             recaptcha_token, browser_id = await self._get_recaptcha_token(project_id, action="VIDEO_GENERATION")
-            recaptcha_token = recaptcha_token or ""
+            if not recaptcha_token:
+                raise Exception("Failed to obtain reCAPTCHA token")
             session_id = self._generate_session_id()
             scene_id = str(uuid.uuid4())
 
@@ -910,7 +915,8 @@ class FlowClient:
         for retry_attempt in range(max_retries):
             # 每次重试都重新获取 reCAPTCHA token - 视频使用 VIDEO_GENERATION action
             recaptcha_token, browser_id = await self._get_recaptcha_token(project_id, action="VIDEO_GENERATION")
-            recaptcha_token = recaptcha_token or ""
+            if not recaptcha_token:
+                raise Exception("Failed to obtain reCAPTCHA token")
             session_id = self._generate_session_id()
             scene_id = str(uuid.uuid4())
 
@@ -998,7 +1004,8 @@ class FlowClient:
         
         for retry_attempt in range(max_retries):
             recaptcha_token, browser_id = await self._get_recaptcha_token(project_id, action="VIDEO_GENERATION")
-            recaptcha_token = recaptcha_token or ""
+            if not recaptcha_token:
+                raise Exception("Failed to obtain reCAPTCHA token")
             session_id = self._generate_session_id()
             scene_id = str(uuid.uuid4())
 
@@ -1203,7 +1210,7 @@ class FlowClient:
         elif method == "ezcaptcha":
             client_key = config.ezcaptcha_api_key
             base_url = config.ezcaptcha_base_url
-            task_type = "ReCaptchaV3TaskProxyless"
+            task_type = "ReCaptchaV3TaskProxylessS9"
         elif method == "capsolver":
             client_key = config.capsolver_api_key
             base_url = config.capsolver_base_url

src/services/generation_handler.py

@@ -1001,14 +1001,15 @@ class GenerationHandler:
                 # 如果模型 key 不包含 ultra，自动添加
                 if "ultra" not in model_key:
                     # veo_3_1_i2v_s_fast_fl -> veo_3_1_i2v_s_fast_ultra_fl
+                    # veo_3_1_i2v_s_fast_portrait_fl -> veo_3_1_i2v_s_fast_portrait_ultra_fl
                     # veo_3_1_t2v_fast -> veo_3_1_t2v_fast_ultra
+                    # veo_3_1_t2v_fast_portrait -> veo_3_1_t2v_fast_portrait_ultra
                     # veo_3_0_r2v_fast -> veo_3_0_r2v_fast_ultra
                     if "_fl" in model_key:
                         model_key = model_key.replace("_fl", "_ultra_fl")
-                    elif model_key.endswith("_fast"):
+                    else:
+                        # 直接在末尾添加 _ultra
                         model_key = model_key + "_ultra"
-                    elif "_fast_" in model_key:
-                        model_key = model_key.replace("_fast_", "_fast_ultra_")
                     
                     if stream:
                         yield self._create_stream_chunk(f"TIER_TWO 账号自动切换到 ultra 模型: {model_key}\n")