cirq-core 1.6.0.dev20250424231143__py3-none-any.whl → 1.6.0.dev20250425004112__py3-none-any.whl

cirq/ops/three_qubit_gates.py

@@ -14,6 +14,8 @@
 
 """Common quantum gates that target three qubits."""
 
+from __future__ import annotations
+
 from typing import (
     AbstractSet,
     Any,
@@ -144,7 +146,7 @@ class CCZPowGate(gate_features.InterchangeableQubitsGate, eigen_gate.EigenGate):
             sweep_abc,
         ]
 
-    def _apply_unitary_(self, args: 'protocols.ApplyUnitaryArgs') -> np.ndarray:
+    def _apply_unitary_(self, args: protocols.ApplyUnitaryArgs) -> np.ndarray:
         if protocols.is_parameterized(self):
             return NotImplemented
         ooo = args.subspace_index(0b111)
@@ -154,12 +156,10 @@ class CCZPowGate(gate_features.InterchangeableQubitsGate, eigen_gate.EigenGate):
             args.target_tensor *= p
         return args.target_tensor
 
-    def _circuit_diagram_info_(
-        self, args: 'cirq.CircuitDiagramInfoArgs'
-    ) -> 'cirq.CircuitDiagramInfo':
+    def _circuit_diagram_info_(self, args: cirq.CircuitDiagramInfoArgs) -> cirq.CircuitDiagramInfo:
         return protocols.CircuitDiagramInfo(('@', '@', '@'), exponent=self._diagram_exponent(args))
 
-    def _qasm_(self, args: 'cirq.QasmArgs', qubits: Tuple['cirq.Qid', ...]) -> Optional[str]:
+    def _qasm_(self, args: cirq.QasmArgs, qubits: Tuple[cirq.Qid, ...]) -> Optional[str]:
         if self._exponent != 1:
             return None
 
@@ -206,7 +206,7 @@ class CCZPowGate(gate_features.InterchangeableQubitsGate, eigen_gate.EigenGate):
         """
         if num_controls == 0:
             return self
-        sub_gate: 'cirq.Gate' = self
+        sub_gate: cirq.Gate = self
         if self._global_shift == 0:
             sub_gate = controlled_gate.ControlledGate(
                 common_gates.ZPowGate(exponent=self._exponent), num_controls=2
@@ -253,8 +253,8 @@ class ThreeQubitDiagonalGate(raw_types.Gate):
         }
 
     def _resolve_parameters_(
-        self, resolver: 'cirq.ParamResolver', recursive: bool
-    ) -> 'ThreeQubitDiagonalGate':
+        self, resolver: cirq.ParamResolver, recursive: bool
+    ) -> ThreeQubitDiagonalGate:
         return self.__class__(
             [
                 protocols.resolve_parameters(angle, resolver, recursive)
@@ -270,7 +270,7 @@ class ThreeQubitDiagonalGate(raw_types.Gate):
             return NotImplemented
         return np.diag([np.exp(1j * angle) for angle in self._diag_angles_radians])
 
-    def _apply_unitary_(self, args: 'protocols.ApplyUnitaryArgs') -> np.ndarray:
+    def _apply_unitary_(self, args: protocols.ApplyUnitaryArgs) -> np.ndarray:
         if self._is_parameterized_():
             return NotImplemented
         for index, angle in enumerate(self._diag_angles_radians):
@@ -279,16 +279,14 @@ class ThreeQubitDiagonalGate(raw_types.Gate):
             args.target_tensor[subspace_index] *= np.exp(1j * angle)
         return args.target_tensor
 
-    def _circuit_diagram_info_(
-        self, args: 'cirq.CircuitDiagramInfoArgs'
-    ) -> 'cirq.CircuitDiagramInfo':
+    def _circuit_diagram_info_(self, args: cirq.CircuitDiagramInfoArgs) -> cirq.CircuitDiagramInfo:
         rounded_angles = np.array(self._diag_angles_radians)
         if args.precision is not None:
             rounded_angles = rounded_angles.round(args.precision)
         diag_str = f"diag({', '.join(proper_repr(angle) for angle in rounded_angles)})"
         return protocols.CircuitDiagramInfo((diag_str, '#2', '#3'))
 
-    def __pow__(self, exponent: Any) -> 'ThreeQubitDiagonalGate':
+    def __pow__(self, exponent: Any) -> ThreeQubitDiagonalGate:
         if not isinstance(exponent, (int, float, sympy.Basic)):
             return NotImplemented
         return ThreeQubitDiagonalGate(
@@ -451,7 +449,7 @@ class CCXPowGate(gate_features.InterchangeableQubitsGate, eigen_gate.EigenGate):
     def qubit_index_to_equivalence_group_key(self, index):
         return index < 2
 
-    def _apply_unitary_(self, args: 'protocols.ApplyUnitaryArgs') -> np.ndarray:
+    def _apply_unitary_(self, args: protocols.ApplyUnitaryArgs) -> np.ndarray:
         if protocols.is_parameterized(self):
             return NotImplemented
         p = 1j ** (2 * self._exponent * self._global_shift)
@@ -471,14 +469,12 @@ class CCXPowGate(gate_features.InterchangeableQubitsGate, eigen_gate.EigenGate):
         yield CCZPowGate(exponent=self._exponent, global_shift=self.global_shift).on(c1, c2, t)
         yield common_gates.H(t)
 
-    def _circuit_diagram_info_(
-        self, args: 'cirq.CircuitDiagramInfoArgs'
-    ) -> 'cirq.CircuitDiagramInfo':
+    def _circuit_diagram_info_(self, args: cirq.CircuitDiagramInfoArgs) -> cirq.CircuitDiagramInfo:
         return protocols.CircuitDiagramInfo(
             ('@', '@', 'X'), exponent=self._diagram_exponent(args), exponent_qubit_index=2
         )
 
-    def _qasm_(self, args: 'cirq.QasmArgs', qubits: Tuple['cirq.Qid', ...]) -> Optional[str]:
+    def _qasm_(self, args: cirq.QasmArgs, qubits: Tuple[cirq.Qid, ...]) -> Optional[str]:
         if self._exponent != 1:
             return None
 
@@ -520,7 +516,7 @@ class CCXPowGate(gate_features.InterchangeableQubitsGate, eigen_gate.EigenGate):
         """
         if num_controls == 0:
             return self
-        sub_gate: 'cirq.Gate' = self
+        sub_gate: cirq.Gate = self
         if self._global_shift == 0:
             sub_gate = controlled_gate.ControlledGate(
                 common_gates.XPowGate(exponent=self._exponent), num_controls=2
@@ -572,8 +568,8 @@ class CSwapGate(gate_features.InterchangeableQubitsGate, raw_types.Gate):
         return self._decompose_outside_control(c, t1, t2)
 
     def _decompose_inside_control(
-        self, target1: 'cirq.Qid', control: 'cirq.Qid', target2: 'cirq.Qid'
-    ) -> Iterator['cirq.OP_TREE']:
+        self, target1: cirq.Qid, control: cirq.Qid, target2: cirq.Qid
+    ) -> Iterator[cirq.OP_TREE]:
         """A decomposition assuming the control separates the targets.
 
         target1: ─@─X───────T──────@────────@─────────X───@─────X^-0.5─
@@ -608,7 +604,7 @@ class CSwapGate(gate_features.InterchangeableQubitsGate, raw_types.Gate):
         yield common_gates.S(c) ** -1
         yield pauli_gates.X(a) ** -0.5
 
-    def _apply_unitary_(self, args: 'protocols.ApplyUnitaryArgs') -> np.ndarray:
+    def _apply_unitary_(self, args: protocols.ApplyUnitaryArgs) -> np.ndarray:
         return protocols.apply_unitary(
             controlled_gate.ControlledGate(swap_gates.SWAP),
             protocols.ApplyUnitaryArgs(args.target_tensor, args.available_buffer, args.axes),
@@ -616,8 +612,8 @@ class CSwapGate(gate_features.InterchangeableQubitsGate, raw_types.Gate):
         )
 
     def _decompose_outside_control(
-        self, control: 'cirq.Qid', near_target: 'cirq.Qid', far_target: 'cirq.Qid'
-    ) -> Iterator['cirq.OP_TREE']:
+        self, control: cirq.Qid, near_target: cirq.Qid, far_target: cirq.Qid
+    ) -> Iterator[cirq.OP_TREE]:
         """A decomposition assuming one of the targets is in the middle.
 
         control: ───T──────@────────@───@────────────@────────────────
@@ -652,14 +648,12 @@ class CSwapGate(gate_features.InterchangeableQubitsGate, raw_types.Gate):
     def _unitary_(self) -> np.ndarray:
         return linalg.block_diag(np.diag([1, 1, 1, 1, 1]), np.array([[0, 1], [1, 0]]), np.diag([1]))
 
-    def _circuit_diagram_info_(
-        self, args: 'cirq.CircuitDiagramInfoArgs'
-    ) -> 'cirq.CircuitDiagramInfo':
+    def _circuit_diagram_info_(self, args: cirq.CircuitDiagramInfoArgs) -> cirq.CircuitDiagramInfo:
         if not args.use_unicode_characters:
             return protocols.CircuitDiagramInfo(('@', 'swap', 'swap'))
         return protocols.CircuitDiagramInfo(('@', '×', '×'))
 
-    def _qasm_(self, args: 'cirq.QasmArgs', qubits: Tuple['cirq.Qid', ...]) -> Optional[str]:
+    def _qasm_(self, args: cirq.QasmArgs, qubits: Tuple[cirq.Qid, ...]) -> Optional[str]:
         args.validate_version('2.0', '3.0')
         return args.format('cswap {0},{1},{2};\n', qubits[0], qubits[1], qubits[2])
 

cirq/ops/two_qubit_diagonal_gate.py

@@ -18,6 +18,8 @@ The gate is used to create a 4x4 matrix with the diagonal elements
 passed as a list.
 """
 
+from __future__ import annotations
+
 from typing import AbstractSet, Any, Dict, Iterator, Optional, Sequence, Tuple, TYPE_CHECKING
 
 import numpy as np
@@ -80,8 +82,8 @@ class TwoQubitDiagonalGate(raw_types.Gate):
         }
 
     def _resolve_parameters_(
-        self, resolver: 'cirq.ParamResolver', recursive: bool
-    ) -> 'TwoQubitDiagonalGate':
+        self, resolver: cirq.ParamResolver, recursive: bool
+    ) -> TwoQubitDiagonalGate:
         return TwoQubitDiagonalGate(
             protocols.resolve_parameters(self._diag_angles_radians, resolver, recursive)
         )
@@ -94,7 +96,7 @@ class TwoQubitDiagonalGate(raw_types.Gate):
             return None
         return np.diag([np.exp(1j * angle) for angle in self._diag_angles_radians])
 
-    def _decompose_(self, qubits: Sequence['cirq.Qid']) -> Iterator['cirq.OP_TREE']:
+    def _decompose_(self, qubits: Sequence[cirq.Qid]) -> Iterator[cirq.OP_TREE]:
         x0, x1, x2, x3 = self._diag_angles_radians
         q0, q1 = qubits
         yield common_gates.ZPowGate(exponent=x2 / np.pi).on(q0)
@@ -104,7 +106,7 @@ class TwoQubitDiagonalGate(raw_types.Gate):
         yield common_gates.CZPowGate(exponent=x0 / np.pi).on(q0, q1)
         yield common_gates.XPowGate().on_each(q0, q1)
 
-    def _apply_unitary_(self, args: 'protocols.ApplyUnitaryArgs') -> np.ndarray:
+    def _apply_unitary_(self, args: protocols.ApplyUnitaryArgs) -> np.ndarray:
         if self._is_parameterized_():
             return NotImplemented
         for index, angle in enumerate(self._diag_angles_radians):
@@ -112,16 +114,14 @@ class TwoQubitDiagonalGate(raw_types.Gate):
             args.target_tensor[subspace_index] *= np.exp(1j * angle)
         return args.target_tensor
 
-    def _circuit_diagram_info_(
-        self, args: 'cirq.CircuitDiagramInfoArgs'
-    ) -> 'cirq.CircuitDiagramInfo':
+    def _circuit_diagram_info_(self, args: cirq.CircuitDiagramInfoArgs) -> cirq.CircuitDiagramInfo:
         rounded_angles = np.array(self._diag_angles_radians)
         if args.precision is not None:
             rounded_angles = rounded_angles.round(args.precision)
         diag_str = f"diag({', '.join(proper_repr(angle) for angle in rounded_angles)})"
         return protocols.CircuitDiagramInfo((diag_str, '#2'))
 
-    def __pow__(self, exponent: Any) -> 'TwoQubitDiagonalGate':
+    def __pow__(self, exponent: Any) -> TwoQubitDiagonalGate:
         if not isinstance(exponent, (int, float, sympy.Basic)):
             return NotImplemented
         angles = []

cirq/ops/uniform_superposition_gate.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from typing import Any, Dict, Iterator, Sequence, TYPE_CHECKING
 
 import numpy as np
@@ -58,7 +60,7 @@ class UniformSuperpositionGate(raw_types.Gate):
         self._m_value = m_value
         self._num_qubits = num_qubits
 
-    def _decompose_(self, qubits: Sequence["cirq.Qid"]) -> Iterator["cirq.OP_TREE"]:
+    def _decompose_(self, qubits: Sequence[cirq.Qid]) -> Iterator[cirq.OP_TREE]:
         """Decomposes the gate into a sequence of standard gates.
         Implements the construction from https://arxiv.org/pdf/2306.11747.
         """

cirq/ops/wait_gate.py

@@ -11,6 +11,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+from __future__ import annotations
+
 from typing import AbstractSet, Any, Dict, Optional, Tuple, TYPE_CHECKING
 
 from cirq import protocols, value
@@ -30,7 +33,7 @@ class WaitGate(raw_types.Gate):
 
     def __init__(
         self,
-        duration: 'cirq.DURATION_LIKE',
+        duration: cirq.DURATION_LIKE,
         num_qubits: Optional[int] = None,
         qid_shape: Optional[Tuple[int, ...]] = None,
     ) -> None:
@@ -66,7 +69,7 @@ class WaitGate(raw_types.Gate):
         self._qid_shape = qid_shape
 
     @property
-    def duration(self) -> 'cirq.Duration':
+    def duration(self) -> cirq.Duration:
         return self._duration
 
     def _is_parameterized_(self) -> bool:
@@ -75,7 +78,7 @@ class WaitGate(raw_types.Gate):
     def _parameter_names_(self) -> AbstractSet[str]:
         return protocols.parameter_names(self.duration)
 
-    def _resolve_parameters_(self, resolver: 'cirq.ParamResolver', recursive: bool) -> 'WaitGate':
+    def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> WaitGate:
         return WaitGate(
             protocols.resolve_parameters(self.duration, resolver, recursive),
             qid_shape=self._qid_shape,
@@ -132,12 +135,12 @@ class WaitGate(raw_types.Gate):
 
 
 def wait(
-    *target: 'cirq.Qid',
-    duration: 'cirq.DURATION_LIKE' = None,
-    picos: 'cirq.TParamVal' = 0,
-    nanos: 'cirq.TParamVal' = 0,
-    micros: 'cirq.TParamVal' = 0,
-    millis: 'cirq.TParamVal' = 0,
+    *target: cirq.Qid,
+    duration: cirq.DURATION_LIKE = None,
+    picos: cirq.TParamVal = 0,
+    nanos: cirq.TParamVal = 0,
+    micros: cirq.TParamVal = 0,
+    millis: cirq.TParamVal = 0,
 ) -> raw_types.Operation:
     """Creates a WaitGate applied to all the given qubits.
 

cirq/protocols/act_on_protocol.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from types import NotImplementedType
 from typing import Any, Optional, Sequence, TYPE_CHECKING, Union
 
@@ -28,7 +30,7 @@ class SupportsActOn(Protocol):
     """An object that explicitly specifies how to act on simulator states."""
 
     @doc_private
-    def _act_on_(self, sim_state: 'cirq.SimulationStateBase') -> Union[NotImplementedType, bool]:
+    def _act_on_(self, sim_state: cirq.SimulationStateBase) -> Union[NotImplementedType, bool]:
         """Applies an action to the given argument, if it is a supported type.
 
         For example, unitary operations can implement an `_act_on_` method that
@@ -59,7 +61,7 @@ class SupportsActOnQubits(Protocol):
 
     @doc_private
     def _act_on_(
-        self, sim_state: 'cirq.SimulationStateBase', qubits: Sequence['cirq.Qid']
+        self, sim_state: cirq.SimulationStateBase, qubits: Sequence[cirq.Qid]
     ) -> Union[NotImplementedType, bool]:
         """Applies an action to the given argument, if it is a supported type.
 
@@ -88,8 +90,8 @@ class SupportsActOnQubits(Protocol):
 
 def act_on(
     action: Any,
-    sim_state: 'cirq.SimulationStateBase',
-    qubits: Optional[Sequence['cirq.Qid']] = None,
+    sim_state: cirq.SimulationStateBase,
+    qubits: Optional[Sequence[cirq.Qid]] = None,
     *,
     allow_decompose: bool = True,
 ):

cirq/protocols/act_on_protocol_test.py

@@ -11,6 +11,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+from __future__ import annotations
+
 from typing import Any, Sequence, Tuple
 
 import numpy as np
@@ -34,7 +37,7 @@ class ExampleSimulationState(cirq.SimulationState):
         self.fallback_result = fallback_result
 
     def _act_on_fallback_(
-        self, action: Any, qubits: Sequence['cirq.Qid'], allow_decompose: bool = True
+        self, action: Any, qubits: Sequence[cirq.Qid], allow_decompose: bool = True
     ):
         return self.fallback_result
 
@@ -62,10 +65,10 @@ def test_act_on_fallback_errors():
 def test_act_on_errors():
     class Op(cirq.Operation):
         @property
-        def qubits(self) -> Tuple['cirq.Qid', ...]:  # type: ignore[empty-body]
+        def qubits(self) -> Tuple[cirq.Qid, ...]:  # type: ignore[empty-body]
             pass
 
-        def with_qubits(self, *new_qubits: 'cirq.Qid') -> Self:  # type: ignore[empty-body]
+        def with_qubits(self, *new_qubits: cirq.Qid) -> Self:  # type: ignore[empty-body]
             pass
 
         def _act_on_(self, sim_state):
@@ -79,10 +82,10 @@ def test_act_on_errors():
 def test_qubits_not_allowed_for_operations():
     class Op(cirq.Operation):
         @property
-        def qubits(self) -> Tuple['cirq.Qid', ...]:  # type: ignore[empty-body]
+        def qubits(self) -> Tuple[cirq.Qid, ...]:  # type: ignore[empty-body]
             pass
 
-        def with_qubits(self, *new_qubits: 'cirq.Qid') -> Self:  # type: ignore[empty-body]
+        def with_qubits(self, *new_qubits: cirq.Qid) -> Self:  # type: ignore[empty-body]
             pass
 
     state = ExampleSimulationState()

cirq/protocols/apply_unitary_protocol.py

@@ -14,8 +14,10 @@
 
 """A protocol for implementing high performance unitary left-multiplies."""
 
+from __future__ import annotations
+
 import warnings
-from types import NotImplementedType
+from types import EllipsisType, NotImplementedType
 from typing import Any, cast, Iterable, Optional, Sequence, Tuple, TYPE_CHECKING, TypeVar, Union
 
 import numpy as np
@@ -112,7 +114,7 @@ class ApplyUnitaryArgs:
     @staticmethod
     def default(
         num_qubits: Optional[int] = None, *, qid_shape: Optional[Tuple[int, ...]] = None
-    ) -> 'ApplyUnitaryArgs':
+    ) -> ApplyUnitaryArgs:
         """A default instance starting in state |0⟩.
 
         Specify exactly one argument.
@@ -138,7 +140,7 @@ class ApplyUnitaryArgs:
     @classmethod
     def for_unitary(
         cls, num_qubits: Optional[int] = None, *, qid_shape: Optional[Tuple[int, ...]] = None
-    ) -> 'ApplyUnitaryArgs':
+    ) -> ApplyUnitaryArgs:
         """A default instance corresponding to an identity matrix.
 
         Specify exactly one argument.
@@ -162,7 +164,7 @@ class ApplyUnitaryArgs:
         state = qis.eye_tensor(qid_shape, dtype=np.complex128)
         return ApplyUnitaryArgs(state, np.empty_like(state), range(num_qubits))
 
-    def with_axes_transposed_to_start(self) -> 'ApplyUnitaryArgs':
+    def with_axes_transposed_to_start(self) -> ApplyUnitaryArgs:
         """Returns a transposed view of the same arguments.
 
         Returns:
@@ -181,7 +183,7 @@ class ApplyUnitaryArgs:
 
     def _for_operation_with_qid_shape(
         self, indices: Iterable[int], slices: Tuple[Union[int, slice], ...]
-    ) -> 'ApplyUnitaryArgs':
+    ) -> ApplyUnitaryArgs:
         """Creates a sliced and transposed view of `self` appropriate for an
         operation with shape `qid_shape` on qubits with the given indices.
 
@@ -213,7 +215,7 @@ class ApplyUnitaryArgs:
 
     def subspace_index(
         self, little_endian_bits_int: int = 0, *, big_endian_bits_int: int = 0
-    ) -> Tuple[Union[slice, int, 'ellipsis'], ...]:
+    ) -> Tuple[Union[slice, int, EllipsisType], ...]:
         """An index for the subspace where the target axes equal a value.
 
         Args:
@@ -506,7 +508,7 @@ def _strat_apply_unitary_from_decompose(val: Any, args: ApplyUnitaryArgs) -> Opt
 
 def apply_unitaries(
     unitary_values: Iterable[Any],
-    qubits: Sequence['cirq.Qid'],
+    qubits: Sequence[cirq.Qid],
     args: Optional[ApplyUnitaryArgs] = None,
     default: Any = RaiseTypeErrorIfNotProvided,
 ) -> Optional[np.ndarray]:
@@ -589,7 +591,7 @@ def apply_unitaries(
 
 
 def _incorporate_result_into_target(
-    args: 'ApplyUnitaryArgs', sub_args: 'ApplyUnitaryArgs', sub_result: np.ndarray
+    args: ApplyUnitaryArgs, sub_args: ApplyUnitaryArgs, sub_result: np.ndarray
 ):
     """Takes the result of calling `_apply_unitary_` on `sub_args` and
     copies it back into `args.target_tensor` or `args.available_buffer` as

cirq/protocols/circuit_diagram_info_protocol.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import re
 from fractions import Fraction
 from typing import (
@@ -104,7 +106,7 @@ class CircuitDiagramInfo:
         )
 
     def _wire_symbols_including_formatted_exponent(
-        self, args: 'cirq.CircuitDiagramInfoArgs', *, preferred_exponent_index: Optional[int] = None
+        self, args: cirq.CircuitDiagramInfoArgs, *, preferred_exponent_index: Optional[int] = None
     ) -> List[str]:
         result = list(self.wire_symbols)
         exponent = self._formatted_exponent(args)
@@ -122,7 +124,7 @@ class CircuitDiagramInfo:
                 result[k] += f"^{exponent}"
         return result
 
-    def _formatted_exponent(self, args: 'cirq.CircuitDiagramInfoArgs') -> Optional[str]:
+    def _formatted_exponent(self, args: cirq.CircuitDiagramInfoArgs) -> Optional[str]:
         if protocols.is_parameterized(self.exponent):
             name = str(self.exponent)
             return f'({name})' if _is_exposed_formula(name) else name
@@ -195,15 +197,15 @@ class CircuitDiagramInfoArgs:
             right (transpose is False), or from top to bottom.
     """
 
-    UNINFORMED_DEFAULT: 'CircuitDiagramInfoArgs'
+    UNINFORMED_DEFAULT: CircuitDiagramInfoArgs
 
     def __init__(
         self,
-        known_qubits: Optional[Iterable['cirq.Qid']],
+        known_qubits: Optional[Iterable[cirq.Qid]],
         known_qubit_count: Optional[int],
         use_unicode_characters: bool,
         precision: Optional[int],
-        label_map: Optional[Dict['cirq.LabelEntity', int]],
+        label_map: Optional[Dict[cirq.LabelEntity, int]],
         include_tags: bool = True,
         transpose: bool = False,
     ) -> None:
@@ -251,7 +253,7 @@ class CircuitDiagramInfoArgs:
             return str(val)
         return f'{float(val):.{self.precision}}'
 
-    def format_complex(self, val: Union[sympy.Basic, int, float, 'cirq.TParamValComplex']) -> str:
+    def format_complex(self, val: Union[sympy.Basic, int, float, cirq.TParamValComplex]) -> str:
         if isinstance(val, sympy.Basic):
             return str(val)
         c = complex(val)
@@ -336,8 +338,8 @@ RaiseTypeErrorIfNotProvided = CircuitDiagramInfo(())
 
 
 def _op_info_with_fallback(
-    op: 'cirq.Operation', args: 'cirq.CircuitDiagramInfoArgs'
-) -> 'cirq.CircuitDiagramInfo':
+    op: cirq.Operation, args: cirq.CircuitDiagramInfoArgs
+) -> cirq.CircuitDiagramInfo:
     info = protocols.circuit_diagram_info(op, args, None)
     rows: List[LabelEntity] = list(op.qubits)
     if args.label_map is not None:

cirq/protocols/control_key_protocol.py

@@ -13,6 +13,8 @@
 # limitations under the License.
 """Protocol for object that have control keys."""
 
+from __future__ import annotations
+
 from types import NotImplementedType
 from typing import Any, FrozenSet, TYPE_CHECKING, Union
 
@@ -35,7 +37,7 @@ class SupportsControlKey(Protocol):
     """
 
     @doc_private
-    def _control_keys_(self) -> Union[FrozenSet['cirq.MeasurementKey'], NotImplementedType, None]:
+    def _control_keys_(self) -> Union[FrozenSet[cirq.MeasurementKey], NotImplementedType, None]:
         """Return the keys for controls referenced by the receiving object.
 
         Returns:
@@ -44,7 +46,7 @@ class SupportsControlKey(Protocol):
         """
 
 
-def control_keys(val: Any) -> FrozenSet['cirq.MeasurementKey']:
+def control_keys(val: Any) -> FrozenSet[cirq.MeasurementKey]:
     """Gets the keys that the value is classically controlled by.
 
     Args:
@@ -62,7 +64,7 @@ def control_keys(val: Any) -> FrozenSet['cirq.MeasurementKey']:
     return frozenset()
 
 
-def measurement_keys_touched(val: Any) -> FrozenSet['cirq.MeasurementKey']:
+def measurement_keys_touched(val: Any) -> FrozenSet[cirq.MeasurementKey]:
     """Returns all the measurement keys used by the value.
 
     This would be the case if the value is or contains a measurement gate, or