Peach: Local-first video metadata scraper and media manager.
feat(tasks): 网盘挂载的网络读数标出来源
longmeidao0fbdae589f70
diff --git a/src/peach/task_resources.py b/src/peach/task_resources.pyindex 93e7e8a2f..a2078af1f 100644--- a/src/peach/task_resources.py+++ b/src/peach/task_resources.py@@ -36,6 +36,8 @@ class Usage:self.processes = {}self.network_bytes = 0self.network_error = ''+ #: 读数未取得时传输走的是哪一路;`cloud` 是网盘挂载,界面据此写「网盘读取」。+ self.network_via = ''self.lock = threading.RLock()self.saved_at = 0.0with _LOCK:@@ -45,7 +47,7 @@ class Usage:with self.lock:return {'pid': self.pid, 'created': self.created, 'threads': list(self.threads),'processes': dict(self.processes), 'network_bytes': self.network_bytes,- 'network_error': self.network_error}+ 'network_error': self.network_error, 'network_via': self.network_via}def publish(self, *, force=False):now = time.monotonic()@@ -99,12 +101,13 @@ def record_download(size):control.usage.publish()-def unobserved_network(reason):+def unobserved_network(reason, *, via=''):from .task_control import CURRENTcontrol = CURRENT.get()if control is not None:with control.usage.lock:control.usage.network_error = reason+ control.usage.network_via = viacontrol.usage.publish(force=True)@@ -119,8 +122,10 @@ def media_input(path):raw = str(source_identity(path))config = settings_file.active()location, _index, _tail = resolve_root(raw, config.locations)- if location in CLOUD_LOCATIONS or resolve(raw, config) is not None:- unobserved_network('挂载或 SMB 的缓存与预读无法按任务取得实际网速')+ if location in CLOUD_LOCATIONS:+ unobserved_network('网盘挂载的缓存与预读无法按任务取得实际网速', via='cloud')+ elif resolve(raw, config) is not None:+ unobserved_network('SMB 的缓存与预读无法按任务取得实际网速')def _metric(state, field, value=None, reason='', threshold=0):@@ -159,7 +164,8 @@ class Monitor:or not math.isfinite(value['created']) or value['created'] <= 0or type(value.get('network_bytes')) not in (int, float)or not math.isfinite(value['network_bytes']) or value['network_bytes'] < 0- or not isinstance(value.get('network_error', ''), str)):+ or not isinstance(value.get('network_error', ''), str)+ or not isinstance(value.get('network_via', ''), str)):raise ValueError('这轮任务的资源归属记录无效')if value.get('pid') != run.pid:return None@@ -223,6 +229,8 @@ class Monitor:network_metric = _metric('ready', 'bytes_per_second', round(rate), threshold=NETWORK_HIGH)if owners.get('network_error'):network_metric = _metric('unavailable', 'bytes_per_second', reason=owners['network_error'])+ if owners.get('network_via'):+ network_metric['via'] = owners['network_via']if hasattr(self.gpu, 'sample_processes'):try:identities = {root.pid: root.create_time(), **{pid: child.create_time() for pid, child in children.items()}}diff --git a/tests/test_task_resources.py b/tests/test_task_resources.pyindex a952b0769..dbc8db053 100644--- a/tests/test_task_resources.py+++ b/tests/test_task_resources.py@@ -230,6 +230,22 @@ class TaskResourceTests(unittest.TestCase):self.assertEqual(network['state'], 'unavailable')self.assertIsNone(network['bytes_per_second'])self.assertEqual(network['reason'], '挂载盘传输无法准确归属')+ self.assertNotIn('via', network)++ def test_network_read_through_a_cloud_mount_says_so_while_staying_unmeasured(self):+ run = self.new_run('cloud')+ usage = self.usage(run, threads=(11,))+ monitor = self.monitor()+ monitor.for_run(run)+ token = task_control.CURRENT.set(SimpleNamespace(usage=usage))+ try:+ task_resources.unobserved_network('网盘挂载的缓存与预读无法按任务取得实际网速', via='cloud')+ finally:+ task_control.CURRENT.reset(token)+ self.clock.advance()+ network = monitor.for_run(run)['network']+ self.assertEqual((network['state'], network['via']), ('unavailable', 'cloud'))+ self.assertIsNone(network['bytes_per_second'])def test_parent_aggregation_deduplicates_cpu_parts_shared_with_a_child_run(self):parent = self.new_run('parent')