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

cirq/ops/phased_x_z_gate.py

@@ -15,7 +15,8 @@
 from __future__ import annotations
 
 import numbers
-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
@@ -140,6 +141,10 @@ class PhasedXZGate(raw_types.Gate):
         return self._axis_phase_exponent
 
     def _value_equality_values_(self):
+        if self._is_parameterized_():
+            # If this is parameterized, do not try to calculate the canonical exponents
+            # as this results in some slow sympy operations.
+            return (self._x_exponent, self._z_exponent, self._axis_phase_exponent)
         c = self._canonical()
         return (
             value.PeriodicValue(c._x_exponent, 2),
@@ -216,7 +221,7 @@ class PhasedXZGate(raw_types.Gate):
             or protocols.is_parameterized(self._axis_phase_exponent)
         )
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         """See `cirq.SupportsParameterization`."""
         return (
             protocols.parameter_names(self._x_exponent)
@@ -231,17 +236,19 @@ class PhasedXZGate(raw_types.Gate):
         z_exponent = resolver.value_of(self._z_exponent, recursive)
         x_exponent = resolver.value_of(self._x_exponent, recursive)
         axis_phase_exponent = resolver.value_of(self._axis_phase_exponent, recursive)
-        if isinstance(z_exponent, numbers.Complex):
+        if not isinstance(z_exponent, float) and isinstance(z_exponent, numbers.Complex):
             if isinstance(z_exponent, numbers.Real):
                 z_exponent = float(z_exponent)
             else:
                 raise ValueError(f'Complex exponent {z_exponent} not allowed in cirq.PhasedXZGate')
-        if isinstance(x_exponent, numbers.Complex):
+        if not isinstance(x_exponent, float) and isinstance(x_exponent, numbers.Complex):
             if isinstance(x_exponent, numbers.Real):
                 x_exponent = float(x_exponent)
             else:
                 raise ValueError(f'Complex exponent {x_exponent} not allowed in cirq.PhasedXZGate')
-        if isinstance(axis_phase_exponent, numbers.Complex):
+        if not isinstance(axis_phase_exponent, float) and isinstance(
+            axis_phase_exponent, numbers.Complex
+        ):
             if isinstance(axis_phase_exponent, numbers.Real):
                 axis_phase_exponent = float(axis_phase_exponent)
             else:

cirq/ops/projector.py

@@ -4,7 +4,8 @@ from __future__ import annotations
 
 import itertools
 import math
-from typing import Any, Iterable, Mapping, TYPE_CHECKING
+from collections.abc import Iterable, Mapping
+from typing import Any, TYPE_CHECKING
 
 import numpy as np
 from scipy.sparse import csr_matrix

cirq/ops/qubit_manager.py

@@ -16,7 +16,8 @@ from __future__ import annotations
 
 import abc
 import dataclasses
-from typing import Iterable, TYPE_CHECKING
+from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from cirq.ops import raw_types
 

cirq/ops/qubit_order.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable, Iterable, TYPE_CHECKING, TypeVar
+from collections.abc import Callable, Iterable
+from typing import Any, TYPE_CHECKING, TypeVar
 
 if TYPE_CHECKING:
     import cirq

cirq/ops/qubit_order_or_list.py

@@ -20,7 +20,7 @@ mypy.
 
 from __future__ import annotations
 
-from typing import Iterable
+from collections.abc import Iterable
 
 from cirq._doc import document
 from cirq.ops import qubit_order, raw_types

cirq/ops/random_gate_channel.py

@@ -15,7 +15,8 @@
 from __future__ import annotations
 
 import numbers
-from typing import AbstractSet, Any, cast, SupportsFloat, TYPE_CHECKING
+from collections.abc import Set
+from typing import Any, cast, SupportsFloat, TYPE_CHECKING
 
 import numpy as np
 
@@ -74,7 +75,7 @@ class RandomGateChannel(raw_types.Gate):
             self.sub_gate
         )
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return protocols.parameter_names(self.probability) | protocols.parameter_names(
             self.sub_gate
         )

cirq/ops/raw_types.py

@@ -18,19 +18,9 @@ from __future__ import annotations
 
 import abc
 import functools
+from collections.abc import Callable, Collection, Hashable, Iterable, Mapping, Sequence, Set
 from types import NotImplementedType
-from typing import (
-    AbstractSet,
-    Any,
-    Callable,
-    cast,
-    Collection,
-    Hashable,
-    Iterable,
-    Mapping,
-    Sequence,
-    TYPE_CHECKING,
-)
+from typing import Any, cast, overload, TYPE_CHECKING
 
 import numpy as np
 
@@ -482,10 +472,18 @@ class Gate(metaclass=value.ABCMetaImplementAnyOneOf):
 
     def _mul_with_qubits(self, qubits: tuple[cirq.Qid, ...], other):
         """cirq.GateOperation.__mul__ delegates to this method."""
+        from cirq.ops.pauli_string import _try_interpret_as_pauli_string
+
+        if (as_pauli_string := _try_interpret_as_pauli_string(self.on(*qubits))) is not None:
+            return as_pauli_string * other
         return NotImplemented
 
     def _rmul_with_qubits(self, qubits: tuple[cirq.Qid, ...], other):
         """cirq.GateOperation.__rmul__ delegates to this method."""
+        from cirq.ops.pauli_string import _try_interpret_as_pauli_string
+
+        if (as_pauli_string := _try_interpret_as_pauli_string(self.on(*qubits))) is not None:
+            return other * as_pauli_string
         return NotImplemented
 
     def _json_dict_(self) -> dict[str, Any]:
@@ -519,6 +517,9 @@ class Operation(metaclass=abc.ABCMeta):
     def _qid_shape_(self) -> tuple[int, ...]:
         return protocols.qid_shape(self.qubits)
 
+    def __pow__(self, exponent: Any) -> Operation:
+        return NotImplemented  # pragma: no cover
+
     @abc.abstractmethod
     def with_qubits(self, *new_qubits: cirq.Qid) -> cirq.Operation:
         """Returns the same operation, but applied to different qubits.
@@ -679,9 +680,17 @@ class Operation(metaclass=abc.ABCMeta):
         """The classical controls gating this operation."""
         return frozenset()
 
+    @overload
+    def with_classical_controls(self) -> cirq.Operation:
+        pass
+
+    @overload
     def with_classical_controls(
         self, *conditions: str | cirq.MeasurementKey | cirq.Condition | sympy.Expr
-    ) -> cirq.Operation:
+    ) -> cirq.ClassicallyControlledOperation:
+        pass
+
+    def with_classical_controls(self, *conditions):
         """Returns a classically controlled version of this operation.
 
         An operation that is classically controlled is executed iff all
@@ -892,7 +901,7 @@ class TaggedOperation(Operation):
         return NotImplemented
 
     @cached_method
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         tag_params = {name for tag in self.tags for name in protocols.parameter_names(tag)}
         return protocols.parameter_names(self.sub_operation) | tag_params
 
@@ -949,9 +958,17 @@ class TaggedOperation(Operation):
         new_sub_operation = self.sub_operation.without_classical_controls()
         return self if new_sub_operation is self.sub_operation else new_sub_operation
 
+    @overload
+    def with_classical_controls(self) -> cirq.Operation:
+        pass
+
+    @overload
     def with_classical_controls(
         self, *conditions: str | cirq.MeasurementKey | cirq.Condition | sympy.Expr
-    ) -> cirq.Operation:
+    ) -> cirq.ClassicallyControlledOperation:
+        pass
+
+    def with_classical_controls(self, *conditions):
         if not conditions:
             return self
         return self.sub_operation.with_classical_controls(*conditions)
@@ -998,7 +1015,7 @@ class _InverseCompositeGate(Gate):
         return protocols.is_parameterized(self._original)
 
     @cached_method
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return protocols.parameter_names(self._original)
 
     def _resolve_parameters_(

cirq/ops/raw_types_test.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import AbstractSet, Any, cast, Iterator
+from collections.abc import Iterator, Set
+from typing import Any, cast
 
 import numpy as np
 import pytest
@@ -739,7 +740,7 @@ class ParameterizableTag:
     def _is_parameterized_(self) -> bool:
         return cirq.is_parameterized(self.value)
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return cirq.parameter_names(self.value)
 
     def _resolve_parameters_(
@@ -781,7 +782,7 @@ def test_inverse_composite_standards() -> None:
         def _value_equality_values_(self):
             return (self._param,)
 
-        def _parameter_names_(self) -> AbstractSet[str]:
+        def _parameter_names_(self) -> Set[str]:
             return cirq.parameter_names(self._param)
 
         def _is_parameterized_(self) -> bool:

cirq/ops/state_preparation_channel.py

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

cirq/ops/three_qubit_gates.py

@@ -16,7 +16,8 @@
 
 from __future__ import annotations
 
-from typing import AbstractSet, Any, Collection, Iterator, Sequence, TYPE_CHECKING
+from collections.abc import Collection, Iterator, Sequence, Set
+from typing import Any, TYPE_CHECKING
 
 import numpy as np
 import sympy
@@ -224,7 +225,7 @@ class ThreeQubitDiagonalGate(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/two_qubit_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
@@ -76,7 +77,7 @@ class TwoQubitDiagonalGate(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/uniform_superposition_gate.py

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

cirq/ops/wait_gate.py

@@ -14,7 +14,10 @@
 
 from __future__ import annotations
 
-from typing import AbstractSet, Any, TYPE_CHECKING
+from collections.abc import Set
+from typing import Any, TYPE_CHECKING
+
+import sympy
 
 from cirq import protocols, value
 from cirq.ops import raw_types
@@ -51,8 +54,11 @@ class WaitGate(raw_types.Gate):
             ValueError: If the `qid_shape` provided is empty or `num_qubits` contradicts
                 `qid_shape`.
         """
-        self._duration = value.Duration(duration)
-        if not protocols.is_parameterized(self.duration) and self.duration < 0:
+        self._duration = (
+            duration if isinstance(duration, value.Duration) else value.Duration(duration)
+        )
+        total_picos = self.duration.total_picos()
+        if not isinstance(total_picos, sympy.Basic) and total_picos < 0:
             raise ValueError('duration < 0')
         if qid_shape is None:
             if num_qubits is None:
@@ -75,7 +81,7 @@ class WaitGate(raw_types.Gate):
     def _is_parameterized_(self) -> bool:
         return protocols.is_parameterized(self.duration)
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return protocols.parameter_names(self.duration)
 
     def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> WaitGate:

cirq/protocols/act_on_protocol.py

@@ -14,8 +14,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Sequence
 from types import NotImplementedType
-from typing import Any, Protocol, Sequence, TYPE_CHECKING
+from typing import Any, Protocol, TYPE_CHECKING
 
 from cirq import ops
 from cirq._doc import doc_private

cirq/protocols/act_on_protocol_test.py

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

cirq/protocols/apply_channel_protocol.py

@@ -16,8 +16,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Iterable, Sequence
 from types import NotImplementedType
-from typing import Any, Iterable, Protocol, Sequence, TypeVar
+from typing import Any, Protocol, TypeVar
 
 import numpy as np
 

cirq/protocols/apply_mixture_protocol.py

@@ -16,8 +16,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Iterable
 from types import NotImplementedType
-from typing import Any, cast, Iterable, Protocol, TypeVar
+from typing import Any, cast, Protocol, TypeVar
 
 import numpy as np
 

cirq/protocols/apply_mixture_protocol_test.py

@@ -13,7 +13,8 @@
 # limitations under the License.
 from __future__ import annotations
 
-from typing import Any, cast, Iterable
+from collections.abc import Iterable
+from typing import Any, cast
 
 import numpy as np
 import pytest

cirq/protocols/apply_unitary_protocol.py

@@ -17,8 +17,9 @@
 from __future__ import annotations
 
 import warnings
+from collections.abc import Iterable, Sequence
 from types import EllipsisType, NotImplementedType
-from typing import Any, cast, Iterable, Protocol, Sequence, TYPE_CHECKING, TypeVar
+from typing import Any, cast, Protocol, TYPE_CHECKING, TypeVar
 
 import numpy as np
 

cirq/protocols/apply_unitary_protocol_test.py

@@ -240,6 +240,7 @@ def test_apply_unitary_args_tensor_manipulation() -> None:
             op_indices, tuple(qid_shape[i] for i in op_indices)
         )
         sub_result = val._apply_unitary_(sub_args)
+        assert isinstance(sub_result, np.ndarray)
         result = _incorporate_result_into_target(args, sub_args, sub_result)
         np.testing.assert_allclose(result, expected, atol=1e-8)
 
@@ -258,6 +259,7 @@ def test_apply_unitary_args_tensor_manipulation() -> None:
             op_indices, tuple(qid_shape[i] for i in op_indices)
         )
         sub_result = val._apply_unitary_(sub_args)
+        assert isinstance(sub_result, np.ndarray)
         result = _incorporate_result_into_target(args, sub_args, sub_result)
         np.testing.assert_allclose(result, expected, atol=1e-8, verbose=True)
 

cirq/protocols/approximate_equality_protocol.py

@@ -15,9 +15,10 @@
 from __future__ import annotations
 
 import numbers
+from collections.abc import Iterable
 from decimal import Decimal
 from fractions import Fraction
-from typing import Any, Iterable, Protocol
+from typing import Any, Protocol
 
 import numpy as np
 import sympy

cirq/protocols/circuit_diagram_info_protocol.py

@@ -15,8 +15,9 @@
 from __future__ import annotations
 
 import re
+from collections.abc import Iterable, Sequence
 from fractions import Fraction
-from typing import Any, Iterable, overload, Protocol, Self, Sequence, TYPE_CHECKING, TypeVar, Union
+from typing import Any, overload, Protocol, Self, TYPE_CHECKING, TypeVar, Union
 
 import numpy as np
 import sympy

cirq/protocols/control_key_protocol.py

@@ -53,6 +53,13 @@ def control_keys(val: Any) -> frozenset[cirq.MeasurementKey]:
     Returns:
         The measurement keys the value is controlled by. If the value is not
         classically controlled, the result is the empty tuple.
+
+    Notes:
+        For composite operations (e.g. CircuitOperation), only control keys that
+        have not already been measured earlier in the subcircuit are returned.
+        Control keys that are satisfied by measurements **after** their use in
+        the subcircuit are still required externally and thus appear in the
+        result.
     """
     getter = getattr(val, '_control_keys_', None)
     result = NotImplemented if getter is None else getter()

cirq/protocols/decompose_protocol.py

@@ -18,19 +18,9 @@ import dataclasses
 import inspect
 import itertools
 from collections import defaultdict
+from collections.abc import Callable, Iterable, Iterator, Sequence
 from types import NotImplementedType
-from typing import (
-    Any,
-    Callable,
-    Iterable,
-    Iterator,
-    overload,
-    Protocol,
-    Sequence,
-    TYPE_CHECKING,
-    TypeVar,
-    Union,
-)
+from typing import Any, overload, Protocol, TYPE_CHECKING, TypeVar, Union
 
 from cirq import devices, ops
 from cirq._doc import doc_private

cirq/protocols/has_stabilizer_effect_protocol.py

@@ -97,7 +97,7 @@ def _strat_has_stabilizer_effect_from_unitary(val: Any) -> bool | None:
             ps = DensePauliString(pauli_string)
             p = ps._unitary_()
             if not pauli_string_decomposition.unitary_to_pauli_string(
-                (unitary @ p @ unitary.T.conj())
+                unitary @ p @ unitary.T.conj()
             ):
                 return False
     return True

cirq/protocols/has_stabilizer_effect_protocol_test.py

@@ -14,6 +14,8 @@
 
 from __future__ import annotations
 
+from typing import Any
+
 import numpy as np
 
 import cirq
@@ -50,40 +52,40 @@ class EmptyOp(cirq.Operation):
         self.q = q
 
     @property
-    def qubits(self):
+    def qubits(self) -> tuple[cirq.Qid, ...]:
         return (self.q,)
 
-    def with_qubits(self, *new_qubits):  # pragma: no cover
+    def with_qubits(self, *new_qubits) -> cirq.Operation:  # pragma: no cover
         return self
 
 
 class NoOp(EmptyOp):
     @property
-    def gate(self):
+    def gate(self) -> Any:
         return No()
 
 
 class NoOp1(EmptyOp):
     @property
-    def gate(self):
+    def gate(self) -> Any:
         return No1()
 
 
 class NoOp2(EmptyOp):
     @property
-    def gate(self):
+    def gate(self) -> Any:
         return No2()
 
 
 class NoOp3(EmptyOp):
     @property
-    def gate(self):
+    def gate(self) -> Any:
         return No3()
 
 
 class YesOp(EmptyOp):
     @property
-    def gate(self):
+    def gate(self) -> Any:
         return Yes()
 
 
@@ -95,8 +97,8 @@ class OpWithUnitary(EmptyOp):
         return self.unitary
 
     @property
-    def qubits(self):
-        return cirq.LineQubit.range(self.unitary.shape[0].bit_length() - 1)
+    def qubits(self) -> tuple[cirq.Qid, ...]:
+        return tuple(cirq.LineQubit.range(self.unitary.shape[0].bit_length() - 1))
 
 
 class GateDecomposes(cirq.Gate):

cirq/protocols/has_unitary_protocol_test.py

@@ -218,8 +218,8 @@ class EmptyOp(cirq.Operation):
     """A trivial operation that will be recognized as `_apply_unitary_`-able."""
 
     @property
-    def qubits(self):
+    def qubits(self) -> tuple[cirq.Qid, ...]:
         return ()
 
-    def with_qubits(self, *new_qubits):  # pragma: no cover
-        return self
+    def with_qubits(self, *new_qubits) -> cirq.Operation:
+        raise NotImplementedError()

cirq/protocols/hash_from_pickle_test.py

@@ -18,8 +18,8 @@ import multiprocessing
 import os
 import pathlib
 import pickle
-from collections.abc import Iterator
-from typing import Any, Hashable
+from collections.abc import Hashable, Iterator
+from typing import Any
 
 import pytest
 

cirq/protocols/inverse_protocol.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Iterable, overload, TYPE_CHECKING, TypeVar
+from collections.abc import Iterable
+from typing import Any, overload, TYPE_CHECKING, TypeVar
 
 from cirq import ops
 

cirq/protocols/json_serialization.py

@@ -20,8 +20,9 @@ import gzip
 import json
 import numbers
 import pathlib
+from collections.abc import Callable, Iterable, Sequence
 from types import NotImplementedType
-from typing import Any, Callable, cast, IO, Iterable, overload, Protocol, Sequence
+from typing import Any, cast, IO, overload, Protocol
 
 import attrs
 import numpy as np
@@ -217,7 +218,7 @@ class CirqEncoder(json.JSONEncoder):
         super().__init__(*args, **kwargs)
         self._memo: dict[Any, dict] = {}
 
-    def default(self, o):
+    def default(self, o) -> dict[str, Any] | list[Any] | float | bool:
         # Object with custom method?
         if hasattr(o, '_json_dict_'):
             json_dict = _json_dict_with_cirq_type(o)
@@ -519,7 +520,7 @@ def read_json(
     *,
     json_text: str | None = None,
     resolvers: Sequence[JsonResolver] | None = None,
-):
+) -> Any:
     """Read a JSON file that optionally contains cirq objects.
 
     Args:
@@ -605,7 +606,7 @@ def read_json_gzip(
     *,
     gzip_raw: bytes | None = None,
     resolvers: Sequence[JsonResolver] | None = None,
-):
+) -> Any:
     """Read a gzipped JSON file that optionally contains cirq objects.
 
     Args: