From 97ad0ae2e502f39d1140f3f6de1534ffbd5e962e Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Sun, 27 Sep 2026 21:42:18 +0800 Subject: [PATCH] =?UTF-8?q?fix(p0):=20=E5=9B=BA=E5=8C=96=20GPU=5FENCODE=20?= =?UTF-8?q?=E5=88=B0=20.env.staging=20+=20MediaKit=20=E6=8A=BD=E5=B8=A7=20?= =?UTF-8?q?403=20=E4=BF=AE=E5=A4=8D=20(#2069)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: xiaoxia Co-committed-by: xiaoxia --- apps/worker/video_processing/oss_helpers.py | 21 +++++++++++++++++++ .../video_processing/thumbnail_generator.py | 13 +++++++----- deploy/configs/.env.staging | 15 +++++++++++++ 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/apps/worker/video_processing/oss_helpers.py b/apps/worker/video_processing/oss_helpers.py index b042e5aa7..72284b0f9 100755 --- a/apps/worker/video_processing/oss_helpers.py +++ b/apps/worker/video_processing/oss_helpers.py @@ -337,3 +337,24 @@ def resolve_asset_ids_to_paths( if local_path: result[aid] = local_path return result + + +def delete_from_oss(storage_key_or_url: str) -> bool: + """从 OSS 删除对象（best-effort 清理临时文件，失败不抛异常）。 + + Args: + storage_key_or_url: 存储键或完整 URL + + Returns: + True 删除成功，False 删除失败或未配置。 + """ + bucket = oss_bucket() + if bucket is None: + return False + try: + key = normalize_storage_key(storage_key_or_url) + bucket.delete_object(key) + return True + except Exception: + logger.exception("删除OSS对象失败: %s", storage_key_or_url[:80]) + return False diff --git a/apps/worker/video_processing/thumbnail_generator.py b/apps/worker/video_processing/thumbnail_generator.py index a0d4b9dcc..f57a6b684 100755 --- a/apps/worker/video_processing/thumbnail_generator.py +++ b/apps/worker/video_processing/thumbnail_generator.py @@ -221,7 +221,7 @@ def _extract_frames_via_mediakit( """ import uuid - from video_processing.oss_helpers import upload_to_oss + from video_processing.oss_helpers import get_signed_download_url, upload_to_oss from packages.shared.mediakit_client import get_mediakit_client @@ -230,14 +230,17 @@ def _extract_frames_via_mediakit( logger.info("[thumbnail] MediaKit 未配置，跳过智能抽帧") return None - # 1. 上传视频到 OSS 获取 URL + video_storage_key: str = "" + # 1. 上传视频到 OSS，并生成预签名下载 URL（bucket 私有读，公网 URL 会 403） try: video_storage_key = f"temp/{plan_id}/{uuid.uuid4().hex[:8]}_{Path(video_path).name}" - video_url = upload_to_oss(video_path, video_storage_key) - if not video_url: + public_url = upload_to_oss(video_path, video_storage_key) + if not public_url: logger.warning("[thumbnail] 视频上传 OSS 失败，无法使用 MediaKit") return None - logger.info("[thumbnail] 视频已上传 OSS: %s", video_url[:80]) + # MediaKit 从公网拉取视频，必须使用预签名 URL；签名 1h 足够完成抽帧 + video_url = get_signed_download_url(video_storage_key, expires_seconds=3600) or public_url + logger.info("[thumbnail] 视频已上传 OSS 并生成签名 URL: key=%s", video_storage_key[:80]) except Exception as e: logger.warning("[thumbnail] 视频上传 OSS 异常: %s，降级到 ffmpeg", e) return None diff --git a/deploy/configs/.env.staging b/deploy/configs/.env.staging index 63ee299da..54aa8e2f5 100644 --- a/deploy/configs/.env.staging +++ b/deploy/configs/.env.staging @@ -280,3 +280,18 @@ USE_GPU_LIPSYNC=true GPU_LIPSYNC_POLL_INTERVAL=5 GPU_LIPSYNC_WAIT_TIMEOUT=1200 GPU_WORKER_STALE_SECONDS=300 + +# ==================== P4000 NVENC 硬件编码（GPU mezzanine relay）==================== +# 注意：这些值必须写死在模板里（不是 CI Secret），否则每次 CI 重新渲染 .env 都会被丢弃， +# 导致 staging 发版后 GPU 编码静默降级到 CPU（P0 防复发）。 +ENABLE_GPU_ENCODE=true +GPU_ENCODE_ENDPOINT=http://100.105.75.67:8900 +GPU_ENCODE_RELAY_BASE_URL=http://100.125.116.43:8092 +GPU_ENCODE_RELAY_INTERNAL_BASE_URL=http://xiaoxia-api-staging:8000 +GPU_ENCODE_RELAY_SECRET=0e1a8f0626438564a8b3fa92f3f2aac29e3c69bc02f2f85c +GPU_ENCODE_VCODEC=h264_nvenc +GPU_ENCODE_PRESET=p4 +GPU_ENCODE_CRF=23 +GPU_ENCODE_FALLBACK_CPU=true +GPU_ENCODE_MEZZANINE_TRANSPORT=relay +GPU_ENCODE_OSS_TMP_PREFIX=tmp/gpu-mezzanine/