diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 042fd1fee..108fd4270 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -229,7 +229,7 @@ Integration and E2E tests require an environment configuration and can be run ag Sample configuration for IBM Quantum ```bash QISKIT_IBM_TOKEN=... # IBM Quantum API token -QISKIT_IBM_URL=https://auth.quantum-computing.ibm.com/api # IBM Quantum API URL +QISKIT_IBM_URL=https://auth.quantum.ibm.com/api # IBM Quantum API URL QISKIT_IBM_INSTANCE=ibm-q/open/main # IBM Quantum provider to use (hub/group/project) QISKIT_IBM_QPU=... # IBM Quantum Processing Unit to use ``` diff --git a/README.md b/README.md index 523cd2575..a0d81b7b4 100644 --- a/README.md +++ b/README.md @@ -280,7 +280,7 @@ Access to IBM Quantum Platform channel is controlled by the instances (previousl > **_NOTE:_** IBM Cloud instances are different from IBM Quantum Platform instances. IBM Cloud does not use the hub/group/project structure for user management. To view and create IBM Cloud instances, visit the [IBM Cloud Quantum Instances page](https://cloud.ibm.com/quantum/instances). -To view a list of your instances, visit your [account settings page](https://www.quantum-computing.ibm.com/account) or use the `instances()` method. +To view a list of your instances, visit your [account settings page](https://www.quantum.ibm.com/account) or use the `instances()` method. You can specify an instance when initializing the service or provider, or when picking a backend: @@ -352,9 +352,9 @@ If you use Qiskit, please cite as per the included [BibTeX file](https://github. [Apache License 2.0]. -[IBM Quantum]: https://www.ibm.com/quantum-computing/ -[IBM Quantum login page]: https://quantum-computing.ibm.com/login -[IBM Quantum account page]: https://quantum-computing.ibm.com/account +[IBM Quantum]: https://www.ibm.com/quantum/ +[IBM Quantum login page]: https://quantum.ibm.com/login +[IBM Quantum account page]: https://quantum.ibm.com/account [contribution guidelines]: https://github.com/Qiskit/qiskit-ibm-runtime/blob/main/CONTRIBUTING.md [code of conduct]: https://github.com/Qiskit/qiskit-ibm-runtime/blob/main/CODE_OF_CONDUCT.md [GitHub issues]: https://github.com/Qiskit/qiskit-ibm-runtime/issues diff --git a/qiskit_ibm_runtime/accounts/account.py b/qiskit_ibm_runtime/accounts/account.py index f369f02ac..1a53155b5 100644 --- a/qiskit_ibm_runtime/accounts/account.py +++ b/qiskit_ibm_runtime/accounts/account.py @@ -28,7 +28,7 @@ AccountType = Optional[Literal["cloud", "legacy"]] ChannelType = Optional[Literal["ibm_cloud", "ibm_quantum", "local"]] -IBM_QUANTUM_API_URL = "https://auth.quantum-computing.ibm.com/api" +IBM_QUANTUM_API_URL = "https://auth.quantum.ibm.com/api" IBM_CLOUD_API_URL = "https://cloud.ibm.com" logger = logging.getLogger(__name__) diff --git a/qiskit_ibm_runtime/constants.py b/qiskit_ibm_runtime/constants.py index ca7f93e1d..2a23bbabe 100644 --- a/qiskit_ibm_runtime/constants.py +++ b/qiskit_ibm_runtime/constants.py @@ -21,7 +21,7 @@ from .utils.runner_result import RunnerResult -QISKIT_IBM_RUNTIME_API_URL = "https://auth.quantum-computing.ibm.com/api" +QISKIT_IBM_RUNTIME_API_URL = "https://auth.quantum.ibm.com/api" API_TO_JOB_STATUS = { "QUEUED": JobStatus.QUEUED, diff --git a/qiskit_ibm_runtime/qiskit_runtime_service.py b/qiskit_ibm_runtime/qiskit_runtime_service.py index 5b4a29e81..b56b622c8 100644 --- a/qiskit_ibm_runtime/qiskit_runtime_service.py +++ b/qiskit_ibm_runtime/qiskit_runtime_service.py @@ -99,7 +99,7 @@ def __init__( token: IBM Cloud API key or IBM Quantum API token. url: The API URL. Defaults to https://cloud.ibm.com (ibm_cloud) or - https://auth.quantum-computing.ibm.com/api (ibm_quantum). + https://auth.quantum.ibm.com/api (ibm_quantum). filename: Full path of the file where the account is created. Default: _DEFAULT_ACCOUNT_CONFIG_JSON_FILE name: Name of the account to load. @@ -664,7 +664,7 @@ def save_account( token: IBM Cloud API key or IBM Quantum API token. url: The API URL. Defaults to https://cloud.ibm.com (ibm_cloud) or - https://auth.quantum-computing.ibm.com/api (ibm_quantum). + https://auth.quantum.ibm.com/api (ibm_quantum). instance: The CRN (ibm_cloud) or hub/group/project (ibm_quantum). channel: Channel type. `ibm_cloud` or `ibm_quantum`. filename: Full path of the file where the account is saved. diff --git a/qiskit_ibm_runtime/runtime_options.py b/qiskit_ibm_runtime/runtime_options.py index 19c56013a..822fc0aa0 100644 --- a/qiskit_ibm_runtime/runtime_options.py +++ b/qiskit_ibm_runtime/runtime_options.py @@ -70,7 +70,12 @@ def __init__( this time limit, it is forcibly cancelled. Simulator jobs continue to use wall clock time. session_time: Length of session in seconds. - private: Boolean of whether or not the job is marked as private. + private: Boolean that indicates whether the job is marked as private. This is only + supported for ``ibm_quantum`` channel. When set to true, input parameters are not + returned, and the results can only be read once. After the results are read or after + a specified time after the job is completed, the results are deleted from the service. + When set to false, the input parameters and results follow the standard retention + behavior. """ self.backend = backend self.image = image diff --git a/test/decorators.py b/test/decorators.py index 0ed3d3184..5a4f22f9e 100644 --- a/test/decorators.py +++ b/test/decorators.py @@ -75,7 +75,7 @@ def _get_integration_test_config(): os.getenv("QISKIT_IBM_INSTANCE"), os.getenv("QISKIT_IBM_QPU"), ) - channel: Any = "ibm_quantum" if url.find("quantum-computing.ibm.com") >= 0 else "ibm_cloud" + channel: Any = "ibm_quantum" if url.find("quantum.ibm.com") >= 0 else "ibm_cloud" return channel, token, url, instance, qpu diff --git a/test/unit/test_account.py b/test/unit/test_account.py index 02ff03b4d..6e6bf54d0 100644 --- a/test/unit/test_account.py +++ b/test/unit/test_account.py @@ -44,7 +44,7 @@ _TEST_IBM_QUANTUM_ACCOUNT = Account.create_account( channel="ibm_quantum", token="token-x", - url="https://auth.quantum-computing.ibm.com/api", + url="https://auth.quantum.ibm.com/api", instance="ibm-q/open/main", ) @@ -66,7 +66,7 @@ class TestAccount(IBMTestCase): dummy_token = "123" dummy_ibm_cloud_url = "https://us-east.quantum-computing.cloud.ibm.com" - dummy_ibm_quantum_url = "https://auth.quantum-computing.ibm.com/api" + dummy_ibm_quantum_url = "https://auth.quantum.ibm.com/api" def test_skip_crn_resolution_for_crn(self): """Test that CRN resolution is skipped if the instance value is already a CRN.""" diff --git a/test/unit/test_client_parameters.py b/test/unit/test_client_parameters.py index 98cc036c2..927d84b9b 100644 --- a/test/unit/test_client_parameters.py +++ b/test/unit/test_client_parameters.py @@ -77,9 +77,9 @@ def test_get_runtime_api_base_url(self) -> None: ( "ibm_quantum", "h/g/p", - "https://auth.quantum-computing.ibm.com/api", + "https://auth.quantum.ibm.com/api", None, - "https://auth.quantum-computing.ibm.com/api", + "https://auth.quantum.ibm.com/api", ), ( "ibm_cloud", @@ -92,9 +92,9 @@ def test_get_runtime_api_base_url(self) -> None: ( "ibm_quantum", "h/g/p", - "https://auth.quantum-computing.ibm.com/api", + "https://auth.quantum.ibm.com/api", lambda a, b, c: f"{a}:{b}:{c}", - "https://auth.quantum-computing.ibm.com/api:h/g/p:False", + "https://auth.quantum.ibm.com/api:h/g/p:False", ), ] for spec in test_specs: