优化目前版本中的问题

app/api/business/project_detect_api.py

@@ -132,8 +132,7 @@ def get_log_pager(detect_log_pager: ProjectDetectLogPager, session: Session = De
     :return:
     """
     result = pdc.get_log_pager(detect_log_pager, session)
-    result = jsonable_encoder(result)
-    return rc.response_success(data=result)
+    return rc.response_success_pager(result)
 
 
 @detect.get("/get_log_imgs/{log_id}")

app/api/business/project_train_api.py

@@ -141,9 +141,11 @@ def del_label(label_id: int, session: Session = Depends(get_db)):
 @project.post("/up_proj_img")
 def upload_project_image(project_id: int = Form(...),
                          files: List[UploadFile] = File(...),
+                         img_type: str = Form(...),
                          session: Session = Depends(get_db)):
     """
     上传项目图片
+    :param img_type:
     :param files: 文件图片
     :param project_id:
     :param session:
@@ -152,10 +154,10 @@ def upload_project_image(project_id: int = Form(...),
     project_info = pic.get_project_by_id(project_id, session)
     if project_info is None:
         return rc.response_error("项目查询错误，请刷新页面后再试")
-    is_check, file_name = ps.check_image_name(project_id, files, session)
+    is_check, file_name = ps.check_image_name(project_id, img_type, files, session)
     if not is_check:
         return rc.response_error(msg="存在重名的图片文件：" + file_name)
-    ps.upload_project_image(project_info, files, session)
+    ps.upload_project_image(project_info,img_type, files, session)
     return rc.response_success(msg="上传成功")
 
 
@@ -228,6 +230,16 @@ async def run_train(project_id: int, session: Session = Depends(get_db)):
         return rc.response_error("项目查询错误")
     if project_info.project_status == '1':
         return rc.response_error("项目当前存在训练进程，请稍后再试")
+    train_img_count = pimc.get_image_count(project_id, 'train', session)
+    if train_img_count == 0:
+        return rc.response_error("请先上传训练图片")
+    if train_img_count < 10:
+        return rc.response_error("训练图片少于10张，请继续上传训练图片")
+    val_img_count = pimc.get_image_count(project_id, 'val', session)
+    if val_img_count == 0:
+        return rc.response_error("请先上传验证图片")
+    if val_img_count < 5:
+        return rc.response_error("验证图片少于5张，请继续上传验证图片")
     data, project_name, name = ps.run_train_yolo(project_info, session)
     return StreamingResponse(
         ps.run_commend(data, project_name, name, 50, project_id, session),

app/api/business/websocket_api.py

@@ -0,0 +1,27 @@
+from fastapi import APIRouter, WebSocket
+
+from app.websocket.web_socket_server import room_manager
+
+
+web_socket = APIRouter()
+
+
+@web_socket.websocket("/{room}")
+async def websocket_room(websocket: WebSocket, room: str):
+    """
+    websocket 房间管理
+    :param websocket:
+    :param room:
+    :return:
+    """
+    await websocket.accept()
+    await room_manager.add_to_room(room, websocket)
+    try:
+        while True:
+            data = await websocket.receive_text()
+            await room_manager.broadcast_to_room(room, data, exclude_websocket=websocket)
+    except Exception as e:
+        print(f"连接关闭: {e}")
+    finally:
+        await room_manager.remove_from_room(room, websocket)
+        await websocket.close()