Skip to content

armgit / peach

Public Imported from GitHub
0

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

fix(ci): 阻断后台异常并清理测试生命周期

longmeidao6dffadd81638
diff --git a/docs/TESTING.md b/docs/TESTING.md
index f8704bcc1..72f61316a 100644
--- a/docs/TESTING.md
+++ b/docs/TESTING.md
@@ -75,6 +75,10 @@ Dependabot 的 PR 一律在本地接管,不在网页上合:
Python 静态检查使用开发依赖 Ruff,随每个正式测试域扫描全仓自有 Python 文件,覆盖应用、脚本、测试和打包入口。规则为 Pyflakes(`F`)、Ruff 支持的 Pylint 错误规则(`PLE`),以及可变默认参数、`finally` 跳转、无效表达式和循环闭包规则(`B006`、`B012`、`B018`、`B023`)。生成的 `downloads_clouddrive_pb2.py` 排除;公开导出的导入用显式同名别名声明。命名、行数、空行和复杂度偏好不属于这套 lint 门槛。
+无效转义由 Ruff `W605` 阻断,Windows 路径使用原始字符串或双反斜杠。正式入口和定向调试都将未处理的后台线程异常记为测试错误,保留原始 traceback;临时账本须在线程退出后清理。Starlette TestClient 使用开发依赖 `httpx2`,应用的 HTTP 客户端仍按运行时清单安装。
+
+前端通过 `allowScripts` 逐项登记安装脚本策略,未登记脚本由 `frontend/.npmrc` 拒绝安装。`@sentry/cli` 使用锁文件中的平台二进制包,禁用额外下载脚本;`fsevents` 的可选原生构建也禁用,文件监听沿用 Node 提供的能力。升级后核对实际安装、构建和 CLI 可用性,不批量放行脚本。
+
文档与文案检查包含 seiso 稳定规则和最终状态检查,随正式入口执行。分类、范围、独立检查与预览规则用法见 [文档与界面文案](WRITING.md#检查与复核)。seiso 由开发依赖与锁文件固定,运行 Peach 不需要它。
不是每次都跑全量:本机按改动涉及的域选测,CI 按提交类型决定覆盖多宽。
diff --git a/frontend/.npmrc b/frontend/.npmrc
new file mode 100644
index 000000000..4a6e0c1f5
--- /dev/null
+++ b/frontend/.npmrc
@@ -0,0 +1 @@
+strict-allow-scripts=true
diff --git a/frontend/package.json b/frontend/package.json
index c821bbb79..281500d1d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -5,6 +5,10 @@
"engines": {
"node": ">=24"
},
+ "allowScripts": {
+ "@sentry/cli": false,
+ "fsevents": false
+ },
"scripts": {
"dev": "vite build --watch",
"build": "vite build && vite build -c vite.pages.config.ts",
diff --git a/pyproject.toml b/pyproject.toml
index 1bc3fe00b..1c3535048 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -71,6 +71,7 @@ peach-tray = "peach.error_reporting:tray_main"
# psutil 给 `scripts/agent_worktree.py` 查工作树里的残留进程:当前目录、父进程、CPU 与内存。
dev = [
"filelock==4.2.4",
+ "httpx2==2.16.0",
"psutil==7.2.2",
"ruff==0.17.3",
"seiso==0.4.0",
@@ -111,4 +112,4 @@ target-version = "py314"
extend-exclude = ["src/peach/downloads_clouddrive_pb2.py"]
[tool.ruff.lint]
-select = ["F", "PLE", "B006", "B012", "B018", "B023"]
+select = ["F", "PLE", "B006", "B012", "B018", "B023", "W605"]
diff --git a/scripts/test_runner.py b/scripts/test_runner.py
index 70e95e711..a27f793a2 100644
--- a/scripts/test_runner.py
+++ b/scripts/test_runner.py
@@ -13,6 +13,7 @@ import stat
import subprocess
import sys
import tempfile
+import threading
import time
import unittest
from collections.abc import Iterable
@@ -704,8 +705,22 @@ class TimedResult(unittest.TextTestResult):
def startTestRun(self):
self.last = time.monotonic()
+ self.thread_errors = []
+ self.previous_thread_hook = threading.excepthook
+ threading.excepthook = self._thread_error
super().startTestRun()
+ def _thread_error(self, args):
+ self.thread_errors.append((args.thread.name, (args.exc_type, args.exc_value, args.exc_traceback)))
+ self.previous_thread_hook(args)
+
+ def stopTestRun(self):
+ threading.excepthook = self.previous_thread_hook
+ for name, error in self.thread_errors:
+ self.addError(unittest.suite._ErrorHolder(f"background thread {name}"), error)
+ self.thread_errors.clear()
+ super().stopTestRun()
+
def startTest(self, test):
if self.selection and test.id() in test_resume.CONTAINERS:
self.selection_context = test_resume.selection_environment(
diff --git a/src/peach/api.py b/src/peach/api.py
index 74a0c48ec..f7a0f70a4 100644
--- a/src/peach/api.py
+++ b/src/peach/api.py
@@ -553,6 +553,8 @@ def create_app(
# 死链检查和资源对账的后台线程是 daemon,本来挡不住进程退出;这里显式收
# 一下,免得在途的那一轮在解释器拆卸期间还继续查库、往没人读的状态里写。
contract.stop_background_jobs()
+ from . import face_models
+ face_models.detach(contract.task_runs)
if mdns is not None:
await asyncio.to_thread(mdns.stop)
# stop 让还在等边缘的握手当场返回;握手若刚好在 stop 之后才拉起子进程,
diff --git a/src/peach/face_models.py b/src/peach/face_models.py
index 02e8d28e4..44696be02 100644
--- a/src/peach/face_models.py
+++ b/src/peach/face_models.py
@@ -69,6 +69,13 @@ def attach(runs) -> None:
face_detect.observer = Reporter(runs)
+def detach(runs) -> None:
+ """服务关停后释放属于这份账本的模型任务记录器。"""
+ observer = face_detect.observer
+ if isinstance(observer, Reporter) and observer.runs is runs:
+ face_detect.observer = None
+
+
#: 「立即重试」的地址:活动中心页顶「需要处理」那一行调它,请求体 `{}`。
RETRY_URL = "/api/face-models"
diff --git a/tests/test_dependency_policy.py b/tests/test_dependency_policy.py
index 5980779d6..4b88f028f 100644
--- a/tests/test_dependency_policy.py
+++ b/tests/test_dependency_policy.py
@@ -1,6 +1,8 @@
from __future__ import annotations
import ast
+import contextlib
+import io
import json
from pathlib import Path
import re
@@ -106,6 +108,10 @@ class DockerBuildContextTests(unittest.TestCase):
class NpmAuditTests(unittest.TestCase):
+ def setUp(self):
+ self.output = io.StringIO()
+ self.enterContext(contextlib.redirect_stdout(self.output))
+
def test_docker_dependency_updates_have_a_takeover_recipe(self):
for manifest in ('Dockerfile', '.github/actions/actionlint/Dockerfile'):
self.assertEqual(adopt.recipe_for([manifest])[0], 'docker')
@@ -119,6 +125,7 @@ class NpmAuditTests(unittest.TestCase):
{'metadata': {'vulnerabilities': counts}}), '')
run, sleep = mock.Mock(return_value=response), mock.Mock()
self.assertEqual(npm_audit.audit(ROOT, runner=run, sleep=sleep), 1)
+ self.assertEqual(json.loads(self.output.getvalue().splitlines()[-1])['decision'], 'vulnerable')
self.assertEqual(run.call_count, 1)
sleep.assert_not_called()
diff --git a/tests/test_downloads_jav_browser.py b/tests/test_downloads_jav_browser.py
index d8cb2eaf0..34e5e1633 100644
--- a/tests/test_downloads_jav_browser.py
+++ b/tests/test_downloads_jav_browser.py
@@ -165,7 +165,7 @@ class BrowserTests(unittest.TestCase):
with contract.database.write_transaction() as connection:
asset_id = connection.execute(
'INSERT INTO asset(path,name,location,medium,code) VALUES(?,?,?,?,?)',
- ('R:\Media\ABC-123.mp4', 'ABC-123.mp4', 'local', 'video', 'ABC-123')).lastrowid
+ (r'R:\Media\ABC-123.mp4', 'ABC-123.mp4', 'local', 'video', 'ABC-123')).lastrowid
person = upsert_asset_entity(connection, asset_id=asset_id, kind='performer', name='测试演员',
role='performer', source='user:test')
contract.avatar_root.mkdir(parents=True, exist_ok=True)
diff --git a/tests/test_face_models.py b/tests/test_face_models.py
index 623e0d226..367835d36 100644
--- a/tests/test_face_models.py
+++ b/tests/test_face_models.py
@@ -30,6 +30,14 @@ class FaceModelsCase(unittest.TestCase):
class ReporterTests(FaceModelsCase):
+ def test_detach_releases_only_the_owning_ledgers_reporter(self):
+ face_models.attach(self.store)
+ attached = face_detect.observer
+ face_models.detach(object())
+ self.assertIs(face_detect.observer, attached)
+ face_models.detach(self.store)
+ self.assertIsNone(face_detect.observer)
+
def setUp(self):
super().setUp()
self.report = face_models.Reporter(self.store)
diff --git a/tests/test_feeds_web.py b/tests/test_feeds_web.py
index f9700788d..a44a692e0 100644
--- a/tests/test_feeds_web.py
+++ b/tests/test_feeds_web.py
@@ -108,6 +108,13 @@ class FeedWebFixture(unittest.TestCase):
self._fetch_cover = feed_followup.fetch_cover
feed_followup.fetch_cover = self._fake_cover
self.addCleanup(lambda: setattr(feed_followup, "fetch_cover", self._fetch_cover))
+ self.addCleanup(self._finish_feed_job)
+
+ def _finish_feed_job(self):
+ thread = self.contract.feed_job.thread
+ self.contract.feed_job.stop(timeout=15)
+ if thread is not None:
+ self.assertFalse(thread.is_alive(), '检查线程未结束,不能还原替身或删除临时账本')
def _fake_cover(self, contract, code, cover_url=None):
self.cover_urls[code] = cover_url
diff --git a/tests/test_test_planning.py b/tests/test_test_planning.py
index 9805a7420..28e84248f 100644
--- a/tests/test_test_planning.py
+++ b/tests/test_test_planning.py
@@ -683,6 +683,7 @@ class TestPlanningTests(unittest.TestCase):
for test in (first, second):
result.startTest(test)
result.stopTest(test)
+ result.stopTestRun()
self.assertEqual(result.files, {'test_alpha': 6.0, 'test_beta': 4.0})
self.assertEqual([seconds for seconds, _ in result.timings], [1.0, 1.0])
with tempfile.TemporaryDirectory() as directory:
@@ -693,6 +694,27 @@ class TestPlanningTests(unittest.TestCase):
table.write_text('不是 JSON', encoding='utf-8')
self.assertEqual(runner.load_file_seconds(table), {})
+ def test_background_thread_exceptions_fail_the_suite_and_restore_the_hook(self):
+ import threading
+ previous = threading.excepthook
+ def crash():
+ raise RuntimeError('background fixture failed')
+ class Case(unittest.TestCase):
+ def runTest(self):
+ thread = threading.Thread(target=crash, name='fixture-worker')
+ thread.start()
+ thread.join()
+ with patch.object(threading, 'excepthook') as original_hook:
+ result = unittest.TextTestRunner(stream=io.StringIO(), resultclass=runner.TimedResult).run(
+ unittest.TestSuite([Case()]))
+ self.assertIs(threading.excepthook, original_hook)
+ original_hook.assert_called_once()
+ self.assertIs(threading.excepthook, previous)
+ self.assertFalse(result.wasSuccessful())
+ self.assertEqual(len(result.errors), 1)
+ self.assertIn('background fixture failed', result.errors[0][1])
+ self.assertTrue(any(row['outcome'] == 'error' for row in result.results))
+
def test_jobs_accepts_auto_or_a_positive_integer(self):
self.assertEqual(runner.resolve_jobs('3'), 3)
self.assertTrue(1 <= runner.resolve_jobs('auto') <= runner.DEFAULT_JOBS)
diff --git a/uv.lock b/uv.lock
index 202597d0d..74053da5e 100644
--- a/uv.lock
+++ b/uv.lock
@@ -683,6 +683,19 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/7e/f5/f66802a942d491edb555dd61e3a9961140fd64c90bce1eafd741609d334d/httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55", size = 78784, upload-time = "2025-04-24T22:06:20.566Z" },
]
+[[package]]
+name = "httpcore2"
+version = "2.16.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+ { name = "h11" },
+ { name = "truststore" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/c0/61/afa9d6b7452f9eca73f73d45324eb0bb52f098fd5e6049bf6b8263be9b4e/httpcore2-2.16.0.tar.gz", hash = "sha256:c72cd0413563b17e1cd8354677dff887466f8ec2551679759e93126534428643", size = 69886, upload-time = "2026-10-21T07:09:45.31Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/af/c2/ce417c397afa5181f0e3c6ff01a4d01639414e1adef08730d97571297151/httpcore2-2.16.0-py3-none-any.whl", hash = "sha256:5c4358319f2602d984ad93182c9fee5160f22e9da7babdda870a5e7c4e2dc34f", size = 85070, upload-time = "2026-10-21T07:09:42.802Z" },
+]
+
[[package]]
name = "httpx"
version = "0.28.1"
@@ -698,6 +711,31 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517, upload-time = "2024-12-06T15:37:21.509Z" },
]
+[[package]]
+name = "httpx2"
+version = "2.16.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+ { name = "anyio", marker = "sys_platform != 'emscripten'" },
+ { name = "httpcore2", marker = "sys_platform != 'emscripten'" },
+ { name = "httpx2-jsfetch", marker = "sys_platform == 'emscripten'" },
+ { name = "idna" },
+ { name = "truststore", marker = "sys_platform != 'emscripten'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/43/73/5ca2cedf5e4e50423d1c258877865a6b62793633b561c58499f8aeb33b7e/httpx2-2.16.0.tar.gz", hash = "sha256:0d54c98128e8f2ff7fbbde0fca8c359e5f032edeaaaac443cdb7f31f685bcd7f", size = 103116, upload-time = "2026-10-21T07:09:46.348Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/7b/3d/2e4bc4fd1ef9770871669adb348d612a6e4786b303a23f9935b81c48dd60/httpx2-2.16.0-py3-none-any.whl", hash = "sha256:fd2c5d7909e8d86fe92d53020c310ca0e4e431b838c207c5754b9bbf0308d49a", size = 97880, upload-time = "2026-10-21T07:09:44.01Z" },
+]
+
+[[package]]
+name = "httpx2-jsfetch"
+version = "1.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/cd/c4/0e5636363151a2a1795e0a77617168b9ca438e1748ec05fc9b5687f93d64/httpx2_jsfetch-1.0.tar.gz", hash = "sha256:70a0e3eabfef7cce5ad9c629f7d01ca05e418f586646f4ddf14782e4c1454c60", size = 6872, upload-time = "2026-08-07T00:13:07.492Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/9b/43/832f631d32e4f1211caa2ba368317739fe71f0b8530e4c9d15dc454bac2a/httpx2_jsfetch-1.0-py3-none-any.whl", hash = "sha256:cb916b707601e69a07721aabc8f3f6659be3a6893bc1ff5c6f9e02241df2da32", size = 6382, upload-time = "2026-08-07T00:13:06.567Z" },
+]
+
[[package]]
name = "id2dirnode"
version = "0.0.2"
@@ -1234,6 +1272,7 @@ build = [
]
dev = [
{ name = "filelock" },
+ { name = "httpx2" },
{ name = "psutil" },
{ name = "ruff" },
{ name = "seiso" },
@@ -1266,6 +1305,7 @@ requires-dist = [
{ name = "filelock", marker = "extra == 'dev'", specifier = "==4.2.4" },
{ name = "grpcio", specifier = "==1.85.0" },
{ name = "httpx", specifier = "==0.28.1" },
+ { name = "httpx2", marker = "extra == 'dev'", specifier = "==2.16.0" },
{ name = "itsdangerous", specifier = "==2.2.0" },
{ name = "m3u8", specifier = "==6.0.0" },
{ name = "numpy", marker = "extra == 'vision'", specifier = "==2.5.4" },
@@ -2352,6 +2392,15 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/a3/3b/e1cabd6eccc198273ba350eb35c6eb78848d5a8434b0eb0272e1d30df2d4/torznab-0.2.1-py3-none-any.whl", hash = "sha256:6f07a621e503a0afe209ed1d4ddc0455469203762dbf2ecd7f832945a1825399", size = 8288, upload-time = "2026-09-16T16:37:42.393Z" },
]
+[[package]]
+name = "truststore"
+version = "0.10.5"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/ee/9f/c5201d42a484c061e528825fc8e2d565f5abd50a4ced6fb7d29c4ec99b2b/truststore-0.10.5.tar.gz", hash = "sha256:30d36967ccaded5cbb38d602c433f53600036c79d502f4533a49b60a03bbefcd", size = 28091, upload-time = "2026-10-12T22:27:31.808Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/51/e9/3a7820be2bb0fe53b6bc9c3be26d3d1158004e4c3ab953aa6840b955b1e9/truststore-0.10.5-py3-none-any.whl", hash = "sha256:9aaaedaefaf06d8b206278cf8b5012bc897f485a874503501e12d776df78951c", size = 19017, upload-time = "2026-10-12T22:27:30.377Z" },
+]
+
[[package]]
name = "typing-extensions"
version = "4.16.0"