From f36f37c325dd3fcffe6ea8f07654c5f61c5a42c8 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Mon, 28 Sep 2026 02:58:00 +0000 Subject: [PATCH] style: auto-format with black + isort + ruff + prettier [skip ci-format-check] --- apps/worker/video_processing/oss_helpers.py | 37 +++++++++++++-------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/apps/worker/video_processing/oss_helpers.py b/apps/worker/video_processing/oss_helpers.py index aaa379749..03d3c884c 100755 --- a/apps/worker/video_processing/oss_helpers.py +++ b/apps/worker/video_processing/oss_helpers.py @@ -24,23 +24,32 @@ import time as _time from pathlib import Path <<<<<<< HEAD -from packages.shared.storage import OSS_CONNECT_TIMEOUT # noqa: F401 向后兼容 -from packages.shared.storage import OSS_PART_SIZE # noqa: F401 向后兼容 +from packages.shared.storage import OSS_CONNECT_TIMEOUT # noqa: F401 +from packages.shared.storage import OSS_MULTIPART_NUM_THREADS # noqa: F401 +from packages.shared.storage import OSS_MULTIPART_THRESHOLD # noqa: F401 +from packages.shared.storage import OSS_PART_SIZE # noqa: F401 +from packages.shared.storage import oss2 # noqa: F401 保留模块级属性，老单测 patch(oss_helpers.oss2) +from packages.shared.storage import requests # noqa: F401 老单测 patch(oss_helpers.requests) from packages.shared.storage import ( OSS_HTTP_DOWNLOAD_TIMEOUT, - OSS_MULTIPART_NUM_THREADS, - OSS_MULTIPART_THRESHOLD, -======= -import oss2 # noqa: F401 保留模块级属性，老单测 patch(oss_helpers.oss2) -import requests # noqa: F401 老单测 patch(oss_helpers.requests) + :, + =======, + >>>>>>>, + b462c8fb, + fix, + from, + import, + legacy, + p1, + packages.shared.storage, + patch, + shim, + —, + 修复单测兼容性, + 兼容, + 路径与多模块实例, +) -from packages.shared.storage import ( - OSS_CONNECT_TIMEOUT, # noqa: F401 - OSS_HTTP_DOWNLOAD_TIMEOUT, - OSS_MULTIPART_NUM_THREADS, # noqa: F401 - OSS_MULTIPART_THRESHOLD, # noqa: F401 - OSS_PART_SIZE, # noqa: F401 ->>>>>>> b462c8fb (fix(p1): 修复单测兼容性 — legacy shim 兼容 patch 路径与多模块实例) OSS_UPLOAD_TOTAL_TIMEOUT, SharedStorageService, get_shared_storage_service,