Add input data check for Sampler

qiskit_ibm_runtime/sampler.py

@@ -17,6 +17,7 @@
 import copy
 
 from qiskit.circuit import QuantumCircuit, Parameter
+from qiskit.primitives.utils import final_measurement_mapping
 
 # TODO import BaseSampler and SamplerResult from terra once released
 from .qiskit.primitives import BaseSampler, SamplerResult
@@ -180,14 +181,25 @@ def run(
         Raises:
             ValueError: If the input values are invalid.
         """
-        if isinstance(circuits, Iterable) and not all(
-            isinstance(inst, QuantumCircuit) for inst in circuits
-        ):
-            raise ValueError(
-                "The circuits parameter has to be instances of QuantumCircuit."
-            )
+        if isinstance(circuits, QuantumCircuit):
+            circuits = [circuits]
+
+        for circ in circuits:
+            if not isinstance(circ, QuantumCircuit):
+                raise ValueError(
+                    "The circuits parameter has to be instances of QuantumCircuit."
+                )
+            if circ.num_clbits == 0:
+                raise ValueError("The circuits should have at least one classical bit.")
+            if self.options.resilience_level >= 1 and circ.num_clbits > len(
+                final_measurement_mapping(circ)
+            ):
+                raise ValueError(
+                    "All classical bits should be mapped to qubits "
+                    "in the final measurement to apply readout error mitigation."
+                )
 
-        circ_count = 1 if isinstance(circuits, QuantumCircuit) else len(circuits)
+        circ_count = len(circuits)
 
         inputs = {
             "circuits": circuits,

test/integration/test_sampler.py

@@ -166,3 +166,24 @@ def test_sampler_primitive_as_session(self, service):
             self.assertIsInstance(result, SamplerResult)
             self.assertEqual(len(result.quasi_dists), len(circuits0))
             self.assertEqual(len(result.metadata), len(circuits0))
+
+    @run_integration_test
+    def test_sampler_raise_error(self, service):
+        """Test error check properly works."""
+        with Session(service, self.backend) as session:
+            sampler = Sampler(session=session)
+
+            with self.assertRaises(ValueError):
+                _ = sampler.run(123)
+            with self.assertRaises(ValueError):
+                _ = sampler.run([123])
+
+            circuit = QuantumCircuit(2)
+            with self.assertRaises(ValueError):
+                _ = sampler.run(circuit)
+
+            sampler.options.resilience_level = 1
+            circuit = QuantumCircuit(1, 2)
+            circuit.measure(0, 0)
+            with self.assertRaises(ValueError):
+                _ = sampler.run(circuit)