Follow up on non-versioned primitives deprecation

qiskit/primitives/backend_estimator.py

@@ -37,7 +37,7 @@
 )
 from qiskit.utils.deprecation import deprecate_func
 
-from .base import BaseEstimator, EstimatorResult
+from .base import BaseEstimatorV1, EstimatorResult
 from .primitive_job import PrimitiveJob
 from .utils import _circuit_key, _observable_key, init_observable
 
@@ -89,23 +89,23 @@ def _prepare_counts(results: list[Result]):
     return counts
 
 
-class BackendEstimator(BaseEstimator[PrimitiveJob[EstimatorResult]]):
+class BackendEstimatorV1(BaseEstimatorV1[PrimitiveJob[EstimatorResult]]):
     """Evaluates expectation value using Pauli rotation gates.
 
     The :class:`~.BackendEstimator` class is a generic implementation of the
-    :class:`~.BaseEstimator` interface that is used to wrap a :class:`~.BackendV2`
+    :class:`~.BaseEstimatorV1` interface that is used to wrap a :class:`~.BackendV2`
     (or :class:`~.BackendV1`) object in the :class:`~.BaseEstimator` API. It
     facilitates using backends that do not provide a native
-    :class:`~.BaseEstimator` implementation in places that work with
-    :class:`~.BaseEstimator`. However,
+    :class:`~.BaseEstimatorV1` implementation in places that work with
+    :class:`~.BaseEstimatorV1`. However,
     if you're using a provider that has a native implementation of
-    :class:`~.BaseEstimator`, it is a better choice to leverage that native
+    :class:`~.BaseEstimatorV1` or :class:`~.BaseEstimatorV2`, it is a better
+    choice to leverage that native
     implementation as it will likely include additional optimizations and be
     a more efficient implementation. The generic nature of this class
     precludes doing any provider- or backend-specific optimizations.
     """
 
-    @deprecate_func(since="1.2", additional_msg="Use BackendEstimatorV2 instead.")
     def __init__(
         self,
         backend: BackendV1 | BackendV2,
@@ -409,6 +409,60 @@ def _bound_pass_manager_run(self, circuits):
             return output
 
 
+class BackendEstimator(BackendEstimatorV1):
+    """Evaluates expectation value using Pauli rotation gates.
+
+    The :class:`~.BackendEstimator` class is a generic implementation of the
+    :class:`~.BaseEstimatorV1` interface that is used to wrap a :class:`~.BackendV2`
+    (or :class:`~.BackendV1`) object in the :class:`~.BaseEstimator` API. It
+    facilitates using backends that do not provide a native
+    :class:`~.BaseEstimatorV1` implementation in places that work with
+    :class:`~.BaseEstimatorV1`. However,
+    if you're using a provider that has a native implementation of
+    :class:`~.BaseEstimatorV1` or :class:`~.BaseEstimatorV2`, it is a better
+    choice to leverage that native
+    implementation as it will likely include additional optimizations and be
+    a more efficient implementation. The generic nature of this class
+    precludes doing any provider- or backend-specific optimizations.
+    """
+
+    @deprecate_func(
+        since="1.2",
+        additional_msg="The preferred replacement is "
+        ":class:`.BackendEstimatorV2`. However, "
+        ":class:`.BackendEstimatorV1` is a drop-in replacement "
+        "for `BackendEstimatorV2`, which is an alias.",
+    )
+    def __init__(
+        self,
+        backend: BackendV1 | BackendV2,
+        options: dict | None = None,
+        abelian_grouping: bool = True,
+        bound_pass_manager: PassManager | None = None,
+        skip_transpilation: bool = False,
+    ):
+        """Initialize a new BackendEstimator instance
+
+        Args:
+            backend: Required: the backend to run the primitive on
+            options: Default options.
+            abelian_grouping: Whether the observable should be grouped into
+                commuting
+            bound_pass_manager: An optional pass manager to run after
+                parameter binding.
+            skip_transpilation: If this is set to True the internal compilation
+                of the input circuits is skipped and the circuit objects
+                will be directly executed when this object is called.
+        """
+        super().__init__(
+            backend=backend,
+            options=options,
+            abelian_grouping=abelian_grouping,
+            bound_pass_manager=bound_pass_manager,
+            skip_transpilation=skip_transpilation,
+        )
+
+
 def _paulis2inds(paulis: PauliList) -> list[int]:
     """Convert PauliList to diagonal integers.
     These are integer representations of the binary string with a

qiskit/primitives/backend_sampler.py

@@ -26,28 +26,27 @@
 from qiskit.utils.deprecation import deprecate_func
 
 from .backend_estimator import _prepare_counts, _run_circuits
-from .base import BaseSampler, SamplerResult
+from .base import BaseSamplerV1, SamplerResult
 from .primitive_job import PrimitiveJob
 from .utils import _circuit_key
 
 
-class BackendSampler(BaseSampler[PrimitiveJob[SamplerResult]]):
-    """A :class:`~.BaseSampler` implementation that provides an interface for
+class BackendSamplerV1(BaseSamplerV1[PrimitiveJob[SamplerResult]]):
+    """A :class:`~.BaseSamplerV1` implementation that provides an interface for
     leveraging the sampler interface from any backend.
 
     This class provides a sampler interface from any backend and doesn't do
     any measurement mitigation, it just computes the probability distribution
     from the counts. It facilitates using backends that do not provide a
-    native :class:`~.BaseSampler` implementation in places that work with
-    :class:`~.BaseSampler`.
+    native :class:`~.BaseSamplerV1` implementation in places that work with
+    :class:`~.BaseSamplerV1`.
     However, if you're using a provider that has a native implementation of
-    :class:`~.BaseSampler`, it is a better choice to leverage that native
+    :class:`~.BaseSamplerV1` or :class:`~.BaseSamplerV2`, it is a better choice to leverage that native
     implementation as it will likely include additional optimizations and be
     a more efficient implementation. The generic nature of this class
     precludes doing any provider- or backend-specific optimizations.
     """
 
-    @deprecate_func(since="1.2", additional_msg="Use BackendSamplerV2 instead.")
     def __init__(
         self,
         backend: BackendV1 | BackendV2,
@@ -213,3 +212,54 @@ def _run(
         job = PrimitiveJob(self._call, circuit_indices, parameter_values, **run_options)
         job._submit()
         return job
+
+
+class BackendSampler(BackendSamplerV1):
+    """A :class:`~.BaseSamplerV1` implementation that provides an interface for
+    leveraging the sampler interface from any backend.
+
+    This class provides a sampler interface from any backend and doesn't do
+    any measurement mitigation, it just computes the probability distribution
+    from the counts. It facilitates using backends that do not provide a
+    native :class:`~.BaseSamplerV1` implementation in places that work with
+    :class:`~.BaseSamplerV1`.
+    However, if you're using a provider that has a native implementation of
+    :class:`~.BaseSamplerV1` or :class:`~.BaseSamplerV2`, it is a better choice to leverage that native
+    implementation as it will likely include additional optimizations and be
+    a more efficient implementation. The generic nature of this class
+    precludes doing any provider- or backend-specific optimizations.
+    """
+
+    @deprecate_func(
+        since="1.2",
+        additional_msg="The preferred replacement is "
+        ":class:`.BackendSamplerV2`. However, "
+        ":class:`.BackendSamplerV1` is a drop-in replacement "
+        "for `BackendSampler`, which is an alias.",
+    )
+    def __init__(
+        self,
+        backend: BackendV1 | BackendV2,
+        options: dict | None = None,
+        bound_pass_manager: PassManager | None = None,
+        skip_transpilation: bool = False,
+    ):
+        """Initialize a new BackendSampler
+
+        Args:
+            backend: Required: the backend to run the sampler primitive on
+            options: Default options.
+            bound_pass_manager: An optional pass manager to run after
+                parameter binding.
+            skip_transpilation: If this is set to True the internal compilation
+                of the input circuits is skipped and the circuit objects
+                will be directly executed when this objected is called.
+        Raises:
+            ValueError: If backend is not provided
+        """
+        super().__init__(
+            backend=backend,
+            options=options,
+            bound_pass_manager=bound_pass_manager,
+            skip_transpilation=skip_transpilation,
+        )

qiskit/primitives/base/base_estimator.py

@@ -194,7 +194,13 @@ class BaseEstimator(BaseEstimatorV1[T]):
     See :class:`.BaseEstimatorV1` for details.
     """
 
-    @deprecate_func(since="1.2", additional_msg="Use BaseEstimatorV2 instead.")
+    @deprecate_func(
+        since="1.2",
+        additional_msg="The preferred replacement is "
+        ":class:`.BaseEstimatorV2`. However, "
+        ":class:`.BaseEstimatorV1` is a drop-in replacement "
+        "for `BaseEstimator`, which is an alias.",
+    )
     def __init__(
         self,
         *,

qiskit/primitives/base/base_sampler.py

@@ -157,7 +157,13 @@ class BaseSampler(BaseSamplerV1[T]):
     See :class:`.BaseSamplerV1` for details.
     """
 
-    @deprecate_func(since="1.2", additional_msg="Use BaseSamplerV2 instead.")
+    @deprecate_func(
+        since="1.2",
+        additional_msg="The preferred replacement is "
+        ":class:`.BaseSamplerV2`. However, "
+        ":class:`.BaseSamplerV1` is a drop-in replacement "
+        "for `BaseSampler`, which is an alias.",
+    )
     def __init__(
         self,
         *,

qiskit/primitives/estimator.py

@@ -26,7 +26,7 @@
 from qiskit.quantum_info.operators.base_operator import BaseOperator
 from qiskit.utils.deprecation import deprecate_func
 
-from .base import BaseEstimator, EstimatorResult
+from .base import BaseEstimatorV1, EstimatorResult
 from .primitive_job import PrimitiveJob
 from .utils import (
     _circuit_key,
@@ -36,9 +36,9 @@
 )
 
 
-class Estimator(BaseEstimator[PrimitiveJob[EstimatorResult]]):
+class Estimator(BaseEstimatorV1[PrimitiveJob[EstimatorResult]]):
     """
-    Reference implementation of :class:`BaseEstimator`.
+    Reference implementation of :class:`BaseEstimatorV1`.
 
     :Run Options:
 
@@ -52,7 +52,13 @@ class Estimator(BaseEstimator[PrimitiveJob[EstimatorResult]]):
           this option is ignored.
     """
 
-    @deprecate_func(since="1.2", additional_msg="Use StatevectorEstimator instead.")
+    @deprecate_func(
+        since="1.2",
+        additional_msg="The preferred replacement is "
+        ":class:`.EstimatorV2`. However, "
+        ":class:`.EstimatorV1` is a drop-in replacement "
+        "for `Estimator`, which is an alias.",
+    )
     def __init__(self, *, options: dict | None = None):
         """
         Args:

qiskit/primitives/sampler.py

@@ -26,7 +26,7 @@
 from qiskit.result import QuasiDistribution
 from qiskit.utils.deprecation import deprecate_func
 
-from .base import BaseSampler, SamplerResult
+from .base import BaseSamplerV1, SamplerResult
 from .primitive_job import PrimitiveJob
 from .utils import (
     _circuit_key,
@@ -36,7 +36,7 @@
 )
 
 
-class Sampler(BaseSampler[PrimitiveJob[SamplerResult]]):
+class Sampler(BaseSamplerV1[PrimitiveJob[SamplerResult]]):
     """
     Sampler class.
 
@@ -53,7 +53,13 @@ class Sampler(BaseSampler[PrimitiveJob[SamplerResult]]):
           option is ignored.
     """
 
-    @deprecate_func(since="1.2", additional_msg="Use StatevectorSampler instead.")
+    @deprecate_func(
+        since="1.2",
+        additional_msg="The preferred replacement is "
+        ":class:`.SamplerV2`. However, "
+        ":class:`.SamplerV1` is a drop-in replacement "
+        "for `Sampler`, which is an alias.",
+    )
     def __init__(self, *, options: dict | None = None):
         """
         Args:

qiskit/primitives/utils.py

@@ -25,14 +25,8 @@
 from qiskit.quantum_info import PauliList, SparsePauliOp, Statevector
 from qiskit.quantum_info.operators.base_operator import BaseOperator
 from qiskit.quantum_info.operators.symplectic.base_pauli import BasePauli
-from qiskit.utils.deprecation import deprecate_func
 
 
-@deprecate_func(
-    since="1.2",
-    additional_msg="To initialize a circuit from a ``Statevector`` instance, "
-    + "use ``QuantumCircuit.initialize`` instead.",
-)
 def init_circuit(state: QuantumCircuit | Statevector) -> QuantumCircuit:
     """Initialize state by converting the input to a quantum circuit.
 
@@ -51,10 +45,6 @@ def init_circuit(state: QuantumCircuit | Statevector) -> QuantumCircuit:
     return qc
 
 
-@deprecate_func(
-    since="1.2",
-    additional_msg="Use the constructor of ``SparsePauliOp`` instead.",
-)
 def init_observable(observable: BaseOperator | str) -> SparsePauliOp:
     """Initialize observable by converting the input to a :class:`~qiskit.quantum_info.SparsePauliOp`.
 
@@ -78,12 +68,6 @@ def init_observable(observable: BaseOperator | str) -> SparsePauliOp:
         return SparsePauliOp(observable)
 
 
-@deprecate_func(
-    since="1.2",
-    additional_msg="Use ``QuantumCircuit.layout`` and ``SparsePauliOp.apply_layout`` "
-    + "to adjust an operator for a layout. Otherwise, use ``mthree.utils.final_measurement_mapping``. "
-    + "See https://qiskit-extensions.github.io/mthree/apidocs/utils.html for details.",
-)
 def final_measurement_mapping(circuit: QuantumCircuit) -> dict[int, int]:
     """Return the final measurement mapping for the circuit.
 

releasenotes/notes/deprecate-non-versioned-primitives.yaml

@@ -0,0 +1,13 @@
+---
+deprecations_primitives:
+  - |
+    Non-versioned primitives aliases are now deprecated and will be removed in the next major release.
+
+    The following classes are deprecated:
+
+      * :class:`.BaseEstimator` as :class:`.BaseEstimatorV1` alias. However, :class:`.BaseEstimatorV2` is recommended instead.
+      * :class:`.BaseSampler` as :class:`.BaseSamplerV1` alias. However, :class:`.BaseSamplerV2` is recommended instead.
+      * :class:`.Estimator` as :class:`.EstimatorV1` alias. However, :class:`.EstimatorV2` is recommended instead.
+      * :class:`.Sampler` as :class:`.SamplerV1` alias. However, :class:`.SamplerV2` is recommended instead.
+      * :class:`.BackendEstimator` as :class:`.BackendEstimatorV1` alias. However, :class:`.BackendEstimatorV2` is recommended instead.
+      * :class:`.BackendSampler` as :class:`.BackendSamplerV1` alias. However, :class:`.BackendSamplerV2` is recommended instead.