cirq-core 1.5.0.dev20250409222543__py3-none-any.whl → 1.6.0__py3-none-any.whl

cirq/transformers/target_gatesets/compilation_target_gateset.py

@@ -14,18 +14,20 @@
 
 """Base class for creating custom target gatesets which can be used for compilation."""
 
+from __future__ import annotations
+
 import abc
-from typing import Hashable, List, Optional, Type, TYPE_CHECKING, Union
+from typing import Hashable, TYPE_CHECKING
 
 from cirq import circuits, ops, protocols, transformers
-from cirq.protocols.decompose_protocol import DecomposeResult
 from cirq.transformers import merge_k_qubit_gates, merge_single_qubit_gates
 
 if TYPE_CHECKING:
     import cirq
+    from cirq.protocols.decompose_protocol import DecomposeResult
 
 
-def create_transformer_with_kwargs(transformer: 'cirq.TRANSFORMER', **kwargs) -> 'cirq.TRANSFORMER':
+def create_transformer_with_kwargs(transformer: cirq.TRANSFORMER, **kwargs) -> cirq.TRANSFORMER:
     """Method to capture additional keyword arguments to transformers while preserving mypy type.
 
     Returns a `cirq.TRANSFORMER` which, when called with a circuit and transformer context, is
@@ -33,13 +35,13 @@ def create_transformer_with_kwargs(transformer: 'cirq.TRANSFORMER', **kwargs) ->
     capture keyword arguments of a transformer before passing them as an argument to an API that
     expects `cirq.TRANSFORMER`. For example:
 
-    >>> def run_transformers(transformers: 'List[cirq.TRANSFORMER]'):
+    >>> def run_transformers(transformers: list[cirq.TRANSFORMER]):
     ...     circuit = cirq.Circuit(cirq.X(cirq.q(0)))
     ...     context = cirq.TransformerContext()
     ...     for transformer in transformers:
     ...         transformer(circuit, context=context)
     ...
-    >>> transformers: 'List[cirq.TRANSFORMER]' = []
+    >>> transformers: list[cirq.TRANSFORMER] = []
     >>> transformers.append(
     ...     cirq.create_transformer_with_kwargs(
     ...         cirq.expand_composite, no_decomp=lambda op: cirq.num_qubits(op) <= 2
@@ -65,8 +67,8 @@ def create_transformer_with_kwargs(transformer: 'cirq.TRANSFORMER', **kwargs) ->
         raise SyntaxError('**kwargs to be captured must not contain `context`.')
 
     def transformer_with_kwargs(
-        circuit: 'cirq.AbstractCircuit', *, context: Optional['cirq.TransformerContext'] = None
-    ) -> 'cirq.AbstractCircuit':
+        circuit: cirq.AbstractCircuit, *, context: cirq.TransformerContext | None = None
+    ) -> cirq.AbstractCircuit:
         return transformer(circuit, context=context, **kwargs)
 
     return transformer_with_kwargs
@@ -81,8 +83,8 @@ class CompilationTargetGateset(ops.Gateset, metaclass=abc.ABCMeta):
 
     def __init__(
         self,
-        *gates: Union[Type['cirq.Gate'], 'cirq.Gate', 'cirq.GateFamily'],
-        name: Optional[str] = None,
+        *gates: type[cirq.Gate] | cirq.Gate | cirq.GateFamily,
+        name: str | None = None,
         unroll_circuit_op: bool = True,
         preserve_moment_structure: bool = True,
         reorder_operations: bool = False,
@@ -116,7 +118,7 @@ class CompilationTargetGateset(ops.Gateset, metaclass=abc.ABCMeta):
         """Maximum number of qubits on which a gate from this gateset can act upon."""
 
     @abc.abstractmethod
-    def decompose_to_target_gateset(self, op: 'cirq.Operation', moment_idx: int) -> DecomposeResult:
+    def decompose_to_target_gateset(self, op: cirq.Operation, moment_idx: int) -> DecomposeResult:
         """Method to rewrite the given operation using gates from this gateset.
 
         Args:
@@ -128,7 +130,7 @@ class CompilationTargetGateset(ops.Gateset, metaclass=abc.ABCMeta):
             - `None` or `NotImplemented` if does not know how to decompose `op`.
         """
 
-    def _validate_operation(self, op: 'cirq.Operation') -> bool:
+    def _validate_operation(self, op: cirq.Operation) -> bool:
         """Validates whether the given `cirq.Operation` is contained in this Gateset.
 
         Overrides the method on the base gateset class to ensure that operations which created
@@ -153,7 +155,7 @@ class CompilationTargetGateset(ops.Gateset, metaclass=abc.ABCMeta):
         return "_default_merged_k_qubit_unitaries"
 
     @property
-    def preprocess_transformers(self) -> List['cirq.TRANSFORMER']:
+    def preprocess_transformers(self) -> list[cirq.TRANSFORMER]:
         """List of transformers which should be run before decomposing individual operations."""
         reorder_transfomers = (
             [transformers.insertion_sort_transformer] if self._reorder_operations else []
@@ -172,9 +174,9 @@ class CompilationTargetGateset(ops.Gateset, metaclass=abc.ABCMeta):
         ]
 
     @property
-    def postprocess_transformers(self) -> List['cirq.TRANSFORMER']:
+    def postprocess_transformers(self) -> list[cirq.TRANSFORMER]:
         """List of transformers which should be run after decomposing individual operations."""
-        processors: List['cirq.TRANSFORMER'] = [
+        processors: list[cirq.TRANSFORMER] = [
             merge_single_qubit_gates.merge_single_qubit_moments_to_phxz,
             transformers.drop_negligible_operations,
             transformers.drop_empty_moments,
@@ -221,7 +223,7 @@ class TwoQubitCompilationTargetGateset(CompilationTargetGateset):
     def num_qubits(self) -> int:
         return 2
 
-    def decompose_to_target_gateset(self, op: 'cirq.Operation', moment_idx: int) -> DecomposeResult:
+    def decompose_to_target_gateset(self, op: cirq.Operation, moment_idx: int) -> DecomposeResult:
         if not 1 <= protocols.num_qubits(op) <= 2:
             return self._decompose_multi_qubit_operation(op, moment_idx)
         if protocols.num_qubits(op) == 1:
@@ -248,7 +250,7 @@ class TwoQubitCompilationTargetGateset(CompilationTargetGateset):
         )
         if switch_to_new:
             return new_optree
-        mapped_old_optree: List['cirq.OP_TREE'] = []
+        mapped_old_optree: list[cirq.OP_TREE] = []
         for old_op in ops.flatten_to_ops(old_optree):
             if old_op in self:
                 mapped_old_optree.append(old_op)
@@ -260,7 +262,7 @@ class TwoQubitCompilationTargetGateset(CompilationTargetGateset):
         return mapped_old_optree
 
     def _decompose_single_qubit_operation(
-        self, op: 'cirq.Operation', moment_idx: int
+        self, op: cirq.Operation, moment_idx: int
     ) -> DecomposeResult:
         """Decomposes (connected component of) 1-qubit operations using gates from this gateset.
 
@@ -282,7 +284,7 @@ class TwoQubitCompilationTargetGateset(CompilationTargetGateset):
         )
 
     def _decompose_multi_qubit_operation(
-        self, op: 'cirq.Operation', moment_idx: int
+        self, op: cirq.Operation, moment_idx: int
     ) -> DecomposeResult:
         """Decomposes operations acting on more than 2 qubits using gates from this gateset.
 
@@ -298,7 +300,7 @@ class TwoQubitCompilationTargetGateset(CompilationTargetGateset):
 
     @abc.abstractmethod
     def _decompose_two_qubit_operation(
-        self, op: 'cirq.Operation', moment_idx: int
+        self, op: cirq.Operation, moment_idx: int
     ) -> DecomposeResult:
         """Decomposes (connected component of) 2-qubit operations using gates from this gateset.
 

cirq/transformers/target_gatesets/compilation_target_gateset_test.py

@@ -12,15 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import List
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 import pytest
 
 import cirq
-from cirq.protocols.decompose_protocol import DecomposeResult
+
+if TYPE_CHECKING:
+    from cirq.protocols.decompose_protocol import DecomposeResult
 
 
-def test_compilation_target_gateset():
+def test_compilation_target_gateset() -> None:
     class ExampleTargetGateset(cirq.CompilationTargetGateset):
         def __init__(self):
             super().__init__(cirq.AnyUnitaryGateFamily(2))
@@ -29,11 +33,11 @@ def test_compilation_target_gateset():
         def num_qubits(self) -> int:
             return 2
 
-        def decompose_to_target_gateset(self, op: 'cirq.Operation', _) -> DecomposeResult:
+        def decompose_to_target_gateset(self, op: cirq.Operation, _) -> DecomposeResult:
             return op if cirq.num_qubits(op) == 2 and cirq.has_unitary(op) else NotImplemented
 
         @property
-        def preprocess_transformers(self) -> List[cirq.TRANSFORMER]:
+        def preprocess_transformers(self) -> list[cirq.TRANSFORMER]:
             return []
 
     gateset = ExampleTargetGateset()
@@ -63,7 +67,7 @@ class ExampleCXTargetGateset(cirq.TwoQubitCompilationTargetGateset):
     def __init__(self):
         super().__init__(cirq.AnyUnitaryGateFamily(1), cirq.CNOT)
 
-    def _decompose_two_qubit_operation(self, op: 'cirq.Operation', _) -> DecomposeResult:
+    def _decompose_two_qubit_operation(self, op: cirq.Operation, _) -> DecomposeResult:
         if not cirq.has_unitary(op):
             return NotImplemented
 
@@ -77,7 +81,7 @@ class ExampleCXTargetGateset(cirq.TwoQubitCompilationTargetGateset):
             cirq.Z.on_each(q0, q1),
         ]
 
-    def _decompose_single_qubit_operation(self, op: 'cirq.Operation', _) -> DecomposeResult:
+    def _decompose_single_qubit_operation(self, op: cirq.Operation, _) -> DecomposeResult:
         if not cirq.has_unitary(op):
             return NotImplemented
         assert self._intermediate_result_tag in op.tags
@@ -90,7 +94,7 @@ class ExampleCXTargetGateset(cirq.TwoQubitCompilationTargetGateset):
         )
 
 
-def test_two_qubit_compilation_leaves_single_gates_in_gateset():
+def test_two_qubit_compilation_leaves_single_gates_in_gateset() -> None:
     q = cirq.LineQubit.range(2)
     gateset = ExampleCXTargetGateset()
 
@@ -101,7 +105,7 @@ def test_two_qubit_compilation_leaves_single_gates_in_gateset():
     cirq.testing.assert_same_circuits(cirq.optimize_for_target_gateset(c, gateset=gateset), c)
 
 
-def test_two_qubit_compilation_merges_runs_of_single_qubit_gates():
+def test_two_qubit_compilation_merges_runs_of_single_qubit_gates() -> None:
     q = cirq.LineQubit.range(2)
     c = cirq.Circuit(cirq.CNOT(*q), cirq.X(q[0]), cirq.Y(q[0]), cirq.CNOT(*q))
     cirq.testing.assert_same_circuits(
@@ -114,7 +118,7 @@ def test_two_qubit_compilation_merges_runs_of_single_qubit_gates():
     )
 
 
-def test_two_qubit_compilation_decompose_operation_not_implemented():
+def test_two_qubit_compilation_decompose_operation_not_implemented() -> None:
     gateset = ExampleCXTargetGateset()
     q = cirq.LineQubit.range(3)
     assert gateset.decompose_to_target_gateset(cirq.measure(q[0]), 1) is NotImplemented
@@ -126,7 +130,7 @@ def test_two_qubit_compilation_decompose_operation_not_implemented():
     assert gateset.decompose_to_target_gateset(cirq.CCZ(*q), 1) is NotImplemented
 
 
-def test_two_qubit_compilation_merge_and_replace_to_target_gateset():
+def test_two_qubit_compilation_merge_and_replace_to_target_gateset() -> None:
     q = cirq.LineQubit.range(2)
     c_orig = cirq.Circuit(
         cirq.Moment(cirq.Z(q[1]), cirq.X(q[0])),
@@ -160,7 +164,7 @@ def test_two_qubit_compilation_merge_and_replace_to_target_gateset():
     )
 
 
-def test_two_qubit_compilation_merge_and_replace_inefficient_component():
+def test_two_qubit_compilation_merge_and_replace_inefficient_component() -> None:
     q = cirq.LineQubit.range(2)
     c_orig = cirq.Circuit(
         cirq.Moment(cirq.X(q[0])),
@@ -204,16 +208,16 @@ m: ═════════════════════════
     )
 
 
-def test_two_qubit_compilation_replaces_only_if_2q_gate_count_is_less():
+def test_two_qubit_compilation_replaces_only_if_2q_gate_count_is_less() -> None:
     class ExampleTargetGateset(cirq.TwoQubitCompilationTargetGateset):
         def __init__(self):
             super().__init__(cirq.X, cirq.CNOT)
 
-        def _decompose_two_qubit_operation(self, op: 'cirq.Operation', _) -> DecomposeResult:
+        def _decompose_two_qubit_operation(self, op: cirq.Operation, _) -> DecomposeResult:
             q0, q1 = op.qubits
             return [cirq.X.on_each(q0, q1), cirq.CNOT(q0, q1)] * 10
 
-        def _decompose_single_qubit_operation(self, op: 'cirq.Operation', _) -> DecomposeResult:
+        def _decompose_single_qubit_operation(self, op: cirq.Operation, _) -> DecomposeResult:
             return cirq.X(*op.qubits) if op.gate == cirq.Y else NotImplemented
 
     q = cirq.LineQubit.range(2)
@@ -224,7 +228,7 @@ def test_two_qubit_compilation_replaces_only_if_2q_gate_count_is_less():
     cirq.testing.assert_same_circuits(c_new, c_expected)
 
 
-def test_create_transformer_with_kwargs_raises():
+def test_create_transformer_with_kwargs_raises() -> None:
     with pytest.raises(SyntaxError, match="must not contain `context`"):
         cirq.create_transformer_with_kwargs(
             cirq.merge_k_qubit_unitaries, k=2, context=cirq.TransformerContext()

cirq/transformers/target_gatesets/cz_gateset.py

@@ -14,7 +14,9 @@
 
 """Target gateset used for compiling circuits to CZ + 1-q rotations + measurement gates."""
 
-from typing import Any, Dict, Sequence, Type, TYPE_CHECKING, Union
+from __future__ import annotations
+
+from typing import Any, Sequence, TYPE_CHECKING
 
 from cirq import ops, protocols
 from cirq.transformers.analytical_decompositions import two_qubit_to_cz
@@ -47,7 +49,7 @@ class CZTargetGateset(compilation_target_gateset.TwoQubitCompilationTargetGatese
         *,
         atol: float = 1e-8,
         allow_partial_czs: bool = False,
-        additional_gates: Sequence[Union[Type['cirq.Gate'], 'cirq.Gate', 'cirq.GateFamily']] = (),
+        additional_gates: Sequence[type[cirq.Gate] | cirq.Gate | cirq.GateFamily] = (),
         preserve_moment_structure: bool = True,
         reorder_operations: bool = False,
     ) -> None:
@@ -83,7 +85,7 @@ class CZTargetGateset(compilation_target_gateset.TwoQubitCompilationTargetGatese
         self.atol = atol
         self.allow_partial_czs = allow_partial_czs
 
-    def _decompose_two_qubit_operation(self, op: 'cirq.Operation', _) -> 'cirq.OP_TREE':
+    def _decompose_two_qubit_operation(self, op: cirq.Operation, _) -> cirq.OP_TREE:
         if not protocols.has_unitary(op):
             return NotImplemented
         return two_qubit_to_cz.two_qubit_matrix_to_cz_operations(
@@ -106,8 +108,8 @@ class CZTargetGateset(compilation_target_gateset.TwoQubitCompilationTargetGatese
     def _value_equality_values_(self) -> Any:
         return self.atol, self.allow_partial_czs, frozenset(self.additional_gates)
 
-    def _json_dict_(self) -> Dict[str, Any]:
-        d: Dict[str, Any] = {'atol': self.atol, 'allow_partial_czs': self.allow_partial_czs}
+    def _json_dict_(self) -> dict[str, Any]:
+        d: dict[str, Any] = {'atol': self.atol, 'allow_partial_czs': self.allow_partial_czs}
         if self.additional_gates:
             d['additional_gates'] = list(self.additional_gates)
         return d

cirq/transformers/target_gatesets/cz_gateset_test.py

@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Optional, Sequence, Type
+from __future__ import annotations
+
+from typing import Sequence
 
 import numpy as np
 import pytest
@@ -31,7 +33,7 @@ def all_gates_of_type(m: cirq.Moment, g: cirq.Gateset):
 def assert_optimizes(
     before: cirq.Circuit,
     expected: cirq.Circuit,
-    additional_gates: Optional[Sequence[Type[cirq.Gate]]] = None,
+    additional_gates: Sequence[type[cirq.Gate]] | None = None,
 ):
     if additional_gates is None:
         gateset = cirq.CZTargetGateset()
@@ -56,7 +58,7 @@ def assert_optimization_not_broken(circuit: cirq.Circuit):
     )
 
 
-def test_convert_to_cz_preserving_moment_structure():
+def test_convert_to_cz_preserving_moment_structure() -> None:
     q = cirq.LineQubit.range(5)
     op = lambda q0, q1: cirq.H(q1).controlled_by(q0)
     c_orig = cirq.Circuit(
@@ -100,7 +102,7 @@ def test_convert_to_cz_preserving_moment_structure():
     )
 
 
-def test_clears_paired_cnot():
+def test_clears_paired_cnot() -> None:
     a, b = cirq.LineQubit.range(2)
     assert_optimizes(
         before=cirq.Circuit(cirq.Moment(cirq.CNOT(a, b)), cirq.Moment(cirq.CNOT(a, b))),
@@ -108,7 +110,7 @@ def test_clears_paired_cnot():
     )
 
 
-def test_ignores_czs_separated_by_parameterized():
+def test_ignores_czs_separated_by_parameterized() -> None:
     a, b = cirq.LineQubit.range(2)
     assert_optimizes(
         before=cirq.Circuit(
@@ -129,19 +131,19 @@ def test_ignores_czs_separated_by_parameterized():
     )
 
 
-def test_cnots_separated_by_single_gates_correct():
+def test_cnots_separated_by_single_gates_correct() -> None:
     a, b = cirq.LineQubit.range(2)
     assert_optimization_not_broken(cirq.Circuit(cirq.CNOT(a, b), cirq.H(b), cirq.CNOT(a, b)))
 
 
-def test_czs_separated_by_single_gates_correct():
+def test_czs_separated_by_single_gates_correct() -> None:
     a, b = cirq.LineQubit.range(2)
     assert_optimization_not_broken(
         cirq.Circuit(cirq.CZ(a, b), cirq.X(b), cirq.X(b), cirq.X(b), cirq.CZ(a, b))
     )
 
 
-def test_inefficient_circuit_correct():
+def test_inefficient_circuit_correct() -> None:
     t = 0.1
     v = 0.11
     a, b = cirq.LineQubit.range(2)
@@ -166,7 +168,7 @@ def test_inefficient_circuit_correct():
     )
 
 
-def test_optimizes_single_iswap():
+def test_optimizes_single_iswap() -> None:
     a, b = cirq.LineQubit.range(2)
     c = cirq.Circuit(cirq.ISWAP(a, b))
     assert_optimization_not_broken(c)
@@ -174,7 +176,7 @@ def test_optimizes_single_iswap():
     assert len([1 for op in c.all_operations() if len(op.qubits) == 2]) == 2
 
 
-def test_optimizes_tagged_partial_cz():
+def test_optimizes_tagged_partial_cz() -> None:
     a, b = cirq.LineQubit.range(2)
     c = cirq.Circuit((cirq.CZ**0.5)(a, b).with_tags('mytag'))
     assert_optimization_not_broken(c)
@@ -184,7 +186,7 @@ def test_optimizes_tagged_partial_cz():
     ), 'It should take 2 CZ gates to decompose a CZ**0.5 gate'
 
 
-def test_not_decompose_czs():
+def test_not_decompose_czs() -> None:
     circuit = cirq.Circuit(
         cirq.CZPowGate(exponent=1, global_shift=-0.5).on(*cirq.LineQubit.range(2))
     )
@@ -201,7 +203,7 @@ def test_not_decompose_czs():
         ),
     ),
 )
-def test_decompose_partial_czs(circuit):
+def test_decompose_partial_czs(circuit) -> None:
     circuit = cirq.optimize_for_target_gateset(
         circuit, gateset=cirq.CZTargetGateset(), ignore_failures=False
     )
@@ -216,7 +218,7 @@ def test_decompose_partial_czs(circuit):
     assert num_part_cz == 0
 
 
-def test_not_decompose_partial_czs():
+def test_not_decompose_partial_czs() -> None:
     circuit = cirq.Circuit(
         cirq.CZPowGate(exponent=0.1, global_shift=-0.5)(*cirq.LineQubit.range(2))
     )
@@ -232,7 +234,7 @@ def test_not_decompose_partial_czs():
     assert num_part_cz == 1
 
 
-def test_avoids_decompose_when_matrix_available():
+def test_avoids_decompose_when_matrix_available() -> None:
     class OtherXX(cirq.testing.TwoQubitGate):  # pragma: no cover
         def _has_unitary_(self) -> bool:
             return True
@@ -261,7 +263,7 @@ def test_avoids_decompose_when_matrix_available():
     assert len(c) == 0
 
 
-def test_composite_gates_without_matrix():
+def test_composite_gates_without_matrix() -> None:
     class CompositeExample(cirq.testing.SingleQubitGate):
         def _decompose_(self, qubits):
             yield cirq.X(qubits[0])
@@ -289,7 +291,7 @@ def test_composite_gates_without_matrix():
     )
 
 
-def test_unsupported_gate():
+def test_unsupported_gate() -> None:
     class UnsupportedExample(cirq.testing.TwoQubitGate):
         pass
 
@@ -319,11 +321,11 @@ def test_unsupported_gate():
         cirq.CZTargetGateset(additional_gates=()),
     ],
 )
-def test_repr(gateset):
+def test_repr(gateset) -> None:
     cirq.testing.assert_equivalent_repr(gateset)
 
 
-def test_with_commutation():
+def test_with_commutation() -> None:
     c = cirq.Circuit(
         cirq.CZ(cirq.q(0), cirq.q(1)), cirq.CZ(cirq.q(1), cirq.q(2)), cirq.CZ(cirq.q(0), cirq.q(1))
     )
@@ -335,7 +337,7 @@ def test_with_commutation():
     assert got == cirq.Circuit(cirq.CZ(cirq.q(1), cirq.q(2)))
 
 
-def test_reorder_operations_and_preserve_moment_structure_raises():
+def test_reorder_operations_and_preserve_moment_structure_raises() -> None:
     with pytest.raises(
         ValueError, match='reorder_operations and preserve_moment_structure can not both be True'
     ):

cirq/transformers/target_gatesets/sqrt_iswap_gateset.py

@@ -14,15 +14,17 @@
 
 """Target gateset used for compiling circuits to √iSWAP + 1-q rotations + measurement gates."""
 
-from typing import Any, Dict, Optional, Sequence, Type, TYPE_CHECKING, Union
+from __future__ import annotations
+
+from typing import Any, Sequence, TYPE_CHECKING
 
 from cirq import ops, protocols
-from cirq.protocols.decompose_protocol import DecomposeResult
 from cirq.transformers.analytical_decompositions import two_qubit_to_sqrt_iswap
 from cirq.transformers.target_gatesets import compilation_target_gateset
 
 if TYPE_CHECKING:
     import cirq
+    from cirq.protocols.decompose_protocol import DecomposeResult
 
 
 class SqrtIswapTargetGateset(compilation_target_gateset.TwoQubitCompilationTargetGateset):
@@ -47,9 +49,9 @@ class SqrtIswapTargetGateset(compilation_target_gateset.TwoQubitCompilationTarge
         self,
         *,
         atol: float = 1e-8,
-        required_sqrt_iswap_count: Optional[int] = None,
+        required_sqrt_iswap_count: int | None = None,
         use_sqrt_iswap_inv: bool = False,
-        additional_gates: Sequence[Union[Type['cirq.Gate'], 'cirq.Gate', 'cirq.GateFamily']] = (),
+        additional_gates: Sequence[type[cirq.Gate] | cirq.Gate | cirq.GateFamily] = (),
     ):
         """Initializes `cirq.SqrtIswapTargetGateset`
 
@@ -87,7 +89,7 @@ class SqrtIswapTargetGateset(compilation_target_gateset.TwoQubitCompilationTarge
         self.required_sqrt_iswap_count = required_sqrt_iswap_count
         self.use_sqrt_iswap_inv = use_sqrt_iswap_inv
 
-    def _decompose_two_qubit_operation(self, op: 'cirq.Operation', _) -> DecomposeResult:
+    def _decompose_two_qubit_operation(self, op: cirq.Operation, _) -> DecomposeResult:
         if protocols.has_unitary(op):
             return two_qubit_to_sqrt_iswap.two_qubit_matrix_to_sqrt_iswap_operations(
                 op.qubits[0],
@@ -123,8 +125,8 @@ class SqrtIswapTargetGateset(compilation_target_gateset.TwoQubitCompilationTarge
             frozenset(self.additional_gates),
         )
 
-    def _json_dict_(self) -> Dict[str, Any]:
-        d: Dict[str, Any] = {
+    def _json_dict_(self) -> dict[str, Any]:
+        d: dict[str, Any] = {
             'atol': self.atol,
             'required_sqrt_iswap_count': self.required_sqrt_iswap_count,
             'use_sqrt_iswap_inv': self.use_sqrt_iswap_inv,