mypy

Author: mpharrigan

qualtran/bloqs/for_testing/costing.py

@@ -19,13 +19,18 @@
 from qualtran.resource_counting import BloqCountT, CostKey, SympySymbolAllocator
 
 
+def _convert_callees(callees: Sequence[BloqCountT]) -> Tuple[BloqCountT, ...]:
+    # Convert to tuples in a type-checked way.
+    return tuple(callees)
+
+
 @frozen
 class CostingBloq(Bloq):
     """A bloq that lets you set the costs via attributes."""
 
     name: str
     num_qubits: int
-    callees: Sequence[BloqCountT] = field(converter=tuple, factory=tuple)
+    callees: Sequence[BloqCountT] = field(converter=_convert_callees, factory=tuple)
     static_costs: Sequence[Tuple[CostKey, Any]] = field(converter=tuple, factory=tuple)
 
     @property

qualtran/resource_counting/_call_graph.py

@@ -14,7 +14,7 @@
 
 """Functionality for the `Bloq.call_graph()` protocol."""
 
-import collections.abc as abc
+import collections.abc
 from collections import defaultdict
 from typing import Callable, Dict, List, Optional, Sequence, Set, Tuple, Union
 
@@ -231,7 +231,7 @@ def get_bloq_call_graph(
         keep = lambda b: False
     if generalizer is None:
         generalizer = lambda b: b
-    if isinstance(generalizer, abc.Sequence):
+    if isinstance(generalizer, collections.abc.Sequence):
         generalizer = _make_composite_generalizer(*generalizer)
 
     g = nx.DiGraph()

qualtran/resource_counting/_costing.py

@@ -13,6 +13,7 @@
 #  limitations under the License.
 
 import abc
+import collections
 import logging
 import time
 from collections import defaultdict
@@ -173,7 +174,7 @@ def get_cost_value(
         costs_cache = {}
     if generalizer is None:
         generalizer = lambda b: b
-    if isinstance(generalizer, (list, tuple)):
+    if isinstance(generalizer, collections.abc.Sequence):
         generalizer = _make_composite_generalizer(*generalizer)
 
     cost_val = _get_cost_value(bloq, cost_key, costs_cache=costs_cache, generalizer=generalizer)
@@ -210,7 +211,7 @@ def get_cost_cache(
         costs_cache = {}
     if generalizer is None:
         generalizer = lambda b: b
-    if isinstance(generalizer, (list, tuple)):
+    if isinstance(generalizer, collections.abc.Sequence):
         generalizer = _make_composite_generalizer(*generalizer)
 
     _get_cost_value(bloq, cost_key, costs_cache=costs_cache, generalizer=generalizer)
@@ -240,7 +241,7 @@ def query_costs(
         A dictionary of dictionaries forming a table of multiple costs for multiple bloqs.
         This is indexed by bloq, then cost key.
     """
-    costs = defaultdict(dict)
+    costs: Dict['Bloq', Dict[CostKey, CostValT]] = defaultdict(dict)
     for cost_key in cost_keys:
         cost_for_bloqs = get_cost_cache(bloq, cost_key, generalizer=generalizer)
         for bloq, val in cost_for_bloqs.items():

qualtran/resource_counting/_costing_test.py

@@ -43,7 +43,7 @@ def compute(self, bloq: 'Bloq', get_callee_cost: Callable[['Bloq'], int]) -> int
 
         return total
 
-    def zero(self) -> CostValT:
+    def zero(self) -> int:
         return 0
 
     def __hash__(self):