diff --git a/src/algorithm/__init__.py b/src/algorithm/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/face_recognition_algorithm.py b/src/algorithm/face_recognition_algorithm.py similarity index 95% rename from src/face_recognition_algorithm.py rename to src/algorithm/face_recognition_algorithm.py index 23927c4..cd160eb 100644 --- a/src/face_recognition_algorithm.py +++ b/src/algorithm/face_recognition_algorithm.py @@ -1,10 +1,5 @@ # face_recognition_algorithm.py -import cv2 -import numpy as np from insightface.app import FaceAnalysis -from typing import List, Dict, Tuple, Optional - -from src.base_face_biz import BaseFaceBiz class FaceRecognitionAlgorithm: diff --git a/src/api/routes/algorithm_router.py b/src/api/routes/algorithm_router.py index 6667f3f..2b6eb8a 100644 --- a/src/api/routes/algorithm_router.py +++ b/src/api/routes/algorithm_router.py @@ -6,19 +6,17 @@ import os import logging from datetime import datetime, timedelta -from typing import Dict, Any from fastapi import APIRouter, HTTPException, BackgroundTasks -from sqlalchemy.orm import Session from src.config import settings from src.database.connection import db_manager -from src.models.face_feature import SurFaceFeature, FeatureStatus +from src.models.face_feature import FeatureStatus from src.models.video_check_task import SurVideoCheckTask from src.repositories.face_feature_repository import FaceFeatureRepository -from src.face_recognition_algorithm import FaceRecognitionAlgorithm -from src.base_face_biz import BaseFaceBiz -from src.video_check_biz import VideoCheckBiz +from src.algorithm.face_recognition_algorithm import FaceRecognitionAlgorithm +from src.biz.base_face_biz import BaseFaceBiz +from src.biz.video_check_biz import VideoCheckBiz from src.repositories.video_check_repository import VideoCheckTaskRepository # 创建路由器 diff --git a/src/biz/__init__.py b/src/biz/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/base_face_biz.py b/src/biz/base_face_biz.py similarity index 100% rename from src/base_face_biz.py rename to src/biz/base_face_biz.py diff --git a/src/video_check_biz.py b/src/biz/video_check_biz.py similarity index 99% rename from src/video_check_biz.py rename to src/biz/video_check_biz.py index 08f5b46..dab7b74 100644 --- a/src/video_check_biz.py +++ b/src/biz/video_check_biz.py @@ -5,11 +5,11 @@ import cv2 import numpy as np -from typing import Optional, List, Dict, Tuple +from typing import Optional, List, Dict import os from insightface.app import FaceAnalysis -from src.base_face_biz import BaseFaceBiz +from src.biz.base_face_biz import BaseFaceBiz class VideoCheckBiz(BaseFaceBiz): diff --git a/src/video_face_recognition_cann_3.py b/src/video_face_recognition_cann_3.py index 56da1a2..849983e 100644 --- a/src/video_face_recognition_cann_3.py +++ b/src/video_face_recognition_cann_3.py @@ -3,7 +3,7 @@ import cv2 import numpy as np import time import os -from face_recognition_algorithm import FaceRecognitionAlgorithm +from src.algorithm.face_recognition_algorithm import FaceRecognitionAlgorithm def process_video_file(algorithm: FaceRecognitionAlgorithm, video_path: str, output_path: str = None,