From b112566f7302b697bd6dc054b82b71e5026cb81a Mon Sep 17 00:00:00 2001 From: zqc <835569504@qq.com> Date: Sun, 4 Jan 2026 09:45:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=95=E5=85=A5=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E7=A7=BB=E9=99=A4src?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dependencies.py | 6 +++--- src/api/routes/algorithm_router.py | 24 ++++++++++----------- src/api/routes/face_features.py | 10 ++++----- src/app.py | 16 +++++++------- src/biz/video_check_biz.py | 2 +- src/biz/video_face_biz.py | 2 +- src/database/connection.py | 4 ++-- src/main.py | 12 +++++------ src/models/face_feature.py | 2 +- src/repositories/face_feature_repository.py | 8 +++---- src/repositories/video_check_repository.py | 4 ++-- src/rtsp/service.py | 2 +- src/rtsp_service_ws_1217.py | 2 +- src/run.py | 4 ++-- src/services/face_feature_service.py | 8 +++---- src/utils/logger.py | 2 +- src/video_face_recognition_cann_3.py | 2 +- 17 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/api/dependencies.py b/src/api/dependencies.py index b457472..0b8ec51 100644 --- a/src/api/dependencies.py +++ b/src/api/dependencies.py @@ -6,9 +6,9 @@ from typing import Generator, Optional from fastapi import Depends, HTTPException, status from sqlalchemy.orm import Session -from src.database.connection import db_manager, get_db -from src.repositories.face_feature_repository import FaceFeatureRepository -from src.services.face_feature_service import FaceFeatureService +from database.connection import db_manager, get_db +from repositories.face_feature_repository import FaceFeatureRepository +from services.face_feature_service import FaceFeatureService def get_face_feature_repository( diff --git a/src/api/routes/algorithm_router.py b/src/api/routes/algorithm_router.py index 3804649..0cf2e13 100644 --- a/src/api/routes/algorithm_router.py +++ b/src/api/routes/algorithm_router.py @@ -9,18 +9,18 @@ from datetime import datetime, timedelta from fastapi import APIRouter, HTTPException, BackgroundTasks -from src.config import settings -from src.database.connection import db_manager -from src.models.face_feature import FeatureStatus -from src.models.video_check_task import SurVideoCheckTask -from src.models.sur_config import SurConfigBase -from src.models.sur_person import SurPersonBlacklist, SurFaceFeature -from src.repositories.face_feature_repository import FaceFeatureRepository -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.biz.video_face_biz import VideoFaceBiz -from src.repositories.video_check_repository import VideoCheckTaskRepository +from config import settings +from database.connection import db_manager +from models.face_feature import FeatureStatus +from models.video_check_task import SurVideoCheckTask +from models.sur_config import SurConfigBase +from models.sur_person import SurPersonBlacklist, SurFaceFeature +from repositories.face_feature_repository import FaceFeatureRepository +from algorithm.face_recognition_algorithm import FaceRecognitionAlgorithm +from biz.base_face_biz import BaseFaceBiz +from biz.video_check_biz import VideoCheckBiz +from biz.video_face_biz import VideoFaceBiz +from repositories.video_check_repository import VideoCheckTaskRepository # 创建路由器 router = APIRouter(prefix="/algorithm", tags=["algorithm"]) diff --git a/src/api/routes/face_features.py b/src/api/routes/face_features.py index f7f6401..435cbe5 100644 --- a/src/api/routes/face_features.py +++ b/src/api/routes/face_features.py @@ -7,7 +7,7 @@ from datetime import datetime from fastapi import APIRouter, Depends, HTTPException, status, Query, BackgroundTasks from fastapi.responses import JSONResponse -from src.schemas.face_feature import ( +from schemas.face_feature import ( FaceFeatureCreate, FaceFeatureUpdate, FaceFeatureQuery, @@ -17,17 +17,17 @@ from src.schemas.face_feature import ( BatchFaceFeatureCreate, FeatureStatus ) -from src.api.dependencies import ( +from api.dependencies import ( get_face_feature_service, get_face_feature_by_id ) -from src.services.face_feature_service import FaceFeatureService -from src.api.errors import ( +from services.face_feature_service import FaceFeatureService +from api.errors import ( FaceFeatureProcessingError, FeatureNotFoundError, DuplicateFeatureError ) -from src.config import settings +from config import settings # 创建路由器 router = APIRouter( diff --git a/src/app.py b/src/app.py index c005491..17377d3 100644 --- a/src/app.py +++ b/src/app.py @@ -17,18 +17,18 @@ from fastapi.openapi.docs import ( ) from fastapi.staticfiles import StaticFiles -from src.api.routes import face_features -from src.api.routes.algorithm_router import router as algorithm_router, sync_videofacebiz_params, sync_videofacebiz_blacklist -from src.api.errors import ( +from api.routes import face_features +from api.routes.algorithm_router import router as algorithm_router, sync_videofacebiz_params, sync_videofacebiz_blacklist +from api.errors import ( APIError, validation_exception_handler, api_error_handler, generic_exception_handler ) -from src.config import settings -from src.database.connection import init_database -from src.database.connection import db_manager -from src.rtsp.service import rtsp_server +from config import settings +from database.connection import init_database +from database.connection import db_manager +from rtsp.service import rtsp_server # 生命周期管理 @@ -134,7 +134,7 @@ app.add_middleware( app.add_middleware( TrustedHostMiddleware, - allowed_hosts=["*"] if settings.DEBUG else ["localhost", "127.0.0.1"] + allowed_hosts=["*"] if settings.DEBUG else ["localhost", "127.0.0.1", "0.0.0.0"] ) diff --git a/src/biz/video_check_biz.py b/src/biz/video_check_biz.py index dab7b74..2431a09 100644 --- a/src/biz/video_check_biz.py +++ b/src/biz/video_check_biz.py @@ -9,7 +9,7 @@ from typing import Optional, List, Dict import os from insightface.app import FaceAnalysis -from src.biz.base_face_biz import BaseFaceBiz +from biz.base_face_biz import BaseFaceBiz class VideoCheckBiz(BaseFaceBiz): diff --git a/src/biz/video_face_biz.py b/src/biz/video_face_biz.py index c1d73b4..3feb981 100644 --- a/src/biz/video_face_biz.py +++ b/src/biz/video_face_biz.py @@ -8,7 +8,7 @@ import numpy as np from typing import Optional, List, Dict import time from insightface.app import FaceAnalysis -from src.biz.base_face_biz import BaseFaceBiz +from biz.base_face_biz import BaseFaceBiz class VideoFaceBiz(BaseFaceBiz): """ diff --git a/src/database/connection.py b/src/database/connection.py index a27f62a..f741340 100644 --- a/src/database/connection.py +++ b/src/database/connection.py @@ -17,8 +17,8 @@ from sqlalchemy.ext.asyncio import ( async_sessionmaker ) -from src.config import settings -from src.utils.logger import setup_logger +from config import settings +from utils.logger import setup_logger logger = setup_logger(__name__) diff --git a/src/main.py b/src/main.py index 4d8b459..82a07f8 100644 --- a/src/main.py +++ b/src/main.py @@ -6,12 +6,12 @@ import asyncio from datetime import datetime, timedelta -from src.config import settings -from src.database.connection import db_manager, init_database -from src.models.face_feature import SurFaceFeature -from src.repositories.face_feature_repository import FaceFeatureRepository -from src.services.face_feature_service import FaceFeatureService -from src.schemas.face_feature import ( +from config import settings +from database.connection import db_manager, init_database +from models.face_feature import SurFaceFeature +from repositories.face_feature_repository import FaceFeatureRepository +from services.face_feature_service import FaceFeatureService +from schemas.face_feature import ( FaceFeatureCreate, FaceFeatureUpdate, FaceFeatureQuery, diff --git a/src/models/face_feature.py b/src/models/face_feature.py index a35f51a..88bf9c3 100644 --- a/src/models/face_feature.py +++ b/src/models/face_feature.py @@ -19,7 +19,7 @@ from sqlalchemy import ( from sqlalchemy.dialects.postgresql import BYTEA from sqlalchemy.sql import func -from src.database.base import BaseModel +from database.base import BaseModel class FeatureStatus(IntEnum): diff --git a/src/repositories/face_feature_repository.py b/src/repositories/face_feature_repository.py index e87a67b..c8928b2 100644 --- a/src/repositories/face_feature_repository.py +++ b/src/repositories/face_feature_repository.py @@ -12,15 +12,15 @@ from sqlalchemy import select, update, delete, func, and_, or_, desc, asc from sqlalchemy.orm import Session, joinedload from sqlalchemy.exc import SQLAlchemyError, IntegrityError -from src.models.face_feature import SurFaceFeature -from src.schemas.face_feature import ( +from models.face_feature import SurFaceFeature +from schemas.face_feature import ( FaceFeatureCreate, FaceFeatureUpdate, FaceFeatureQuery, FeatureStatus ) -from src.models.face_feature import FeatureStatusEnum -from src.utils.logger import setup_logger +from models.face_feature import FeatureStatusEnum +from utils.logger import setup_logger logger = setup_logger(__name__) diff --git a/src/repositories/video_check_repository.py b/src/repositories/video_check_repository.py index cecb5bf..ff6ecc5 100644 --- a/src/repositories/video_check_repository.py +++ b/src/repositories/video_check_repository.py @@ -6,8 +6,8 @@ from typing import List, Optional, Dict, Any from sqlalchemy.orm import Session from sqlalchemy import and_ -from src.models.video_check_task import SurVideoCheckTask, SurVideo, SurConfigBase -from src.config import settings +from models.video_check_task import SurVideoCheckTask, SurVideo, SurConfigBase +from config import settings class VideoCheckTaskRepository: diff --git a/src/rtsp/service.py b/src/rtsp/service.py index 562e536..179ef0f 100644 --- a/src/rtsp/service.py +++ b/src/rtsp/service.py @@ -3,7 +3,7 @@ RTSP 服务模块 - 简洁版本，直接使用原始服务 """ import threading -from src.rtsp_service_ws_1217 import RTSPService +from rtsp_service_ws_1217 import RTSPService class SimpleRTSPServer: diff --git a/src/rtsp_service_ws_1217.py b/src/rtsp_service_ws_1217.py index 8f0cb9e..9a8dee1 100644 --- a/src/rtsp_service_ws_1217.py +++ b/src/rtsp_service_ws_1217.py @@ -21,7 +21,7 @@ import torch # 导入人脸识别算法 try: - from src.api.routes.algorithm_router import video_face_biz + from api.routes.algorithm_router import video_face_biz print("[INFO] 成功导入人脸识别算法") except Exception as e: diff --git a/src/run.py b/src/run.py index 67ce87b..3ebc04f 100644 --- a/src/run.py +++ b/src/run.py @@ -5,7 +5,7 @@ FastAPI应用启动脚本 import uvicorn import argparse -from src.config import settings +from config import settings def main(): @@ -77,7 +77,7 @@ def main(): print(f"📊 健康检查: http://{args.host}:{args.port}/health") uvicorn.run( - "src.app:app", + "app:app", **uvicorn_config ) diff --git a/src/services/face_feature_service.py b/src/services/face_feature_service.py index b464e29..2babc3e 100644 --- a/src/services/face_feature_service.py +++ b/src/services/face_feature_service.py @@ -7,8 +7,8 @@ from datetime import datetime from typing import Optional, List, Dict, Any from contextlib import contextmanager -from src.repositories.face_feature_repository import FaceFeatureRepository -from src.schemas.face_feature import ( +from repositories.face_feature_repository import FaceFeatureRepository +from schemas.face_feature import ( FaceFeatureCreate, FaceFeatureUpdate, FaceFeatureQuery, @@ -18,8 +18,8 @@ from src.schemas.face_feature import ( BatchFaceFeatureCreate, FeatureStatus ) -from src.models.face_feature import FeatureStatusEnum -from src.utils.logger import setup_logger +from models.face_feature import FeatureStatusEnum +from utils.logger import setup_logger logger = setup_logger(__name__) diff --git a/src/utils/logger.py b/src/utils/logger.py index 67402b4..5ae9da3 100644 --- a/src/utils/logger.py +++ b/src/utils/logger.py @@ -7,7 +7,7 @@ import sys from typing import Optional from logging.handlers import RotatingFileHandler -from src.config import settings +from config import settings def setup_logger( diff --git a/src/video_face_recognition_cann_3.py b/src/video_face_recognition_cann_3.py index 849983e..cd081a1 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 src.algorithm.face_recognition_algorithm import FaceRecognitionAlgorithm +from algorithm.face_recognition_algorithm import FaceRecognitionAlgorithm def process_video_file(algorithm: FaceRecognitionAlgorithm, video_path: str, output_path: str = None,