Added channel and instance for initialization

pyproject.toml

@@ -14,7 +14,7 @@ authors = []
 dependencies = [
     "certifi>=2021.5.30",
     "importlib_metadata>=4.8.1",
-    "qiskit_serverless>=0.20.0, <0.21.0",
+    "qiskit_serverless @ git+https://github.com/Qiskit/qiskit-serverless.git@ibm-cloud-integration#subdirectory=client"
 ]
 
 [project.optional-dependencies]

qiskit_ibm_catalog/catalog.py

@@ -26,7 +26,9 @@
 from qiskit_ibm_runtime import QiskitRuntimeService
 from qiskit_serverless import IBMServerlessClient
 from qiskit_serverless.core import Job, QiskitFunction
+from qiskit_serverless.core.enums import Channel
 from qiskit_serverless.core.function import RunnableQiskitFunction
+from qiskit_serverless.exception import QiskitServerlessException
 
 
 class QiskitFunctionsCatalog:
@@ -53,7 +55,13 @@ class QiskitFunctionsCatalog:
 
     PRE_FILTER_KEYWORD: str = "catalog"
 
-    def __init__(self, token: Optional[str] = None, name: Optional[str] = None) -> None:
+    def __init__(
+        self,
+        token: Optional[str] = None,
+        channel: str = Channel.IBM_QUANTUM.value,
+        instance: Optional[str] = None,
+        name: Optional[str] = None,
+    ) -> None:
         """
         Initialize qiskit functions catalog.
 
@@ -64,10 +72,14 @@ def __init__(self, token: Optional[str] = None, name: Optional[str] = None) -> N
         be retrieved from the user's local IBM Quantum account config file.
 
         Args:
+            channel: identifies the method to use to authenticate the user
             token: IBM quantum token
+            instance: IBM Cloud CRN
             name: Name of the account to load
         """
-        self._client = IBMServerlessClient(token=token, name=name)
+        self._client = IBMServerlessClient(
+            channel=channel, token=token, instance=instance, name=name
+        )
 
     def load(
         self, title: str, provider: Optional[str] = None
@@ -201,6 +213,8 @@ def __repr__(self) -> str:
     @staticmethod
     def save_account(
         token: Optional[str] = None,
+        channel: str = Channel.IBM_QUANTUM.value,
+        instance: Optional[str] = None,
         name: Optional[str] = None,
         overwrite: Optional[bool] = False,
     ) -> None:
@@ -209,7 +223,23 @@ def save_account(
 
         Args:
             token: IBM Quantum API token
+            channel: identifies the method to use to authenticate the user
+            instance: IBM Cloud CRN
             name: Name of the account to save
             overwrite: ``True`` if the existing account is to be overwritten
         """
-        QiskitRuntimeService.save_account(token=token, name=name, overwrite=overwrite)
+        try:
+            channel_enum = Channel(channel)
+        except ValueError as error:
+            raise QiskitServerlessException(
+                "Your channel value is not correct. Use one of the available channels: "
+                f"{Channel.LOCAL.value}, {Channel.IBM_QUANTUM.value}, {Channel.IBM_CLOUD.value}"
+            ) from error
+
+        QiskitRuntimeService.save_account(
+            channel=channel_enum.value,
+            token=token,
+            instance=instance,
+            name=name,
+            overwrite=overwrite,
+        )

qiskit_ibm_catalog/serverless.py

@@ -27,7 +27,9 @@
 from qiskit_ibm_runtime import QiskitRuntimeService
 from qiskit_serverless import IBMServerlessClient
 from qiskit_serverless.core import Job, QiskitFunction
+from qiskit_serverless.core.enums import Channel
 from qiskit_serverless.core.function import RunnableQiskitFunction
+from qiskit_serverless.exception import QiskitServerlessException
 
 
 class QiskitServerless:
@@ -54,7 +56,13 @@ class QiskitServerless:
 
     PRE_FILTER_KEYWORD: str = "serverless"
 
-    def __init__(self, token: Optional[str] = None, name: Optional[str] = None) -> None:
+    def __init__(
+        self,
+        token: Optional[str] = None,
+        channel: str = Channel.IBM_QUANTUM.value,
+        instance: Optional[str] = None,
+        name: Optional[str] = None,
+    ) -> None:
         """
         Initialize qiskit serverless client.
 
@@ -65,10 +73,14 @@ def __init__(self, token: Optional[str] = None, name: Optional[str] = None) -> N
         be retrieved from the user's local IBM Quantum account config file.
 
         Args:
-            token: IBM quantum token
+            channel: identifies the method to use to authenticate the user
+            token: IBM quantum token or IBM Cloud Api Key
+            instance: IBM Cloud CRN
             name: Name of the account to load
         """
-        self._client = IBMServerlessClient(token=token, name=name)
+        self._client = IBMServerlessClient(
+            channel=channel, token=token, instance=instance, name=name
+        )
 
     def upload(self, function: QiskitFunction) -> RunnableQiskitFunction:
         """Uploads qiskit function.
@@ -213,6 +225,8 @@ def __repr__(self) -> str:
     @staticmethod
     def save_account(
         token: Optional[str] = None,
+        channel: str = Channel.IBM_QUANTUM.value,
+        instance: Optional[str] = None,
         name: Optional[str] = None,
         overwrite: Optional[bool] = False,
     ) -> None:
@@ -221,7 +235,24 @@ def save_account(
 
         Args:
             token: IBM Quantum API token
+            channel: identifies the method to use to authenticate the user
+            instance: IBM Cloud CRN
             name: Name of the account to save
             overwrite: ``True`` if the existing account is to be overwritten
         """
-        QiskitRuntimeService.save_account(token=token, name=name, overwrite=overwrite)
+
+        try:
+            channel_enum = Channel(channel)
+        except ValueError as error:
+            raise QiskitServerlessException(
+                "Your channel value is not correct. Use one of the available channels: "
+                f"{Channel.LOCAL.value}, {Channel.IBM_QUANTUM.value}, {Channel.IBM_CLOUD.value}"
+            ) from error
+
+        QiskitRuntimeService.save_account(
+            channel=channel_enum.value,
+            token=token,
+            instance=instance,
+            name=name,
+            overwrite=overwrite,
+        )

tests/test_wrappers.py

@@ -31,7 +31,7 @@ class TestCatalog(TestCase):
         IBMServerlessClient, "jobs", return_value=[Job("42", mock.MagicMock())]
     )
     @mock.patch(
-        "qiskit_serverless.core.clients.serverless_client.ServerlessClient._verify_token"
+        "qiskit_serverless.core.clients.serverless_client.ServerlessClient._verify_credentials"
     )
     def test_basic_functions(self, _token_mock, jobs_mock, functions_list_mock):
         """Tests basic function of catalog."""
@@ -58,7 +58,7 @@ class TestServerless(TestCase):
         IBMServerlessClient, "jobs", return_value=[Job("42", mock.MagicMock())]
     )
     @mock.patch(
-        "qiskit_serverless.core.clients.serverless_client.ServerlessClient._verify_token"
+        "qiskit_serverless.core.clients.serverless_client.ServerlessClient._verify_credentials"
     )
     def test_basic_functions(self, _token_mock, jobs_mock, functions_list_mock):
         """Tests basic function of serverless client."""