fix last merge commit

src/braket/circuits/circuit.py

@@ -1247,7 +1247,7 @@ def _validate_gate_calbrations_uniqueness(
         self,
         gate_definitions: dict[tuple[Gate, QubitSet], PulseSequence],
         frames: dict[Frame],
-        waveforms: dict[ArbitraryWaveform],
+        waveforms: dict[Waveform],
     ) -> None:
         for key, calibration in gate_definitions.items():
             for frame in calibration._frames.values():
@@ -1305,7 +1305,7 @@ def _generate_frame_wf_defcal_declarations(
 
     def _get_frames_waveforms_from_instrs(
         self, gate_definitions: Optional[dict[tuple[Gate, QubitSet], PulseSequence]]
-    ) -> tuple[dict[Frame], dict[ArbitraryWaveform]]:
+    ) -> tuple[dict[Frame], dict[Waveform]]:
         from braket.circuits.gates import PulseGate
 
         frames = {}

src/braket/parametric/free_parameter_expression.py

@@ -43,7 +43,7 @@ class FreeParameterExpression:
     def __init__(
         self,
         expression: Union[FreeParameterExpression, Number, Expr, str],
-        _type: Optional[ClassicalType] = None,
+        _type: ClassicalType | None = None,
     ):
         """
         Initializes a FreeParameterExpression. Best practice is to initialize using
@@ -53,7 +53,7 @@ def __init__(
 
         Args:
             expression (Union[FreeParameterExpression, Number, Expr, str]): The expression to use.
-            _type (Optional[ClassicalType]): The OpenQASM3 type associated with the expression.
+            _type (ClassicalType | None): The OpenQASM3 type associated with the expression.
                 Subtypes of openqasm3.ast.ClassicalType are used to specify how to express the
                 expression in the OpenQASM3 IR. Any type other than DurationType is considered
                 as FloatType.

src/braket/pulse/ast/free_parameters.py

@@ -27,7 +27,7 @@
 class _FreeParameterTransformer(QASMTransformer):
     """Walk the AST and evaluate FreeParameterExpressions."""
 
-    def __init__(self, param_values: dict[str, float]):
+    def __init__(self, param_values: dict[str, float], program: Program):
         self.param_values = param_values
         self.program = program
         super().__init__()