Peach: Local-first video metadata scraper and media manager.
fix(tasks): 对齐批量删除控制与父子资源汇总
longmeidao75cd18aba019
diff --git a/src/peach/task_resources.py b/src/peach/task_resources.pyindex bed1e1b06..24185a749 100644--- a/src/peach/task_resources.py+++ b/src/peach/task_resources.py@@ -222,9 +222,11 @@ class Monitor:network_metric = _metric('unavailable', 'bytes_per_second', reason=owners['network_error'])gpu_metric = _metric(gpu_state, 'percent', reason=gpu_error)engines = {}+ gpu_parts = {}if gpu is not None:for pid in children:for engine, value in gpu.get(pid, {}).items():+ gpu_parts[(pid, engine)] = valueengines[engine] = engines.get(engine, 0.0) + valueshared = max(gpu.get(root.pid, {}).values(), default=0.0)if shared:@@ -232,7 +234,7 @@ class Monitor:else:gpu_metric = _metric('ready', 'percent', round(min(100.0, max(engines.values(), default=0.0)), 1), threshold=GPU_HIGH)return {'cpu': cpu_metric, 'gpu': gpu_metric, 'network': network_metric,- '_cpu_parts': parts, '_gpu_engines': engines}+ '_cpu_parts': parts, '_gpu_parts': gpu_parts}def snapshot(self):with self.lock:@@ -295,10 +297,13 @@ class Monitor:parts[key] = max(parts.get(key, 0.0), value)value = round(min(100.0, sum(parts.values())), 1)elif name == 'gpu':- engines = {}+ parts = {}for sample in samples:- for key, value in sample.get('_gpu_engines', {}).items():- engines[key] = engines.get(key, 0.0) + value+ for key, value in sample.get('_gpu_parts', {}).items():+ parts[key] = max(parts.get(key, 0.0), value)+ engines = {}+ for (_pid, engine), value in parts.items():+ engines[engine] = engines.get(engine, 0.0) + valuevalue = round(min(100.0, max(engines.values(), default=0.0)), 1)else:value = sum(value[field] for value in values)diff --git a/src/peach/web_performer_delete.py b/src/peach/web_performer_delete.pyindex 413ec1d4c..cb5393b78 100644--- a/src/peach/web_performer_delete.py+++ b/src/peach/web_performer_delete.py@@ -5,6 +5,7 @@ import hashlibimport jsonfrom .task_runs import TaskRunHandle+from .task_control import bind, Cancelledfrom .web_batch import _finish_purge, _restore_staged_media, purge_assetsfrom .web_entity import _decorate_indexfrom .web_resource_sync import clean_resource_orphans@@ -83,22 +84,29 @@ def w_performer_delete(contract, body):handle = TaskRunHandle(contract.task_runs, run.id if run else None)outcome = Nonetry:- with contract.write_transaction() as connection:- connection.execute('BEGIN IMMEDIATE')- _people, rows, token = _selection(connection, ids)- if token != body['plan']:- raise ValueError("影片清单已变化,请关闭确认窗口后重新查看")- if not rows:- raise ValueError("没有可删除的影片")- outcome = purge_assets(connection, rows)+ with bind(contract.task_runs, handle.run_id):+ try:+ with contract.write_transaction() as connection:+ connection.execute('BEGIN IMMEDIATE')+ _people, rows, token = _selection(connection, ids)+ if token != body['plan']:+ raise ValueError("影片清单已变化,请关闭确认窗口后重新查看")+ if not rows:+ raise ValueError("没有可删除的影片")+ outcome = purge_assets(connection, rows)+ except BaseException:+ if outcome is not None:+ _restore_staged_media(outcome['_staged'])+ raise+ contract.cache_bust()+ result = {'ok': True, 'entity_ids': ids, **_finish_purge(outcome)}+ result.update(clean_resource_orphans(contract))+ except Cancelled:+ handle.finish('cancelled', summary={'cancelled_by_user': True})+ raiseexcept BaseException as error:- if outcome is not None:- _restore_staged_media(outcome['_staged'])handle.finish('failed', error=f'{type(error).__name__}: {error}')raise- contract.cache_bust()- result = {'ok': True, 'entity_ids': ids, **_finish_purge(outcome)}- result.update(clean_resource_orphans(contract))handle.finish('succeeded', summary={'operation': 'performer-delete','changed': result['purged'], 'blocked': len(result['blocked'])})return resultdiff --git a/tests/test_performer_delete.py b/tests/test_performer_delete.pyindex 86d90cec4..009854a30 100644--- a/tests/test_performer_delete.py+++ b/tests/test_performer_delete.py@@ -7,6 +7,7 @@ from unittest import mockfrom support.ledger import fresh_ledgerfrom peach.web_performer_delete import q_performer_delete_candidates, q_performer_delete_plan, w_performer_deletefrom peach.web_state import WebContract+from peach import task_controlclass PerformerDeleteTests(unittest.TestCase):@@ -61,6 +62,23 @@ class PerformerDeleteTests(unittest.TestCase):self.assertTrue(first.exists())self.assertTrue(second.exists())+ def test_cancel_before_deletion_keeps_media_and_records_cancelled(self):+ path = self.add(1)+ plan = self.plan()+ start = self.contract.task_runs.start++ def cancel_started(*args, **kwargs):+ run = start(*args, **kwargs)+ task_control.request(self.contract.task_runs, run.id, 'cancel')+ return run++ with mock.patch.object(self.contract.task_runs, 'start', side_effect=cancel_started):+ with self.assertRaises(task_control.Cancelled):+ self.delete(plan)+ self.assertTrue(path.exists())+ self.assertEqual(self.plan()['total'], 1)+ self.assertEqual(self.contract.task_runs.query(limit=1)[0].status, 'cancelled')+def test_more_than_200_files_delete_together_and_keep_profile_photos_and_unrelated_media(self):for asset_id in range(1, 202):self.add(asset_id)diff --git a/tests/test_task_resources.py b/tests/test_task_resources.pyindex 197335265..10ef3b7c7 100644--- a/tests/test_task_resources.py+++ b/tests/test_task_resources.py@@ -237,6 +237,18 @@ class TaskResourceTests(unittest.TestCase):self.assertEqual(monitor.for_run(parent)['cpu']['percent'], 50.0)self.assertEqual(monitor.for_run(child_run)['cpu']['percent'], 25.0)+ def test_parent_gpu_counts_each_owned_process_engine_once_across_descendants(self):+ parent = self.new_run('parent')+ self.store.enqueue_followups(parent.id, [('child:1', 'child', '子任务')])+ child_run = self.store.claim_followup(['child'])+ shared, separate = self.child(5001), self.child(5002)+ self.usage(parent, processes=(shared.pid,))+ self.usage(child_run, processes=(shared.pid, separate.pid))+ monitor = self.monitor(GpuReader({shared.pid: {'engine-0': 40, 'engine-1': 60},+ separate.pid: {'engine-0': 30}}))+ self.assertEqual(monitor.for_run(parent)['gpu']['percent'], 70.0)+ self.assertEqual(monitor.for_run(child_run)['gpu']['percent'], 70.0)+def test_finished_parent_still_shows_live_descendants_but_pure_history_has_no_resources(self):parent = self.new_run('parent')child_id = self.store.enqueue_followups(parent.id, [('child:1', 'child', '子任务')])['queued'][0]