diff --git a/app/model/crud/project_detect_crud.py b/app/model/crud/project_detect_crud.py index 6e06783..363f994 100644 --- a/app/model/crud/project_detect_crud.py +++ b/app/model/crud/project_detect_crud.py @@ -5,7 +5,7 @@ from fastapi.encoders import jsonable_encoder from app.model.bussiness_model import ProjectDetect, ProjectDetectImg, ProjectDetectLog, ProjectDetectLogImg from app.model.schemas.project_detect_schemas import ProjectDetectOut, ProjectDetectPager, \ - ProjectDetectImageOut, ProjectDetectImgPager, ProjectDetectLogOut, ProjectDetectLogImgOut + ProjectDetectImageOut, ProjectDetectImgPager, ProjectDetectLogOut, ProjectDetectLogImgOut, ProjectDetectList from app.db.page_util import get_pager @@ -59,7 +59,7 @@ def get_detect_list(project_id: int, session: Session): :return: """ query = session.query(ProjectDetect).filter_by(project_id=project_id).order_by(asc(ProjectDetect.id)) - result = jsonable_encoder(query.all()) + result = [ProjectDetectList.from_orm(detect).dict() for detect in query.all()] return result diff --git a/app/model/schemas/project_detect_schemas.py b/app/model/schemas/project_detect_schemas.py index b38a3c3..ae7c5c8 100644 --- a/app/model/schemas/project_detect_schemas.py +++ b/app/model/schemas/project_detect_schemas.py @@ -33,6 +33,14 @@ class ProjectDetectOut(BaseModel): } +class ProjectDetectList(BaseModel): + id: Optional[int] + detect_name: Optional[str] + + class Config: + orm_mode = True + + class ProjectDetectImgPager(BaseModel): detect_id: Optional[int] = Field(..., description="训练集合id") pagerNum: Optional[int] = Field(None, description="当前页码") diff --git a/app/service/project_train_service.py b/app/service/project_train_service.py index 6d1de57..b90a78e 100644 --- a/app/service/project_train_service.py +++ b/app/service/project_train_service.py @@ -188,7 +188,9 @@ def run_commend(data: str, project: str, "--data=" + data, "--project=" + project, "--name=" + name, - "--epochs=" + str(epochs)], + "--epochs=" + str(epochs), + "--batch-size=4", + "--exist_ok"], bufsize=1, # bufsize=0时,为不缓存;bufsize=1时,按行缓存;bufsize为其他正整数时,为按照近似该正整数的字节数缓存 shell=False, stdout=subprocess.PIPE,