xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 16 Pull Requests 9 Actions 34.2k Packages Projects Releases 7 Wiki Activity

style: auto-format with black + isort + ruff + prettier [skip ci-format-check]
CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped
Details
CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 1s
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 2s
Details
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped
Details
CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
Details
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 33s
Details
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 35s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m44s
Details
PR Automation / Auto Approve on CI Green (pull_request) Successful in 2m58s
Details
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 3m46s
Details
CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled
Details
CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled
Details
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled
Details
CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled
Details
CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled
Details
CI/CD Pipeline / CI Gate (pull_request) Has been cancelled
Details
CI/CD Pipeline / Validate - Style (pull_request) Has been cancelled
Details
CI/CD Pipeline / Validate - Security (pull_request) Has been cancelled
Details
CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled
Details
AI Code Review / AI Code Review (pull_request) Has been cancelled
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Has been cancelled
Details
Preview Deploy / Deploy Preview Environment (pull_request) Has been cancelled
Details

Browse Source
This commit is contained in:
CI Bot
2026-09-28 02:58:00 +00:00
parent 6a61a0e97f
commit f36f37c325
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/worker/video_processing/oss_helpers.py
+23 -14
View File
@@ -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,