Refactor and Optimize Cross-Platform Support, Error Handling, and UI Enhancements
This commit is contained in:
+14
-18
@@ -1,31 +1,27 @@
|
||||
from typing import Any
|
||||
from typing import Any, Optional
|
||||
import insightface
|
||||
|
||||
import modules.globals
|
||||
from modules.typing import Frame
|
||||
|
||||
FACE_ANALYSER = None
|
||||
FACE_ANALYSER: Optional[insightface.app.FaceAnalysis] = None
|
||||
|
||||
|
||||
def get_face_analyser() -> Any:
|
||||
def get_face_analyser() -> insightface.app.FaceAnalysis:
|
||||
global FACE_ANALYSER
|
||||
|
||||
if FACE_ANALYSER is None:
|
||||
FACE_ANALYSER = insightface.app.FaceAnalysis(name='buffalo_l', providers=modules.globals.execution_providers)
|
||||
FACE_ANALYSER = insightface.app.FaceAnalysis(
|
||||
name='buffalo_l',
|
||||
providers=modules.globals.execution_providers
|
||||
)
|
||||
FACE_ANALYSER.prepare(ctx_id=0, det_size=(640, 640))
|
||||
|
||||
return FACE_ANALYSER
|
||||
|
||||
def get_one_face(frame: Frame) -> Optional[Any]:
|
||||
faces = get_face_analyser().get(frame)
|
||||
return min(faces, key=lambda x: x.bbox[0], default=None)
|
||||
|
||||
def get_one_face(frame: Frame) -> Any:
|
||||
face = get_face_analyser().get(frame)
|
||||
try:
|
||||
return min(face, key=lambda x: x.bbox[0])
|
||||
except ValueError:
|
||||
return None
|
||||
|
||||
|
||||
def get_many_faces(frame: Frame) -> Any:
|
||||
try:
|
||||
return get_face_analyser().get(frame)
|
||||
except IndexError:
|
||||
return None
|
||||
def get_many_faces(frame: Frame) -> Optional[Any]:
|
||||
faces = get_face_analyser().get(frame)
|
||||
return faces if faces else None
|
||||
|
||||
Reference in New Issue
Block a user