完善相关问题,并增加推理的部分代码

This commit is contained in:
2025-02-28 16:30:11 +08:00
parent 0301e41e96
commit 4262d3e908
20 changed files with 564 additions and 32 deletions

View File

@ -9,7 +9,7 @@ from app.model.schemas.project_image_schemas import ProjectImgLeaferLabel, Proje
from app.model.bussiness_model import ProjectLabel as pl
from app.common.jwt_check import get_user_id
from app.common import reponse_code as rc
from app.service import project_service as ps
from app.service import project_train_service as ps
from app.db.db_session import get_db
from typing import List
@ -37,7 +37,7 @@ def project_pager(info: ProjectInfoPager, session: Session = Depends(get_db)):
:param session:
:return:
"""
pager = pic.get_project_pager(info, session)
pager = pic.get_project_pager2(info, session)
return rc.response_success_pager(pager)
@ -51,7 +51,7 @@ def add_project(request: Request, info: ProjectInfoIn, session: Session = Depend
:return:
"""
if pic.check_project_name(info.project_name, session):
return rc.response_error("已经存在相同名称的项目")
return rc.response_error("已经存在相同名称的任务")
user_id = get_user_id(request)
project_id = ps.add_project(info, session, user_id)
return rc.response_success(msg="新建成功", data=project_id)
@ -69,6 +69,18 @@ def get_project(project_id: int, session: Session = Depends(get_db)):
return rc.response_success(data=project_info.dict())
@project.get("/del/{project_id}")
def del_project(project_id: int, session: Session = Depends(get_db)):
"""
删除项目,假删
:param project_id:
:param session:
:return:
"""
pic.del_project(project_id, session)
return rc.response_success(msg="删除成功")
@project.get("/label_list/{project_id}")
def get_label_list(project_id: int, session: Session = Depends(get_db)):
"""
@ -147,7 +159,19 @@ def upload_project_image(project_id: int = Form(...),
return rc.response_success(msg="上传成功")
@project.get("/img_list")
@project.get("/del_img/{image_id}")
def del_image(image_id: int, session: Session = Depends(get_db)):
"""
删除图片
:param image_id:
:param session:
:return:
"""
ps.del_img(image_id, session)
return rc.response_success("删除成功")
@project.post("/img_list")
def get_image_list(image: ProjectImagePager, session: Session = Depends(get_db)):
"""
获取项目图片列表
@ -160,7 +184,7 @@ def get_image_list(image: ProjectImagePager, session: Session = Depends(get_db))
result = jsonable_encoder(image_list)
return rc.response_success(data=result)
else:
pager = pimc.get_image_pager(image, session)
pager = pimc.get_image_pager2(image, session)
return rc.response_success_pager(pager)
@ -206,7 +230,7 @@ async def run_train(project_id: int, session: Session = Depends(get_db)):
return rc.response_error("项目当前存在训练进程,请稍后再试")
data, project_name, name = ps.run_train_yolo(project_info, session)
return StreamingResponse(
ps.run_commend(data, project_name, name, 10, project_id, session),
ps.run_commend(data, project_name, name, 100, project_id, session),
media_type="text/plain")