From 63d32c4fff156dce73757632ce2cdb177b09fec9 Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Tue, 5 Apr 2022 22:43:50 -0400 Subject: [PATCH 1/4] update jupyter tutorial --- qiskit_ibm_provider/ibm_backend_service.py | 2 +- qiskit_ibm_provider/jupyter/backend_info.py | 5 ++--- qiskit_ibm_provider/jupyter/live_data_widget.py | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/qiskit_ibm_provider/ibm_backend_service.py b/qiskit_ibm_provider/ibm_backend_service.py index 9586032a6..60629e9ad 100644 --- a/qiskit_ibm_provider/ibm_backend_service.py +++ b/qiskit_ibm_provider/ibm_backend_service.py @@ -525,7 +525,7 @@ def _get_job_ids( initial_filter = copy.deepcopy(api_filter) while True: - job_page = self._provider._api_client.list_jobs_ids( + job_page = self._default_hgp._api_client.list_jobs_ids( limit=current_page_limit, skip=skip, descending=descending, diff --git a/qiskit_ibm_provider/jupyter/backend_info.py b/qiskit_ibm_provider/jupyter/backend_info.py index 44126ffde..c8ba4960e 100644 --- a/qiskit_ibm_provider/jupyter/backend_info.py +++ b/qiskit_ibm_provider/jupyter/backend_info.py @@ -48,7 +48,6 @@ def backend_widget(backend: Union[IBMBackend, FakeBackend]) -> None: backend: Display information about this backend. """ vue.theme.dark = False - cred = backend._credentials last_tab = vue.TabItem(children=[]) livedata = LiveDataVisualization() card = vue.Card( @@ -61,8 +60,8 @@ def backend_widget(backend: Union[IBMBackend, FakeBackend]) -> None: children=[ vue.ToolbarTitle( children=[ - "{} @ ({}/{}/{})".format( - backend.name(), cred.hub, cred.group, cred.project + "{} @ ({})".format( + backend.name(), backend._api_client._params.instance ) ], style_="color:white", diff --git a/qiskit_ibm_provider/jupyter/live_data_widget.py b/qiskit_ibm_provider/jupyter/live_data_widget.py index 4217071f2..8acfea4a3 100644 --- a/qiskit_ibm_provider/jupyter/live_data_widget.py +++ b/qiskit_ibm_provider/jupyter/live_data_widget.py @@ -1172,7 +1172,7 @@ def set_job(self, job) -> None: # To get all the information needed, we request the job details to the API # The information returned is the type of QiskitJob - qiskit_job = self._backend.provider().backend.retrieve_job(job_id=job["id"]) + qiskit_job = self._backend.provider().backend.job(job_id=job["id"]) status = qiskit_job.status() if status in [JobStatus.RUNNING, JobStatus.DONE]: self.show_progress_bar() @@ -1320,8 +1320,7 @@ def get_provider(self) -> str: Return: bi (str): Backend information """ - - return f"{self._backend.hub}/{self._backend.group}/{self._backend.project}" + return self._backend._api_client._params.instance def time_to_completion(self, completion_time: datetime) -> str: """Get the estimate remaining time to complete From 29867d1629ae8e58159ca61815bec768268a5e73 Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Tue, 5 Apr 2022 23:09:46 -0400 Subject: [PATCH 2/4] fix docs --- qiskit_ibm_provider/jupyter/backend_info.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/qiskit_ibm_provider/jupyter/backend_info.py b/qiskit_ibm_provider/jupyter/backend_info.py index c8ba4960e..ff7eb46af 100644 --- a/qiskit_ibm_provider/jupyter/backend_info.py +++ b/qiskit_ibm_provider/jupyter/backend_info.py @@ -27,6 +27,7 @@ from .qubits_widget import qubits_tab from .live_data_widget import LiveDataVisualization from ..visualization.interactive import iplot_error_map +from ..utils.hgp import to_instance_format def _async_job_loader( @@ -48,6 +49,11 @@ def backend_widget(backend: Union[IBMBackend, FakeBackend]) -> None: backend: Display information about this backend. """ vue.theme.dark = False + if isinstance(backend, FakeBackend): + cred = backend._credentials + instance = to_instance_format(cred.hub, cred.group, cred.project) + else: + instance = backend._api_client._params.instance last_tab = vue.TabItem(children=[]) livedata = LiveDataVisualization() card = vue.Card( @@ -61,7 +67,7 @@ def backend_widget(backend: Union[IBMBackend, FakeBackend]) -> None: vue.ToolbarTitle( children=[ "{} @ ({})".format( - backend.name(), backend._api_client._params.instance + backend.name(), instance ) ], style_="color:white", From e64f4364e61a771bf6159efabfeb699fbb27cb6a Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Tue, 5 Apr 2022 23:12:50 -0400 Subject: [PATCH 3/4] fix lint --- qiskit_ibm_provider/jupyter/backend_info.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/qiskit_ibm_provider/jupyter/backend_info.py b/qiskit_ibm_provider/jupyter/backend_info.py index ff7eb46af..c9c3c41f6 100644 --- a/qiskit_ibm_provider/jupyter/backend_info.py +++ b/qiskit_ibm_provider/jupyter/backend_info.py @@ -65,11 +65,7 @@ def backend_widget(backend: Union[IBMBackend, FakeBackend]) -> None: color="#002d9c", children=[ vue.ToolbarTitle( - children=[ - "{} @ ({})".format( - backend.name(), instance - ) - ], + children=["{} @ ({})".format(backend.name(), instance)], style_="color:white", ) ], From d527a1dca61e8f29f08d8b0546171cd4635509ea Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Wed, 6 Apr 2022 00:03:14 -0400 Subject: [PATCH 4/4] update account tutorial --- docs/tutorials/1_the_ibm_quantum_account.ipynb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorials/1_the_ibm_quantum_account.ipynb b/docs/tutorials/1_the_ibm_quantum_account.ipynb index 3f7b2e123..ce1dafc03 100644 --- a/docs/tutorials/1_the_ibm_quantum_account.ipynb +++ b/docs/tutorials/1_the_ibm_quantum_account.ipynb @@ -71,8 +71,8 @@ "`IBMProvider` class can be initialized using the `API token`, which is used to authenticate to your IBM Quantum account.\n", "\n", "Class Methods:\n", - "- `IBMProvider.save_account(TOKEN, HUB, GROUP, PROJECT)`: Save your account to disk for future use and optionally set a default hub/group/project to be used when loading your account.\n", - "- `IBMProvider.saved_account()`: View the account saved to disk.\n", + "- `IBMProvider.save_account(TOKEN, INSTANCE)`: Save your account to disk for future use and optionally set a default hub/group/project to be used when loading your account.\n", + "- `IBMProvider.saved_accounts()`: View the accounts saved to disk.\n", "- `IBMProvider.delete_account()`: Delete the saved account from disk.\n", "- `IBMProvider.active_account()`: List the account currently active in the session.\n", "\n",