From 199a0276c4becfa23f64014b4f426a0c317068fe Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Tue, 14 Jan 2025 15:59:27 +0000 Subject: [PATCH] Run mypy on src/aiida/orm/nodes/caching.py (#6703) --- .pre-commit-config.yaml | 1 - src/aiida/orm/nodes/caching.py | 10 +++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 98812cf488..fb2019ac26 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -125,7 +125,6 @@ repos: src/aiida/orm/comments.py| src/aiida/orm/computers.py| src/aiida/orm/implementation/storage_backend.py| - src/aiida/orm/nodes/caching.py| src/aiida/orm/nodes/comments.py| src/aiida/orm/nodes/data/array/bands.py| src/aiida/orm/nodes/data/array/trajectory.py| diff --git a/src/aiida/orm/nodes/caching.py b/src/aiida/orm/nodes/caching.py index b916e13f5a..7bc8dcd1a7 100644 --- a/src/aiida/orm/nodes/caching.py +++ b/src/aiida/orm/nodes/caching.py @@ -53,13 +53,13 @@ def _compute_hash(self, ignore_errors: bool = True, **kwargs: t.Any) -> str | No self._node.logger.exception('Node hashing failed') return None - def _get_objects_to_hash(self) -> list[t.Any]: + def _get_objects_to_hash(self) -> dict[str, t.Any]: warn_deprecation( '`NodeCaching._get_objects_to_hash` is deprecated, use `NodeCaching.get_objects_to_hash` instead', version=3 ) return self.get_objects_to_hash() - def get_objects_to_hash(self) -> list[t.Any]: + def get_objects_to_hash(self) -> dict[str, t.Any]: """Return a list of objects which should be included in the hash.""" return { @@ -158,11 +158,7 @@ def _iter_all_same_nodes(self, allow_before_store=False) -> t.Iterator['Node']: builder = QueryBuilder(backend=self._node.backend) builder.append(self._node.__class__, filters={f'extras.{self._HASH_EXTRA_KEY}': node_hash}, subclassing=False) - return ( - node - for (node,) in builder.iterall() - if node.base.caching.is_valid_cache # type: ignore[misc,union-attr] - ) + return (node for (node,) in builder.iterall() if node.base.caching.is_valid_cache) @property def is_valid_cache(self) -> bool: