[QI2-1277] Centralize API helper code (#89)

QuTech-Delft · Dec 30, 2024 · f2e7ae1 · f2e7ae1
1 parent f91e185
commit f2e7ae1
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 585 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qiskit-quantuminspire"
-version = "0.1.0"
+version = "0.3.0"
 description = "Qiskit provider for Quantum Inspire backends "
 authors = ["Quantum Inspire <support@quantum-inspire.com>"]
 readme = "README.md"
@@ -19,7 +19,7 @@ classifiers = [
 [tool.poetry.dependencies]
 python = "^3.9"
 qiskit = "^1.2.0"
-qi-compute-api-client = "^0.39.0"
+qi-compute-api-client = "^0.43.0"
 pydantic = "^2.10.4"
 requests = "^2.32.3"
 opensquirrel = "^0.1.0"

diff --git a/qiskit_quantuminspire/api/__init__.py b/qiskit_quantuminspire/api/__init__.py
diff --git a/qiskit_quantuminspire/api/authentication.py b/qiskit_quantuminspire/api/authentication.py
diff --git a/qiskit_quantuminspire/api/client.py b/qiskit_quantuminspire/api/client.py
diff --git a/qiskit_quantuminspire/api/pagination.py b/qiskit_quantuminspire/api/pagination.py
diff --git a/qiskit_quantuminspire/api/settings.py b/qiskit_quantuminspire/api/settings.py
diff --git a/qiskit_quantuminspire/qi_backend.py b/qiskit_quantuminspire/qi_backend.py
@@ -4,6 +4,7 @@
 from typing import Any, List, Union
 
 from compute_api_client import ApiClient, BackendStatus, BackendType, BackendTypesApi
+from qi2_shared.client import config
 from qiskit.circuit import Instruction, Measure, QuantumCircuit
 from qiskit.circuit.library import (
     CCXGate,
@@ -21,7 +22,6 @@
 from qiskit.providers.options import Options
 from qiskit.transpiler import CouplingMap, Target
 
-from qiskit_quantuminspire.api.client import config
 from qiskit_quantuminspire.qi_jobs import QIJob
 from qiskit_quantuminspire.utils import is_coupling_map_complete, run_async
 

diff --git a/qiskit_quantuminspire/qi_jobs.py b/qiskit_quantuminspire/qi_jobs.py
@@ -35,6 +35,9 @@
     ResultsApi,
     ShareType,
 )
+from qi2_shared.client import config
+from qi2_shared.pagination import PageReader
+from qi2_shared.settings import ApiSettings
 from qiskit import qpy
 from qiskit.circuit import QuantumCircuit
 from qiskit.providers import JobV1
@@ -45,9 +48,6 @@
 from qiskit.result.result import Result
 
 from qiskit_quantuminspire import cqasm
-from qiskit_quantuminspire.api.client import config
-from qiskit_quantuminspire.api.pagination import PageReader
-from qiskit_quantuminspire.api.settings import ApiSettings
 from qiskit_quantuminspire.base_provider import BaseProvider
 from qiskit_quantuminspire.utils import run_async
 

diff --git a/qiskit_quantuminspire/qi_provider.py b/qiskit_quantuminspire/qi_provider.py
@@ -1,9 +1,9 @@
 from typing import Any, List, Optional, Sequence
 
 from compute_api_client import ApiClient, BackendType, BackendTypesApi, PageBackendType
+from qi2_shared.client import config
+from qi2_shared.pagination import PageReader
 
-from qiskit_quantuminspire.api.client import config
-from qiskit_quantuminspire.api.pagination import PageReader
 from qiskit_quantuminspire.base_provider import BaseProvider
 from qiskit_quantuminspire.qi_backend import QIBackend
 from qiskit_quantuminspire.utils import run_async

diff --git a/tests/api/conftest.py b/tests/api/conftest.py