cirq-core 1.7.0.dev20250924231107__py3-none-any.whl → 1.7.0.dev20251203004401__py3-none-any.whl

cirq/interop/quirk/cells/composite_cell_test.py

@@ -14,7 +14,7 @@
 
 from __future__ import annotations
 
-from typing import Iterable
+from collections.abc import Iterable
 
 import pytest
 

cirq/interop/quirk/cells/control_cells.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Iterable, Iterator, TYPE_CHECKING
+from collections.abc import Iterable, Iterator
+from typing import Any, TYPE_CHECKING
 
 from cirq import ops, value
 from cirq.interop.quirk.cells.cell import Cell, CellMaker

cirq/interop/quirk/cells/frequency_space_cells.py

@@ -14,7 +14,7 @@
 
 from __future__ import annotations
 
-from typing import Callable, Iterator
+from collections.abc import Callable, Iterator
 
 import sympy
 

cirq/interop/quirk/cells/ignored_cells.py

@@ -14,7 +14,7 @@
 
 from __future__ import annotations
 
-from typing import Iterator
+from collections.abc import Iterator
 
 from cirq.interop.quirk.cells.cell import CELL_SIZES, CellMaker
 

cirq/interop/quirk/cells/input_cells.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Callable, Iterable, Iterator, TYPE_CHECKING
+from collections.abc import Callable, Iterable, Iterator
+from typing import TYPE_CHECKING
 
 from cirq.interop.quirk.cells.cell import Cell, CELL_SIZES, CellMaker
 

cirq/interop/quirk/cells/input_rotation_cells.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Iterable, Iterator, Sequence
+from collections.abc import Iterable, Iterator, Sequence
+from typing import Any
 
 import numpy as np
 

cirq/interop/quirk/cells/measurement_cells.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import cast, Iterable, Iterator, TYPE_CHECKING
+from collections.abc import Iterable, Iterator
+from typing import cast, TYPE_CHECKING
 
 from cirq import ops
 from cirq.interop.quirk.cells.cell import CellMaker, ExplicitOperationsCell

cirq/interop/quirk/cells/parse.py

@@ -16,17 +16,8 @@ from __future__ import annotations
 
 import cmath
 import re
-from typing import (
-    Any,
-    Callable,
-    cast,
-    Iterable,
-    Iterator,
-    Mapping,
-    SupportsFloat,
-    TypeAlias,
-    TypeVar,
-)
+from collections.abc import Callable, Iterable, Iterator, Mapping
+from typing import Any, cast, SupportsFloat, TypeAlias, TypeVar
 
 import numpy as np
 import sympy

cirq/interop/quirk/cells/qubit_permutation_cells.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Callable, Iterator, Sequence, TYPE_CHECKING
+from collections.abc import Callable, Iterator, Sequence
+from typing import TYPE_CHECKING
 
 from cirq import ops, value
 from cirq.interop.quirk.cells.cell import CELL_SIZES, CellMaker

cirq/interop/quirk/cells/scalar_cells.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Iterator, TYPE_CHECKING
+from collections.abc import Iterator
+from typing import TYPE_CHECKING
 
 from cirq import ops
 from cirq.interop.quirk.cells.cell import CellMaker

cirq/interop/quirk/cells/single_qubit_rotation_cells.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Callable, Iterator, TYPE_CHECKING
+from collections.abc import Callable, Iterator
+from typing import TYPE_CHECKING
 
 import sympy
 

cirq/interop/quirk/cells/swap_cell.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Iterable, Iterator, TYPE_CHECKING
+from collections.abc import Iterable, Iterator
+from typing import Any, TYPE_CHECKING
 
 from cirq import ops, value
 from cirq.interop.quirk.cells.cell import Cell, CellMaker

cirq/interop/quirk/cells/unsupported_cells.py

@@ -14,7 +14,7 @@
 
 from __future__ import annotations
 
-from typing import Iterator
+from collections.abc import Iterator
 
 from cirq.interop.quirk.cells.cell import CELL_SIZES, CellMaker
 

cirq/interop/quirk/url_to_circuit.py

@@ -16,7 +16,8 @@ from __future__ import annotations
 
 import json
 import urllib.parse
-from typing import Any, cast, Iterable, Mapping, Sequence, TYPE_CHECKING
+from collections.abc import Iterable, Mapping, Sequence
+from typing import Any, cast, TYPE_CHECKING
 
 import numpy as np
 

cirq/json_resolver_cache.py

@@ -21,8 +21,6 @@ from typing import NamedTuple, TYPE_CHECKING
 
 if TYPE_CHECKING:
     import cirq
-    import cirq.devices.unconstrained_device
-    import cirq.ops.pauli_gates
     from cirq.protocols.json_serialization import ObjectFactory
 
 

cirq/linalg/decompositions.py

@@ -18,7 +18,8 @@ from __future__ import annotations
 
 import cmath
 import math
-from typing import Any, Callable, cast, Iterable, TYPE_CHECKING, TypeVar
+from collections.abc import Callable, Iterable
+from typing import Any, cast, TYPE_CHECKING, TypeVar
 
 import matplotlib.pyplot as plt
 import numpy as np
@@ -243,7 +244,7 @@ def so4_to_magic_su2s(
 
 @value.value_equality(approximate=True)
 class AxisAngleDecomposition:
-    """Represents a unitary operation as an axis, angle, and global phase.
+    r"""Represents a unitary operation as an axis, angle, and global phase.
 
     The unitary $U$ is decomposed as follows:
 
@@ -472,6 +473,9 @@ class KakDecomposition:
             f'    global_phase={self.global_phase!r})'
         )
 
+    def _has_unitary_(self) -> bool:
+        return True
+
     def _unitary_(self) -> np.ndarray:
         """Returns the decomposition's two-qubit unitary matrix.
 

cirq/linalg/decompositions_test.py

@@ -259,6 +259,7 @@ def test_kak_plot_empty() -> None:
 )
 def test_kak_decomposition(target) -> None:
     kak = cirq.kak_decomposition(target)
+    assert cirq.has_unitary(kak)
     np.testing.assert_allclose(cirq.unitary(kak), target, atol=1e-8)
 
 

cirq/linalg/diagonalize.py

@@ -16,7 +16,7 @@
 
 from __future__ import annotations
 
-from typing import Callable
+from collections.abc import Callable
 
 import numpy as np
 

cirq/linalg/predicates.py

@@ -16,8 +16,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Sequence
 from types import EllipsisType
-from typing import cast, Sequence
+from typing import cast
 
 import numpy as np
 

cirq/linalg/tolerance.py

@@ -17,7 +17,8 @@ tolerances."""
 
 from __future__ import annotations
 
-from typing import Iterable, TYPE_CHECKING
+from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 import numpy as np
 

cirq/linalg/transformations.py

@@ -18,8 +18,9 @@ from __future__ import annotations
 
 import dataclasses
 import functools
+from collections.abc import Sequence
 from types import EllipsisType
-from typing import Any, Sequence
+from typing import Any
 
 import numpy as np
 

cirq/ops/arithmetic_operation.py

@@ -17,7 +17,8 @@ from __future__ import annotations
 
 import abc
 import itertools
-from typing import cast, Iterable, Self, Sequence, TYPE_CHECKING
+from collections.abc import Iterable, Sequence
+from typing import cast, Self, TYPE_CHECKING
 
 import numpy as np
 

cirq/ops/arithmetic_operation_test.py

@@ -14,7 +14,7 @@
 
 from __future__ import annotations
 
-from typing import Sequence
+from collections.abc import Sequence
 
 import numpy as np
 import pytest

cirq/ops/boolean_hamiltonian.py

@@ -27,7 +27,8 @@ from __future__ import annotations
 
 import functools
 import itertools
-from typing import Any, Generator, Sequence
+from collections.abc import Generator, Sequence
+from typing import Any
 
 import sympy.parsing.sympy_parser as sympy_parser
 
@@ -334,8 +335,8 @@ def _get_gates_from_hamiltonians(
 
         cnots = _simplify_cnots(cnots)
 
-        for gate in (cirq.CNOT(qubits[c], qubits[t]) for c, t in cnots):
-            yield gate
+        for c, t in cnots:
+            yield cirq.CNOT(qubits[c], qubits[t])
 
     sorted_hamiltonian_keys = sorted(
         hamiltonians.keys(), key=functools.cmp_to_key(_gray_code_comparator)

cirq/ops/classically_controlled_operation.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import AbstractSet, Any, Mapping, Sequence, TYPE_CHECKING
+from collections.abc import Mapping, Sequence, Set
+from typing import Any, TYPE_CHECKING
 
 import sympy
 
@@ -150,7 +151,7 @@ class ClassicallyControlledOperation(raw_types.Operation):
     def _is_parameterized_(self) -> bool:
         return protocols.is_parameterized(self._sub_operation)
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return protocols.parameter_names(self._sub_operation)
 
     def _resolve_parameters_(

cirq/ops/clifford_gate.py

@@ -15,9 +15,10 @@
 from __future__ import annotations
 
 import functools
+from collections.abc import Sequence
 from dataclasses import dataclass
 from types import NotImplementedType
-from typing import Any, Sequence, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 
 import numpy as np
 

cirq/ops/clifford_gate_test.py

@@ -48,8 +48,7 @@ def _assert_no_collision(gate) -> None:
 
 
 def _all_rotations():
-    for pauli, flip in itertools.product(_paulis, _bools):
-        yield (pauli, flip)
+    yield from itertools.product(_paulis, _bools)
 
 
 def _all_rotation_pairs():

cirq/ops/common_channels.py

@@ -17,7 +17,8 @@
 from __future__ import annotations
 
 import itertools
-from typing import Any, Iterable, Sequence, TYPE_CHECKING
+from collections.abc import Iterable, Sequence
+from typing import Any, TYPE_CHECKING
 
 import numpy as np
 

cirq/ops/common_gates.py

@@ -27,8 +27,9 @@ raised to a power (i.e. cirq.H**0.5). See the definition in EigenGate.
 
 from __future__ import annotations
 
+from collections.abc import Collection, Sequence
 from types import NotImplementedType
-from typing import Any, cast, Collection, Sequence
+from typing import Any, cast
 
 import numpy as np
 import sympy

cirq/ops/control_values.py

@@ -16,8 +16,9 @@ from __future__ import annotations
 
 import abc
 import itertools
+from collections.abc import Collection, Iterator, Sequence
 from functools import cached_property
-from typing import Any, Collection, Iterator, Sequence, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 
 from cirq import protocols, value
 

cirq/ops/controlled_gate.py

@@ -14,8 +14,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Collection, Sequence, Set
 from types import NotImplementedType
-from typing import AbstractSet, Any, Collection, Sequence, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 
 import numpy as np
 
@@ -244,7 +245,7 @@ class ControlledGate(raw_types.Gate):
     def _is_parameterized_(self) -> bool:
         return protocols.is_parameterized(self.sub_gate)
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return protocols.parameter_names(self.sub_gate)
 
     def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> ControlledGate:

cirq/ops/controlled_gate_test.py

@@ -14,8 +14,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Sequence
 from types import EllipsisType, NotImplementedType
-from typing import Any, cast, Sequence
+from typing import Any, cast
 
 import numpy as np
 import pytest

cirq/ops/controlled_operation.py

@@ -14,8 +14,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Collection, Sequence, Set
 from types import EllipsisType, NotImplementedType
-from typing import AbstractSet, Any, Collection, Sequence, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 
 import numpy as np
 
@@ -261,7 +262,7 @@ class ControlledOperation(raw_types.Operation):
     def _is_parameterized_(self) -> bool:
         return protocols.is_parameterized(self.sub_operation)
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return protocols.parameter_names(self.sub_operation)
 
     def _resolve_parameters_(

cirq/ops/controlled_operation_test.py

@@ -16,8 +16,9 @@ from __future__ import annotations
 
 import itertools
 import re
+from collections.abc import Sequence
 from types import EllipsisType, NotImplementedType
-from typing import cast, Sequence
+from typing import cast
 
 import numpy as np
 import pytest

cirq/ops/dense_pauli_string.py

@@ -16,19 +16,9 @@ from __future__ import annotations
 
 import abc
 import numbers
+from collections.abc import Callable, Iterable, Iterator, Sequence, Set
 from types import NotImplementedType
-from typing import (
-    AbstractSet,
-    Any,
-    Callable,
-    cast,
-    Iterable,
-    Iterator,
-    overload,
-    Self,
-    Sequence,
-    TYPE_CHECKING,
-)
+from typing import Any, cast, overload, Self, TYPE_CHECKING
 
 import numpy as np
 import sympy
@@ -187,7 +177,7 @@ class BaseDensePauliString(raw_types.Gate, metaclass=abc.ABCMeta):
     def _is_parameterized_(self) -> bool:
         return protocols.is_parameterized(self.coefficient)
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return protocols.parameter_names(self.coefficient)
 
     def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> Self:

cirq/ops/diagonal_gate.py

@@ -20,7 +20,8 @@ passed as a list.
 
 from __future__ import annotations
 
-from typing import AbstractSet, Any, Iterator, Sequence, TYPE_CHECKING
+from collections.abc import Iterator, Sequence, Set
+from typing import Any, TYPE_CHECKING
 
 import numpy as np
 import sympy
@@ -95,7 +96,7 @@ class DiagonalGate(raw_types.Gate):
     def _is_parameterized_(self) -> bool:
         return any(protocols.is_parameterized(angle) for angle in self._diag_angles_radians)
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return {
             name for angle in self._diag_angles_radians for name in protocols.parameter_names(angle)
         }

cirq/ops/eigen_gate.py

@@ -18,8 +18,9 @@ import abc
 import fractions
 import math
 import numbers
+from collections.abc import Iterable, Set
 from types import NotImplementedType
-from typing import AbstractSet, Any, cast, Iterable, NamedTuple, TYPE_CHECKING
+from typing import Any, cast, NamedTuple, TYPE_CHECKING
 
 import numpy as np
 import sympy
@@ -341,16 +342,17 @@ class EigenGate(raw_types.Gate):
     def _is_parameterized_(self) -> bool:
         return protocols.is_parameterized(self._exponent)
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return protocols.parameter_names(self._exponent)
 
     def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> EigenGate:
         exponent = resolver.value_of(self._exponent, recursive)
-        if isinstance(exponent, numbers.Complex):
-            if isinstance(exponent, numbers.Real):
-                exponent = float(exponent)
-            else:
-                raise ValueError(f'Complex exponent {exponent} not supported for EigenGate')
+        # Note that int/float checking is purposely done first,
+        # since numbers instance checking is somewhat slow.
+        if isinstance(exponent, (int, float)) or isinstance(exponent, numbers.Real):  # noqa: SIM101
+            exponent = float(exponent)
+        elif isinstance(exponent, numbers.Complex):
+            raise ValueError(f'Complex exponent {exponent} not supported for EigenGate')
         return self._with_exponent(exponent=exponent)
 
     def _equal_up_to_global_phase_(self, other, atol):

cirq/ops/fourier_transform.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import AbstractSet, Any
+from collections.abc import Set
+from typing import Any
 
 import numpy as np
 import sympy
@@ -163,7 +164,7 @@ class PhaseGradientGate(raw_types.Gate):
     def _is_parameterized_(self) -> bool:
         return cirq.is_parameterized(self.exponent)
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return cirq.parameter_names(self.exponent)
 
     def _resolve_parameters_(

cirq/ops/fourier_transform_test.py

@@ -107,9 +107,7 @@ def test_qft() -> None:
 
     arr = np.array([[1, 1, 1, 1], [1, -1j, -1, 1j], [1, -1, 1, -1], [1, 1j, -1, -1j]]) / 2
     np.testing.assert_allclose(
-        cirq.unitary(cirq.qft(*cirq.LineQubit.range(2)) ** -1),  # type: ignore[operator]
-        arr,  # type: ignore[arg-type]
-        atol=1e-8,
+        cirq.unitary(cirq.qft(*cirq.LineQubit.range(2)) ** -1), arr, atol=1e-8
     )
 
     for k in range(4):
@@ -121,7 +119,7 @@ def test_qft() -> None:
 
 def test_inverse() -> None:
     a, b, c = cirq.LineQubit.range(3)
-    assert cirq.qft(a, b, c, inverse=True) == cirq.qft(a, b, c) ** -1  # type: ignore[operator]
+    assert cirq.qft(a, b, c, inverse=True) == cirq.qft(a, b, c) ** -1
     assert cirq.qft(a, b, c, inverse=True, without_reverse=True) == cirq.inverse(
         cirq.qft(a, b, c, without_reverse=True)
     )

cirq/ops/fsim_gate.py

@@ -26,7 +26,8 @@ from __future__ import annotations
 
 import cmath
 import math
-from typing import AbstractSet, Any, Iterator
+from collections.abc import Iterator, Set
+from typing import Any
 
 import numpy as np
 import sympy
@@ -125,7 +126,7 @@ class FSimGate(gate_features.InterchangeableQubitsGate, raw_types.Gate):
     def _is_parameterized_(self) -> bool:
         return cirq.is_parameterized(self.theta) or cirq.is_parameterized(self.phi)
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return cirq.parameter_names(self.theta) | cirq.parameter_names(self.phi)
 
     def _has_unitary_(self):

cirq/ops/gate_operation.py

@@ -16,20 +16,12 @@
 
 from __future__ import annotations
 
+import numbers
 import re
 import warnings
+from collections.abc import Collection, Mapping, Sequence, Set
 from types import NotImplementedType
-from typing import (
-    AbstractSet,
-    Any,
-    cast,
-    Collection,
-    Mapping,
-    Self,
-    Sequence,
-    TYPE_CHECKING,
-    TypeVar,
-)
+from typing import Any, cast, Self, TYPE_CHECKING, TypeVar
 
 from cirq import ops, protocols, value
 from cirq.ops import control_values as cv, gate_features, raw_types
@@ -269,7 +261,7 @@ class GateOperation(raw_types.Operation):
             return getter()
         return NotImplemented
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         getter = getattr(self.gate, '_parameter_names_', None)
         if getter is not None:
             return getter()
@@ -332,12 +324,16 @@ class GateOperation(raw_types.Operation):
         return self.gate._rmul_with_qubits(self._qubits, other)
 
     def __add__(self, other):
+        if not isinstance(other, (ops.Operation, numbers.Number)):
+            return NotImplemented
         return 1 * self + other
 
     def __radd__(self, other):
         return other + 1 * self
 
     def __sub__(self, other):
+        if not isinstance(other, (ops.Operation, numbers.Number)):
+            return NotImplemented
         return 1 * self - other
 
     def __rsub__(self, other):