From 66e791603cf9d6ff2a0919825a51e1fc0457d584 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sat, 3 Oct 2026 08:43:31 +0800 Subject: [PATCH] fix(monitor): type snapshot reconciliation state --- app/modules/filemanager/storages/__init__.py | 15 +++++++++------ tests/fixtures/architecture/mypy-baseline.json | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/modules/filemanager/storages/__init__.py b/app/modules/filemanager/storages/__init__.py index 9b936c57e..5ccb60a5e 100644 --- a/app/modules/filemanager/storages/__init__.py +++ b/app/modules/filemanager/storages/__init__.py @@ -1,6 +1,6 @@ from abc import ABCMeta, abstractmethod from pathlib import Path, PurePosixPath -from typing import Callable, Dict, List, Optional, Tuple, Union +from typing import Any, Callable, Dict, List, Optional, Tuple, Union from tqdm import tqdm @@ -14,6 +14,9 @@ from app.schemas.system import StorageConf as _SchemaStorageConf from app.schemas.workflow import FileItem as _SchemaFileItem +_SnapshotInfo = Dict[str, Dict[str, Any]] + + def transfer_process(path: str) -> Callable[[int | float], None]: """ 传输进度回调 @@ -315,9 +318,9 @@ class StorageBase(metaclass=ABCMeta): @staticmethod def _snapshot_previous_state( root_path: PurePosixPath, - previous_snapshot: Optional[Dict[str, Dict]], + previous_snapshot: Optional[_SnapshotInfo], ) -> Tuple[ - Dict[str, Dict], + _SnapshotInfo, Dict[PurePosixPath, set[PurePosixPath]], Dict[PurePosixPath, str], ]: @@ -353,7 +356,7 @@ class StorageBase(metaclass=ABCMeta): @staticmethod def _snapshot_remove_previous_subtree( path: PurePosixPath, - files_info: Dict[str, Dict], + files_info: _SnapshotInfo, previous_children: Dict[PurePosixPath, set[PurePosixPath]], previous_files: Dict[PurePosixPath, str], ) -> None: @@ -370,7 +373,7 @@ class StorageBase(metaclass=ABCMeta): self, fileitem: _SchemaFileItem, sub_files: List[_SchemaFileItem], - files_info: Dict[str, Dict], + files_info: _SnapshotInfo, previous_children: Dict[PurePosixPath, set[PurePosixPath]], previous_files: Dict[PurePosixPath, str], ) -> None: @@ -394,7 +397,7 @@ class StorageBase(metaclass=ABCMeta): def _snapshot_file( self, fileitem: _SchemaFileItem, - files_info: Dict[str, Dict], + files_info: _SnapshotInfo, previous_children: Dict[PurePosixPath, set[PurePosixPath]], previous_files: Dict[PurePosixPath, str], last_snapshot_time: float, diff --git a/tests/fixtures/architecture/mypy-baseline.json b/tests/fixtures/architecture/mypy-baseline.json index 0186acfc2..d72d2f797 100644 --- a/tests/fixtures/architecture/mypy-baseline.json +++ b/tests/fixtures/architecture/mypy-baseline.json @@ -1517,7 +1517,7 @@ "attr-defined": 4, "index": 1, "no-untyped-call": 2, - "no-untyped-def": 8, + "no-untyped-def": 7, "return-value": 1, "type-arg": 6, "var-annotated": 1