Resolve mypy error with temporary fix.

See #402 for the issue to make a proper fix.

Author: goodmami

delphin/dmrs/_operations.py

@@ -4,12 +4,12 @@
 """
 
 import warnings
-from typing import Callable, Dict, List, Optional, cast
+from typing import Callable, Optional, cast
 
 from delphin import dmrs, mrs, scope, variable
 
-_HCMap = Dict[str, mrs.HCons]
-_IdMap = Dict[str, int]
+_HCMap = dict[str, mrs.HCons]
+_IdMap = dict[str, int]
 
 
 def from_mrs(
@@ -32,7 +32,11 @@ def from_mrs(
         DMRSError when conversion fails.
     """
     hcmap: _HCMap = {hc.hi: hc for hc in m.hcons}
-    reps = scope.representatives(m, priority=representative_priority)
+    # TODO: fix type annotation with scope.representatives overloads?
+    reps = cast(
+        dict[str, list[mrs.EP]],
+        scope.representatives(m, priority=representative_priority)
+    )
     # EP id to node id map; create now to keep ids consistent
     id_to_nid: _IdMap = {ep.id: i
                          for i, ep in enumerate(m.rels, dmrs.FIRST_NODE_ID)}
@@ -83,7 +87,7 @@ def _mrs_get_top(
     return top
 
 
-def _mrs_to_nodes(m: mrs.MRS, id_to_nid: _IdMap) -> List[dmrs.Node]:
+def _mrs_to_nodes(m: mrs.MRS, id_to_nid: _IdMap) -> list[dmrs.Node]:
     nodes = []
     for ep in m.rels:
         node_id = id_to_nid[ep.id]
@@ -117,10 +121,10 @@ def _mrs_to_nodes(m: mrs.MRS, id_to_nid: _IdMap) -> List[dmrs.Node]:
 def _mrs_to_links(
         m: mrs.MRS,
         hcmap: _HCMap,
-        reps: scope.ScopeMap,
+        reps: dict[str, list[mrs.EP]],  # MRS-specific ScopeMap
         iv_to_nid: _IdMap,
         id_to_nid: _IdMap
-) -> List[dmrs.Link]:
+) -> list[dmrs.Link]:
     links = []
     # links from arguments
     for src, roleargs in m.arguments().items():

delphin/scope.py

@@ -2,7 +2,7 @@
 Structures and operations for quantifier scope in DELPH-IN semantics.
 """
 
-from typing import Dict, Iterable, List, Mapping, Optional, Tuple
+from typing import Iterable, Mapping, Optional
 
 # Default modules need to import the PyDelphin version
 from delphin.__about__ import __version__  # noqa: F401
@@ -29,11 +29,11 @@
 ScopeLabel = str
 ScopeRelation = str
 ScopeMap = Mapping[ScopeLabel, Predications]
-DescendantMap = Mapping[Identifier, List[Predication]]
-ScopalRoleArgument = Tuple[Role, ScopeRelation, Identifier]
-ScopalArgumentStructure = Mapping[Identifier, List[ScopalRoleArgument]]
+DescendantMap = Mapping[Identifier, list[Predication]]
+ScopalRoleArgument = tuple[Role, ScopeRelation, Identifier]
+ScopalArgumentStructure = Mapping[Identifier, list[ScopalRoleArgument]]
 # Regarding literal types, see: https://www.python.org/dev/peps/pep-0563/
-ScopeEqualities = Iterable[Tuple[ScopeLabel, ScopeLabel]]
+ScopeEqualities = Iterable[tuple[ScopeLabel, ScopeLabel]]
 
 
 # Exceptions
@@ -87,7 +87,7 @@ def scopal_arguments(self, scopes=None) -> ScopalArgumentStructure:
         """
         raise NotImplementedError()
 
-    def scopes(self) -> Tuple[ScopeLabel, ScopeMap]:
+    def scopes(self) -> tuple[ScopeLabel, ScopeMap]:
         """
         Return a tuple containing the top label and the scope map.
 
@@ -117,7 +117,7 @@ def conjoin(scopes: ScopeMap, leqs: ScopeEqualities) -> ScopeMap:
         >>> {lbl: [p.id for p in ps] for lbl, ps in conjoined.items()}
         {'h1': ['e2'], 'h2': ['x4', 'e6']}
     """
-    scopemap: Dict[ScopeLabel, List[Predication]] = {}
+    scopemap: dict[ScopeLabel, list[Predication]] = {}
     for component in _connected_components(list(scopes), leqs):
         chosen_label = next(iter(component))
         scopemap[chosen_label] = []
@@ -155,13 +155,13 @@ def descendants(x: ScopingSemanticStructure,
     if scopes is None:
         _, scopes = x.scopes()
     scargs = x.scopal_arguments(scopes=scopes)
-    descs: Dict[Identifier, List[Predication]] = {}
+    descs: dict[Identifier, list[Predication]] = {}
     for p in x.predications:
         _descendants(descs, p.id, scargs, scopes)
     return descs
 
 
-def _descendants(descs: Dict[Identifier, List[Predication]],
+def _descendants(descs: dict[Identifier, list[Predication]],
                  id: Identifier,
                  scargs: ScopalArgumentStructure,
                  scopes: ScopeMap) -> None:
@@ -203,7 +203,7 @@ def representatives(x: ScopingSemanticStructure, priority=None) -> ScopeMap:
 
     3. Prefer tensed over untensed eventualities
 
-    4. Finally, prefer prefer those appearing first in *x*
+    4. Finally, prefer those appearing first in *x*
 
     The definition of "tensed" vs "untensed" eventualities is
     grammar-specific, but it is used by several large grammars. If a
@@ -233,7 +233,7 @@ def representatives(x: ScopingSemanticStructure, priority=None) -> ScopeMap:
     descs = {id: set(d.id for d in ds)
              for id, ds in descendants(x, scopes).items()}
 
-    reps: Dict[ScopeLabel, List[Predication]] = {
+    reps: dict[ScopeLabel, list[Predication]] = {
         label: [] for label in scopes
     }
     for label, scope in scopes.items():