Merge branch 'main' into account-mgmt

# Conflicts:
#	qiskit_ibm_runtime/ibm_runtime_service.py

qiskit_ibm_runtime/api/clients/runtime.py

@@ -281,13 +281,13 @@ def logout(self) -> None:
 
     # IBM Cloud only functions
 
-    def list_backends(self) -> List[Dict[str, Any]]:
+    def list_backends(self) -> List[str]:
         """Return IBM Cloud backends available for this service instance.
 
         Returns:
             IBM Cloud backends available for this service instance.
         """
-        return self.api.backends()
+        return self.api.backends()["devices"]
 
     def backend_configuration(self, backend_name: str) -> Dict[str, Any]:
         """Return the configuration of the IBM Cloud backend.

qiskit_ibm_runtime/api/rest/runtime.py

@@ -204,7 +204,7 @@ def backend(self, backend_name: str) -> CloudBackend:
         """
         return CloudBackend(self.session, backend_name)
 
-    def backends(self, timeout: Optional[float] = None) -> List[Dict[str, Any]]:
+    def backends(self, timeout: Optional[float] = None) -> Dict[str, List[str]]:
         """Return a list of IBM Cloud backends.
 
         Args:

qiskit_ibm_runtime/hub_group_project.py

@@ -120,7 +120,7 @@ def _discover_remote_backends(
                     configuration=config,
                     service=self._service,
                     credentials=self.credentials,
-                    api_client=self._api_client,
+                    account_client=self._api_client,
                 )
             except Exception:  # pylint: disable=broad-except
                 logger.warning(

qiskit_ibm_runtime/ibm_backend.py

@@ -31,7 +31,7 @@
 # pylint: disable=unused-import, cyclic-import
 from qiskit_ibm_runtime import ibm_runtime_service
 
-from .api.clients import AccountClient
+from .api.clients import AccountClient, RuntimeClient
 from .backendreservation import BackendReservation
 from .credentials import Credentials
 from .exceptions import IBMBackendApiProtocolError
@@ -69,7 +69,8 @@ def __init__(
         configuration: Union[QasmBackendConfiguration, PulseBackendConfiguration],
         service: "ibm_runtime_service.IBMRuntimeService",
         credentials: Credentials,
-        api_client: AccountClient,
+        account_client: Optional[AccountClient] = None,
+        runtime_client: Optional[RuntimeClient] = None,
     ) -> None:
         """IBMBackend constructor.
 
@@ -81,7 +82,8 @@ def __init__(
         """
         super().__init__(provider=service, configuration=configuration)
 
-        self._api_client = api_client
+        self._account_client = account_client
+        self._runtime_client = runtime_client
         self._credentials = credentials
         self.hub = credentials.hub
         self.group = credentials.group
@@ -150,9 +152,12 @@ def properties(
             datetime = local_to_utc(datetime)
 
         if datetime or refresh or self._properties is None:
-            api_properties = self._api_client.backend_properties(
-                self.name(), datetime=datetime
-            )
+            if self._account_client:
+                api_properties = self._account_client.backend_properties(
+                    self.name(), datetime=datetime
+                )
+            elif self._runtime_client:
+                api_properties = self._runtime_client.backend_properties(self.name())
             if not api_properties:
                 return None
             decode_backend_properties(api_properties)
@@ -177,7 +182,10 @@ def status(self) -> BackendStatus:
         Raises:
             IBMBackendApiProtocolError: If the status for the backend cannot be formatted properly.
         """
-        api_status = self._api_client.backend_status(self.name())
+        if self._account_client:
+            api_status = self._account_client.backend_status(self.name())
+        elif self._runtime_client:
+            api_status = self._runtime_client.backend_status(self.name())
 
         try:
             return BackendStatus.from_dict(api_status)
@@ -202,7 +210,10 @@ def defaults(self, refresh: bool = False) -> Optional[PulseDefaults]:
             The backend pulse defaults or ``None`` if the backend does not support pulse.
         """
         if refresh or self._defaults is None:
-            api_defaults = self._api_client.backend_pulse_defaults(self.name())
+            if self._account_client:
+                api_defaults = self._api_client.backend_pulse_defaults(self.name())
+            elif self._runtime_client:
+                api_defaults = self._runtime_client.backend_pulse_defaults(self.name())
             if api_defaults:
                 decode_pulse_defaults(api_defaults)
                 self._defaults = PulseDefaults.from_dict(api_defaults)
@@ -233,7 +244,7 @@ def reservations(
         """
         start_datetime = local_to_utc(start_datetime) if start_datetime else None
         end_datetime = local_to_utc(end_datetime) if end_datetime else None
-        raw_response = self._api_client.backend_reservations(
+        raw_response = self._account_client.backend_reservations(
             self.name(), start_datetime, end_datetime
         )
         return convert_reservation_data(raw_response, self.name())

qiskit_ibm_runtime/ibm_runtime_service.py

@@ -24,6 +24,7 @@
 from qiskit.circuit import QuantumCircuit
 from qiskit.providers.backend import BackendV1 as Backend
 from qiskit.providers.exceptions import QiskitBackendNotFoundError
+from qiskit.providers.models import PulseBackendConfiguration, QasmBackendConfiguration
 from qiskit.providers.providerutils import filter_backends
 from qiskit.transpiler import Layout
 
@@ -49,7 +50,7 @@
 from .runtime_job import RuntimeJob
 from .runtime_program import RuntimeProgram, ParameterNamespace
 from .utils import RuntimeDecoder, to_base64_string, to_python_identifier
-from .utils.backend import convert_reservation_data
+from .utils.backend import convert_reservation_data, decode_backend_configuration
 
 logger = logging.getLogger(__name__)
 
@@ -156,7 +157,7 @@ def __init__(
                 verify=verify,
             )
         )
-        account_credentials = Credentials(
+        self.account_credentials = Credentials(
             auth=self.account.auth,
             token=self.account.token,
             url=self.account.url,
@@ -165,29 +166,74 @@ def __init__(
             verify=self.account.verify,
         )
 
-        if self.account.auth == "cloud":
-            self._api_client = RuntimeClient(credentials=account_credentials)
-            self._programs: Dict[str, RuntimeProgram] = {}
-            return
+        if auth == "cloud":
+            self._api_client = RuntimeClient(credentials=self.account_credentials)
+            self._backends = self._discover_remote_backends()
+        else:
+            self._initialize_hgps(credentials=self.account_credentials)
+            self._api_client = None
+            hgps = self._get_hgps()
+            for hgp in hgps:
+                for backend_name, backend in hgp.backends.items():
+                    if backend_name not in self._backends:
+                        self._backends[backend_name] = backend
+                if not self._api_client and hgp.has_service("runtime"):
+                    self._default_hgp = hgp
+                    self._api_client = RuntimeClient(self._default_hgp.credentials)
+                    self._access_token = self._default_hgp.credentials.access_token
+                    self._ws_url = self._default_hgp.credentials.runtime_url.replace(
+                        "https", "wss"
+                    )
+                    self._programs: Dict[str, RuntimeProgram] = {}
 
-        self._initialize_hgps(credentials=account_credentials)
-        self._backends: Dict[str, "ibm_backend.IBMBackend"] = {}
-        self._api_client = None
-        hgps = self._get_hgps()
-        for hgp in hgps:
-            for backend_name, backend in hgp.backends.items():
-                if backend_name not in self._backends:
-                    self._backends[backend_name] = backend
-            if not self._api_client and hgp.has_service("runtime"):
-                self._default_hgp = hgp
-                self._api_client = RuntimeClient(self._default_hgp.credentials)
-                self._access_token = self._default_hgp.credentials.access_token
-                self._ws_url = self._default_hgp.credentials.runtime_url.replace(
-                    "https", "wss"
-                )
-                self._programs = {}
         self._discover_backends()
 
+    def _discover_remote_backends(self) -> Dict[str, "ibm_backend.IBMBackend"]:
+        """Return the remote backends available for this service instance.
+
+        Returns:
+            A dict of the remote backend instances, keyed by backend name.
+        """
+        ret = OrderedDict()  # type: ignore[var-annotated]
+        backends_list = self._api_client.list_backends()
+        for backend_name in backends_list:
+            raw_config = self._api_client.backend_configuration(
+                backend_name=backend_name
+            )
+            # Make sure the raw_config is of proper type
+            if not isinstance(raw_config, dict):
+                logger.warning(
+                    "An error occurred when retrieving backend "
+                    "information. Some backends might not be available."
+                )
+                continue
+            try:
+                decode_backend_configuration(raw_config)
+                try:
+                    config = PulseBackendConfiguration.from_dict(raw_config)
+                except (KeyError, TypeError):
+                    config = QasmBackendConfiguration.from_dict(raw_config)
+                backend_cls = (
+                    ibm_backend.IBMSimulator
+                    if config.simulator
+                    else ibm_backend.IBMBackend
+                )
+                ret[config.backend_name] = backend_cls(
+                    configuration=config,
+                    service=self,
+                    credentials=self.account_credentials,
+                    runtime_client=self._api_client,
+                )
+            except Exception:  # pylint: disable=broad-except
+                logger.warning(
+                    'Remote backend "%s" for service instance %s could not be instantiated due to an '
+                    "invalid config: %s",
+                    raw_config.get("backend_name", raw_config.get("name", "unknown")),
+                    repr(self),
+                    traceback.format_exc(),
+                )
+        return ret
+
     def _initialize_hgps(
         self, credentials: Credentials, preferences: Optional[Dict] = None
     ) -> None: