iqm-pulla 11.1.0__py3-none-any.whl → 11.3.0__py3-none-any.whl

iqm/pulla/pulla.py

@@ -210,6 +210,7 @@ class Pulla:
         context: dict[str, Any],
         settings: SettingNode,
         verbose: bool = True,
+        wait_completion: bool = True,
     ) -> StationControlResult:
         """Executes a quantum circuit on the remote quantum computer.
 
@@ -218,6 +219,7 @@ class Pulla:
             context: Context object of the successful compiler run, containing the readout mappings.
             settings: Station settings.
             verbose: Whether to print results.
+            wait_completion: If True, returns immediately with job ID. If False, waits for completion.
 
         Returns:
             results of the execution
@@ -240,72 +242,130 @@ class Pulla:
             )
         )
         job_id = uuid.UUID(sweep_response["job_id"])
-        try:
-            logger.info("Created job in queue with ID: %s", job_id)
-            if href := sweep_response.get("job_href"):
-                logger.info("Job link: %s", href)
 
-            logger.info("Waiting for the job to finish...")
+        logger.info("Created job in queue with ID: %s", job_id)
+        if href := sweep_response.get("job_href"):
+            logger.info("Job link: %s", href)
 
-            while True:
-                job_data = self._station_control.get_job(job_id)
-                sc_result = StationControlResult(sweep_id=job_id, task_id=job_id, status=TaskStatus.PENDING)
+        if wait_completion:
+            return self.get_execution_result(job_id, context, verbose, wait_completion=True)
+        else:
+            return StationControlResult(sweep_id=job_id, task_id=job_id, status=TaskStatus.PENDING)
 
-                if job_data.job_status <= JobExecutorStatus.EXECUTION_STARTED:  # type: ignore[operator]
-                    # Wait in the task queue while showing a progress bar
+    def get_execution_result(
+        self,
+        job_id: uuid.UUID,
+        context: dict[str, Any],
+        verbose: bool = True,
+        wait_completion: bool = True,
+    ) -> StationControlResult:
+        """Get execution results.
 
-                    interrupted = self._station_control._wait_job_completion(str(job_id), get_progress_bar_callback())  # type: ignore[attr-defined]
-                    if interrupted:
-                        raise KeyboardInterrupt
-                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
+        Args:
+            job_id: The ID of the job to process.
+            context: Context object of the successful compiler run, containing the readout mappings.
+            verbose: Whether to print results.
+            wait_completion: If True, waits for job completion. If False, returns current status.
 
-                        if verbose:
-                            # TODO: Consider using just 'logger.debug' here and remove 'verbose'
-                            logger.info(sc_result.result)
+        Returns:
+            The processed station control result.
 
-                        return sc_result
+        """
+        sc_result = StationControlResult(sweep_id=job_id, task_id=job_id, status=TaskStatus.PENDING)
 
-                    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
+        try:
+            if wait_completion:
+                logger.info("Waiting for the job to finish...")
 
-                    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
+            while True:
+                job_data = self._station_control.get_job(job_id)
+                sc_result.status = TaskStatus.PENDING
+
+                if job_data.job_status <= JobExecutorStatus.EXECUTION_STARTED:  # type: ignore[operator]
+                    if wait_completion:
+                        # Wait in the task queue while showing a progress bar
+                        interrupted = self._station_control._wait_job_completion(  # type: ignore[attr-defined]
+                            str(job_id), get_progress_bar_callback()
+                        )
+                        if interrupted:
+                            raise KeyboardInterrupt
+                    else:
+                        # Non-blocking check - return current status
+                        sc_result.status = (
+                            TaskStatus.PROGRESS
+                            if job_data.job_status == JobExecutorStatus.EXECUTION_STARTED
+                            else TaskStatus.PENDING
                         )
-                        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)
+                else:
+                    # job is not in queue or executing, so we can query the sweep
+                    result_or_nothing = self._get_result_of_started_job(
+                        context, job_data, job_id, sc_result, wait_completion, verbose
+                    )
+                    if result_or_nothing is not None:
+                        return result_or_nothing
+
+                if wait_completion:
+                    time.sleep(1)
+                else:
+                    break
 
         except KeyboardInterrupt as exc:
-            logger.info("Caught KeyboardInterrupt, revoking job %s", job_id)
-            self._station_control.abort_job(job_id)
+            if wait_completion:
+                logger.info("Caught KeyboardInterrupt, revoking job %s", job_id)
+                self._station_control.abort_job(job_id)
             raise KeyboardInterrupt from exc
 
+        return sc_result
+
+    def _get_result_of_started_job(
+        self,
+        context: dict[str, Any],
+        job_data: Any,
+        job_id: uuid.UUID,
+        sc_result: StationControlResult,
+        wait_completion: bool,
+        verbose: bool,
+    ) -> StationControlResult | None:
+        sweep_data = self._station_control.get_sweep(job_id)
+        if job_data.job_status == JobExecutorStatus.READY:
+            if wait_completion:
+                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 and wait_completion:
+                # 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)
+            if wait_completion:
+                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)
+            if wait_completion:
+                logger.error("Submission was revoked!")
+            return sc_result
+
+        return None
+
 
 init_loggers({"iqm": "INFO"})

{iqm_pulla-11.1.0.dist-info → iqm_pulla-11.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-pulla
-Version: 11.1.0
+Version: 11.3.0
 Summary: Client library for pulse-level access to an IQM quantum computer
 Author-email: IQM Finland Oy <developers@meetiqm.com>
 License: Apache License
@@ -217,30 +217,30 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 License-File: AUTHORS.rst
 Requires-Dist: iqm-exa-common <27,>=26
-Requires-Dist: iqm-station-control-client <10,>=9
+Requires-Dist: iqm-station-control-client <11,>=10
 Requires-Dist: iqm-pulse <13,>=12
 Requires-Dist: iqm-data-definitions <3.0,>=2.13
 Requires-Dist: pylatexenc ==2.10
 Requires-Dist: pydantic <3.0,>=2.10.4
 Provides-Extra: notebook
 Requires-Dist: iqm-exa-common <27,>=26 ; extra == 'notebook'
-Requires-Dist: iqm-station-control-client <10,>=9 ; extra == 'notebook'
+Requires-Dist: iqm-station-control-client <11,>=10 ; 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 <27,>=26 ; extra == 'qir'
-Requires-Dist: iqm-station-control-client <10,>=9 ; extra == 'qir'
+Requires-Dist: iqm-station-control-client <11,>=10 ; 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'
 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-station-control-client <11,>=10 ; extra == 'qiskit'
 Requires-Dist: iqm-pulse <13,>=12 ; extra == 'qiskit'
-Requires-Dist: iqm-client <32,>=31 ; extra == 'qiskit'
 Requires-Dist: iqm-client[qiskit] <32,>=31 ; extra == 'qiskit'
+Requires-Dist: iqm-client <32,>=31 ; extra == 'qiskit'
 
 IQM Pulla
 #########

{iqm_pulla-11.1.0.dist-info → iqm_pulla-11.3.0.dist-info}/RECORD

@@ -11,7 +11,7 @@ iqm/cpc/interface/compiler.py,sha256=zxUyalyiBIQA9EUK_fDGNq0SZ5OwfxQdB6Xk5BDDMVk
 iqm/pulla/__init__.py,sha256=fj5Qh8R9K-z6q5g9-CySBZsG8d33nU7hCHrqIIB8_-0,901
 iqm/pulla/calibration.py,sha256=c_SNlTxXC0y-ahDY7JY53N7SofU5WUWMrNBogtdfHl4,4523
 iqm/pulla/interface.py,sha256=QquVKhOl2fs2V03fqQJq5sIEaIGiYvetPKKNz_fWH54,3570
-iqm/pulla/pulla.py,sha256=RWsUgtCy_wAgm8TDk6uZEmaG_v-lTBFzx43qpA1CfQU,14243
+iqm/pulla/pulla.py,sha256=kgcyoMe9a9VvD9Y7HLvFdaQaax8vJkP_OVRd7sftvjo,16166
 iqm/pulla/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iqm/pulla/quantum_architecture.py,sha256=mJH9e9fdkblg6LrgN7qd-Ui3Igawf-hGd2Z7ZclQg04,6260
 iqm/pulla/utils.py,sha256=xVu4jLlSHX-_YQT1kB-zBiGy4wNy0YyOKZg4AGMB5DE,24748
@@ -19,9 +19,9 @@ 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.1.0.dist-info/AUTHORS.rst,sha256=iCStz7WP5Jk7uMnn9jRA4ybS14X4yeUW2SsWE-OTaRk,328
-iqm_pulla-11.1.0.dist-info/LICENSE.txt,sha256=cCj_biRA4Q8A77vxR8AuvAf-DZ5G79yxR_3lYY6TrmA,11333
-iqm_pulla-11.1.0.dist-info/METADATA,sha256=TCrfN86y-VD9EyR7t5rrwsB7RM-MltOQ0gpDdYXyqEg,17696
-iqm_pulla-11.1.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_pulla-11.1.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_pulla-11.1.0.dist-info/RECORD,,
+iqm_pulla-11.3.0.dist-info/AUTHORS.rst,sha256=iCStz7WP5Jk7uMnn9jRA4ybS14X4yeUW2SsWE-OTaRk,328
+iqm_pulla-11.3.0.dist-info/LICENSE.txt,sha256=cCj_biRA4Q8A77vxR8AuvAf-DZ5G79yxR_3lYY6TrmA,11333
+iqm_pulla-11.3.0.dist-info/METADATA,sha256=Tupb5P7iJM8flI6Cvj8DrZkGYyCq4mDH395PT5lFwNs,17700
+iqm_pulla-11.3.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_pulla-11.3.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_pulla-11.3.0.dist-info/RECORD,,