- 对齐「多智能体收敛」与「回忆录 stories-first / markdown-first」方向:收紧运行时契约、 删除过渡兼容路径与双轨逻辑,并同步更新客户端与文档。 - Chat:以 ChatOrchestrator 为实时编排入口;删除独立 conversation_agent,精简 prompts。 - Memoir:删除 memory_agent;MemoirOrchestrator、classification / story_route 与 prompts 收敛到 prepare_batches + run_story_pipeline_for_category_batch 主链路。 - 将 agents 侧 processor 迁入 feature 层为 background_runner,并移除 features 下重复/过时 processor 封装。 - 新增 history_store,强化「conversation_messages 为 DB 真源、Redis 为缓存」模型。 - 调整 models、repo、service、session_history;精简 WS message_types,重构 pipeline 与 router。 - 移除章节占位、整章再生等旧路径;章节列表与封面逻辑要求 story 关联;收紧 cover 资格与 enqueue。 - helpers、repo、service、router、reading_segment_materialize、story_pipeline_sync、pdf_service 等按 canonical markdown / cover_asset_id 收缩;删除 memoir_images/provider 等冗余。 - tasks:memoir_tasks、chapter_cover_tasks 等大幅瘦身;story_image_tasks 等与当前图片任务对齐。 - core:config、logging、redis、task_tracker 小幅调整。 - auth / user / payment / quota:路由或服务侧删减过时接口或逻辑(如 payment router 行数减少)。 - pyproject.toml、development.sh、.env.example / .env.production、README 等同步说明或变量。 - Alembic 0001_initial_schema 微调(与当前 schema 叙事一致的小改动)。 - 回忆录:types / mappers / api、章节页与 memoir 页与后端契约对齐;markdown-renderer 调整。 - 语音:删除 voice/player,voice-segment-store 相应精简。 - api/tests:删除 conftest 及绝大部分既有测试文件(websocket_baseline、conversation、memoir 图片、PDF、SMS 等),属有意收缩/待按 backend-test-system 重建的信号。 - docs:新增多智能体收敛与移除兼容层计划摘要;更新 story-first 设计、backend-test-system、 multi-agent-refactor-plan、实施总结等。 BREAKING CHANGE: 后端对外契约、回忆录章节字段与若干路由/任务行为已变更;大量 API 测试被移除, CI 若依赖这些用例需按新策略补测或调整流水线。
218 lines
6.6 KiB
Python
218 lines
6.6 KiB
Python
from urllib.parse import urlparse, urlunparse
|
|
|
|
from qcloud_cos import CosConfig, CosS3Client
|
|
from qcloud_cos.cos_exception import CosClientError, CosServiceError
|
|
|
|
from app.core.logging import get_logger
|
|
|
|
logger = get_logger(__name__)
|
|
|
|
|
|
def normalize_cos_base_url(base_url: str, bucket: str, region: str) -> str:
|
|
candidate = (base_url or "").rstrip("/")
|
|
if not candidate and bucket and region:
|
|
candidate = f"https://{bucket}.cos.{region}.myqcloud.com"
|
|
if not candidate:
|
|
return ""
|
|
|
|
parsed = urlparse(candidate)
|
|
duplicated_appid_host = f"{bucket}-appid.cos." if bucket else ""
|
|
if duplicated_appid_host and parsed.netloc.startswith(duplicated_appid_host):
|
|
parsed = parsed._replace(
|
|
netloc=parsed.netloc.replace(duplicated_appid_host, f"{bucket}.cos.", 1),
|
|
path=parsed.path.rstrip("/"),
|
|
)
|
|
return urlunparse(parsed).rstrip("/")
|
|
|
|
return candidate
|
|
|
|
|
|
def normalize_cos_url(
|
|
url: str | None, bucket: str, region: str, base_url: str | None = None
|
|
) -> str | None:
|
|
if not url:
|
|
return url
|
|
|
|
parsed = urlparse(url)
|
|
if not parsed.scheme or not parsed.netloc:
|
|
return url
|
|
|
|
normalized_base = normalize_cos_base_url(
|
|
base_url or f"{parsed.scheme}://{parsed.netloc}",
|
|
bucket=bucket,
|
|
region=region,
|
|
)
|
|
if not normalized_base:
|
|
return url
|
|
|
|
normalized_parsed = urlparse(normalized_base)
|
|
return urlunparse(
|
|
parsed._replace(
|
|
scheme=normalized_parsed.scheme, netloc=normalized_parsed.netloc
|
|
)
|
|
)
|
|
|
|
|
|
def resolve_image_storage_key(image: dict | None) -> str | None:
|
|
if not image:
|
|
return None
|
|
|
|
explicit_key = image.get("storage_key")
|
|
if explicit_key:
|
|
return explicit_key
|
|
|
|
url = image.get("url")
|
|
if not url:
|
|
return None
|
|
|
|
parsed = urlparse(url)
|
|
if parsed.scheme and parsed.netloc:
|
|
key = parsed.path.lstrip("/")
|
|
return key or 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, str] | None = None
|
|
|
|
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,
|
|
Token=token,
|
|
Scheme="https",
|
|
)
|
|
self.client = CosS3Client(config)
|
|
|
|
def upload_bytes(self, image_bytes: bytes, key: str, content_type: str) -> str:
|
|
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", "")
|
|
public_url = f"{self.base_url}/{key}"
|
|
logger.debug(
|
|
"COS upload ok: key=%s url=%s ETag=%s request_id=%s bytes=%s",
|
|
key,
|
|
public_url,
|
|
etag,
|
|
request_id,
|
|
len(image_bytes),
|
|
)
|
|
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 public_url
|
|
|
|
def get_download_url(self, key: str, expires: int = 3600) -> str:
|
|
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_settings(cls, settings) -> "TencentCosStorageService":
|
|
config = (
|
|
getattr(settings, "tencent_cos_secret_id", "") or "",
|
|
getattr(settings, "tencent_cos_secret_key", "") or "",
|
|
getattr(settings, "tencent_cos_region", "") or "",
|
|
getattr(settings, "tencent_cos_bucket", "") or "",
|
|
getattr(settings, "tencent_cos_base_url", "") or "",
|
|
getattr(settings, "tencent_cos_token", "") or "",
|
|
)
|
|
if cls._instance is None or cls._instance_config != config:
|
|
cls._instance = cls(
|
|
secret_id=config[0],
|
|
secret_key=config[1],
|
|
region=config[2],
|
|
bucket=config[3],
|
|
base_url=config[4],
|
|
token=config[5],
|
|
)
|
|
cls._instance_config = config
|
|
return cls._instance
|
|
|
|
@classmethod
|
|
def from_env(cls) -> "TencentCosStorageService":
|
|
from app.core.config import settings
|
|
|
|
return cls.from_settings(settings)
|