Peach: Local-first video metadata scraper and media manager.
fix(web): 断网后人脸模型与站点圆标按窗口重试
longmeidao67ab8a77bccc
diff --git a/src/peach/avatar_face.py b/src/peach/avatar_face.pyindex 9e4c1bb67..2802e1073 100644--- a/src/peach/avatar_face.py+++ b/src/peach/avatar_face.py@@ -13,6 +13,7 @@ sidecar 的形状是契约的一部分,读它的是 `peach.web_state.avatar_fofrom __future__ import annotationsimport json+import timefrom pathlib import Pathfrom peach import face_detect@@ -165,31 +166,43 @@ def drop_sidecar(image_path: Path) -> None:sidecar_path(image_path).unlink(missing_ok=True)+#: 模型取不到之后隔多久再试。服务进程里的探针活得和进程一样久:启动时恰好没网,+#: 联网后要能自己恢复;但也不能每张图都在请求线程里重下一遍。+RETRY_SECONDS = 3600++class FaceProbe:"""按需构造模型的人脸探针,检不出与检不了分得开。模型是懒构造的:这一趟一个候选都没走到就不必去下 232 KB 的 ONNX。取不到模型也不让整轮停下——那会把「今天没网」变成「所有人都没有头像」——但要把原因记进 `unavailable`让调用方报出来,不然一次下载失败会静悄悄地把整批退回不看脸的旧判据。+ 取不到之后 `RETRY_SECONDS` 内直接回 None,过了这段再试一次;取到了 `unavailable` 清空。"""- def __init__(self):+ def __init__(self, clock=time.monotonic):self._detector: FaceDetector | None = Noneself._unavailable = ""+ self._failed_at: float | None = None+ self._clock = clock@propertydef unavailable(self) -> str:return self._unavailabledef _ready(self) -> FaceDetector | None:- if self._unavailable:+ if self._detector is not None:+ return self._detector+ if self._failed_at is not None and self._clock() - self._failed_at < RETRY_SECONDS:return None- if self._detector is None:- try:- self._detector = FaceDetector()- except Exception as error: # 缺模型、缺 OpenCV、下载失败- self._unavailable = str(error)- return None+ try:+ self._detector = FaceDetector()+ except Exception as error: # 缺模型、缺 OpenCV、下载失败+ self._unavailable = str(error)+ self._failed_at = self._clock()+ return None+ self._unavailable = ""+ self._failed_at = Nonereturn self._detectordef __call__(self, image_path: Path) -> dict | None:diff --git a/src/peach/routes_media.py b/src/peach/routes_media.pyindex 3bb4abd8b..24c2df2bc 100644--- a/src/peach/routes_media.py+++ b/src/peach/routes_media.py@@ -775,8 +775,8 @@ def source_icon(request: Request, provider: str = "", args: dict[str, str] = Dep#: 人脸探针,题材头像与换头像按番号取的封面共用。YuNet 的模型是个 232 KB 的 ONNX,-#: 首次用到时才去取;取不到就一直回 None,那时圆标退回样式表里的默认取景、封面退回-#: 正封取景——没网不该等于这一排一张图都没有。+#: 首次用到时才去取;取不到时回 None,圆标退回样式表里的默认取景、封面退回正封取景+#: ——没网不该等于这一排一张图都没有。取不到之后隔 `avatar_face.RETRY_SECONDS` 再试。_WORK_FACE_PROBE = avatar_face.FaceProbe()@@ -1141,6 +1141,10 @@ def _site_mark_response(state, url: str, root: Path):地址一律由服务端自己从某张表或账本解析,函数本身不判断来路——但它是唯一会真的去连对方站点的地方,所以每个调用方都得先说清自己的地址从哪来。++ 取不到时留一个 `.failed` 标记,`follow_assets.RETRY_SECONDS` 内不再出网:一次+ 取图要试首页、manifest 和几个候选,各等 8 秒,断网时资料页每枚外链都重跑一遍,+ 图标区就一直卡着。标记期间有旧图发旧图,没有就 404 露出地球图标。"""# 存档链接按快照保存的原站找图标,缓存也按原站存:缓存键只看主机,按存档地址存,# 所有存档链接就共用 web.archive.org 那一枚。@@ -1148,7 +1152,9 @@ def _site_mark_response(state, url: str, root: Path):cached = link_marks.cached_path(root, page)if cached is None:return JSONResponse({"error": "unavailable"}, status_code=404)- if not link_marks.is_fresh(cached, ttl=FAVICON_REFRESH_SECONDS):+ marker = cached.with_suffix(".failed")+ if (not link_marks.is_fresh(cached, ttl=FAVICON_REFRESH_SECONDS)+ and not follow_assets.is_fresh(marker, follow_assets.RETRY_SECONDS)):def fetch(target: str):try:upstream = state.http_transport.client.get(@@ -1169,12 +1175,15 @@ def _site_mark_response(state, url: str, root: Path):if made is None and archived:made = site_icons.best_mark(url, fetch, link_marks.render_mark,fallback=link_marks.plain_mark)+ root.mkdir(parents=True, exist_ok=True)if made:- root.mkdir(parents=True, exist_ok=True)cached.write_bytes(made)- elif not cached.exists():- # 取不到就让前端露出下面的地球图标,不要留一个空白圆。- return JSONResponse({"error": "unavailable"}, status_code=404)+ marker.unlink(missing_ok=True)+ else:+ marker.write_bytes(b"")+ if not cached.exists():+ # 取不到就让前端露出下面的地球图标,不要留一个空白圆。+ return JSONResponse({"error": "unavailable"}, status_code=404)result = FileResponse(cached, media_type="image/png")result.headers["Cache-Control"] = "public, no-cache"return resultdiff --git a/tests/test_avatar_face.py b/tests/test_avatar_face.pyindex 784957717..0e8294441 100644--- a/tests/test_avatar_face.py+++ b/tests/test_avatar_face.py@@ -97,6 +97,26 @@ class FaceProbeTests(unittest.TestCase):self.assertIsNone(probe(Path("/tmp/a.img")))self.assertEqual(probe.unavailable, "模型未取得")+ def test_a_failed_model_load_waits_out_the_retry_window_then_recovers(self):+ """服务启动时恰好没网,联网后圆标要自己恢复取景;窗口内不在请求线程里反复重下。"""+ from peach import avatar_face++ now = [1000.0]+ probe = FaceProbe(clock=lambda: now[0])+ with unittest.mock.patch(+ "peach.avatar_face.FaceDetector",+ side_effect=[RuntimeError("模型未取得"), unittest.mock.MagicMock()]) as detector, \+ unittest.mock.patch("peach.avatar_face.face_record", return_value=record()):+ self.assertIsNone(probe(Path("/tmp/a.img")))+ self.assertEqual(probe.unavailable, "模型未取得")+ now[0] += avatar_face.RETRY_SECONDS - 1+ self.assertIsNone(probe(Path("/tmp/a.img")))+ self.assertEqual(detector.call_count, 1)+ now[0] += 1+ self.assertEqual(probe(Path("/tmp/a.img")), record())+ self.assertEqual(detector.call_count, 2)+ self.assertEqual(probe.unavailable, "")+def test_one_undecodable_image_does_not_take_down_the_batch(self):probe = FaceProbe()with unittest.mock.patch("peach.avatar_face.FaceDetector"):diff --git a/tests/test_fastapi_api.py b/tests/test_fastapi_api.pyindex b4fae5ef6..4fbe96553 100644--- a/tests/test_fastapi_api.py+++ b/tests/test_fastapi_api.py@@ -3,9 +3,11 @@ import csvimport importlib.utilimport ioimport json+import osimport sqlite3import tempfileimport threading+import timeimport unittestfrom collections import OrderedDictfrom contextlib import asynccontextmanager, closing@@ -1103,6 +1105,35 @@ class FastApiContractTests(unittest.IsolatedAsyncioTestCase):red, green, blue, _alpha = Image.open(io.BytesIO(answer.content)).convert("RGBA").getpixel((64, 6))self.assertGreater(green, max(red, blue))+ async def test_an_unreachable_site_is_not_asked_again_until_the_retry_window_passes(self):+ """断网时资料页每枚外链都要试首页、manifest 和几个候选;失败一次就先记下,过了窗口再问。"""+ from peach import follow_assets++ asked = self._archive_links(lambda url: "red")+ serving = self.app.state.http_transport.client++ def offline(request):+ asked.append(str(request.url))+ raise httpx.ConnectError("offline", request=request)+ self._swap_http_client(offline)++ first = await self.client.get("/link-mark?t=secret&id=901")+ self.assertEqual(first.status_code, 404)+ self.assertTrue(asked)+ reached = len(asked)+ again = await self.client.get("/link-mark?t=secret&id=901")+ self.assertEqual(again.status_code, 404)+ self.assertEqual(len(asked), reached, "失败窗口内不再出网")++ marker, = (self.root / "generated" / "link-marks").glob("*.failed")+ past = time.time() - follow_assets.RETRY_SECONDS - 1+ os.utime(marker, (past, past))+ self.app.state.http_transport.client = serving+ recovered = await self.client.get("/link-mark?t=secret&id=901")+ self.assertEqual(recovered.status_code, 200)+ self.assertGreater(len(asked), reached)+ self.assertFalse(marker.exists())+async def test_unauthorized_keeps_three_shapes_grouped_by_route_class(self):"""401 三种形态按路由类分组,收敛到 Depends 之后也不许并成一种。