Remove depreceated pasqal cloud emulator concept (#36)

Author: awennersteen

qiskit_pasqal_provider/providers/abstract_base.py

@@ -10,7 +10,7 @@
 from qiskit.providers import BackendV2, JobStatus
 from qiskit.providers.jobstatus import JOB_FINAL_STATES
 from pasqal_cloud import SDK as PasqalSDK
-from pasqal_cloud.device import EmulatorType
+from pasqal_cloud.device import DeviceTypeName
 from pulser.backend.remote import JobParams, RemoteResults
 from pulser.register.register_layout import RegisterLayout
 from pulser_simulation.simresults import SimulationResults
@@ -61,7 +61,7 @@ class PasqalBackend(BackendV2, ABC):
     _backend_name: str | PasqalBackendType
     _version: str
     _executor: PasqalExecutor | PasqalSDK  # pylint: disable=E0601
-    _emulator: EmulatorType | None
+    _device_type: DeviceTypeName | None = None
 
     @property
     def backend_name(self) -> str | PasqalBackendType:
@@ -70,13 +70,13 @@ def backend_name(self) -> str | PasqalBackendType:
 
     @property
     def executor(self) -> PasqalExecutor | PasqalSDK:
-        """Pasqal emulator or QPU instance"""
+        """Pasqal executor instance."""
         return self._executor
 
     @property
-    def emulator(self) -> EmulatorType | None:
-        """Emulator object"""
-        return self._emulator
+    def device_type(self) -> DeviceTypeName | None:
+        """Pasqal cloud device type for remote runs."""
+        return self._device_type
 
     @abstractmethod
     def run(

qiskit_pasqal_provider/providers/backends/emu_remote.py

@@ -1,9 +1,9 @@
-"""Remote emulator backend"""
+"""Remote cloud backend."""
 
 from copy import deepcopy
 from typing import Any
 
-from pasqal_cloud.device import EmulatorType
+from pasqal_cloud.device import DeviceTypeName
 from pasqal_cloud.job import CreateJob
 from pulser.register import Register
 from pulser_pasqal import PasqalCloud
@@ -22,12 +22,12 @@
 
 
 class EmuRemoteBackend(PasqalBackend):
-    """Remotely emulate backends. It gathers the remote backends."""
+    """Remote cloud backend for EMU device types."""
 
     def __init__(
         self,
         backend_name: str,
-        emulator: EmulatorType,
+        device_type: DeviceTypeName,
         remote_config: RemoteConfig,
         target: PasqalTarget | None = None,
     ):
@@ -36,7 +36,7 @@ def __init__(
         super().__init__()
 
         self._backend_name = backend_name
-        self._emulator = emulator
+        self._device_type = device_type
         self._cloud = PasqalCloud(
             username=remote_config.username,
             password=remote_config.password,
@@ -88,7 +88,7 @@ def run(
             run_input
         )
 
-        if self._emulator == EmulatorType.EMU_FRESNEL:
+        if self._device_type == DeviceTypeName.EMU_FRESNEL:
             # define automatic layout based on register (limited functionality)
             analog_register = analog_register.with_automatic_layout(
                 device=self.target.device

qiskit_pasqal_provider/providers/backends/qpu.py

@@ -27,7 +27,6 @@ class QPUBackend(PasqalBackend):
 
     _version: str = "0.1.0"
     _backend_name = PasqalBackendType.FRESNEL
-    _emulator = None
 
     def __init__(self, remote_config: RemoteConfig):
         """initialize and instantiate PasqalCloud."""

qiskit_pasqal_provider/providers/backends/qutip.py

@@ -26,7 +26,6 @@ class QutipEmulatorBackend(PasqalBackend):
 
     _version: str = "0.1.0"
     backend_name = PasqalBackendType.QUTIP
-    _emulator = None
 
     def __init__(self, target: PasqalTarget, **options: Any):
         """

qiskit_pasqal_provider/providers/backends/remote.py

@@ -2,7 +2,7 @@
 
 from typing import Any
 
-from pasqal_cloud.device import EmulatorType
+from pasqal_cloud.device import DeviceTypeName
 from qiskit import QuantumCircuit
 
 from qiskit_pasqal_provider.providers.abstract_base import (
@@ -30,17 +30,17 @@ def __new__(
         match backend:
             case "remote-emu-free":
                 return EmuRemoteBackend(
-                    backend, EmulatorType.EMU_FREE, remote_config, target
+                    backend, DeviceTypeName.EMU_FREE, remote_config, target
                 )
 
             case "remote-emu-mps":
                 return EmuRemoteBackend(
-                    backend, EmulatorType.EMU_MPS, remote_config, target
+                    backend, DeviceTypeName.EMU_MPS, remote_config, target
                 )
 
             case "remote-emu-fresnel":
                 return EmuRemoteBackend(
-                    backend, EmulatorType.EMU_FRESNEL, remote_config, target
+                    backend, DeviceTypeName.EMU_FRESNEL, remote_config, target
                 )
 
             case "fresnel":

qiskit_pasqal_provider/providers/jobs.py

@@ -27,12 +27,11 @@ class PasqalLocalJob(PasqalJob):
 
     def __init__(self, backend: PasqalBackend, job_id: str, **kwargs: Any):
         """
-        A Pasqal job for local emulators.
+        A Pasqal job for local backends.
 
         Args:
-            backend: Pasqal backends (must be an emulator)
+            backend: Pasqal backend instance
             job_id: job id of the execution
-            emulator: which emulator to use
             **kwargs: extra arguments if needed
         """
 
@@ -65,7 +64,7 @@ def cancel(self) -> Any:
 
 
 class PasqalRemoteJob(PasqalJob):
-    """A Pasqal job for remote executors (emulator or QPU)."""
+    """A Pasqal job for remote cloud executors."""
 
     _backend: PasqalBackend
     _result: PrimitiveResult[SamplerPubResult] | None
@@ -82,7 +81,7 @@ def __init__(
         **kwargs: Any,
     ):
         """
-        A Pasqal job for remote executors (emulator or QPU).
+        A Pasqal job for remote cloud executors.
 
         Args:
             job_id: job id of the execution
@@ -140,8 +139,8 @@ def submit(self) -> None:
         self._status = JobStatus.RUNNING
 
         create_batch_kwargs: dict[str, Any] = {"wait": self._wait}
-        if self._backend.emulator is not None:
-            create_batch_kwargs["emulator"] = self._backend.emulator
+        if self._backend.device_type is not None:
+            create_batch_kwargs["device_type"] = self._backend.device_type
 
         self._batch = self._executor.create_batch(
             self._seq.to_abstract_repr(),

tests/conftest.py

@@ -14,7 +14,7 @@
 import pytest
 
 from pasqal_cloud.batch import Batch
-from pasqal_cloud.device import EmulatorType, BaseConfig
+from pasqal_cloud.device import BaseConfig, DeviceTypeName
 from pasqal_cloud.job import CreateJob, Job
 from pasqal_cloud.utils.responses import PaginatedResponse
 from pasqal_cloud.utils.filters import JobFilters
@@ -214,7 +214,7 @@ def create_batch(
         _serialized_sequence: str,
         jobs: list[CreateJob],
         open: bool | None = None,  # pylint: disable=redefined-builtin
-        emulator: EmulatorType | None = None,
+        device_type: DeviceTypeName | None = None,
         configuration: BaseConfig | None = None,
         wait: bool = False,  # pylint: disable=unused-argument
     ) -> Batch:
@@ -226,7 +226,7 @@ def create_batch(
             complete=bool(open),
             created_at="",
             updated_at="",
-            device_type=emulator if emulator else "FRESNEL",
+            device_type=(device_type or DeviceTypeName.FRESNEL).value,
             project_id="",
             user_id="",
             status="DONE",

tests/test_result.py

@@ -140,7 +140,7 @@ class MockBackend:
         def __init__(self, executor: MockSDK) -> None:
             self._executor = executor
             self.name = "MockBackend"
-            self.emulator = None
+            self.device_type = None
 
         @property
         def executor(self) -> MockSDK:
@@ -199,7 +199,7 @@ class MockBackend:
         def __init__(self) -> None:
             self._executor = MockExecutor()
             self.name = "MockBackend"
-            self.emulator = None
+            self.device_type = None
 
         @property
         def executor(self) -> MockExecutor:
@@ -257,7 +257,7 @@ class MockBackend:
         def __init__(self) -> None:
             self._executor = MockExecutor()
             self.name = "MockBackend"
-            self.emulator = None
+            self.device_type = None
 
         @property
         def executor(self) -> MockExecutor: