From b98c83582b6bbe1128044b14ea3d03e44c3bebd2 Mon Sep 17 00:00:00 2001 From: Audit Bot Date: Mon, 29 Jun 2026 22:11:22 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6=E4=BB=8E=20800MB=20?= =?UTF-8?q?=E6=8F=90=E5=8D=87=E8=87=B3=202000MB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit P0 修复: - config.py: OSS_DIRECT_UPLOAD_MAX_MB 默认值从 800 改为 2000 - config.py: 添加 AliasChoices 支持 MAX_UPLOAD_SIZE_MB 环境变量 （.env.production 中 MAX_UPLOAD_SIZE_MB=2000 现在可被正确读取） P1 修复: - infra/nginx/xiaoxia-saas.conf: client_max_body_size 800m → 2g（3处） - infra/docker/nginx-production.conf: client_max_body_size 800m → 2g --- apps/api/app/config.py | 7 +++++-- infra/docker/nginx-production.conf | 2 +- infra/nginx/xiaoxia-saas.conf | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/api/app/config.py b/apps/api/app/config.py index 811decbcc..00f6c9b92 100755 --- a/apps/api/app/config.py +++ b/apps/api/app/config.py @@ -1,7 +1,7 @@ import os from typing import Optional -from pydantic import field_validator +from pydantic import AliasChoices, Field, field_validator from pydantic_settings import BaseSettings, SettingsConfigDict @@ -83,7 +83,10 @@ class Settings(BaseSettings): OSS_ACCESS_KEY_ID: str = "" OSS_ACCESS_KEY_SECRET: str = "" OSS_BUCKET_NAME: str = "xiaoxia-autocut" - OSS_DIRECT_UPLOAD_MAX_MB: int = 800 + OSS_DIRECT_UPLOAD_MAX_MB: int = Field( + default=2000, + validation_alias=AliasChoices("OSS_DIRECT_UPLOAD_MAX_MB", "MAX_UPLOAD_SIZE_MB"), + ) OSS_DIRECT_UPLOAD_EXPRESS_SECRET: int = 900 LOG_LEVEL: str = "INFO" diff --git a/infra/docker/nginx-production.conf b/infra/docker/nginx-production.conf index 3b07b0be7..c13b9e0a4 100644 --- a/infra/docker/nginx-production.conf +++ b/infra/docker/nginx-production.conf @@ -8,7 +8,7 @@ server { gzip_vary on; gzip_min_length 1024; gzip_types text/plain text/css text/xml text/javascript application/javascript application/json application/xml+rss; - client_max_body_size 800m; + client_max_body_size 2g; location /api/ { proxy_pass http://xiaoxia-api-production:8000/api/; diff --git a/infra/nginx/xiaoxia-saas.conf b/infra/nginx/xiaoxia-saas.conf index c1996de6b..969caf864 100644 --- a/infra/nginx/xiaoxia-saas.conf +++ b/infra/nginx/xiaoxia-saas.conf @@ -28,7 +28,7 @@ server { include /etc/letsencrypt/options-ssl-nginx.conf; ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; - client_max_body_size 800m; + client_max_body_size 2g; location / { proxy_pass http://127.0.0.1:3002/; @@ -51,7 +51,7 @@ server { include /etc/letsencrypt/options-ssl-nginx.conf; ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; - client_max_body_size 800m; + client_max_body_size 2g; location /api/ { proxy_pass http://127.0.0.1:8001; @@ -112,7 +112,7 @@ server { include /etc/letsencrypt/options-ssl-nginx.conf; ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; - client_max_body_size 800m; + client_max_body_size 2g; location / { proxy_pass http://127.0.0.1:3000/; -- 2.54.0 From b5e27a5e9e9871f69e9032f04bd62e63ef3c3a4a Mon Sep 17 00:00:00 2001 From: Audit Bot Date: Mon, 29 Jun 2026 22:13:08 +0800 Subject: [PATCH 2/7] feat(assets): add 2GB file size validation and OSS direct upload for large files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add MAX_FILE_SIZE (2GB) validation in handleUpload with friendly error message - Route files >100MB through OSS presigned direct upload (uploadAssetDirect) - Keep small file form upload (uploadAsset) for files <=100MB - Update upload hint text to show '单文件不超过 2GB' limit - Add directUploadMutation with proper loading state tracking Co-Authored-By: Claude Fable 5 --- apps/web/src/pages/assets/AssetLibrary.tsx | 53 ++++++++++++++++++---- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/apps/web/src/pages/assets/AssetLibrary.tsx b/apps/web/src/pages/assets/AssetLibrary.tsx index 173f620b4..a11472957 100644 --- a/apps/web/src/pages/assets/AssetLibrary.tsx +++ b/apps/web/src/pages/assets/AssetLibrary.tsx @@ -37,12 +37,18 @@ import { getAssets, deleteAsset, uploadAsset, + uploadAssetDirect, } from '@/api/assets'; import { getOrCreateDefaultProject } from '@/api/projects'; const { Title, Text } = Typography; const { Dragger } = Upload; +/** 最大文件大小：2GB */ +const MAX_FILE_SIZE = 2 * 1024 * 1024 * 1024; // 2147483648 bytes +/** 大文件阈值：100MB，超过此值走 OSS 直传通道 */ +const LARGE_FILE_THRESHOLD = 100 * 1024 * 1024; // 104857600 bytes + /** 素材库类型图标 */ const KindIcon: React.FC<{ kind: string }> = ({ kind }) => { switch (kind) { @@ -99,7 +105,7 @@ const AssetLibrary: React.FC = () => { onError: (err: any) => { if (!err?.__msgShown) message.error('创建失败') }, }); - // 上传素材 + // 上传素材（小文件表单上传） const uploadMutation = useMutation({ mutationFn: uploadAsset, onSuccess: () => { @@ -110,6 +116,17 @@ const AssetLibrary: React.FC = () => { onError: (err: any) => { if (!err?.__msgShown) message.error('上传失败') }, }); + // 大文件直传（OSS 预签名） + const directUploadMutation = useMutation({ + mutationFn: uploadAssetDirect, + onSuccess: () => { + message.success('上传成功'); + queryClient.invalidateQueries({ queryKey: ['assets', activeLibrary] }); + queryClient.invalidateQueries({ queryKey: ['asset-libraries'] }); + }, + onError: (err: any) => { if (!err?.__msgShown) message.error('上传失败') }, + }); + // 删除素材 const deleteMutation = useMutation({ mutationFn: deleteAsset, @@ -127,16 +144,32 @@ const AssetLibrary: React.FC = () => { message.warning('请先选择素材库'); return false; } + + // 文件大小校验：上限 2GB + if (file.size > MAX_FILE_SIZE) { + message.error('文件大小不能超过 2GB'); + return false; + } + setUploading(true); try { - const project = await getOrCreateDefaultProject(); - const formData = new FormData(); - formData.append('file', file); - formData.append('library_id', activeLibrary); - formData.append('project_id', project.id); - await uploadMutation.mutateAsync(formData); + if (file.size > LARGE_FILE_THRESHOLD) { + // 大文件（>100MB）走 OSS 预签名直传通道 + await directUploadMutation.mutateAsync({ + file, + library_id: activeLibrary, + }); + } else { + // 小文件走表单上传 + const project = await getOrCreateDefaultProject(); + const formData = new FormData(); + formData.append('file', file); + formData.append('library_id', activeLibrary); + formData.append('project_id', project.id); + await uploadMutation.mutateAsync(formData); + } } catch { - // uploadMutation.onError 已处理错误提示 + // mutation.onError 已处理错误提示 } finally { setUploading(false); } @@ -216,7 +249,7 @@ const AssetLibrary: React.FC = () => { beforeUpload={handleUpload} showUploadList={false} multiple - disabled={uploading || uploadMutation.isPending} + disabled={uploading || uploadMutation.isPending || directUploadMutation.isPending} style={{ marginBottom: 24 }} >

@@ -226,7 +259,7 @@ const AssetLibrary: React.FC = () => { {uploading ? '正在上传，请稍候...' : '点击或拖拽文件到此区域上传'}

- 支持 {kindLabel[currentLib?.kind || 'video']} 格式文件 + 支持 {kindLabel[currentLib?.kind || 'video']} 格式文件，单文件不超过 2GB

)} -- 2.54.0 From 304354208a319c80cd601cf02bdb2504d79d1e7f Mon Sep 17 00:00:00 2001 From: Audit Bot Date: Tue, 30 Jun 2026 00:07:27 +0800 Subject: [PATCH 3/7] fix(assets): add project_id to OSS direct upload and align size limit to 2048MB P1: prepareDirectUpload and completeDirectUpload now require project_id, uploadAssetDirect calls getOrCreateDefaultProject() to obtain it automatically. P2: MAX_FILE_SIZE changed from 2*1024^3 to 2048*1024*1024 to align with backend OSS_DIRECT_UPLOAD_MAX_MB=2000. --- apps/web/src/api/assets.ts | 7 +++++++ apps/web/src/pages/assets/AssetLibrary.tsx | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/web/src/api/assets.ts b/apps/web/src/api/assets.ts index b95c736fb..d68bd13af 100644 --- a/apps/web/src/api/assets.ts +++ b/apps/web/src/api/assets.ts @@ -154,6 +154,7 @@ export const uploadAsset = async ( /** 预签名直传准备 */ export const prepareDirectUpload = async (data: { + project_id: string; library_id: string; filename: string; content_type: string; @@ -172,6 +173,7 @@ export const prepareDirectUpload = async (data: { /** 直传完成确认 */ export const completeDirectUpload = async (data: { + project_id: string; library_id: string; storage_key: string; }): Promise<{ storage_key: string; ingest_job_id: string }> => { @@ -184,7 +186,11 @@ export const uploadAssetDirect = async (data: { file: File; library_id: string; }): Promise<{ storage_key: string; ingest_job_id: string }> => { + // 后端要求 project_id，前端自动获取默认项目 + const project = await getOrCreateDefaultProject(); + const prepared = await prepareDirectUpload({ + project_id: project.id, library_id: data.library_id, filename: data.file.name, content_type: data.file.type || 'application/octet-stream', @@ -206,6 +212,7 @@ export const uploadAssetDirect = async (data: { } return completeDirectUpload({ + project_id: project.id, library_id: data.library_id, storage_key: prepared.storage_key, }); diff --git a/apps/web/src/pages/assets/AssetLibrary.tsx b/apps/web/src/pages/assets/AssetLibrary.tsx index a11472957..f764f3a1e 100644 --- a/apps/web/src/pages/assets/AssetLibrary.tsx +++ b/apps/web/src/pages/assets/AssetLibrary.tsx @@ -44,8 +44,8 @@ import { getOrCreateDefaultProject } from '@/api/projects'; const { Title, Text } = Typography; const { Dragger } = Upload; -/** 最大文件大小：2GB */ -const MAX_FILE_SIZE = 2 * 1024 * 1024 * 1024; // 2147483648 bytes +/** 最大文件大小：2048MB（与后端 OSS_DIRECT_UPLOAD_MAX_MB=2000 对齐，留少量余量） */ +const MAX_FILE_SIZE = 2048 * 1024 * 1024; // 2147483648 bytes /** 大文件阈值：100MB，超过此值走 OSS 直传通道 */ const LARGE_FILE_THRESHOLD = 100 * 1024 * 1024; // 104857600 bytes -- 2.54.0 From d934e0e322592e3ee3dd89fd9d44ab1519c84816 Mon Sep 17 00:00:00 2001 From: CI Test Date: Tue, 30 Jun 2026 06:58:48 +0800 Subject: [PATCH 4/7] chore(ci): add automatic Docker image cleanup after builds - Add scripts/cleanup_old_images.sh: keeps only last 2 versions per service (api/worker/web), removes old local tags and registry blobs via Registry API, prunes dangling images - Add cleanup step to deploy.yml build-production-runtime-images job with if:always() to ensure cleanup runs even on build failure - Prevents disk space exhaustion from accumulated Docker images and Registry blobs on the build server --- .gitea/workflows/deploy.yml | 15 +++++++++ scripts/cleanup_old_images.sh | 63 +++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100755 scripts/cleanup_old_images.sh diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 588a03f98..24ebf8a13 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -169,6 +169,21 @@ jobs: scp -i "$key_path" "dist/release-artifacts/xiaoxia-web-${GITHUB_REF_NAME}.tar" \ "$production_user@$production_host:/var/lib/xiaoxia-saas-production/web-${GITHUB_REF_NAME}.tar" + - name: Cleanup old Docker images + if: always() + shell: sh + run: | + set -eu + if [ -f scripts/cleanup_old_images.sh ]; then + chmod +x scripts/cleanup_old_images.sh + scripts/cleanup_old_images.sh + else + echo "Cleanup script not found, doing basic prune..." + docker image prune -f 2>/dev/null || true + fi + echo "Disk usage after cleanup:" + df -h / | tail -1 + deploy-production: name: Deploy Production runs-on: runtime-builder:host diff --git a/scripts/cleanup_old_images.sh b/scripts/cleanup_old_images.sh new file mode 100755 index 000000000..e3499f685 --- /dev/null +++ b/scripts/cleanup_old_images.sh @@ -0,0 +1,63 @@ +#!/bin/sh +# cleanup_old_images.sh +# 清理构建服务器上的旧 Docker 镜像和 Registry 旧版本 +# 保留最近 KEEP_VERSIONS 个版本（默认 2） +# 在 CI 构建完成后调用，防止磁盘空间耗尽 +set -eu + +KEEP_VERSIONS="${KEEP_VERSIONS:-2}" +REGISTRY_HOST="${REGISTRY_HOST:-172.30.18.198:5000}" +SERVICES="xiaoxia-saas-api xiaoxia-saas-worker xiaoxia-saas-web" + +echo "=== Docker Image Cleanup ===" +echo "Keeping last ${KEEP_VERSIONS} versions per service" +echo "" + +for svc in $SERVICES; do + # 收集所有 v0.N.N 格式的版本号（去重，按版本号排序） + versions=$(docker images --format "{{.Repository}}:{{.Tag}}" | \ + grep "${svc}" | \ + grep -E "v[0-9]+\.[0-9]+\.[0-9]+" | \ + sed -E "s/.*:${svc}:(v[0-9]+\.[0-9]+\.[0-9]+).*/\1/" | \ + sed -E "s/.*:v([0-9]+\.[0-9]+\.[0-9]+).*/v\1/" | \ + sort -t. -k1,1V -k2,2n -k3,3n | \ + uniq) + + total=$(echo "$versions" | grep -c "^v" || true) + + if [ "$total" -gt "$KEEP_VERSIONS" ]; then + remove_count=$((total - KEEP_VERSIONS)) + to_remove=$(echo "$versions" | head -n "$remove_count") + + echo "[Registry] Cleaning old blobs for ${svc}..." + for ver in $to_remove; do + repo_name=$(echo "$svc" | sed "s/xiaoxia-saas-//") + manifest_url="http://admin:Xiaoxia2026@localhost:5000/v2/${repo_name}/manifests/${ver}" + digest=$(curl -sI -H "Accept: application/vnd.docker.distribution.manifest.v2+json" "$manifest_url" | grep -i "^docker-content-digest:" | tr -d "\r" | awk "{print \$2}") + if [ -n "$digest" ]; then + curl -s -X DELETE -H "Accept: application/vnd.docker.distribution.manifest.v2+json" "http://admin:Xiaoxia2026@localhost:5000/v2/${repo_name}/manifests/${digest}" > /dev/null 2>&1 || true + echo " Deleted registry tag: ${svc}:${ver}" + fi + done + + echo "[Local] Removing old local images for ${svc}..." + for ver in $to_remove; do + docker rmi "${svc}:${ver}" 2>/dev/null && echo " Removed local: ${svc}:${ver}" || true + docker rmi "${REGISTRY_HOST}/${svc}:${ver}" 2>/dev/null && echo " Removed registry-ref: ${REGISTRY_HOST}/${svc}:${ver}" || true + done + else + echo "[${svc}] ${total} version(s) found, within keep limit (${KEEP_VERSIONS})" + fi + echo "" +done + +# 清理悬空镜像（构建中间层） +echo "=== Pruning dangling images ===" +pruned=$(docker image prune -f 2>&1) +echo "$pruned" | tail -1 + +# 清理 dev 标签的旧层（dev 标签会被下次构建覆盖） +echo "" +echo "=== Cleanup complete ===" +echo "Current images:" +docker images --format "table {{.Repository}}\t{{.Tag}}\t{{.Size}}" | grep -E "(xiaoxia|REPOSITORY)" || true -- 2.54.0 From e6ecce79ee6d90420a409442d0d90a9469dfe151 Mon Sep 17 00:00:00 2001 From: Audit Bot Date: Tue, 30 Jun 2026 09:24:27 +0800 Subject: [PATCH 5/7] fix: rename OSS_DIRECT_UPLOAD_EXPRESS_SECRET to OSS_DIRECT_UPLOAD_EXPIRE_SECONDS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Root cause of upload endpoint 500 errors: - config.py defined OSS_DIRECT_UPLOAD_EXPRESS_SECRET (wrong name) - upload.py accessed settings.OSS_DIRECT_UPLOAD_EXPIRE_SECONDS (correct name) - AttributeError on every call to prepare_direct_upload → 500 This fixes both /api/v1/upload/prepare-direct-upload and any other upload endpoints that reference the expire seconds config. --- apps/api/app/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/api/app/config.py b/apps/api/app/config.py index 00f6c9b92..778492c04 100755 --- a/apps/api/app/config.py +++ b/apps/api/app/config.py @@ -87,7 +87,7 @@ class Settings(BaseSettings): default=2000, validation_alias=AliasChoices("OSS_DIRECT_UPLOAD_MAX_MB", "MAX_UPLOAD_SIZE_MB"), ) - OSS_DIRECT_UPLOAD_EXPRESS_SECRET: int = 900 + OSS_DIRECT_UPLOAD_EXPIRE_SECONDS: int = 900 LOG_LEVEL: str = "INFO" CORS_ORIGINS_RAW: str = ( -- 2.54.0 From 05c9137eceb64b235306450328e1e1d78269c50b Mon Sep 17 00:00:00 2001 From: Audit Bot Date: Tue, 30 Jun 2026 09:56:20 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E4=B8=8A=E4=BC=A0=E7=AB=AF=E7=82=B9?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=20+=20OSS=20=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E8=83=BD=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 问题：PR#119 修复变量名后上传端点仍然 500，说明根因不仅是变量名错误 修复： 1. upload.py — 所有 3 个上传端点添加完整异常捕获和日志 - prepare_direct_upload: 捕获 RuntimeError→503 + 其他异常→500+日志 - complete_direct_upload: file_exists() 异常捕获→503（之前未捕获→500） - upload_asset: upload_file() 异常捕获→503/500+日志（之前未捕获→500） 2. storage.py — OSSStorageService.__init__ 添加启动诊断日志 - 凭证缺失时记录 missing env vars - oss2 SDK 未安装时记录错误 - bucket 初始化成功/失败时记录 3. health.py — /ready 端点增加 OSS 检查 - 检查凭证是否配置 - 检查 oss2 SDK 是否可用 - 调用 get_bucket_info() 验证连通性 部署后请调用 GET /api/v1/ready 查看 OSS 状态 --- apps/api/app/api/routes/health.py | 33 +++++++++++++++++++++++++ apps/api/app/api/routes/upload.py | 40 +++++++++++++++++++++++++----- apps/api/app/core/storage.py | 41 +++++++++++++++++++++++-------- 3 files changed, 98 insertions(+), 16 deletions(-) diff --git a/apps/api/app/api/routes/health.py b/apps/api/app/api/routes/health.py index bb85ff5c7..d305d614b 100644 --- a/apps/api/app/api/routes/health.py +++ b/apps/api/app/api/routes/health.py @@ -24,6 +24,7 @@ async def readiness_check(): checks = { "database": await _check_database(), "redis": await _check_redis(), + "oss": _check_oss(), } all_healthy = all(check["status"] == "healthy" for check in checks.values()) response = { @@ -97,6 +98,38 @@ async def _check_redis() -> dict: } +def _check_oss() -> dict: + try: + from app.core.storage import get_storage_service + + svc = get_storage_service() + if not svc.access_key_id or not svc.access_key_secret: + return { + "status": "unhealthy", + "type": "oss", + "message": "OSS credentials not configured (OSS_ACCESS_KEY_ID / OSS_ACCESS_KEY_SECRET missing)", + } + if svc.bucket is None: + return { + "status": "unhealthy", + "type": "oss", + "message": "OSS SDK (oss2) not installed or bucket client init failed", + } + # Try a lightweight OSS API call to verify connectivity & credentials + svc.bucket.get_bucket_info() + return { + "status": "healthy", + "type": "oss", + "message": f"OSS connected: endpoint={svc.endpoint} bucket={svc.bucket_name}", + } + except Exception as error: + return { + "status": "unhealthy", + "type": "oss", + "message": f"OSS check failed: {type(error).__name__}: {error}", + } + + async def _check_migrations() -> dict: if settings.USE_IN_MEMORY_DB: return { diff --git a/apps/api/app/api/routes/upload.py b/apps/api/app/api/routes/upload.py index 8220b77a8..14e5420ec 100644 --- a/apps/api/app/api/routes/upload.py +++ b/apps/api/app/api/routes/upload.py @@ -1,3 +1,4 @@ +import logging from typing import Any from uuid import uuid4 @@ -24,6 +25,8 @@ from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFile, s from packages.application import GetProjectUseCase, SubmitIngestJobCommand, SubmitIngestJobUseCase +logger = logging.getLogger(__name__) + router = APIRouter() # 允许上传的文件 MIME 类型 @@ -131,7 +134,14 @@ async def prepare_direct_upload( expires_seconds=settings.OSS_DIRECT_UPLOAD_EXPIRE_SECONDS, ) except RuntimeError as error: + logger.error("OSS not configured for direct upload prepare: %s", error) raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail=str(error)) from error + except Exception as error: + logger.exception("Unexpected error in direct upload prepare: %s", error) + raise HTTPException( + status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, + detail=f"Failed to prepare upload: {type(error).__name__}", + ) from error return DirectUploadPrepareResponse( upload_url=str(payload["url"]), @@ -162,7 +172,15 @@ async def complete_direct_upload( normalized_key = storage_service._normalize_storage_key(request.storage_key) if not normalized_key.startswith("uploads/"): raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invalid upload key") - if not storage_service.file_exists(normalized_key): + try: + file_exists = storage_service.file_exists(normalized_key) + except Exception as error: + logger.exception("OSS error checking file existence for key=%s: %s", normalized_key, error) + raise HTTPException( + status_code=status.HTTP_503_SERVICE_UNAVAILABLE, + detail="Storage service unavailable", + ) from error + if not file_exists: raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Uploaded file not found") job = _submit_ingest_job( @@ -201,11 +219,21 @@ async def upload_asset( safe_filename = file.filename.replace("/", "_").replace("\\", "_") if file.filename else "unknown" storage_key = f"uploads/{file_id}/{safe_filename}" - file_url = storage_service.upload_file( - file.file, - storage_key, - content_type=validated_content_type, - ) + try: + file_url = storage_service.upload_file( + file.file, + storage_key, + content_type=validated_content_type, + ) + except RuntimeError as error: + logger.error("OSS not configured for upload: %s", error) + raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail=str(error)) from error + except Exception as error: + logger.exception("Unexpected error uploading file to OSS: %s", error) + raise HTTPException( + status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, + detail=f"Failed to upload file: {type(error).__name__}", + ) from error job = _submit_ingest_job( project_id=project_id, diff --git a/apps/api/app/core/storage.py b/apps/api/app/core/storage.py index 868334efb..094c3bea8 100644 --- a/apps/api/app/core/storage.py +++ b/apps/api/app/core/storage.py @@ -28,17 +28,38 @@ class OSSStorageService: self.local_url_prefix = os.getenv("GENERATED_FILES_URL_PREFIX", "/generated-files") self.bucket = None - if settings.OSS_ACCESS_KEY_ID and settings.OSS_ACCESS_KEY_SECRET: + has_key_id = bool(settings.OSS_ACCESS_KEY_ID) + has_key_secret = bool(settings.OSS_ACCESS_KEY_SECRET) + + if has_key_id and has_key_secret: if oss2 is not None: - auth = oss2.Auth( - settings.OSS_ACCESS_KEY_ID, - settings.OSS_ACCESS_KEY_SECRET, - ) - self.bucket = oss2.Bucket( - auth, - settings.OSS_ENDPOINT, - settings.OSS_BUCKET_NAME, - ) + try: + auth = oss2.Auth( + settings.OSS_ACCESS_KEY_ID, + settings.OSS_ACCESS_KEY_SECRET, + ) + self.bucket = oss2.Bucket( + auth, + settings.OSS_ENDPOINT, + settings.OSS_BUCKET_NAME, + ) + logger.info( + "OSS initialized: endpoint=%s bucket=%s", + settings.OSS_ENDPOINT, + settings.OSS_BUCKET_NAME, + ) + except Exception as error: + logger.error("Failed to initialize OSS bucket client: %s", error) + else: + logger.error("oss2 SDK is not installed — OSS operations will fail") + else: + missing = [] + if not has_key_id: + missing.append("OSS_ACCESS_KEY_ID") + if not has_key_secret: + missing.append("OSS_ACCESS_KEY_SECRET") + logger.error("OSS credentials not configured — missing: %s", ", ".join(missing)) + self.access_key_id = settings.OSS_ACCESS_KEY_ID self.access_key_secret = settings.OSS_ACCESS_KEY_SECRET self.endpoint = settings.OSS_ENDPOINT -- 2.54.0 From 37152a0729f60a793e89173a8a227611760b3d96 Mon Sep 17 00:00:00 2001 From: Audit Bot Date: Tue, 30 Jun 2026 10:14:08 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20list=5Fby=5Fproject=20=E2=86=92=20fi?= =?UTF-8?q?nd=5Fby=5Fproject=20(=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0/?= =?UTF-8?q?=E8=AF=8A=E6=96=AD=E7=AB=AF=E7=82=B9=20500)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 根因：upload.py、chunked_upload.py、asset_diagnosis.py 调用了 asset_library_repository.list_by_project()，但 SQLAlchemy 实现 只有 find_by_project()，导致 AttributeError → 500。 同步修复 InMemory 实现的方法名以保持一致。 --- apps/api/app/api/routes/asset_diagnosis.py | 2 +- apps/api/app/api/routes/chunked_upload.py | 2 +- apps/api/app/api/routes/upload.py | 2 +- packages/adapters/in_memory/asset_library_repository.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/api/app/api/routes/asset_diagnosis.py b/apps/api/app/api/routes/asset_diagnosis.py index 76fd75967..74b09af61 100644 --- a/apps/api/app/api/routes/asset_diagnosis.py +++ b/apps/api/app/api/routes/asset_diagnosis.py @@ -202,7 +202,7 @@ def get_project_asset_diagnosis( if project is None: raise HTTPException(status_code=404, detail=f"Project {project_id} not found") - libraries = asset_library_repository.list_by_project(project_id) + libraries = asset_library_repository.find_by_project(project_id) assets: list[Asset] = [] for library in libraries: assets.extend(asset_repository.list_by_library(library.id)) diff --git a/apps/api/app/api/routes/chunked_upload.py b/apps/api/app/api/routes/chunked_upload.py index d2ee4c957..4e06b83d7 100644 --- a/apps/api/app/api/routes/chunked_upload.py +++ b/apps/api/app/api/routes/chunked_upload.py @@ -101,7 +101,7 @@ def _require_project_and_library( if project is None: raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found") - libraries = asset_library_repository.list_by_project(project_id) + libraries = asset_library_repository.find_by_project(project_id) if not any(item.id == library_id for item in libraries): raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Asset library not found") diff --git a/apps/api/app/api/routes/upload.py b/apps/api/app/api/routes/upload.py index 14e5420ec..8001d705d 100644 --- a/apps/api/app/api/routes/upload.py +++ b/apps/api/app/api/routes/upload.py @@ -73,7 +73,7 @@ def _require_project_and_library( if project is None: raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found") - libraries = asset_library_repository.list_by_project(project_id) + libraries = asset_library_repository.find_by_project(project_id) if not any(item.id == library_id for item in libraries): raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Asset library not found") diff --git a/packages/adapters/in_memory/asset_library_repository.py b/packages/adapters/in_memory/asset_library_repository.py index 1c218e805..361938881 100644 --- a/packages/adapters/in_memory/asset_library_repository.py +++ b/packages/adapters/in_memory/asset_library_repository.py @@ -16,7 +16,7 @@ class InMemoryAssetLibraryRepository: def get(self, library_id: str) -> AssetLibrary | None: return self._libraries.get(library_id) - def list_by_project(self, project_id: str, kind: AssetLibraryKind | None = None) -> list[AssetLibrary]: + def find_by_project(self, project_id: str, kind: AssetLibraryKind | None = None) -> list[AssetLibrary]: items = [library for library in self._libraries.values() if library.project_id == project_id] if kind is not None: items = [library for library in items if library.kind == kind] -- 2.54.0