Update Type Hints (#7348)

* update type hints for files in cirq-aqt

* fix formatting

Author: Akshita07

cirq-aqt/cirq_aqt/aqt_device.py

@@ -28,7 +28,7 @@
 
 import json
 from enum import Enum
-from typing import Any, cast, Dict, Iterable, List, Optional, Sequence, Set, Tuple, Union
+from typing import Any, cast, Iterable, Sequence
 
 import networkx as nx
 import numpy as np
@@ -89,7 +89,7 @@ def __init__(self):
 
     def noisy_moment(
         self, moment: cirq.Moment, system_qubits: Sequence[cirq.Qid]
-    ) -> List[cirq.Operation]:
+    ) -> list[cirq.Operation]:
         """Returns a list of noisy moments.
 
         The model includes
@@ -117,7 +117,7 @@ def noisy_moment(
 
     def get_crosstalk_operation(
         self, operation: cirq.Operation, system_qubits: Sequence[cirq.Qid]
-    ) -> List[cirq.Operation]:
+    ) -> list[cirq.Operation]:
         """Returns a list of operations including crosstalk
 
         Args:
@@ -127,7 +127,7 @@ def get_crosstalk_operation(
         Returns:
             List of operations including crosstalk
         """
-        cast(Tuple[cirq.LineQubit], system_qubits)
+        cast(tuple[cirq.LineQubit], system_qubits)
         num_qubits = len(system_qubits)
         xtlk_arr = np.zeros(num_qubits)
         idx_list = []
@@ -169,7 +169,7 @@ def __init__(
         num_qubits: int,
         circuit: cirq.Circuit = cirq.Circuit(),
         simulate_ideal: bool = False,
-        noise_dict: Optional[Dict] = None,
+        noise_dict: dict | None = None,
     ):
         """Initializes the AQT simulator.
 
@@ -200,7 +200,7 @@ def generate_circuit_from_list(self, json_string: str):
         """
         self.circuit = cirq.Circuit()
         json_obj = json.loads(json_string)
-        gate: Union[cirq.PhasedXPowGate, cirq.EigenGate]
+        gate: cirq.PhasedXPowGate | cirq.EigenGate
         for circuit_list in json_obj:
             op_str = circuit_list[0]
             if op_str == 'R':
@@ -308,7 +308,7 @@ def validate_circuit(self, circuit: cirq.AbstractCircuit):
         super().validate_circuit(circuit)
         _verify_unique_measurement_keys(circuit.all_operations())
 
-    def at(self, position: int) -> Optional[cirq.LineQubit]:
+    def at(self, position: int) -> cirq.LineQubit | None:
         """Returns the qubit at the given position, if there is one, else None."""
         q = cirq.LineQubit(position)
         return q if q in self.qubits else None
@@ -341,7 +341,7 @@ def _repr_pretty_(self, p: Any, cycle: bool):
         p.text("AQTDevice(...)" if cycle else self.__str__())
 
 
-def get_aqt_device(num_qubits: int) -> Tuple[AQTDevice, List[cirq.LineQubit]]:
+def get_aqt_device(num_qubits: int) -> tuple[AQTDevice, list[cirq.LineQubit]]:
     """Returns an AQT ion device
 
     Args:
@@ -361,7 +361,7 @@ def get_aqt_device(num_qubits: int) -> Tuple[AQTDevice, List[cirq.LineQubit]]:
     return ion_device, qubit_list
 
 
-def get_default_noise_dict() -> Dict[str, Any]:
+def get_default_noise_dict() -> dict[str, Any]:
     """Returns the current noise parameters"""
     default_noise_dict = {
         OperationString.R.value: cirq.depolarize(1e-3),
@@ -373,7 +373,7 @@ def get_default_noise_dict() -> Dict[str, Any]:
 
 
 def _verify_unique_measurement_keys(operations: Iterable[cirq.Operation]):
-    seen: Set[str] = set()
+    seen: set[str] = set()
     for op in operations:
         if isinstance(op.gate, cirq.MeasurementGate):
             meas = op.gate

cirq-aqt/cirq_aqt/aqt_device_metadata_test.py

@@ -16,8 +16,6 @@
 
 from __future__ import annotations
 
-from typing import List
-
 import pytest
 
 import cirq
@@ -26,7 +24,7 @@
 
 
 @pytest.fixture
-def qubits() -> List[cirq.LineQubit]:
+def qubits() -> list[cirq.LineQubit]:
     return cirq.LineQubit.range(5)
 
 

cirq-aqt/cirq_aqt/aqt_device_test.py

@@ -15,7 +15,6 @@
 from __future__ import annotations
 
 from datetime import timedelta
-from typing import List
 
 import pytest
 
@@ -24,7 +23,7 @@
 
 
 @pytest.fixture
-def qubits() -> List[cirq.LineQubit]:
+def qubits() -> list[cirq.LineQubit]:
     return cirq.LineQubit.range(3)
 
 

cirq-aqt/cirq_aqt/aqt_sampler.py

@@ -27,7 +27,7 @@
 import json
 import time
 import uuid
-from typing import Callable, cast, Dict, List, Literal, Sequence, Tuple, TypedDict, Union
+from typing import Callable, cast, Literal, Sequence, TypedDict
 from urllib.parse import urljoin
 
 import numpy as np
@@ -251,16 +251,14 @@ def _generate_json(
             RuntimeError: If the circuit is empty.
         """
 
-        seq_list: List[Union[Tuple[str, float, List[int]], Tuple[str, float, float, List[int]]]] = (
-            []
-        )
+        seq_list: list[tuple[str, float, list[int]] | tuple[str, float, float, list[int]]] = []
         circuit = cirq.resolve_parameters(circuit, param_resolver)
         for op in circuit.all_operations():
-            line_qubit = cast(Tuple[cirq.LineQubit], op.qubits)
+            line_qubit = cast(tuple[cirq.LineQubit], op.qubits)
             op = cast(cirq.GateOperation, op)
             qubit_idx = [obj.x for obj in line_qubit]
             op_str = get_op_string(op)
-            gate: Union[cirq.EigenGate, cirq.PhasedXPowGate]
+            gate: cirq.EigenGate | cirq.PhasedXPowGate
             if op_str == 'R':
                 gate = cast(cirq.PhasedXPowGate, op.gate)
                 seq_list.append(
@@ -369,7 +367,7 @@ def _send_json(
 
         response = post(submission_url, json=submission_data, headers=headers)
         response = response.json()
-        data = cast(Dict, response)
+        data = cast(dict, response)
 
         if 'response' not in data.keys() or 'status' not in data['response'].keys():
             raise RuntimeError('Got unexpected return data from server: \n' + str(data))
@@ -384,7 +382,7 @@ def _send_json(
         while True:
             response = get(result_url, headers=headers)
             response = response.json()
-            data = cast(Dict, response)
+            data = cast(dict, response)
 
             if 'response' not in data.keys() or 'status' not in data['response'].keys():
                 raise RuntimeError('Got unexpected return data from AQT server: \n' + str(data))
@@ -426,7 +424,7 @@ def run_sweep(
         # TODO: Use measurement name from circuit.
         # Github issue: https://github.com/quantumlib/Cirq/issues/2199
         meas_name = 'm'
-        trial_results: List[cirq.Result] = []
+        trial_results: list[cirq.Result] = []
         for param_resolver in cirq.to_resolvers(params):
             id_str = str(uuid.uuid1())
             num_qubits = len(program.all_qubits())

cirq-aqt/cirq_aqt/aqt_target_gateset.py

@@ -16,8 +16,6 @@
 
 from __future__ import annotations
 
-from typing import List
-
 import numpy as np
 
 import cirq
@@ -67,6 +65,6 @@ def _decompose_two_qubit_operation(self, op: cirq.Operation, _) -> DecomposeResu
         return NotImplemented
 
     @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."""
         return [cirq.drop_negligible_operations, cirq.drop_empty_moments]

cirq-aqt/cirq_aqt/json_resolver_cache.py

@@ -15,11 +15,10 @@
 from __future__ import annotations
 
 import functools
-from typing import Dict
 
 from cirq.protocols.json_serialization import ObjectFactory
 
 
 @functools.lru_cache()
-def _class_resolver_dictionary() -> Dict[str, ObjectFactory]:
+def _class_resolver_dictionary() -> dict[str, ObjectFactory]:
     return {}