iqm-pulla 11.17.0__py3-none-any.whl → 12.0.1__py3-none-any.whl

iqm/pulla/utils_qiskit.py

@@ -17,6 +17,7 @@ from __future__ import annotations
 
 from collections import Counter
 from collections.abc import Collection, Sequence
+from datetime import date
 from typing import TYPE_CHECKING
 
 from iqm.qiskit_iqm.iqm_backend import IQMBackendBase
@@ -27,14 +28,14 @@ from qiskit.providers import JobStatus, JobV1, Options
 from qiskit.result import Counts, Result
 
 from iqm.cpc.interface.compiler import Circuit, CircuitExecutionOptions, HeraldingMode
-from iqm.pulla.interface import StationControlResult, TaskStatus
+from iqm.pulla.pulla import JobStatus as IQMServerJobStatus
 
 if TYPE_CHECKING:
     from iqm.qiskit_iqm.iqm_backend import DynamicQuantumArchitecture
     from iqm.qiskit_iqm.iqm_provider import IQMBackend
 
     from iqm.cpc.compiler.compiler import Compiler
-    from iqm.pulla.pulla import Pulla
+    from iqm.pulla.pulla import Pulla, SweepJob
 
 
 def qiskit_circuits_to_pulla(
@@ -105,41 +106,36 @@ def qiskit_to_pulla(
 
     # create a compiler containing all the required station information
     compiler = pulla.get_standard_compiler(
-        calibration_set=pulla.fetch_calibration_set_by_id(run_request.calibration_set_id),
+        calibration_set_values=pulla.fetch_calibration_set_values_by_id(run_request.calibration_set_id),
     )
-    compiler.component_mapping = (
-        None
-        if run_request.qubit_mapping is None
-        else {m.logical_name: m.physical_name for m in run_request.qubit_mapping}
-    )
-
+    compiler.component_mapping = run_request.qubit_mapping
     # We can be certain run_request contains only Circuit objects, because we created it
     # right in this method with qiskit.QuantumCircuit objects
     circuits: list[Circuit] = [c for c in run_request.circuits if isinstance(c, Circuit)]
     return circuits, compiler
 
 
-def station_control_result_to_qiskit(
-    station_control_result: StationControlResult,
+def sweep_job_to_qiskit(
+    job: SweepJob,
     *,
     shots: int,
     execution_options: CircuitExecutionOptions,
 ) -> Result:
-    """Convert a Station Control result to a Qiskit Result.
+    """Convert a completed Pulla job to a Qiskit Result.
 
     Args:
-        station_control_result: The Station Control result to convert.
-        shots: number of shots requested
+        job: The completed job to convert.
+        shots: Number of shots requested.
         execution_options: Circuit execution options used to produce the result.
 
     Returns:
         The equivalent Qiskit Result.
 
     """
-    if station_control_result.result is None:
+    result = job.result()
+    if result is None:
         raise ValueError(
-            f"Cannot format station control result without result."
-            f'Job status is "{station_control_result.status.value.upper()}"'
+            f'Cannot format Qiskit result without result measurements. Job status is "{job.status.upper()}"'
         )
 
     used_heralding = execution_options.heralding_mode == HeraldingMode.NONE
@@ -149,19 +145,22 @@ def station_control_result_to_qiskit(
         # TODO: Proper naming instead of "index"
         (
             f"{index}",
-            IQMJob._format_measurement_results(
+            IQMJob._iqm_format_measurement_results(
                 circuit_measurements, requested_shots=shots, expect_exact_shots=used_heralding
             ),
         )
-        for index, circuit_measurements in enumerate(station_control_result.result)
+        for index, circuit_measurements in enumerate(result)
     ]
 
     result_dict = {
-        "backend_name": "",
+        "backend_name": "IQMPullaBackend",
         "backend_version": "",
         "qobj_id": "",
-        "job_id": str(station_control_result.sweep_id),
-        "success": station_control_result.status == TaskStatus.READY,
+        "job_id": str(job.job_id),
+        "success": job.status == IQMServerJobStatus.COMPLETED,
+        "date": date.today().isoformat(),
+        "status": str(job.status),
+        "timeline": job.data.timeline.copy(),
         "results": [
             {
                 "shots": len(measurement_results),
@@ -172,19 +171,10 @@ def station_control_result_to_qiskit(
                     "metadata": {},
                 },
                 "header": {"name": name},
-                "calibration_set_id": None,
-                # TODO: calibration set id is known to Pulla, but not the compiler; this is probably good, because
-                #  the compiler is not conceptually linked to the storage of calibration data (id being the property of
-                #  the storage). We need to find a nice way to pass calibration set id to this function.
+                "calibration_set_id": job.data.compilation.calibration_set_id if job.data.compilation else None,
             }
             for name, measurement_results in batch_results
         ],
-        "date": None,
-        "status": station_control_result.status.value,
-        "timestamps": {
-            "start_time": station_control_result.start_time,
-            "end_time": station_control_result.end_time,
-        },
     }
     return Result.from_dict(result_dict)
 
@@ -200,26 +190,27 @@ class IQMPullaBackend(IQMBackendBase):
     """
 
     def __init__(self, architecture: DynamicQuantumArchitecture, pulla: Pulla, compiler: Compiler):
-        super().__init__(architecture)
+        super().__init__(architecture, name="IQMPullaBackend")
         self.pulla = pulla
-        self.name = "IQMPullaBackend"
         self.compiler = compiler
 
-    def run(self, run_input, **options):  # noqa: ANN001, ANN201
+    def run(self, run_input: QuantumCircuit | list[QuantumCircuit], shots: int = 1024, **options) -> DummyJob:
         # Convert Qiskit circuits to Pulla circuits
         pulla_circuits = qiskit_circuits_to_pulla(run_input, self._idx_to_qb)
 
         # Compile the circuits, build settings and execute
         playlist, context = self.compiler.compile(pulla_circuits)
-        shots = options.get("shots")
         settings, context = self.compiler.build_settings(context, shots=shots)
-        # Get the response data from Station Control
-        response_data = self.pulla.execute(playlist, context, settings, verbose=False)
+
+        # submit the playlist for execution
+        job = self.pulla.submit_playlist(playlist, settings, context=context)
+        # wait for the job to finish, no timeout (user can use Ctrl-C to stop)
+        # TODO it would be better if we did not wait and instead returned a Qiskit JobV1 containing
+        # a SweepJob that can be used to actually track the job.
+        job.wait_for_completion(timeout_secs=0.0)
 
         # Convert the response data to a Qiskit result
-        qiskit_result = station_control_result_to_qiskit(
-            response_data, shots=shots, execution_options=context["options"]
-        )
+        qiskit_result = sweep_job_to_qiskit(job, shots=shots, execution_options=context["options"])
 
         # Return a dummy job object that can be used to retrieve the result
         dummy_job = DummyJob(self, qiskit_result)
@@ -227,7 +218,7 @@ class IQMPullaBackend(IQMBackendBase):
 
     @classmethod
     def _default_options(cls) -> Options:
-        return Options(shots=1024)
+        return Options()
 
     @property
     def max_circuits(self) -> int | None:
@@ -240,15 +231,15 @@ class DummyJob(JobV1):
     The ``job_id`` is the same as the ``sweep_id`` of the ``StationControlResult``.
     """
 
-    def __init__(self, backend, qiskit_result):  # noqa: ANN001
+    def __init__(self, backend: IQMBackend, qiskit_result: Result) -> None:
         super().__init__(backend=backend, job_id=qiskit_result.job_id)
         self.qiskit_result = qiskit_result
 
-    def result(self):  # noqa: ANN201
+    def result(self) -> Result:
         return self.qiskit_result
 
-    def status(self):  # noqa: ANN201
+    def status(self) -> JobStatus:
         return JobStatus.DONE
 
-    def submit(self):  # noqa: ANN201
+    def submit(self) -> None:
         return None

{iqm_pulla-11.17.0.dist-info → iqm_pulla-12.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-pulla
-Version: 11.17.0
+Version: 12.0.1
 Summary: Client library for pulse-level access to an IQM quantum computer
 Author-email: IQM Finland Oy <developers@meetiqm.com>
 License: Apache License
@@ -205,42 +205,33 @@ License: Apache License
            See the License for the specific language governing permissions and
            limitations under the License.
         
-Project-URL: Documentation, https://iqm-finland.github.io/docs/iqm-pulla/
+Project-URL: Documentation, https://docs.meetiqm.com/iqm-pulla/
 Project-URL: Homepage, https://pypi.org/project/iqm-pulla/
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: Apache Software License
-Requires-Python: <3.12,>=3.11
+Requires-Python: <3.13,>=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 License-File: AUTHORS.rst
-Requires-Dist: iqm-exa-common <28,>=27
-Requires-Dist: iqm-station-control-client <12,>=11
-Requires-Dist: iqm-pulse <13,>=12
 Requires-Dist: iqm-data-definitions <3.0,>=2.18
 Requires-Dist: pylatexenc ==2.10
 Requires-Dist: pydantic <3.0,>=2.10.4
+Requires-Dist: iqm-client <34,>=33.0.1
+Requires-Dist: iqm-exa-common <28,>=27.4.1
+Requires-Dist: iqm-pulse <13,>=12.7.1
+Requires-Dist: iqm-station-control-client <13,>=12.0.1
 Provides-Extra: notebook
-Requires-Dist: iqm-exa-common <28,>=27 ; extra == 'notebook'
-Requires-Dist: iqm-station-control-client <12,>=11 ; extra == 'notebook'
-Requires-Dist: iqm-pulse <13,>=12 ; extra == 'notebook'
 Requires-Dist: notebook <7,>=6.4.11 ; extra == 'notebook'
 Requires-Dist: matplotlib <4,>=3.6.3 ; extra == 'notebook'
 Requires-Dist: nbclient ~=0.5.10 ; extra == 'notebook'
 Provides-Extra: qir
-Requires-Dist: iqm-exa-common <28,>=27 ; extra == 'qir'
-Requires-Dist: iqm-station-control-client <12,>=11 ; extra == 'qir'
-Requires-Dist: iqm-pulse <13,>=12 ; extra == 'qir'
 Requires-Dist: iqm-pyqir ==0.12.0 ; extra == 'qir'
-Requires-Dist: iqm-qiskit-qir ==0.8.0 ; extra == 'qir'
+Requires-Dist: qiskit <2.2,>=1.0 ; extra == 'qir'
 Provides-Extra: qiskit
-Requires-Dist: iqm-exa-common <28,>=27 ; extra == 'qiskit'
-Requires-Dist: iqm-station-control-client <12,>=11 ; extra == 'qiskit'
-Requires-Dist: iqm-pulse <13,>=12 ; extra == 'qiskit'
-Requires-Dist: iqm-client <33,>=32 ; extra == 'qiskit'
-Requires-Dist: iqm-client[qiskit] <33,>=32 ; extra == 'qiskit'
+Requires-Dist: iqm-client[qiskit] <34,>=33.0.1 ; extra == 'qiskit'
 
 IQM Pulla
 #########
@@ -286,11 +277,11 @@ e2e testing is execution of all user guides (Jupyter notebooks). User guides cov
 so we achieve two things: end-to-end-test Pulla as a client library, and make sure the user guides are correct.
 (Server-side use of Pulla is e2e-tested as part of CoCoS.)
 
-You have to provide CoCoS and Station Control URLs as environment variables:
+You have to provide IQM Server URL as environment variable:
 
 .. code-block:: bash
 
-    COCOS_URL=<COCOS_URL> STATION_CONTROL_URL=<SC_URL> tox -e e2e
+    IQM_SERVER_URL=<IQM_SERVER_URL> tox -e e2e
 
 Notebooks are executed using `jupyter execute` command. It does not print any output if there are no errors. If you want
 to run a particular notebook and see the output cells printed in the terminal, you can use ``nbconvert`` with ``jq``

iqm_pulla-12.0.1.dist-info/RECORD

@@ -0,0 +1,27 @@
+iqm/cpc/__init__.py,sha256=mml8qMgjIQcfcfumrYu2lIfl30ZPSwaN3adn8CdRd3w,1079
+iqm/cpc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+iqm/cpc/compiler/__init__.py,sha256=ieYyHzb2IyevDm5swU--rPMsh5GdUtLrw8773Cd0ens,678
+iqm/cpc/compiler/compiler.py,sha256=hnS-3HWUWe92rxg4K-HtPSK_0p2Yarqj5tJrWYnAj3o,22338
+iqm/cpc/compiler/dd.py,sha256=F665HjKZbSC_Jlvkn9bRauMYiv7uDBtIfQ-o2yKXtaY,21820
+iqm/cpc/compiler/errors.py,sha256=tz-8g1QtDvCAPmAjjCYK3FoULrazkpSTmXIvyqukaT4,1949
+iqm/cpc/compiler/standard_stages.py,sha256=MjhdjXmF9SSc9acaVITC3yVt8od2xK4o2SjKYqHXYm8,35451
+iqm/cpc/compiler/station_settings.py,sha256=iS7z9rRQpSx5SVWsICDOOX__u9-VOT527VfswtxujEM,18711
+iqm/cpc/interface/__init__.py,sha256=mvhNx1I9K5Sg40CwPntWj35M3Bni__23PWEw_qYaXtQ,611
+iqm/cpc/interface/compiler.py,sha256=LTsxIy8RfS7O_Y2ZApMUuSLKG-1hRlfbwC7_wAsprd8,5758
+iqm/pulla/__init__.py,sha256=fj5Qh8R9K-z6q5g9-CySBZsG8d33nU7hCHrqIIB8_-0,901
+iqm/pulla/calibration.py,sha256=9Dp7-gIyj8ppIJujmUjXYk0i7xDepes405lUXlLeJQU,3375
+iqm/pulla/interface.py,sha256=xX9peCpOfc-AcOvrWJcGGGeJ5seiVuqbN9h87t1oH-U,1826
+iqm/pulla/pulla.py,sha256=b5lsrMo04CB8cjdhcrgmGMb-Yhw9siNpqF-2mKTVww8,13219
+iqm/pulla/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+iqm/pulla/quantum_architecture.py,sha256=jj9zqK9CcODedR69p8zLSj3qDfzIxI_f9rb8s07GKaM,6377
+iqm/pulla/utils.py,sha256=By-VFbKAuyaPEac73FuP64r9h5oFm76n_6BvK_Gq1IY,28874
+iqm/pulla/utils_cirq.py,sha256=VtdO356D2RAh2lSVdaPm3ClJ9-nvC4jzhR9hP5QSQhI,793
+iqm/pulla/utils_dd.py,sha256=SxYAuRBgvYELKjeXpFbP4mM0xCCivDk7WUHw7oEXfMo,1695
+iqm/pulla/utils_qir.py,sha256=4jlzN9bZK6_BX5tlAcSbZosKTxAbAAwOfIrd0GgZZ0Y,11625
+iqm/pulla/utils_qiskit.py,sha256=y6B0ByuUXMn75z0wncuANlirgrlZxYGbt2QrMnhxso4,9099
+iqm_pulla-12.0.1.dist-info/AUTHORS.rst,sha256=iCStz7WP5Jk7uMnn9jRA4ybS14X4yeUW2SsWE-OTaRk,328
+iqm_pulla-12.0.1.dist-info/LICENSE.txt,sha256=cCj_biRA4Q8A77vxR8AuvAf-DZ5G79yxR_3lYY6TrmA,11333
+iqm_pulla-12.0.1.dist-info/METADATA,sha256=AqLxmi9u1JX2z3SzOy5IgBMvDo3QqhFeEQjkfftSwsI,17100
+iqm_pulla-12.0.1.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_pulla-12.0.1.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_pulla-12.0.1.dist-info/RECORD,,

iqm_pulla-11.17.0.dist-info/RECORD

@@ -1,27 +0,0 @@
-iqm/cpc/__init__.py,sha256=mml8qMgjIQcfcfumrYu2lIfl30ZPSwaN3adn8CdRd3w,1079
-iqm/cpc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-iqm/cpc/compiler/__init__.py,sha256=ieYyHzb2IyevDm5swU--rPMsh5GdUtLrw8773Cd0ens,678
-iqm/cpc/compiler/compiler.py,sha256=NRmy_G4gECUWT1916iNLsI0NMAt2Nh5ZZXtiNzAw9R8,22398
-iqm/cpc/compiler/dd.py,sha256=Kf5fIZtLHT74oiVpF1vtVNN0mbrjc2KPwVJL0sSSMzE,21802
-iqm/cpc/compiler/errors.py,sha256=tz-8g1QtDvCAPmAjjCYK3FoULrazkpSTmXIvyqukaT4,1949
-iqm/cpc/compiler/standard_stages.py,sha256=wW_pvSwrth9PdTLeTunCKNhz33xPXxJ0f9K8918O1pw,34776
-iqm/cpc/compiler/station_settings.py,sha256=KUq_ZswTYE4AsS6LaKXRwlPbP0jsZ0j7pH2qQv0ifrc,18621
-iqm/cpc/interface/__init__.py,sha256=mvhNx1I9K5Sg40CwPntWj35M3Bni__23PWEw_qYaXtQ,611
-iqm/cpc/interface/compiler.py,sha256=zxUyalyiBIQA9EUK_fDGNq0SZ5OwfxQdB6Xk5BDDMVk,9797
-iqm/pulla/__init__.py,sha256=fj5Qh8R9K-z6q5g9-CySBZsG8d33nU7hCHrqIIB8_-0,901
-iqm/pulla/calibration.py,sha256=c_SNlTxXC0y-ahDY7JY53N7SofU5WUWMrNBogtdfHl4,4523
-iqm/pulla/interface.py,sha256=XZ_uOWyxlZBmil5-Z02R6rZ1dsR5t43xr6oL01DAows,3614
-iqm/pulla/pulla.py,sha256=kgcyoMe9a9VvD9Y7HLvFdaQaax8vJkP_OVRd7sftvjo,16166
-iqm/pulla/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-iqm/pulla/quantum_architecture.py,sha256=jj9zqK9CcODedR69p8zLSj3qDfzIxI_f9rb8s07GKaM,6377
-iqm/pulla/utils.py,sha256=gRl_IbNk_Kom9iZryHX6CjxNRIlCppBl3-ot7_766Fw,28644
-iqm/pulla/utils_cirq.py,sha256=VtdO356D2RAh2lSVdaPm3ClJ9-nvC4jzhR9hP5QSQhI,793
-iqm/pulla/utils_dd.py,sha256=SxYAuRBgvYELKjeXpFbP4mM0xCCivDk7WUHw7oEXfMo,1695
-iqm/pulla/utils_qir.py,sha256=uNEiqBczv7rX8tAqcg7TX-si0P-ZdDcPTMOVfi5eb28,11567
-iqm/pulla/utils_qiskit.py,sha256=pbb2fEJAdxqd6hW9_Qgvpvy0P2H81zTJ1QLahe4Tx6U,9482
-iqm_pulla-11.17.0.dist-info/AUTHORS.rst,sha256=iCStz7WP5Jk7uMnn9jRA4ybS14X4yeUW2SsWE-OTaRk,328
-iqm_pulla-11.17.0.dist-info/LICENSE.txt,sha256=cCj_biRA4Q8A77vxR8AuvAf-DZ5G79yxR_3lYY6TrmA,11333
-iqm_pulla-11.17.0.dist-info/METADATA,sha256=ZWZSpSW6SS7kSxr8t70AiLCka2aL1YPypL6JyHYKQFg,17701
-iqm_pulla-11.17.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_pulla-11.17.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_pulla-11.17.0.dist-info/RECORD,,