From 05c9137eceb64b235306450328e1e1d78269c50b Mon Sep 17 00:00:00 2001 From: Audit Bot Date: Tue, 30 Jun 2026 09:56:20 +0800 Subject: [PATCH 1/2] =?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 2/2] =?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