iqm-pulla 9.7.0__tar.gz → 9.8.0__tar.gz

{iqm_pulla-9.7.0 → iqm_pulla-9.8.0}/CHANGELOG.rst

@@ -2,6 +2,14 @@
 Changelog
 =========
 
+Version 9.8.0 (2025-08-21)
+==========================
+
+Bug fixes
+---------
+
+- FIx Pulla.execute crashing when there are jobs in the queue
+
 Version 9.7.0 (2025-08-20)
 ==========================
 

{iqm_pulla-9.7.0 → iqm_pulla-9.8.0}/PKG-INFO

@@ -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 → iqm_pulla-9.8.0}/requirements/qiskit.txt

@@ -1,5 +1,5 @@
 iqm-exa-common>=26,<27
 iqm-station-control-client>=9,<10
 iqm-pulse>=10,<11
-iqm-client>=30,<31
-iqm-client[qiskit]>=30,<31
+iqm-client[qiskit]>=30,<31
+iqm-client>=30,<31

{iqm_pulla-9.7.0 → iqm_pulla-9.8.0}/src/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 → iqm_pulla-9.8.0}/src/iqm_pulla.egg-info/PKG-INFO

@@ -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 → iqm_pulla-9.8.0}/tests/conftest.py

@@ -105,6 +105,10 @@ def pulla_on_spark(request, monkeypatch):
             response = Response()
             response.status_code = HTTPStatus.INTERNAL_SERVER_ERROR
             return response
+        if args[0].startswith(f"{root_url}/station/jobs/"):
+            response = Response()
+            response.status_code = HTTPStatus.INTERNAL_SERVER_ERROR
+            return response
 
         return HTTPResponse(404)
 

iqm_pulla-9.8.0/version.txt

@@ -0,0 +1 @@
+9.8.0

iqm_pulla-9.7.0/version.txt

@@ -1 +0,0 @@
-9.7.0

{iqm_pulla-9.7.0 → iqm_pulla-9.8.0}/src/iqm_pulla.egg-info/requires.txt

@@ -24,5 +24,5 @@ iqm-qiskit-qir==0.8.0
 iqm-exa-common<27,>=26
 iqm-station-control-client<10,>=9
 iqm-pulse<11,>=10
-iqm-client<31,>=30
 iqm-client[qiskit]<31,>=30
+iqm-client<31,>=30