iqm-pulla 9.7.0__py3-none-any.whl → 9.8.0__py3-none-any.whl

iqm/pulla/pulla.py

@@ -248,57 +248,57 @@ class Pulla:
             logger.info("Waiting for the job to finish...")
 
             while True:
-                sweep_data = self._station_control.get_sweep(job_id)
+                job_data = self._station_control.get_job(job_id)
                 sc_result = StationControlResult(sweep_id=job_id, task_id=job_id, status=TaskStatus.PENDING)
 
-                if sweep_data.job_status <= JobExecutorStatus.EXECUTION_STARTED:  # type: ignore[operator]
+                if job_data.job_status <= JobExecutorStatus.EXECUTION_STARTED:  # type: ignore[operator]
                     # Wait in the task queue while showing a progress bar
 
                     interrupted = self._station_control._wait_job_completion(str(job_id), get_progress_bar_callback())  # type: ignore[attr-defined]
                     if interrupted:
                         raise KeyboardInterrupt
-
-                elif sweep_data.job_status == JobExecutorStatus.READY:
-                    logger.info("Sweep status: %s", str(sweep_data.job_status))
-
-                    sc_result.status = TaskStatus.READY
-                    sc_result.result = map_sweep_results_to_logical_qubits(
-                        self._station_control.get_sweep_results(job_id),
-                        context["readout_mappings"],
-                        context["options"].heralding_mode,
-                    )
-                    sc_result.start_time = (
-                        sweep_data.begin_timestamp.isoformat() if sweep_data.begin_timestamp else None
-                    )
-                    sc_result.end_time = sweep_data.end_timestamp.isoformat() if sweep_data.end_timestamp else None
-
-                    if verbose:
-                        # TODO: Consider using just 'logger.debug' here and remove 'verbose'
-                        logger.info(sc_result.result)
-
-                    return sc_result
-
-                elif sweep_data.job_status == JobExecutorStatus.FAILED:
-                    sc_result.status = TaskStatus.FAILED
-                    sc_result.start_time = (
-                        sweep_data.begin_timestamp.isoformat() if sweep_data.begin_timestamp else None
-                    )
-                    sc_result.end_time = sweep_data.end_timestamp.isoformat() if sweep_data.end_timestamp else None
-                    job = self._station_control.get_job(job_id)
-                    sc_result.message = job["job_error"]  # type: ignore[index]
-                    logger.error("Submission failed! Error: %s", sc_result.message)
-                    return sc_result
-
-                elif sweep_data.job_status == JobExecutorStatus.ABORTED:
-                    sc_result.status = TaskStatus.FAILED
-                    sc_result.start_time = (
-                        sweep_data.begin_timestamp.isoformat() if sweep_data.begin_timestamp else None
-                    )
-                    sc_result.end_time = sweep_data.end_timestamp.isoformat() if sweep_data.end_timestamp else None
-                    job = self._station_control.get_job(job_id)
-                    sc_result.message = job["job_error"]  # type: ignore[index]
-                    logger.error("Submission was revoked!")
-                    return sc_result
+                else:
+                    # job is not in queue or executing, so we can query the sweep
+                    sweep_data = self._station_control.get_sweep(job_id)
+                    if job_data.job_status == JobExecutorStatus.READY:
+                        logger.info("Sweep status: %s", str(sweep_data.job_status))
+
+                        sc_result.status = TaskStatus.READY
+                        sc_result.result = map_sweep_results_to_logical_qubits(
+                            self._station_control.get_sweep_results(job_id),
+                            context["readout_mappings"],
+                            context["options"].heralding_mode,
+                        )
+                        sc_result.start_time = (
+                            sweep_data.begin_timestamp.isoformat() if sweep_data.begin_timestamp else None
+                        )
+                        sc_result.end_time = sweep_data.end_timestamp.isoformat() if sweep_data.end_timestamp else None
+
+                        if verbose:
+                            # TODO: Consider using just 'logger.debug' here and remove 'verbose'
+                            logger.info(sc_result.result)
+
+                        return sc_result
+
+                    if job_data.job_status == JobExecutorStatus.FAILED:
+                        sc_result.status = TaskStatus.FAILED
+                        sc_result.start_time = (
+                            sweep_data.begin_timestamp.isoformat() if sweep_data.begin_timestamp else None
+                        )
+                        sc_result.end_time = sweep_data.end_timestamp.isoformat() if sweep_data.end_timestamp else None
+                        sc_result.message = str(job_data.job_error)
+                        logger.error("Submission failed! Error: %s", sc_result.message)
+                        return sc_result
+
+                    if job_data.job_status == JobExecutorStatus.ABORTED:
+                        sc_result.status = TaskStatus.FAILED
+                        sc_result.start_time = (
+                            sweep_data.begin_timestamp.isoformat() if sweep_data.begin_timestamp else None
+                        )
+                        sc_result.end_time = sweep_data.end_timestamp.isoformat() if sweep_data.end_timestamp else None
+                        sc_result.message = str(job_data.job_error)
+                        logger.error("Submission was revoked!")
+                        return sc_result
 
                 time.sleep(1)
 

{iqm_pulla-9.7.0.dist-info → iqm_pulla-9.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-pulla
-Version: 9.7.0
+Version: 9.8.0
 Summary: Client library for pulse-level access to an IQM quantum computer
 Author-email: IQM Finland Oy <developers@meetiqm.com>
 License: Apache License
@@ -239,8 +239,8 @@ Provides-Extra: qiskit
 Requires-Dist: iqm-exa-common <27,>=26 ; extra == 'qiskit'
 Requires-Dist: iqm-station-control-client <10,>=9 ; extra == 'qiskit'
 Requires-Dist: iqm-pulse <11,>=10 ; extra == 'qiskit'
-Requires-Dist: iqm-client <31,>=30 ; extra == 'qiskit'
 Requires-Dist: iqm-client[qiskit] <31,>=30 ; extra == 'qiskit'
+Requires-Dist: iqm-client <31,>=30 ; extra == 'qiskit'
 
 IQM Pulla
 #########

{iqm_pulla-9.7.0.dist-info → iqm_pulla-9.8.0.dist-info}/RECORD

@@ -11,7 +11,7 @@ iqm/cpc/interface/compiler.py,sha256=2x3ZhL4WcyjwlSoZ3KhlmRcLxboz_ptS0M_rdX1z0c8
 iqm/pulla/__init__.py,sha256=fj5Qh8R9K-z6q5g9-CySBZsG8d33nU7hCHrqIIB8_-0,901
 iqm/pulla/calibration.py,sha256=c_SNlTxXC0y-ahDY7JY53N7SofU5WUWMrNBogtdfHl4,4523
 iqm/pulla/interface.py,sha256=yymQo4REHYcUOWgPxPYq9IixS9bBZ27LXLQgJhzET58,5400
-iqm/pulla/pulla.py,sha256=IpW6VLbpx7Qroy47sbybmNmv4jVr2fyd_zx-sdKMklA,14109
+iqm/pulla/pulla.py,sha256=RWsUgtCy_wAgm8TDk6uZEmaG_v-lTBFzx43qpA1CfQU,14243
 iqm/pulla/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iqm/pulla/quantum_architecture.py,sha256=mJH9e9fdkblg6LrgN7qd-Ui3Igawf-hGd2Z7ZclQg04,6260
 iqm/pulla/utils.py,sha256=TTAOFhNW59VFAjnu6ZicmHXvp-GI_f66oh6IC1zFQKE,24732
@@ -19,9 +19,9 @@ iqm/pulla/utils_cirq.py,sha256=8SBy6w7cr4AmnCgKwh7dBWwBGfGKxnoEMv9-1yfKs0A,777
 iqm/pulla/utils_dd.py,sha256=SxYAuRBgvYELKjeXpFbP4mM0xCCivDk7WUHw7oEXfMo,1695
 iqm/pulla/utils_qir.py,sha256=SKQyYwqluMOqfts6jdhP6ik8BvAIppwaq6-_sY0MO8M,11503
 iqm/pulla/utils_qiskit.py,sha256=RBrAf_KbxlL8DI078mtN8nK1pdfAbd4yk7DJSZVEFSs,10397
-iqm_pulla-9.7.0.dist-info/AUTHORS.rst,sha256=iCStz7WP5Jk7uMnn9jRA4ybS14X4yeUW2SsWE-OTaRk,328
-iqm_pulla-9.7.0.dist-info/LICENSE.txt,sha256=cCj_biRA4Q8A77vxR8AuvAf-DZ5G79yxR_3lYY6TrmA,11333
-iqm_pulla-9.7.0.dist-info/METADATA,sha256=mSSW_T5amveL2CvjouRXL_IoyUQ5My2r5D4JgyZqyrQ,17695
-iqm_pulla-9.7.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_pulla-9.7.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_pulla-9.7.0.dist-info/RECORD,,
+iqm_pulla-9.8.0.dist-info/AUTHORS.rst,sha256=iCStz7WP5Jk7uMnn9jRA4ybS14X4yeUW2SsWE-OTaRk,328
+iqm_pulla-9.8.0.dist-info/LICENSE.txt,sha256=cCj_biRA4Q8A77vxR8AuvAf-DZ5G79yxR_3lYY6TrmA,11333
+iqm_pulla-9.8.0.dist-info/METADATA,sha256=1pt45T-YC8ejygXb1q90CZKSQr4sAZcfwK0mN4e9U_0,17695
+iqm_pulla-9.8.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_pulla-9.8.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_pulla-9.8.0.dist-info/RECORD,,