f9e8d6efdc
Bug 1 — GET /api/v1/assets → 500: asset_repository 所有方法为 async def,但调用方为同步上下文, 未 await 导致返回 coroutine 对象而非实际数据。 修复:全部改为 def(同步),与 SQLAlchemy 同步 Session 一致。 Bug 2 — POST /api/v1/generation/tasks → 500: GenerationTaskModel 仍定义 edit_plan_id 列,但迁移 011 已从数据库 删除该列,INSERT 时报 column does not exist。 修复:从 model、repository、domain entity、application use case、 所有路由中彻底移除 edit_plan_id 引用。 Bug 3 — GET /api/v1/dashboard/overview → 500: generation_task_repository._to_domain() 访问 model.edit_plan_id, 该列已被迁移 011 删除,触发 AttributeError。 修复:同上,移除 edit_plan_id 引用。 涉及文件: - packages/adapters/sqlalchemy_impl/asset_repository.py (async→sync) - packages/ports/asset_repository.py (async→sync 接口) - packages/adapters/sqlalchemy_impl/models.py (移除 edit_plan_id 列) - packages/adapters/sqlalchemy_impl/generation_task_repository.py - packages/domain/generation_task.py - packages/application/generation_tasks.py - apps/api/app/api/routes/generation_tasks.py - apps/api/app/api/routes/task_center.py
119 lines
4.4 KiB
Python
119 lines
4.4 KiB
Python
from sqlalchemy.orm import Session
|
|
|
|
from packages.adapters.sqlalchemy_impl.models import GenerationTaskModel
|
|
from packages.domain import GenerationTask
|
|
|
|
|
|
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=model.status,
|
|
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,
|
|
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,
|
|
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 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
|
|
self.session.commit()
|
|
return task
|