fix(ocr): v6 default was only in backend/ - one-click actually runs scripts/tools/

User log showed PP-OCRv5_mobile_rec still loading despite v6 'upgrade'. Root
cause: one-click-start -> start_backend.ps1 -> scripts/tools/start_backend.py
-> captcha_server.py (the EARLY pipeline), NOT backend/server.py (PR#10). The
v6 default I set in backend/ was never reached.

Set v6 defaults in the code path users actually run:
- backend_config.py: cpu_fast_model v5_mobile -> v6_tiny, cpu_fallback_model
  v5_server -> v6_medium, gpu_model v5_server -> v6_tiny (hybrid fast path).
- ppocr_cpu_pool_worker.py: MODEL_NAME v5_server -> v6_tiny (non-hybrid path).
- backend_config.py line 134 gpu probe default also v6_tiny.
This commit is contained in:
OLmatter
2026-06-23 04:08:50 +08:00
parent 35ef7f87b3
commit 0a108e9523
2 changed files with 5 additions and 5 deletions
+4 -4
View File
@@ -131,7 +131,7 @@ def detect_gpu(timeout: float = 45.0) -> tuple[bool, str]:
if not parse_bool(os.environ.get("CNCAPTCHA_STRICT_GPU_DETECT"), True):
return True, output
model_name = os.environ.get("CNCAPTCHA_GPU_OCR_MODEL", "PP-OCRv5_server_rec")
model_name = os.environ.get("CNCAPTCHA_GPU_OCR_MODEL", "PP-OCRv6_tiny_rec")
device = os.environ.get("CNCAPTCHA_GPU_OCR_DEVICE", "gpu:0")
engine = os.environ.get("CNCAPTCHA_GPU_OCR_ENGINE", "paddle_dynamic")
ocr_probe = (
@@ -206,9 +206,9 @@ def resolve_backend_config(source: str = "env") -> BackendConfig:
minimum=1,
),
cpu_model=os.environ.get("CNCAPTCHA_CPU_OCR_MODEL", "hybrid"),
cpu_fast_model=os.environ.get("CNCAPTCHA_CPU_OCR_FAST_MODEL", "PP-OCRv5_mobile_rec"),
cpu_fallback_model=os.environ.get("CNCAPTCHA_CPU_OCR_FALLBACK_MODEL", "PP-OCRv5_server_rec"),
gpu_model=os.environ.get("CNCAPTCHA_GPU_OCR_MODEL", "PP-OCRv5_server_rec"),
cpu_fast_model=os.environ.get("CNCAPTCHA_CPU_OCR_FAST_MODEL", "PP-OCRv6_tiny_rec"),
cpu_fallback_model=os.environ.get("CNCAPTCHA_CPU_OCR_FALLBACK_MODEL", "PP-OCRv6_medium_rec"),
gpu_model=os.environ.get("CNCAPTCHA_GPU_OCR_MODEL", "PP-OCRv6_tiny_rec"),
gpu_device=os.environ.get("CNCAPTCHA_GPU_OCR_DEVICE", "gpu:0"),
constrained_decode=parse_bool(os.environ.get("CNCAPTCHA_OCR_CONSTRAINED"), True),
gpu_available=gpu_available,
+1 -1
View File
@@ -13,7 +13,7 @@ import numpy as np
ROOT = Path(__file__).resolve().parents[2]
MODEL_NAME = os.environ.get("CNCAPTCHA_CPU_OCR_MODEL", "PP-OCRv5_server_rec")
MODEL_NAME = os.environ.get("CNCAPTCHA_CPU_OCR_MODEL", "PP-OCRv6_tiny_rec")
ENGINE = os.environ.get("CNCAPTCHA_CPU_OCR_ENGINE", "paddle_dynamic")
WORKERS = int(os.environ.get("CNCAPTCHA_CPU_OCR_WORKERS", "3"))
CACHE_NAME = os.environ.get("CNCAPTCHA_CPU_PADDLEX_CACHE", ".paddlex_cache_cpu")