Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

fix(media): 从模型字节加载人脸网络以支持中文路径

longmeidaoeaaa3c9c402c
diff --git a/src/peach/face_detect.py b/src/peach/face_detect.py
index f9448aacb..aa196f1fb 100644
--- a/src/peach/face_detect.py
+++ b/src/peach/face_detect.py
@@ -282,6 +282,7 @@ class FaceDetector:
def __init__(self, model: Path | None = None, *, score: float = DEFAULT_SCORE,
nms: float = DEFAULT_NMS, allow_download: bool = True) -> None:
import cv2
+ import numpy
self._cv2 = cv2
self.score = score
@@ -291,8 +292,10 @@ class FaceDetector:
raise FaceModelUnavailable(
"当前 OpenCV 没有 FaceDetectorYN;需要 4.5.4 以上")
# 模型那道门只管「算不算一次读数」,留不留这张脸由 `detect` 按中位数判。
- self._detector = create(str(self.model_path), "", (320, 320),
- min(score, READ_FLOOR), nms, 5000)
+ # Python 读取支持中文路径;原生文件接口不参与模型路径解码。
+ model_bytes = numpy.frombuffer(self.model_path.read_bytes(), dtype=numpy.uint8)
+ self._detector = create("ONNX", model_bytes, numpy.empty(0, dtype=numpy.uint8),
+ (320, 320), min(score, READ_FLOOR), nms, 5000)
def detect(self, image) -> list[Face]:
"""返回归一化坐标的人脸,按面积从大到小。
diff --git a/src/peach/face_match.py b/src/peach/face_match.py
index ba0d46a32..dd2e725fb 100644
--- a/src/peach/face_match.py
+++ b/src/peach/face_match.py
@@ -63,6 +63,7 @@ class FaceEmbedder:
def __init__(self, model: Path | None = None, *, detector: FaceDetector | None = None,
allow_download: bool = True) -> None:
import cv2
+ import numpy
self._cv2 = cv2
self.model_path = ensure_model(model, allow_download=allow_download)
@@ -70,7 +71,9 @@ class FaceEmbedder:
if create is None: # pragma: no cover - 依赖版本兜底
raise face_detect.FaceModelUnavailable(
"当前 OpenCV 没有 FaceRecognizerSF;需要 4.5.4 以上")
- self._recognizer = create(str(self.model_path), "")
+ # 模型路径交给 Python 读取,OpenCV 只接收校验后的 ONNX 字节。
+ model_bytes = numpy.frombuffer(self.model_path.read_bytes(), dtype=numpy.uint8)
+ self._recognizer = create("ONNX", model_bytes, numpy.empty(0, dtype=numpy.uint8))
self._detector = detector or FaceDetector(allow_download=allow_download)
def embed(self, image):
diff --git a/tests/test_face_detect.py b/tests/test_face_detect.py
index 78b8d8257..03a08a906 100644
--- a/tests/test_face_detect.py
+++ b/tests/test_face_detect.py
@@ -57,6 +57,63 @@ class EnsureModelTests(unittest.TestCase):
self.assertIn(face_detect.ZOO_COMMIT, face_detect.MODEL_URL)
+class ModelLoadingTests(unittest.TestCase):
+ def setUp(self):
+ temporary = tempfile.TemporaryDirectory()
+ self.addCleanup(temporary.cleanup)
+ self.model = Path(temporary.name).resolve() / "中文模型" / "检出.onnx"
+ self.model.parent.mkdir()
+ self.payload = b"verified-yunet-model"
+ self.model.write_bytes(self.payload)
+ digest = patch.object(face_detect, "MODEL_SHA256", hashlib.sha256(self.payload).hexdigest())
+ digest.start()
+ self.addCleanup(digest.stop)
+
+ def test_unicode_model_path_is_read_as_onnx_bytes(self):
+ import cv2
+ import numpy
+
+ with patch.object(cv2, "FaceDetectorYN_create") as create:
+ detector = face_detect.FaceDetector(self.model, score=0.72, nms=0.12, allow_download=False)
+ args = create.call_args.args
+ self.assertEqual(args[0], "ONNX")
+ self.assertIsInstance(args[1], numpy.ndarray)
+ self.assertEqual((args[1].dtype, args[1].ndim, args[1].tobytes()),
+ (numpy.dtype("uint8"), 1, self.payload))
+ self.assertEqual((args[2].dtype, args[2].size), (numpy.dtype("uint8"), 0))
+ self.assertEqual(args[3:], ((320, 320), face_detect.READ_FLOOR, 0.12, 5000))
+ self.assertEqual(detector.model_path, self.model)
+ self.assertIs(detector._detector, create.return_value)
+
+ def test_model_read_error_after_verification_reaches_the_caller(self):
+ import cv2
+
+ failure = PermissionError(13, "model read denied")
+ with patch.object(Path, "read_bytes", side_effect=[self.payload, failure]), \
+ patch.object(cv2, "FaceDetectorYN_create") as create, \
+ self.assertRaises(PermissionError) as caught:
+ face_detect.FaceDetector(self.model, allow_download=False)
+ self.assertIs(caught.exception, failure)
+ create.assert_not_called()
+
+ def test_an_onnx_import_error_is_not_reported_as_no_faces(self):
+ import cv2
+
+ failure = cv2.error("invalid ONNX buffer")
+ with patch.object(cv2, "FaceDetectorYN_create", side_effect=failure), \
+ self.assertRaises(cv2.error) as caught:
+ face_detect.FaceDetector(self.model, allow_download=False)
+ self.assertIs(caught.exception, failure)
+
+ def test_mismatched_model_bytes_never_reach_opencv(self):
+ import cv2
+
+ self.model.write_bytes(b"partial-model")
+ with patch.object(cv2, "FaceDetectorYN_create") as create, self.assertRaises(FaceModelUnavailable):
+ face_detect.FaceDetector(self.model, allow_download=False)
+ create.assert_not_called()
+
+
class BundledModelTests(unittest.TestCase):
"""随包那份先认:在且哈希对得上就不联网、不往数据根写;对不上就退回原来的取法。"""
diff --git a/tests/test_face_match.py b/tests/test_face_match.py
index 655ddf50d..eedb41f8e 100644
--- a/tests/test_face_match.py
+++ b/tests/test_face_match.py
@@ -36,6 +36,65 @@ class EnsureModelTests(unittest.TestCase):
self.assertEqual(face_match.COSINE_THRESHOLD, 0.363)
+class ModelLoadingTests(unittest.TestCase):
+ def setUp(self):
+ temporary = tempfile.TemporaryDirectory()
+ self.addCleanup(temporary.cleanup)
+ self.model = Path(temporary.name).resolve() / "中文模型" / "比对.onnx"
+ self.model.parent.mkdir()
+ self.payload = b"verified-sface-model"
+ self.model.write_bytes(self.payload)
+ digest = patch.object(face_match, "MODEL_SHA256", hashlib.sha256(self.payload).hexdigest())
+ digest.start()
+ self.addCleanup(digest.stop)
+
+ def test_unicode_model_path_is_read_as_onnx_bytes(self):
+ import cv2
+ import numpy
+
+ detector = object()
+ with patch.object(cv2, "FaceRecognizerSF") as recognizer:
+ embedder = face_match.FaceEmbedder(self.model, detector=detector, allow_download=False)
+ args = recognizer.create.call_args.args
+ self.assertEqual(args[0], "ONNX")
+ self.assertIsInstance(args[1], numpy.ndarray)
+ self.assertEqual((args[1].dtype, args[1].ndim, args[1].tobytes()),
+ (numpy.dtype("uint8"), 1, self.payload))
+ self.assertEqual((args[2].dtype, args[2].size), (numpy.dtype("uint8"), 0))
+ self.assertEqual(len(args), 3)
+ self.assertEqual(embedder.model_path, self.model)
+ self.assertIs(embedder._recognizer, recognizer.create.return_value)
+ self.assertIs(embedder._detector, detector)
+
+ def test_model_read_error_after_verification_reaches_the_caller(self):
+ import cv2
+
+ failure = PermissionError(13, "model read denied")
+ with patch.object(Path, "read_bytes", side_effect=[self.payload, failure]), \
+ patch.object(cv2, "FaceRecognizerSF") as recognizer, \
+ self.assertRaises(PermissionError) as caught:
+ face_match.FaceEmbedder(self.model, detector=object(), allow_download=False)
+ self.assertIs(caught.exception, failure)
+ recognizer.create.assert_not_called()
+
+ def test_an_onnx_import_error_reaches_the_caller(self):
+ import cv2
+
+ failure = cv2.error("invalid ONNX buffer")
+ with patch.object(cv2, "FaceRecognizerSF") as recognizer, self.assertRaises(cv2.error) as caught:
+ recognizer.create.side_effect = failure
+ face_match.FaceEmbedder(self.model, detector=object(), allow_download=False)
+ self.assertIs(caught.exception, failure)
+
+ def test_mismatched_model_bytes_never_reach_opencv(self):
+ import cv2
+
+ self.model.write_bytes(b"partial-model")
+ with patch.object(cv2, "FaceRecognizerSF") as recognizer, self.assertRaises(FaceModelUnavailable):
+ face_match.FaceEmbedder(self.model, detector=object(), allow_download=False)
+ recognizer.create.assert_not_called()
+
+
class CosineTests(unittest.TestCase):
def test_same_direction_is_one_and_orthogonal_is_zero(self):
self.assertAlmostEqual(face_match.cosine((1, 2, 3), (2, 4, 6)), 1.0)