Merge branch 'main' into generic

Author: speller26

src/braket/circuits/circuit.py

@@ -1336,10 +1336,10 @@ def from_ir(source: str | OpenQasmProgram, inputs: dict[str, io_type] | None = N
             Circuit: Braket Circuit implementing the OpenQASM program.
         """
         if isinstance(source, OpenQasmProgram):
+            inputs_copy = source.inputs.copy() if source.inputs is not None else {}
             if inputs:
-                inputs_copy = source.inputs.copy() if source.inputs is not None else {}
                 inputs_copy.update(inputs)
-                inputs = inputs_copy
+            inputs = inputs_copy
             source = source.source
         from braket.circuits.braket_program_context import BraketProgramContext  # noqa: PLC0415
 

test/unit_tests/braket/circuits/test_circuit.py

@@ -2208,6 +2208,24 @@ def test_from_ir_inputs_updated():
     assert Circuit.from_ir(source=openqasm, inputs={"phi": 0.1}) == circuit
 
 
+def test_from_ir_program_inputs_only():
+    circuit = Circuit().rx(0, FreeParameter("theta")).ry(0, 0.3).measure(0)
+    openqasm = OpenQasmProgram(
+        source="\n".join([
+            "OPENQASM 3.0;",
+            "input float theta;",
+            "input float phi;",
+            "bit[1] b;",
+            "qubit[1] q;",
+            "rx(theta) q[0];",
+            "ry(phi) q[0];",
+            "b[0] = measure q[0];",
+        ]),
+        inputs={"phi": 0.3},
+    )
+    assert Circuit.from_ir(source=openqasm) == circuit
+
+
 @pytest.mark.parametrize(
     "expected_circuit, ir",
     [