cirq-core 1.7.0.dev20250814213759__py3-none-any.whl → 1.7.0.dev20250814214609__py3-none-any.whl

cirq/_version.py

@@ -28,4 +28,4 @@ if sys.version_info < (3, 11, 0):  # pragma: no cover
         'of Cirq (e.g. "python -m pip install cirq==1.5.0")'
     )
 
-__version__ = "1.7.0.dev20250814213759"
+__version__ = "1.7.0.dev20250814214609"

cirq/_version_test.py

@@ -3,4 +3,4 @@ import cirq
 
 
 def test_version() -> None:
-    assert cirq.__version__ == "1.7.0.dev20250814213759"
+    assert cirq.__version__ == "1.7.0.dev20250814214609"

cirq/ops/classically_controlled_operation.py

@@ -125,15 +125,10 @@ class ClassicallyControlledOperation(raw_types.Operation):
             *self._conditions
         )
 
-    def _decompose_(self):
-        return self._decompose_with_context_()
-
-    def _decompose_with_context_(self, context: cirq.DecompositionContext | None = None):
-        result = protocols.decompose_once(
-            self._sub_operation, NotImplemented, flatten=False, context=context
-        )
-        if result is NotImplemented:
-            return NotImplemented
+    def _decompose_with_context_(self, *, context: cirq.DecompositionContext):
+        result = protocols.decompose_once(self._sub_operation, None, flatten=False, context=context)
+        if result is None:
+            return None
 
         return op_tree.transform_op_tree(
             result, lambda op: ClassicallyControlledOperation(op, self._conditions)

cirq/ops/controlled_operation.py

@@ -26,7 +26,6 @@ from cirq.ops import (
     controlled_gate,
     eigen_gate,
     gate_operation,
-    matrix_gates,
     op_tree,
     raw_types,
 )
@@ -134,26 +133,16 @@ class ControlledOperation(raw_types.Operation):
             new_qubits[:n], self.sub_operation.with_qubits(*new_qubits[n:]), self.control_values
         )
 
-    def _decompose_(self):
-        return self._decompose_with_context_()
-
-    def _decompose_with_context_(self, context: cirq.DecompositionContext | None = None):
+    def _decompose_with_context_(self, *, context: cirq.DecompositionContext):
         result = protocols.decompose_once_with_qubits(
-            self.gate, self.qubits, NotImplemented, flatten=False, context=context
+            self.gate, self.qubits, None, flatten=False, context=context
         )
-        if result is not NotImplemented:
+        if result is not None:
             return result
 
-        if isinstance(self.sub_operation.gate, matrix_gates.MatrixGate):
-            # Default decompositions of 2/3 qubit `cirq.MatrixGate` ignores global phase, which is
-            # local phase in the controlled variant and hence cannot be ignored.
-            return NotImplemented
-
-        result = protocols.decompose_once(
-            self.sub_operation, NotImplemented, flatten=False, context=context
-        )
-        if result is NotImplemented:
-            return NotImplemented
+        result = protocols.decompose_once(self.sub_operation, None, flatten=False, context=context)
+        if result is None:
+            return None
 
         return op_tree.transform_op_tree(
             result, lambda op: op.controlled_by(*self.controls, control_values=self.control_values)

cirq/ops/gate_operation.py

@@ -148,14 +148,9 @@ class GateOperation(raw_types.Operation):
     def _num_qubits_(self):
         return len(self._qubits)
 
-    def _decompose_(self) -> cirq.OP_TREE:
-        return self._decompose_with_context_()
-
-    def _decompose_with_context_(
-        self, context: cirq.DecompositionContext | None = None
-    ) -> cirq.OP_TREE:
+    def _decompose_with_context_(self, *, context: cirq.DecompositionContext) -> cirq.OP_TREE:
         return protocols.decompose_once_with_qubits(
-            self.gate, self.qubits, NotImplemented, flatten=False, context=context
+            self.gate, self.qubits, None, flatten=False, context=context
         )
 
     def _pauli_expansion_(self) -> value.LinearDict[str]:

cirq/ops/raw_types.py

@@ -828,12 +828,7 @@ class TaggedOperation(Operation):
     def _json_dict_(self) -> dict[str, Any]:
         return protocols.obj_to_dict_helper(self, ['sub_operation', 'tags'])
 
-    def _decompose_(self) -> cirq.OP_TREE:
-        return self._decompose_with_context_()
-
-    def _decompose_with_context_(
-        self, context: cirq.DecompositionContext | None = None
-    ) -> cirq.OP_TREE:
+    def _decompose_with_context_(self, *, context: cirq.DecompositionContext) -> cirq.OP_TREE:
         return protocols.decompose_once(
             self.sub_operation, default=None, flatten=False, context=context
         )
@@ -983,11 +978,8 @@ class _InverseCompositeGate(Gate):
             return self._original
         return NotImplemented
 
-    def _decompose_(self, qubits):
-        return self._decompose_with_context_(qubits)
-
     def _decompose_with_context_(
-        self, qubits: Sequence[cirq.Qid], context: cirq.DecompositionContext | None = None
+        self, qubits: Sequence[cirq.Qid], *, context: cirq.DecompositionContext
     ) -> cirq.OP_TREE:
         return protocols.inverse(
             protocols.decompose_once_with_qubits(self._original, qubits, context=context)

cirq/ops/raw_types_test.py

@@ -210,10 +210,10 @@ def test_default_validation_and_inverse() -> None:
     assert i**-1 == t
     assert t**-1 == i
     assert cirq.decompose(i) == [cirq.X(a), cirq.S(b) ** -1, cirq.Z(a)]
-    assert [*i._decompose_()] == [cirq.X(a), cirq.S(b) ** -1, cirq.Z(a)]  # type: ignore[misc]
+    assert cirq.decompose_once(i) == [cirq.X(a), cirq.S(b) ** -1, cirq.Z(a)]
     gate = i.gate
     assert gate is not None
-    assert [*gate._decompose_([a, b])] == [cirq.X(a), cirq.S(b) ** -1, cirq.Z(a)]  # type: ignore
+    assert cirq.decompose_once_with_qubits(gate, [a, b]) == [cirq.X(a), cirq.S(b) ** -1, cirq.Z(a)]
     cirq.testing.assert_allclose_up_to_global_phase(
         cirq.unitary(i), cirq.unitary(t).conj().T, atol=1e-8
     )
@@ -653,7 +653,7 @@ def test_tagged_operation_forwards_protocols() -> None:
     np.testing.assert_equal(cirq.unitary(tagged_h), cirq.unitary(h))
     assert cirq.has_unitary(tagged_h)
     assert cirq.decompose(tagged_h) == cirq.decompose(h)
-    assert [*tagged_h._decompose_()] == cirq.decompose_once(h)
+    assert cirq.decompose_once(tagged_h) == cirq.decompose_once(h)
     assert cirq.pauli_expansion(tagged_h) == cirq.pauli_expansion(h)
     assert cirq.equal_up_to_global_phase(h, tagged_h)
     assert np.isclose(cirq.kraus(h), cirq.kraus(tagged_h)).all()

cirq/protocols/decompose_protocol.py

@@ -31,7 +31,7 @@ from typing import (
     Union,
 )
 
-from typing_extensions import Protocol, runtime_checkable
+from typing_extensions import Protocol
 
 from cirq import devices, ops
 from cirq._doc import doc_private
@@ -51,10 +51,9 @@ DecomposeResult = Union[None, NotImplementedType, 'cirq.OP_TREE']
 _CONTEXT_COUNTER = itertools.count()  # Use _reset_context_counter() to reset the counter.
 
 
-@runtime_checkable
 class OpDecomposerWithContext(Protocol):
     def __call__(
-        self, __op: cirq.Operation, *, context: cirq.DecompositionContext | None = None
+        self, __op: cirq.Operation, *, context: cirq.DecompositionContext
     ) -> DecomposeResult: ...
 
 
@@ -132,9 +131,7 @@ class SupportsDecompose(Protocol):
     def _decompose_(self) -> DecomposeResult:
         pass
 
-    def _decompose_with_context_(
-        self, *, context: DecompositionContext | None = None
-    ) -> DecomposeResult:
+    def _decompose_with_context_(self, *, context: DecompositionContext) -> DecomposeResult:
         pass
 
 
@@ -161,26 +158,24 @@ class SupportsDecomposeWithQubits(Protocol):
         pass
 
     def _decompose_with_context_(
-        self, qubits: tuple[cirq.Qid, ...], *, context: DecompositionContext | None = None
+        self, qubits: tuple[cirq.Qid, ...], *, context: DecompositionContext
     ) -> DecomposeResult:
         pass
 
 
 def _try_op_decomposer(
-    val: Any, decomposer: OpDecomposer | None, *, context: DecompositionContext | None = None
+    val: Any, decomposer: OpDecomposer | None, *, context: DecompositionContext
 ) -> DecomposeResult:
     if decomposer is None or not isinstance(val, ops.Operation):
         return None
     if 'context' in inspect.signature(decomposer).parameters:
-        assert isinstance(decomposer, OpDecomposerWithContext)
-        return decomposer(val, context=context)
-    else:
-        return decomposer(val)
+        return decomposer(val, context=context)  # type: ignore[call-arg]
+    return decomposer(val)  # type: ignore[call-arg]
 
 
 @dataclasses.dataclass(frozen=True)
 class _DecomposeArgs:
-    context: DecompositionContext | None
+    context: DecompositionContext
     intercepting_decomposer: OpDecomposer | None
     fallback_decomposer: OpDecomposer | None
     keep: Callable[[cirq.Operation], bool] | None
@@ -373,7 +368,7 @@ def decompose_once(
 
     method = getattr(val, '_decompose_with_context_', None)
     decomposed = NotImplemented if method is None else method(*args, **kwargs, context=context)
-    if decomposed is NotImplemented or decomposed is None:
+    if decomposed is NotImplemented:
         method = getattr(val, '_decompose_', None)
         decomposed = NotImplemented if method is None else method(*args, **kwargs)
 

cirq/protocols/decompose_protocol_test.py

@@ -15,6 +15,7 @@
 from __future__ import annotations
 
 import itertools
+from types import NotImplementedType
 from unittest import mock
 
 import pytest
@@ -454,3 +455,46 @@ def test_extracting_global_phases() -> None:
     assert not context.extract_global_phases
     assert new_context.extract_global_phases
     assert new_context.qubit_manager is qm
+
+
+def test_handling_of_none_vs_notimplemented_return_values() -> None:
+
+    class TestOp:
+        called_decompose = False
+        called_decompose_with_context = False
+        return_value: NotImplementedType | None = None
+
+        def _decompose_(self):
+            self.called_decompose = True
+            return self.return_value
+
+        def _decompose_with_context_(self, *, context):
+            assert context is not None, 'A default context should be provided'
+            self.called_decompose_with_context = True
+            return self.return_value
+
+    op = TestOp()
+    result = cirq.decompose(op)
+    assert op.called_decompose_with_context, 'Should always call _decompose_with_context_'
+    assert not op.called_decompose, 'Should not fall back to _decompose_'
+    assert result == [op]
+
+    op = TestOp()
+    result = cirq.decompose_once(op, default='dummy')
+    assert op.called_decompose_with_context, 'Should always call _decompose_with_context_'
+    assert not op.called_decompose, 'Should not fall back to _decompose_'
+    assert result == 'dummy'
+
+    op = TestOp()
+    op.return_value = NotImplemented
+    result = cirq.decompose(op)
+    assert op.called_decompose_with_context, 'Should always call _decompose_with_context_'
+    assert op.called_decompose, 'Should fall back to _decompose_'
+    assert result == [op]
+
+    op = TestOp()
+    op.return_value = NotImplemented
+    result = cirq.decompose_once(op, default='dummy')
+    assert op.called_decompose_with_context, 'Should always call _decompose_with_context_'
+    assert op.called_decompose, 'Should fall back to _decompose_'
+    assert result == 'dummy'

{cirq_core-1.7.0.dev20250814213759.dist-info → cirq_core-1.7.0.dev20250814214609.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cirq-core
-Version: 1.7.0.dev20250814213759
+Version: 1.7.0.dev20250814214609
 Summary: A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits.
 Home-page: http://github.com/quantumlib/cirq
 Author: The Cirq Developers

{cirq_core-1.7.0.dev20250814213759.dist-info → cirq_core-1.7.0.dev20250814214609.dist-info}/RECORD

@@ -4,8 +4,8 @@ cirq/_compat_test.py,sha256=emXpdD5ZvwLRlFAoQB8YatmZyU3b4e9jg6FppMTUhkU,33900
 cirq/_doc.py,sha256=BrnoABo1hk5RgB3Cgww4zLHUfiyFny0F1V-tOMCbdaU,2909
 cirq/_import.py,sha256=ixBu4EyGl46Ram2cP3p5eZVEFDW5L2DS-VyTjz4N9iw,8429
 cirq/_import_test.py,sha256=oF4izzOVZLc7NZ0aZHFcGv-r01eiFFt_JORx_x7_D4s,1089
-cirq/_version.py,sha256=5OMdETPu_ahLYEAGWuvz6FQvPo90WuREbv97yjHbWdE,1206
-cirq/_version_test.py,sha256=sIhxk3eJjUQHh23JJW-O4IsJAoBpH15T1Od1lktTCvo,155
+cirq/_version.py,sha256=wn4TSccAw4YfwA1HXhKdlGqvdkZp0JsGBr2ozARMe2k,1206
+cirq/_version_test.py,sha256=nmMc8bJMQBjHlezSSXUxk6J67eYKYbV9A9A9V6rJXxs,155
 cirq/conftest.py,sha256=wSDKNdIQRDfLnXvOCWD3erheOw8JHRhdfQ53EyTUIXg,1239
 cirq/json_resolver_cache.py,sha256=A5DIgFAY1hUNt9vai_C3-gGBv24116CJMzQxMcXOax4,13726
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -287,7 +287,7 @@ cirq/ops/arithmetic_operation.py,sha256=FO2ne5ZHIcUCJySgOC60UApfDtfVBaZqlrhM46f7
 cirq/ops/arithmetic_operation_test.py,sha256=F5fPQF_sRWi8qyP_SgDzJ8kfX0jUVMj59_VOPpbXH_0,4938
 cirq/ops/boolean_hamiltonian.py,sha256=x25fraM9NNs-XzDKDl2AZ1AMpkVovfe-dNm_0wOolyI,14927
 cirq/ops/boolean_hamiltonian_test.py,sha256=_4mFFrbO9C21oZYutr_pl01_bqDDxvgY_h4DWKGkse0,8630
-cirq/ops/classically_controlled_operation.py,sha256=hj8oShyWpOD4bmKS5CTmxNftywkCnHTFi28kku1clJM,10386
+cirq/ops/classically_controlled_operation.py,sha256=4b5vRbUKJcd7JwEOJKHWzeqPifJeDbUqzdCpoqaM__g,10248
 cirq/ops/classically_controlled_operation_test.py,sha256=OedFFoAwS4WnHKG58xgjhbKFgKebhYyP8I7AU4a0m9k,50425
 cirq/ops/clifford_gate.py,sha256=BMjCuJq2fTFZm-Sv475qDqwsFof1kxru8zNDJOTFkL8,40055
 cirq/ops/clifford_gate_test.py,sha256=nuIGDqc7AWf5KJY3JJSe4mt8egLlcyuf5oorX_aBdsU,41268
@@ -301,7 +301,7 @@ cirq/ops/control_values.py,sha256=GrNi8YJZSZDCl8Su6Ocimvd1R1SejFJjVu2thcJ8VLI,13
 cirq/ops/control_values_test.py,sha256=Wyn0nwtcpnJvcPVRHmFGb3PtYxvsbpluA5UbPrG7tIo,13067
 cirq/ops/controlled_gate.py,sha256=3Hex9AdY6c_DedKoCqqpS4gx9rAgm9KZITbwUBXsoYg,13562
 cirq/ops/controlled_gate_test.py,sha256=jmIOlCx8dC3VId4NynX1ZYy7s7tkLav_d-fjiIZyVh0,29308
-cirq/ops/controlled_operation.py,sha256=l0pjUfru39HBuAbBkRCqJmrJDxah0JOFxXXILcUt0v8,13978
+cirq/ops/controlled_operation.py,sha256=Anes_PkQ5YLRS2Y6yQY0ssB85oWg5pJkvoQTSDrX--A,13514
 cirq/ops/controlled_operation_test.py,sha256=qXpnUoeWmOQaTMZPAuuICtX9Idf-JWtdARTsTENv54g,16546
 cirq/ops/dense_pauli_string.py,sha256=1TijNu1D2HIbbnwLbT_f546R2L4OCQtm1bKjqhno1Kg,24234
 cirq/ops/dense_pauli_string_test.py,sha256=JLfTLO13Qnr9c5jZOPBTJWD4409vm7uV6vi8R7m1kOg,21517
@@ -315,7 +315,7 @@ cirq/ops/fsim_gate.py,sha256=Qs7FLsNXR7K2jNVZ8I9o9YLvOb6cC6iBnAvZAHERNk0,20037
 cirq/ops/fsim_gate_test.py,sha256=QgckC2fij30grZJoO6HnQHdGkKcwtiegedEBRid3wF0,25858
 cirq/ops/gate_features.py,sha256=OfjsIGftnGpNUDAYwSP4obG0FsMrHYfp49ZOjbvbmNE,1085
 cirq/ops/gate_features_test.py,sha256=JYPunTBr48CQoIOB1wk2QEdPwtnmE-FxUoF6a4ZeRB8,2407
-cirq/ops/gate_operation.py,sha256=MF8JIYEM6bQu6ft9Eb19hSOillzu8MmaIoXSlmwbm5U,13447
+cirq/ops/gate_operation.py,sha256=PowWX9XcX_xHXt_7Ccg8pqqQwiJtN3qSfbtlKJEyXx4,13321
 cirq/ops/gate_operation_test.py,sha256=4QwWxCjGXNM__6QGw1kYSbBMh_4783jBZVBJD1ERGPk,18020
 cirq/ops/gateset.py,sha256=ya5OUsgd1j703Kk3hq6f-LzT1ZjBo_tl-FV0hvvlaAA,21492
 cirq/ops/gateset_test.py,sha256=JGQtCOkhAC11vhlZRpwJowNfU6v-hlIt9qdRRJgvfQY,17407
@@ -378,8 +378,8 @@ cirq/ops/qubit_order_or_list.py,sha256=5kChRv1gUnBKB-kF6okXoXcCa5CXbJ6HoB6ETpfl3
 cirq/ops/qubit_order_test.py,sha256=8uOW9oLLQcjbYvd2DdXZLCbRS2sJuH6b8Bal3SgPo5M,4372
 cirq/ops/random_gate_channel.py,sha256=i4eg9GA4CF6ZWQRrICa5lfYqvdZzN8oLEWwXHcxRStM,5115
 cirq/ops/random_gate_channel_test.py,sha256=p-xtDOMIYBJ1wVHLJmrALi-ZU978l3AVuX0kgoan1Ac,8523
-cirq/ops/raw_types.py,sha256=2QoHkWlVGAY3Yzkvlkop0GhLRdTMlHPGCIZNzffDjcI,43626
-cirq/ops/raw_types_test.py,sha256=ROi20W_gtt5lmDV0-z7LWhEQm93Icg4AzA8OEvlMJVg,35413
+cirq/ops/raw_types.py,sha256=kna5HmYONBXgXTfrTXgozYwBSxM9SwgBx2jTD4QWGqk,43410
+cirq/ops/raw_types_test.py,sha256=8h2g9EzGc65-eDu_6SPB_fuVy-a3Uos0EIPA1j0eLEc,35401
 cirq/ops/state_preparation_channel.py,sha256=3qbqrrYaVN2eHL1qiBHcItj1Pzjxhtq10tSEkRz9GNM,4781
 cirq/ops/state_preparation_channel_test.py,sha256=xFi6nOFPoQatxvnorCXujmhMvtf65lmyFfxbGlTKo4c,6039
 cirq/ops/swap_gates.py,sha256=mEDVB4pdBsbenaOahrNtAcE2B1ZPW-4vGq079rECxf4,11743
@@ -411,8 +411,8 @@ cirq/protocols/commutes_protocol.py,sha256=6cJNba3aEsCh_XHIeNTHb0LRzws6ZbxOrKL_r
 cirq/protocols/commutes_protocol_test.py,sha256=9YhBFYAwc-XpU7HrQp-GarKwmwmbgyadUYqlkiG10A8,5885
 cirq/protocols/control_key_protocol.py,sha256=uGgfahCHzsFpUGq6flgTMuqPh20zUSB2AOkSrhyoqwQ,2621
 cirq/protocols/control_key_protocol_test.py,sha256=fNDDkf4mQpA_tKuhX1e2BJN72v9HdGftgd79sOqREJE,1014
-cirq/protocols/decompose_protocol.py,sha256=zwmrlFmBggInx1u1xZEeBDxaLGRWMGHCp87F7RRQPH4,19129
-cirq/protocols/decompose_protocol_test.py,sha256=s5ELgra5UKExKCjDHUtMOwTZrGmYwxAphCRryRLMM_Q,16456
+cirq/protocols/decompose_protocol.py,sha256=QFiH6D1QzWT-TCwkClXbcVADIBwKHl39X8SPJ8E2524,18967
+cirq/protocols/decompose_protocol_test.py,sha256=JJexKMKYdSW1K1S4wkTyR1Wy80Ku_jHslSJx3gJ5REs,18130
 cirq/protocols/equal_up_to_global_phase_protocol.py,sha256=y-GPOImHgdjVqXF-qE3SUmlekF6-zI0tgi0E2nTdW1M,4106
 cirq/protocols/equal_up_to_global_phase_protocol_test.py,sha256=EDfWnCuYAVfcvBXHYoZ0lDukNEGG2c53vzP7s8jHLKA,6050
 cirq/protocols/has_stabilizer_effect_protocol.py,sha256=T_CVVpvckp3ZTsWi089mPqbmwOPLlF6GalEKrVK7Hvs,4309
@@ -1234,8 +1234,8 @@ cirq/work/sampler.py,sha256=rxbMWvrhu3gfNSBjZKozw28lLKVvBAS_1EGyPdYe8Xg,19041
 cirq/work/sampler_test.py,sha256=SsMrRvLDYELyOAWLKISjkdEfrBwLYWRsT6D8WrsLM3Q,13533
 cirq/work/zeros_sampler.py,sha256=Fs2JWwq0n9zv7_G5Rm-9vPeHUag7uctcMOHg0JTkZpc,2371
 cirq/work/zeros_sampler_test.py,sha256=lQLgQDGBLtfImryys2HzQ2jOSGxHgc7-koVBUhv8qYk,3345
-cirq_core-1.7.0.dev20250814213759.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.7.0.dev20250814213759.dist-info/METADATA,sha256=6JiKvsC8phpIxxPfGPw7KLuGaCYI4Uv3OziCnTt0w6w,4857
-cirq_core-1.7.0.dev20250814213759.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cirq_core-1.7.0.dev20250814213759.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.7.0.dev20250814213759.dist-info/RECORD,,
+cirq_core-1.7.0.dev20250814214609.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.7.0.dev20250814214609.dist-info/METADATA,sha256=1_5wp3a6PQKEhyc8Zd4QObsjQt9nkxaM1ygELLDFQZ8,4857
+cirq_core-1.7.0.dev20250814214609.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cirq_core-1.7.0.dev20250814214609.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.7.0.dev20250814214609.dist-info/RECORD,,