修复回忆录图片重试状态透传与前端展示

api/services/memoir_images/storage.py

@@ -1,7 +1,11 @@
+import logging
 import os
 from urllib.parse import urlparse, urlunparse
 
 from qcloud_cos import CosConfig, CosS3Client
+from qcloud_cos.cos_exception import CosClientError, CosServiceError
+
+logger = logging.getLogger(__name__)
 
 
 def normalize_cos_base_url(base_url: str, bucket: str, region: str) -> str:
@@ -63,34 +67,114 @@ def resolve_image_storage_key(image: dict | None) -> str | None:
     return str(url).lstrip("/") or None
 
 
+def mark_image_delivery_unavailable(
+    image: dict | None,
+    *,
+    error_message: str = "image delivery unavailable",
+) -> dict:
+    normalized = dict(image or {})
+    normalized["url"] = None
+    normalized["error"] = normalized.get("error") or error_message
+    return normalized
+
+
+class CosStorageError(Exception):
+    """Base exception for COS storage operations."""
+
+    def __init__(self, message: str, *, retryable: bool = True, request_id: str = ""):
+        super().__init__(message)
+        self.retryable = retryable
+        self.request_id = request_id
+
+
+class CosUploadError(CosStorageError):
+    """Raised when put_object fails."""
+
+
+class CosDownloadUrlError(CosStorageError):
+    """Raised when generating a presigned download URL fails."""
+
+
+def _is_retryable_cos_error(exc: Exception) -> bool:
+    if isinstance(exc, CosClientError):
+        return True
+    if isinstance(exc, CosServiceError):
+        try:
+            return exc.get_status_code() >= 500
+        except Exception:
+            return True
+    return True
+
+
 class TencentCosStorageService:
     _instance: "TencentCosStorageService | None" = None
-    _instance_config: tuple[str, str, str, str, str] | None = None
+    _instance_config: tuple[str, str, str, str, str, str] | None = None
 
-    def __init__(self, secret_id: str, secret_key: str, region: str, bucket: str, base_url: str):
+    def __init__(
+        self,
+        secret_id: str,
+        secret_key: str,
+        region: str,
+        bucket: str,
+        base_url: str,
+        token: str = "",
+    ):
         self.secret_id = secret_id
         self.secret_key = secret_key
         self.bucket = bucket
         self.region = region
         self.base_url = normalize_cos_base_url(base_url, bucket=bucket, region=region)
-        config = CosConfig(Region=region, SecretId=secret_id, SecretKey=secret_key)
+        config = CosConfig(
+            Region=region,
+            SecretId=secret_id,
+            SecretKey=secret_key,
+            Token=token,
+            Scheme="https",
+        )
         self.client = CosS3Client(config)
 
     def upload_bytes(self, image_bytes: bytes, key: str, content_type: str) -> str:
-        self.client.put_object(
-            Bucket=self.bucket,
-            Body=image_bytes,
-            Key=key,
-            ContentType=content_type,
-        )
+        try:
+            response = self.client.put_object(
+                Bucket=self.bucket,
+                Body=image_bytes,
+                Key=key,
+                ContentType=content_type,
+            )
+            etag = response.get("ETag", "")
+            request_id = response.get("x-cos-request-id", "")
+            logger.info(
+                "COS upload ok: key=%s, ETag=%s, request_id=%s", key, etag, request_id
+            )
+        except (CosClientError, CosServiceError) as exc:
+            retryable = _is_retryable_cos_error(exc)
+            request_id = (
+                exc.get_request_id() if isinstance(exc, CosServiceError) else ""
+            )
+            raise CosUploadError(
+                f"COS upload failed: key={key}, error={exc}",
+                retryable=retryable,
+                request_id=request_id,
+            ) from exc
         return f"{self.base_url}/{key}"
 
     def get_download_url(self, key: str, expires: int = 3600) -> str:
-        return self.client.get_presigned_download_url(
-            Bucket=self.bucket,
-            Key=key,
-            Expired=expires,
-        )
+        try:
+            return self.client.get_presigned_download_url(
+                Bucket=self.bucket,
+                Key=key,
+                Expired=expires,
+            )
+        except (CosClientError, CosServiceError) as exc:
+            retryable = _is_retryable_cos_error(exc)
+            request_id = (
+                exc.get_request_id() if isinstance(exc, CosServiceError) else ""
+            )
+            raise CosDownloadUrlError(
+                f"COS presigned URL failed: key={key}, error={exc}",
+                retryable=retryable,
+                request_id=request_id,
+            ) from exc
 
     @classmethod
     def from_env(cls) -> "TencentCosStorageService":
@@ -100,6 +184,7 @@ class TencentCosStorageService:
             os.getenv("TENCENT_COS_REGION", ""),
             os.getenv("TENCENT_COS_BUCKET", ""),
             os.getenv("TENCENT_COS_BASE_URL", ""),
+            os.getenv("TENCENT_COS_TOKEN", ""),
         )
         if cls._instance is None or cls._instance_config != config:
             cls._instance = cls(
@@ -108,6 +193,7 @@ class TencentCosStorageService:
                 region=config[2],
                 bucket=config[3],
                 base_url=config[4],
+                token=config[5],
             )
             cls._instance_config = config
         return cls._instance