a101b2170b
Deploy / Build Production Runtime Images (push) Has been skipped
Deploy / Deploy Production (push) Has been skipped
Deploy / Production Browser E2E (push) Has been skipped
Deploy / Staging E2E Tests (push) Failing after 91h12m12s
Deploy / Deploy Staging (push) Failing after 91h14m15s
CI/CD Pipeline / Frontend Lint (push) Failing after 91h14m23s
CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 91h14m23s
根因:SQLAlchemy Column(String(20)) 读出的是纯 str, _model_to_entity 直接传给 domain 实体后,路由层 job.status.value 抛 AttributeError(str 没有 .value 属性)→ 500。 修复 3 个缺失枚举转换的仓储: - tts_job_repository: status=TTSJobStatus(model.status) - voice_clone_profile_repository: status=VoiceCloneStatus(model.status) - generation_task_repository: status=GenerationTaskStatus(model.status) 已有正确转换的仓储(edit_plan/edit_plan_clip/edit_template/ asset/job/ingest_job)不受影响。 新增 22 个单测覆盖: - 所有 StrEnum status 值的枚举转换验证 - .value 属性可正常访问(不再 AttributeError) - 字符串兼容性比较仍然有效 - 已有正确仓储的回归测试 全量 896 单测全绿。 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
128 lines
5.0 KiB
Python
128 lines
5.0 KiB
Python
from sqlalchemy.orm import Session
|
|
|
|
from packages.adapters.sqlalchemy_impl.models import GenerationTaskModel
|
|
from packages.domain import GenerationTask
|
|
from packages.domain.generation_task import GenerationTaskStatus
|
|
|
|
|
|
def _to_domain(model: GenerationTaskModel) -> GenerationTask:
|
|
"""Convert ORM model to domain entity."""
|
|
return GenerationTask(
|
|
id=model.id,
|
|
project_id=model.project_id,
|
|
strategy_id=model.strategy_id,
|
|
asset_library_id=model.asset_library_id,
|
|
voice_library_id=model.voice_library_id,
|
|
template_id=model.template_id,
|
|
asset_ids=list(model.asset_ids or []),
|
|
title_ids=list(model.title_ids or []),
|
|
voice_ids=list(model.voice_ids or []),
|
|
status=GenerationTaskStatus(model.status) if model.status else GenerationTaskStatus.PENDING,
|
|
progress=model.progress,
|
|
result_count=int(model.result_count or 0),
|
|
error_message=model.error_message,
|
|
started_at=model.started_at,
|
|
completed_at=model.completed_at,
|
|
created_by_user_id=model.created_by_user_id,
|
|
source_edit_plan_id=model.source_edit_plan_id or "",
|
|
created_at=model.created_at,
|
|
)
|
|
|
|
|
|
class SQLAlchemyGenerationTaskRepository:
|
|
def __init__(self, session: Session):
|
|
self.session = session
|
|
|
|
def create(self, task: GenerationTask) -> GenerationTask:
|
|
model = GenerationTaskModel(
|
|
id=task.id,
|
|
project_id=task.project_id,
|
|
strategy_id=task.strategy_id,
|
|
asset_library_id=task.asset_library_id,
|
|
voice_library_id=task.voice_library_id,
|
|
template_id=task.template_id,
|
|
asset_ids=task.asset_ids,
|
|
title_ids=task.title_ids,
|
|
voice_ids=task.voice_ids,
|
|
status=task.status,
|
|
progress=task.progress,
|
|
result_count=task.result_count,
|
|
error_message=task.error_message,
|
|
started_at=task.started_at,
|
|
completed_at=task.completed_at,
|
|
created_by_user_id=task.created_by_user_id,
|
|
source_edit_plan_id=task.source_edit_plan_id or None,
|
|
created_at=task.created_at,
|
|
)
|
|
self.session.add(model)
|
|
self.session.commit()
|
|
return task
|
|
|
|
def get(self, task_id: str) -> GenerationTask | None:
|
|
model = self.session.query(GenerationTaskModel).filter(GenerationTaskModel.id == task_id).first()
|
|
if model is None:
|
|
return None
|
|
return _to_domain(model)
|
|
|
|
def list_by_project(self, project_id: str) -> list[GenerationTask]:
|
|
models = (
|
|
self.session.query(GenerationTaskModel)
|
|
.filter(GenerationTaskModel.project_id == project_id)
|
|
.order_by(GenerationTaskModel.created_at.desc())
|
|
.all()
|
|
)
|
|
return [_to_domain(m) for m in models]
|
|
|
|
def list_by_user(self, user_id: str) -> list[GenerationTask]:
|
|
models = (
|
|
self.session.query(GenerationTaskModel)
|
|
.filter(GenerationTaskModel.created_by_user_id == user_id)
|
|
.order_by(GenerationTaskModel.created_at.desc())
|
|
.all()
|
|
)
|
|
return [_to_domain(m) for m in models]
|
|
|
|
def count_by_user(self, user_id: str) -> int:
|
|
return self.session.query(GenerationTaskModel).filter(GenerationTaskModel.created_by_user_id == user_id).count()
|
|
|
|
def list_recent_by_user(self, user_id: str, limit: int = 5) -> list[GenerationTask]:
|
|
models = (
|
|
self.session.query(GenerationTaskModel)
|
|
.filter(GenerationTaskModel.created_by_user_id == user_id)
|
|
.order_by(GenerationTaskModel.created_at.desc())
|
|
.limit(limit)
|
|
.all()
|
|
)
|
|
return [_to_domain(m) for m in models]
|
|
|
|
def list_by_source_edit_plan(self, plan_id: str) -> list[GenerationTask]:
|
|
models = (
|
|
self.session.query(GenerationTaskModel)
|
|
.filter(GenerationTaskModel.source_edit_plan_id == plan_id)
|
|
.order_by(GenerationTaskModel.created_at.desc())
|
|
.all()
|
|
)
|
|
return [_to_domain(m) for m in models]
|
|
|
|
def update(self, task: GenerationTask) -> GenerationTask:
|
|
model = self.session.query(GenerationTaskModel).filter(GenerationTaskModel.id == task.id).first()
|
|
if model is None:
|
|
raise ValueError(f"GenerationTask {task.id} not found")
|
|
model.project_id = task.project_id
|
|
model.asset_library_id = task.asset_library_id
|
|
model.strategy_id = task.strategy_id
|
|
model.voice_library_id = task.voice_library_id
|
|
model.template_id = task.template_id
|
|
model.asset_ids = task.asset_ids
|
|
model.title_ids = task.title_ids
|
|
model.voice_ids = task.voice_ids
|
|
model.status = task.status
|
|
model.progress = task.progress
|
|
model.result_count = task.result_count
|
|
model.error_message = task.error_message
|
|
model.started_at = task.started_at
|
|
model.completed_at = task.completed_at
|
|
model.source_edit_plan_id = task.source_edit_plan_id or None
|
|
self.session.commit()
|
|
return task
|