完善附件管理与生成任务跟踪
This commit is contained in:
+104
-5
@@ -17,7 +17,7 @@ from models.generation_log import GenerationLog
|
||||
from models.paragraph import Paragraph
|
||||
from models.reference_file import ReferenceFile
|
||||
from models.template import Template
|
||||
from schemas.schemas import GenerateFullRequest, GenerateTestRequest, Response
|
||||
from schemas.schemas import GenerateFullRequest, GenerateTestRequest, ReferenceFileUpdate, Response
|
||||
from services.ai_service import call_ai, stream_ai_preview
|
||||
from services.file_summary import summarize_minio_files
|
||||
from services.generation_runtime import (
|
||||
@@ -27,12 +27,18 @@ from services.generation_runtime import (
|
||||
run_generation,
|
||||
update_progress,
|
||||
)
|
||||
from services.minio_client import upload_bytes
|
||||
from services.minio_client import delete_object, split_bucket_path, upload_bytes, get_presigned_url
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
def _serialize_document(document: Document) -> dict:
|
||||
request_payload = {}
|
||||
if document.request_payload_json:
|
||||
try:
|
||||
request_payload = json.loads(document.request_payload_json)
|
||||
except Exception:
|
||||
request_payload = {}
|
||||
return {
|
||||
"id": document.id,
|
||||
"template_id": document.template_id,
|
||||
@@ -42,6 +48,7 @@ def _serialize_document(document: Document) -> dict:
|
||||
"status": document.status,
|
||||
"file_path": document.file_path,
|
||||
"error": document.error,
|
||||
"request_payload": request_payload,
|
||||
"created_at": document.created_at,
|
||||
"updated_at": document.updated_at,
|
||||
}
|
||||
@@ -54,9 +61,25 @@ def _serialize_reference_file(file: ReferenceFile) -> dict:
|
||||
"file_path": file.file_path,
|
||||
"file_size": file.file_size,
|
||||
"content_type": file.content_type,
|
||||
"created_at": file.created_at,
|
||||
"created_at": file.created_at.isoformat() if file.created_at else None,
|
||||
}
|
||||
|
||||
|
||||
async def _build_reference_name_mapping(db: AsyncSession, file_paths: list[str]) -> dict[str, str]:
|
||||
if not file_paths:
|
||||
return {}
|
||||
result = await db.execute(
|
||||
select(ReferenceFile.file_path, ReferenceFile.file_name).where(ReferenceFile.file_path.in_(file_paths))
|
||||
)
|
||||
return {file_path: file_name for file_path, file_name in result.all()}
|
||||
|
||||
|
||||
async def _build_reference_records_mapping(db: AsyncSession, file_paths: list[str]) -> dict[str, ReferenceFile]:
|
||||
if not file_paths:
|
||||
return {}
|
||||
result = await db.execute(select(ReferenceFile).where(ReferenceFile.file_path.in_(file_paths)))
|
||||
return {item.file_path: item for item in result.scalars().all()}
|
||||
|
||||
@router.post("/test")
|
||||
async def generate_test(body: GenerateTestRequest, db: AsyncSession = Depends(get_db)):
|
||||
paragraph = await db.get(Paragraph, body.paragraph_id)
|
||||
@@ -71,7 +94,12 @@ async def generate_test(body: GenerateTestRequest, db: AsyncSession = Depends(ge
|
||||
elif paragraph.model_id:
|
||||
model = await db.get(AiModel, paragraph.model_id)
|
||||
|
||||
file_summaries = await asyncio.to_thread(summarize_minio_files, body.file_paths or []) if body.file_paths else []
|
||||
file_name_mapping = await _build_reference_name_mapping(db, body.file_paths or [])
|
||||
file_summaries = (
|
||||
await asyncio.to_thread(summarize_minio_files, body.file_paths or [], file_name_mapping)
|
||||
if body.file_paths
|
||||
else []
|
||||
)
|
||||
if model is None or model.status != "enabled":
|
||||
content = build_mock_content(paragraph)
|
||||
message = "当前未找到可用模型,返回本地模拟生成结果。"
|
||||
@@ -109,7 +137,12 @@ async def generate_test_stream(body: GenerateTestRequest, db: AsyncSession = Dep
|
||||
if not model.supports_streaming:
|
||||
raise HTTPException(status_code=400, detail="当前模型未开启流式传输")
|
||||
|
||||
file_summaries = await asyncio.to_thread(summarize_minio_files, body.file_paths or []) if body.file_paths else []
|
||||
file_name_mapping = await _build_reference_name_mapping(db, body.file_paths or [])
|
||||
file_summaries = (
|
||||
await asyncio.to_thread(summarize_minio_files, body.file_paths or [], file_name_mapping)
|
||||
if body.file_paths
|
||||
else []
|
||||
)
|
||||
setattr(paragraph, "enable_reasoning", bool(model.enable_reasoning))
|
||||
|
||||
async def event_stream():
|
||||
@@ -236,6 +269,41 @@ async def list_reference_files(
|
||||
return Response(data={"items": items, "total": total, "page": page, "page_size": page_size})
|
||||
|
||||
|
||||
@router.get("/reference-files/{file_id}/download")
|
||||
async def download_reference_file(file_id: int, db: AsyncSession = Depends(get_db)):
|
||||
record = await db.get(ReferenceFile, file_id)
|
||||
if record is None:
|
||||
raise HTTPException(status_code=404, detail="附件记录不存在")
|
||||
bucket, object_name = split_bucket_path(record.file_path)
|
||||
return Response(data={"url": get_presigned_url(bucket, object_name), "file_name": record.file_name})
|
||||
|
||||
|
||||
@router.put("/reference-files/{file_id}")
|
||||
async def update_reference_file(file_id: int, body: ReferenceFileUpdate, db: AsyncSession = Depends(get_db)):
|
||||
record = await db.get(ReferenceFile, file_id)
|
||||
if record is None:
|
||||
raise HTTPException(status_code=404, detail="附件记录不存在")
|
||||
record.file_name = body.file_name.strip()
|
||||
await db.commit()
|
||||
await db.refresh(record)
|
||||
return Response(data=_serialize_reference_file(record))
|
||||
|
||||
|
||||
@router.delete("/reference-files/{file_id}")
|
||||
async def delete_reference_file(file_id: int, db: AsyncSession = Depends(get_db)):
|
||||
record = await db.get(ReferenceFile, file_id)
|
||||
if record is None:
|
||||
raise HTTPException(status_code=404, detail="附件记录不存在")
|
||||
try:
|
||||
bucket, object_name = split_bucket_path(record.file_path)
|
||||
await asyncio.to_thread(delete_object, bucket, object_name)
|
||||
except Exception:
|
||||
pass
|
||||
await db.delete(record)
|
||||
await db.commit()
|
||||
return Response(data={"id": file_id})
|
||||
|
||||
|
||||
@router.post("/full")
|
||||
async def generate_full(body: GenerateFullRequest, db: AsyncSession = Depends(get_db)):
|
||||
template = await db.get(Template, body.template_id)
|
||||
@@ -251,6 +319,36 @@ async def generate_full(body: GenerateFullRequest, db: AsyncSession = Depends(ge
|
||||
if not paragraphs:
|
||||
raise HTTPException(status_code=400, detail="模板下暂无可生成段落")
|
||||
|
||||
normalized_file_map: dict[str, list[str]] = {}
|
||||
for key, values in (body.file_map or {}).items():
|
||||
if not isinstance(values, list):
|
||||
continue
|
||||
normalized_file_map[str(key)] = [item for item in values if item]
|
||||
all_file_paths = [item for values in normalized_file_map.values() for item in values]
|
||||
file_records = await _build_reference_records_mapping(db, all_file_paths)
|
||||
paragraph_snapshot = []
|
||||
for paragraph in paragraphs:
|
||||
selected_paths = normalized_file_map.get(str(paragraph.id), [])
|
||||
paragraph_snapshot.append(
|
||||
{
|
||||
"paragraph_id": paragraph.id,
|
||||
"title": paragraph.title,
|
||||
"sort_index": paragraph.sort_index,
|
||||
"need_file": bool(paragraph.need_file),
|
||||
"file_note": paragraph.file_note or "",
|
||||
"selected_files": [
|
||||
_serialize_reference_file(file_records[file_path])
|
||||
for file_path in selected_paths
|
||||
if file_path in file_records
|
||||
],
|
||||
}
|
||||
)
|
||||
request_payload = {
|
||||
"template_name": template.name,
|
||||
"file_map": normalized_file_map,
|
||||
"paragraphs": paragraph_snapshot,
|
||||
}
|
||||
|
||||
document = Document(
|
||||
template_id=template.id,
|
||||
name=f"{template.name}-{datetime.now().strftime('%Y%m%d%H%M%S')}",
|
||||
@@ -259,6 +357,7 @@ async def generate_full(body: GenerateFullRequest, db: AsyncSession = Depends(ge
|
||||
status="generating",
|
||||
file_path="",
|
||||
error="",
|
||||
request_payload_json=json.dumps(request_payload, ensure_ascii=False),
|
||||
)
|
||||
db.add(document)
|
||||
await db.flush()
|
||||
|
||||
Reference in New Issue
Block a user