Add in-place modifications of waveforms

.github/workflows/code-freeze.yml

@@ -20,22 +20,13 @@ jobs:
     - name: Fetch PR data and check if merge allowed
       if: env.FROZEN == 'true'
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PR_TITLE: ${{ github.event.pull_request.title }}
+        BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
       run: |
-        PR_DATA=$(curl -s \
-          -H "Authorization: Bearer $GITHUB_TOKEN" \
-          -H "Accept: application/vnd.github.v3+json" \
-          https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }})
-        BRANCH_NAME=$(echo $PR_DATA | jq .head.ref -r)
-        PR_TITLE=$(echo $PR_DATA | jq .title -r)
-
-        echo $BRANCH_NAME
-        echo $PR_TITLE
-
         # if it's not a critical fix
-        if ! [[ "$PR_TITLE" == fix\(critical\):* ]]; then
+        if ! [[ "$PR_TITLE" == fix(critical):* ]]; then
           # and there's an unfrozen prefix
-          if ! [[ -z $UNFROZEN_PREFIX ]]; then
+          if [[ -n "${UNFROZEN_PREFIX:-}" ]]; then
             # check if the branch matches unfrozen prefix
             if [[ "$BRANCH_NAME" != $UNFROZEN_PREFIX* ]]; then
               echo "Error: You can only merge from branches that start with '$UNFROZEN_PREFIX', or PRs titled with prefix 'fix(critical): '."

src/braket/pulse/pulse_sequence.py

@@ -31,7 +31,7 @@
 from braket.pulse.ast.qasm_transformer import _IRQASMTransformer
 from braket.pulse.frame import Frame
 from braket.pulse.pulse_sequence_trace import PulseSequenceTrace
-from braket.pulse.waveforms import Waveform
+from braket.pulse.waveforms import Waveform, WaveformDict
 from braket.registers.qubit_set import QubitSet
 
 
@@ -44,9 +44,13 @@ def __init__(self):
         self._capture_v0_count = 0
         self._program = Program(simplify_constants=False)
         self._frames = {}
-        self._waveforms = {}
+        self._waveforms = WaveformDict({}, self)
         self._free_parameters = set()
 
+    @property
+    def waveforms(self) -> WaveformDict:
+        return self._waveforms
+
     def to_time_trace(self) -> PulseSequenceTrace:
         """Generate an approximate trace of the amplitude, frequency, phase for each frame
         contained in the PulseSequence, under the action of the instructions contained in

src/braket/pulse/waveforms.py

@@ -16,11 +16,24 @@
 import random
 import string
 from abc import ABC, abstractmethod
-from typing import Optional, Union
+from copy import deepcopy
+from typing import TYPE_CHECKING, Any, Optional, Union
+
+if TYPE_CHECKING:  # pragma: no cover
+    from braket.pulse.pulse_sequence import PulseSequence
 
 import numpy as np
-from oqpy import WaveformVar, bool_, complex128, declare_waveform_generator, duration, float64
-from oqpy.base import OQPyExpression
+import openpulse.ast as ast
+from oqpy import (
+    WaveformVar,
+    bool_,
+    complex128,
+    convert_float_to_duration,
+    declare_waveform_generator,
+    duration,
+    float64,
+)
+from oqpy.base import OQPyExpression, to_ast
 
 from braket.parametric.free_parameter import FreeParameter
 from braket.parametric.free_parameter_expression import (
@@ -30,6 +43,28 @@
 from braket.parametric.parameterizable import Parameterizable
 
 
+class WaveformDict(dict):
+    """
+    A dict of waveforms.
+
+    Note:
+        WaveformDict binds a pulse sequence to each waveform that is
+            added to the dict. It serves as back reference when a
+            waveform is modified so the OQpy object is also updated.
+    """
+
+    def __init__(self, waveform_dict: dict, pulse_sequence: PulseSequence):
+        for waveform in waveform_dict.values():
+            waveform._pulse_sequence = pulse_sequence
+        super().__init__(waveform_dict)
+        self._pulse_sequence = pulse_sequence
+
+    def __setitem__(self, key: str, value: Waveform):
+        value = deepcopy(value)
+        value._pulse_sequence = self._pulse_sequence
+        super().__setitem__(key, value)
+
+
 class Waveform(ABC):
     """A waveform is a time-dependent envelope that can be used to emit signals on an output port
     or receive signals from an input port. As such, when transmitting signals to the qubit, a
@@ -39,6 +74,25 @@ class Waveform(ABC):
     for more details.
     """
 
+    def __init__(self) -> None:
+        self._pulse_sequence = None
+
+    def _modify_oqpy_waveform_var(
+        self, key: str, value: Any, type_: ast.ClassicalType = float64
+    ) -> None:
+        if self._pulse_sequence is not None:
+            self._pulse_sequence._register_free_parameters(value)
+            self._pulse_sequence._program.undeclared_vars[self.id].init_expression.args[key] = (
+                to_ast(
+                    self._pulse_sequence._program,
+                    (
+                        convert_float_to_duration(value)
+                        if isinstance(type_, ast.DurationType)
+                        else value
+                    ),
+                )
+            )
+
     @abstractmethod
     def _to_oqpy_expression(self) -> OQPyExpression:
         """Returns an OQPyExpression defining this waveform."""
@@ -82,8 +136,28 @@ def __init__(self, amplitudes: list[complex], id: Optional[str] = None):
             id (Optional[str]): The identifier used for declaring this waveform. A random string of
                 ascii characters is assigned by default.
         """
-        self.amplitudes = list(amplitudes)
+        self._amplitudes = list(amplitudes)
         self.id = id or _make_identifier_name()
+        super().__init__()
+
+    @property
+    def amplitudes(self) -> list[complex]:
+        return self._amplitudes
+
+    @amplitudes.setter
+    def amplitudes(self, value: list[complex]) -> None:
+        """
+        Sets the list of amplitudes.
+
+        Args:
+            value (list[complex]): Array of complex values specifying the
+                waveform amplitude at each timestep. The timestep is determined by the sampling rate
+                of the frame to which waveform is applied to.
+
+        """
+        self._amplitudes = value
+        if self._pulse_sequence is not None:
+            self._pulse_sequence._program.undeclared_vars[self.id].init_expression = value
 
     def __repr__(self) -> str:
         return f"ArbitraryWaveform('id': {self.id}, 'amplitudes': {self.amplitudes})"
@@ -140,9 +214,41 @@ def __init__(
             id (Optional[str]): The identifier used for declaring this waveform. A random string of
                 ascii characters is assigned by default.
         """
-        self.length = length
-        self.iq = iq
+        self._length = length
+        self._iq = iq
         self.id = id or _make_identifier_name()
+        super().__init__()
+
+    @property
+    def iq(self) -> complex:
+        return self._iq
+
+    @iq.setter
+    def iq(self, value: complex) -> None:
+        """
+        Sets the IQ value.
+
+        Args:
+            value (complex): complex value specifying the amplitude of the waveform.
+        """
+        self._iq = value
+        self._modify_oqpy_waveform_var("iq", value)
+
+    @property
+    def length(self) -> Union[float, FreeParameterExpression]:
+        return self._length
+
+    @length.setter
+    def length(self, value: Union[float, FreeParameterExpression]) -> None:
+        """
+        Sets the length.
+
+        Args:
+            value (Union[float, FreeParameterExpression]): Value (in seconds)
+                specifying the duration of the waveform.
+        """
+        self._length = value
+        self._modify_oqpy_waveform_var("length", value, duration)
 
     def __repr__(self) -> str:
         return f"ConstantWaveform('id': {self.id}, 'length': {self.length}, 'iq': {self.iq})"
@@ -256,12 +362,92 @@ def __init__(
             id (Optional[str]): The identifier used for declaring this waveform. A random string of
                 ascii characters is assigned by default.
         """
-        self.length = length
-        self.sigma = sigma
-        self.beta = beta
-        self.amplitude = amplitude
-        self.zero_at_edges = zero_at_edges
+        self._length = length
+        self._sigma = sigma
+        self._beta = beta
+        self._amplitude = amplitude
+        self._zero_at_edges = zero_at_edges
         self.id = id or _make_identifier_name()
+        super().__init__()
+
+    @property
+    def length(self) -> Union[float, FreeParameterExpression]:
+        return self._length
+
+    @length.setter
+    def length(self, value: Union[float, FreeParameterExpression]) -> None:
+        """
+        Sets the length.
+
+        Args:
+            value (Union[float, FreeParameterExpression]): Value (in seconds)
+                specifying the duration of the waveform.
+        """
+        self._length = value
+        self._modify_oqpy_waveform_var("length", value, duration)
+
+    @property
+    def sigma(self) -> Union[float, FreeParameterExpression]:
+        return self._sigma
+
+    @sigma.setter
+    def sigma(self, value: Union[float, FreeParameterExpression]) -> None:
+        """
+        Sets the DRAG gaussian width.
+
+        Args:
+            value (Union[float, FreeParameterExpression]): A measure (in seconds) of
+                how wide or narrow the Gaussian peak is.
+        """
+        self._sigma = value
+        self._modify_oqpy_waveform_var("sigma", value, duration)
+
+    @property
+    def beta(self) -> Union[float, FreeParameterExpression]:
+        return self._beta
+
+    @beta.setter
+    def beta(self, value: Union[float, FreeParameterExpression]) -> None:
+        """
+        Sets the beta value.
+
+        Args:
+            value (Union[float, FreeParameterExpression]): The correction amplitude.
+        """
+        self._beta = value
+        self._modify_oqpy_waveform_var("beta", value)
+
+    @property
+    def amplitude(self) -> Union[float, FreeParameterExpression]:
+        return self._amplitude
+
+    @amplitude.setter
+    def amplitude(self, value: Union[float, FreeParameterExpression]) -> None:
+        """
+        Sets the amplitude.
+
+        Args:
+            value (Union[float, FreeParameterExpression]): The amplitude of the
+                waveform envelope.
+        """
+        self._amplitude = value
+        self._modify_oqpy_waveform_var("amplitude", value)
+
+    @property
+    def zero_at_edges(self) -> bool:
+        return self._zero_at_edges
+
+    @zero_at_edges.setter
+    def zero_at_edges(self, value: bool) -> None:
+        """
+        Sets if the DRAG gaussian waveform should start and end at zero.
+
+        Args:
+            value (bool): bool specifying whether the waveform amplitude is clipped to
+                zero at the edges.
+        """
+        self._zero_at_edges = value
+        self._modify_oqpy_waveform_var("zero_at_edges", value)
 
     def __repr__(self) -> str:
         return (
@@ -396,11 +582,79 @@ def __init__(
             id (Optional[str]): The identifier used for declaring this waveform. A random string of
                 ascii characters is assigned by default.
         """
-        self.length = length
-        self.sigma = sigma
-        self.amplitude = amplitude
-        self.zero_at_edges = zero_at_edges
+        self._length = length
+        self._sigma = sigma
+        self._amplitude = amplitude
+        self._zero_at_edges = zero_at_edges
         self.id = id or _make_identifier_name()
+        super().__init__()
+
+    @property
+    def length(self) -> Union[float, FreeParameterExpression]:
+        return self._length
+
+    @length.setter
+    def length(self, value: Union[float, FreeParameterExpression]) -> None:
+        """
+        Sets the length.
+
+        Args:
+            value (Union[float, FreeParameterExpression]): Value (in seconds) specifying the
+                duration of the waveform.
+        """
+        self._length = value
+        self._modify_oqpy_waveform_var("length", value, duration)
+
+    @property
+    def sigma(self) -> Union[float, FreeParameterExpression]:
+        return self._sigma
+
+    @sigma.setter
+    def sigma(self, value: Union[float, FreeParameterExpression]) -> None:
+        """
+        Sets the gaussian waveform width.
+
+        Args:
+            value (Union[float, FreeParameterExpression]): A measure (in seconds) of how wide
+                or narrow the Gaussian peak is.
+        """
+        self._sigma = value
+        self._modify_oqpy_waveform_var("sigma", value, duration)
+
+    @property
+    def amplitude(self) -> Union[float, FreeParameterExpression]:
+        return self._amplitude
+
+    @amplitude.setter
+    def amplitude(self, value: Union[float, FreeParameterExpression]) -> None:
+        """
+        Sets the amplitude.
+
+        Args:
+            value (Union[float, FreeParameterExpression]): The amplitude of the waveform
+                envelope.
+        """
+        self._amplitude = value
+        self._modify_oqpy_waveform_var("amplitude", value)
+
+    @property
+    def zero_at_edges(self) -> bool:
+        return self._zero_at_edges
+
+    @zero_at_edges.setter
+    def zero_at_edges(self, value: bool) -> None:
+        """
+        Sets if the DRAG gaussian waveform should start and end at zero.
+
+        Args:
+            value (bool): bool specifying whether the waveform amplitude is clipped to
+                zero at the edges.
+        """
+        self._zero_at_edges = value
+        if self._pulse_sequence is not None:
+            self._pulse_sequence._program.undeclared_vars[self.id].init_expression.args[
+                "zero_at_edges"
+            ] = value
 
     def __repr__(self) -> str:
         return (