Fix more mypy errors

src/nomad_simulations/schema_packages/model_system.py

@@ -43,7 +43,7 @@
 
 if TYPE_CHECKING:
     from collections.abc import Generator
-    from typing import Callable, Optional
+    from typing import Callable, Optional, Any
 
     import pint
     from nomad.datamodel.datamodel import EntryArchive
@@ -232,6 +232,7 @@ def __init__(self, representative_variable):
     def __hash__(self):
         return self.representative_variable.__hash__()
 
+    @staticmethod
     def _check_implemented(func: Callable):
         """
         Decorator to restrict the comparison functions to the same class.
@@ -369,9 +370,9 @@ class Cell(GeometricSpace):
     )
 
     @staticmethod
-    def _generate_comparer(obj) -> Generator[HashedPositions, None, None]:
+    def _generate_comparer(obj) -> Generator[Any, None, None]:
         try:
-            return (HashedPositions(pos) for pos in obj.positions)
+            return ((HashedPositions(pos)) for pos in obj.positions)
         except AttributeError:
             raise NotImplementedError
 
@@ -445,7 +446,7 @@ def __init__(self, m_def: 'Section' = None, m_context: 'Context' = None, **kwarg
     @staticmethod
     def _generate_comparer(
         obj,
-    ) -> Generator[HashedPositions, PartialOrderElement, None, None]:
+    ) -> Generator[Any, None, None]:
         # presumes `atoms_state` mapping 1-to-1 with `positions` and conserves the order
         try:
             return (

tests/test_model_system.py

@@ -239,7 +239,7 @@ class TestAtomicCell:
             ),  # different position-symbol map
         ],
     )
-    def test_partial_order(self, cell_1: Cell, cell_2: Cell, result: bool):
+    def test_partial_order(self, cell_1: Cell, cell_2: Cell, result: dict[str, bool]):
         """
         Test the comparison operators of `Cell` and `AtomicCell`.
         """