生成项目任务/chat任务软删|生成资源管控回收|生成资源token验签API预处理
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, status
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy import func, select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.dependencies import get_db, get_current_user
|
||||
@@ -7,6 +9,7 @@ from app.models.user import User
|
||||
from app.models.project import Project
|
||||
from app.models.generation_record import GenerationRecord
|
||||
from app.schemas.project import ProjectCreate, ProjectOut
|
||||
from app.services.resource_accounting_service import soft_delete_generation_record_resources
|
||||
from app.utils.id_gen import generate_id
|
||||
|
||||
router = APIRouter(prefix="/projects", tags=["projects"])
|
||||
@@ -19,7 +22,10 @@ async def list_projects(
|
||||
):
|
||||
result = await db.execute(
|
||||
select(Project)
|
||||
.where(Project.user_id == current_user.id)
|
||||
.where(
|
||||
Project.user_id == current_user.id,
|
||||
Project.deleted_at.is_(None),
|
||||
)
|
||||
.order_by(Project.created_at.desc())
|
||||
)
|
||||
return result.scalars().all()
|
||||
@@ -52,17 +58,52 @@ async def delete_project(
|
||||
select(Project).where(
|
||||
Project.id == project_id,
|
||||
Project.user_id == current_user.id,
|
||||
Project.deleted_at.is_(None),
|
||||
)
|
||||
)
|
||||
project = result.scalar_one_or_none()
|
||||
if not project:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="项目不存在")
|
||||
|
||||
# Cascade delete generation records
|
||||
from sqlalchemy import delete
|
||||
await db.execute(
|
||||
delete(GenerationRecord).where(GenerationRecord.project_id == project_id)
|
||||
generating_count = (
|
||||
await db.execute(
|
||||
select(func.count(GenerationRecord.id)).where(
|
||||
GenerationRecord.project_id == project_id,
|
||||
GenerationRecord.user_id == current_user.id,
|
||||
GenerationRecord.status == "generating",
|
||||
GenerationRecord.deleted_at.is_(None),
|
||||
)
|
||||
)
|
||||
).scalar() or 0
|
||||
if generating_count > 0:
|
||||
raise HTTPException(status_code=400, detail="当前项目下存在生成中任务,暂不能删除")
|
||||
|
||||
records_result = await db.execute(
|
||||
select(GenerationRecord).where(
|
||||
GenerationRecord.project_id == project_id,
|
||||
GenerationRecord.user_id == current_user.id,
|
||||
GenerationRecord.deleted_at.is_(None),
|
||||
)
|
||||
)
|
||||
await db.delete(project)
|
||||
records = list(records_result.scalars().all())
|
||||
record_ids = [record.id for record in records]
|
||||
now = datetime.now(timezone.utc)
|
||||
|
||||
project.deleted_at = now
|
||||
for record in records:
|
||||
record.deleted_at = now
|
||||
|
||||
freed_size_bytes = await soft_delete_generation_record_resources(
|
||||
db,
|
||||
record_ids,
|
||||
deleted_at=now,
|
||||
)
|
||||
|
||||
await db.flush()
|
||||
return {"message": "ok"}
|
||||
return {
|
||||
"message": "ok",
|
||||
"project_id": project_id,
|
||||
"deleted": True,
|
||||
"deleted_records": len(record_ids),
|
||||
"freed_size_bytes": freed_size_bytes,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user