iqm-pulla 7.15.0__tar.gz → 7.17.0__tar.gz

{iqm_pulla-7.15.0 → iqm_pulla-7.17.0}/CHANGELOG.rst

@@ -2,6 +2,21 @@
 Changelog
 =========
 
+Version 7.17.0 (2025-05-19)
+===========================
+
+Bug fixes
+---------
+
+- Update dependency on iqm-pulse
+
+Version 7.16.0 (2025-05-16)
+===========================
+
+Features
+--------
+- task management now uses `JobStatus` instead of `SweepStatus`. :issue:`SW-948`.
+
 Version 7.15.0 (2025-05-12)
 ===========================
 

{iqm_pulla-7.15.0 → iqm_pulla-7.17.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-pulla
-Version: 7.15.0
+Version: 7.17.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<4,>=3
+Requires-Dist: iqm-station-control-client<5,>=4
 Requires-Dist: iqm-pulse<10,>=9
 Requires-Dist: iqm-data-definitions<3.0,>=2.6
 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<4,>=3; extra == "notebook"
+Requires-Dist: iqm-station-control-client<5,>=4; extra == "notebook"
 Requires-Dist: iqm-pulse<10,>=9; 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<4,>=3; extra == "qir"
+Requires-Dist: iqm-station-control-client<5,>=4; extra == "qir"
 Requires-Dist: iqm-pulse<10,>=9; 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<4,>=3; extra == "qiskit"
+Requires-Dist: iqm-station-control-client<5,>=4; extra == "qiskit"
 Requires-Dist: iqm-pulse<10,>=9; extra == "qiskit"
-Requires-Dist: iqm-client<25,>=24; extra == "qiskit"
-Requires-Dist: iqm-client[qiskit]<25,>=24; extra == "qiskit"
+Requires-Dist: iqm-client<26,>=25; extra == "qiskit"
+Requires-Dist: iqm-client[qiskit]<26,>=25; extra == "qiskit"
 
 IQM Pulla
 #########

{iqm_pulla-7.15.0 → iqm_pulla-7.17.0}/requirements/base.txt

@@ -1,5 +1,5 @@
 iqm-exa-common>=26,<27
-iqm-station-control-client>=3,<4
+iqm-station-control-client>=4,<5
 iqm-pulse>=9,<10
 iqm-data-definitions >= 2.6, < 3.0
 pylatexenc == 2.10

{iqm_pulla-7.15.0 → iqm_pulla-7.17.0}/requirements/notebook.txt

@@ -1,5 +1,5 @@
 iqm-exa-common>=26,<27
-iqm-station-control-client>=3,<4
+iqm-station-control-client>=4,<5
 iqm-pulse>=9,<10
 notebook >= 6.4.11, < 7
 matplotlib >= 3.6.3, < 4

{iqm_pulla-7.15.0 → iqm_pulla-7.17.0}/requirements/qir.txt

@@ -1,5 +1,5 @@
 iqm-exa-common>=26,<27
-iqm-station-control-client>=3,<4
+iqm-station-control-client>=4,<5
 iqm-pulse>=9,<10
 iqm-pyqir==0.12.0
 iqm-qiskit-qir==0.8.0

iqm_pulla-7.17.0/requirements/qiskit.txt

@@ -0,0 +1,5 @@
+iqm-exa-common>=26,<27
+iqm-station-control-client>=4,<5
+iqm-pulse>=9,<10
+iqm-client>=25,<26
+iqm-client[qiskit]>=25,<26

{iqm_pulla-7.15.0 → iqm_pulla-7.17.0}/src/iqm/pulla/interface.py

@@ -121,7 +121,7 @@ class StationControlResult:
 
     sweep_id: UUID
     """ID of the executed sweep"""
-    task_id: UUID
+    task_id: UUID  # TODO? Rename to job_id
     """ID of the station control task"""
     status: TaskStatus
     """Status of the station control task"""

{iqm_pulla-7.15.0 → iqm_pulla-7.17.0}/src/iqm/pulla/pulla.py

@@ -49,7 +49,8 @@ from iqm.pulse.playlist.channel import ChannelProperties, get_channel_properties
 from iqm.pulse.playlist.playlist import Playlist
 from iqm.station_control.client.station_control import StationControlClient
 from iqm.station_control.client.utils import get_progress_bar_callback
-from iqm.station_control.interface.models.sweep import SweepDefinition, SweepStatus
+from iqm.station_control.interface.models import JobStatus
+from iqm.station_control.interface.models.sweep import SweepDefinition
 
 #    ██████  ██    ██ ██      ██       █████
 #    ██   ██ ██    ██ ██      ██      ██   ██
@@ -236,36 +237,33 @@ class Pulla:
                 sweeps=[],
             )
         )
-        sweep_id = uuid.UUID(sweep_response["sweep_id"])
-        task_id = uuid.UUID(sweep_response["task_id"])
+        job_id = uuid.UUID(sweep_response["job_id"])
         try:
-            logger.info("Submitted sweep with ID: %s", sweep_id)
-            logger.info("Created task in queue with ID: %s", task_id)
-            if href := sweep_response.get("sweep_href"):
-                logger.info("Sweep link: %s", href)
-            if href := sweep_response.get("task_href"):
-                logger.info("Task link: %s", href)
+            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 sweep to finish...")
+            logger.info("Waiting for the job to finish...")
 
             while True:
-                sweep_data = self._station_control_client.get_sweep(sweep_id)
-                sc_result = StationControlResult(sweep_id=sweep_id, task_id=task_id, status=TaskStatus.PENDING)
+                sweep_data = self._station_control_client.get_sweep(job_id)
+                sc_result = StationControlResult(sweep_id=job_id, task_id=job_id, status=TaskStatus.PENDING)
 
-                if sweep_data.sweep_status in (SweepStatus.PENDING, SweepStatus.PROGRESS):
+                if sweep_data.job_status <= JobStatus.EXECUTION_START:
                     # Wait in the task queue while showing a progress bar
-                    interrupted = self._station_control_client._wait_task_completion(
-                        str(task_id), get_progress_bar_callback()
+
+                    interrupted = self._station_control_client._wait_job_completion(
+                        str(job_id), get_progress_bar_callback()
                     )
                     if interrupted:
                         raise KeyboardInterrupt
 
-                elif sweep_data.sweep_status == SweepStatus.SUCCESS:
-                    logger.info("Sweep status: %s", str(sweep_data.sweep_status))
+                elif sweep_data.job_status == JobStatus.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_client.get_sweep_results(sweep_id),
+                        self._station_control_client.get_sweep_results(job_id),
                         context["readout_mappings"],
                         context["options"].heralding_mode,
                     )
@@ -280,37 +278,33 @@ class Pulla:
 
                     return sc_result
 
-                elif sweep_data.sweep_status == SweepStatus.FAILURE:
+                elif sweep_data.job_status == JobStatus.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
-                    task = self._station_control_client.get_task(task_id)
-                    sc_result.message = task["task_error"] + (
-                        task["task_result"]["message"] if task["task_result"] and task["task_result"]["message"] else ""
-                    )
+                    job = self._station_control_client.get_job(job_id)
+                    sc_result.message = job["job_error"]
                     logger.error("Submission failed! Error: %s", sc_result.message)
                     return sc_result
 
-                elif sweep_data.sweep_status in (SweepStatus.REVOKED, SweepStatus.INTERRUPTED):
+                elif sweep_data.job_status == JobStatus.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
-                    task = self._station_control_client.get_task(task_id)
-                    sc_result.message = task["task_error"] + (
-                        task["task_result"]["message"] if task["task_result"] and task["task_result"]["message"] else ""
-                    )
+                    job = self._station_control_client.get_job(job_id)
+                    sc_result.message = job["job_error"]
                     logger.error("Submission was revoked!")
                     return sc_result
 
                 time.sleep(1)
 
         except KeyboardInterrupt as exc:
-            logger.info("Caught KeyboardInterrupt, revoking task %s", task_id)
-            self._station_control_client.revoke_sweep(sweep_id)
+            logger.info("Caught KeyboardInterrupt, revoking job %s", job_id)
+            self._station_control_client.abort_job(job_id)
             raise KeyboardInterrupt from exc
 
 

{iqm_pulla-7.15.0 → iqm_pulla-7.17.0}/src/iqm_pulla.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-pulla
-Version: 7.15.0
+Version: 7.17.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<4,>=3
+Requires-Dist: iqm-station-control-client<5,>=4
 Requires-Dist: iqm-pulse<10,>=9
 Requires-Dist: iqm-data-definitions<3.0,>=2.6
 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<4,>=3; extra == "notebook"
+Requires-Dist: iqm-station-control-client<5,>=4; extra == "notebook"
 Requires-Dist: iqm-pulse<10,>=9; 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<4,>=3; extra == "qir"
+Requires-Dist: iqm-station-control-client<5,>=4; extra == "qir"
 Requires-Dist: iqm-pulse<10,>=9; 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<4,>=3; extra == "qiskit"
+Requires-Dist: iqm-station-control-client<5,>=4; extra == "qiskit"
 Requires-Dist: iqm-pulse<10,>=9; extra == "qiskit"
-Requires-Dist: iqm-client<25,>=24; extra == "qiskit"
-Requires-Dist: iqm-client[qiskit]<25,>=24; extra == "qiskit"
+Requires-Dist: iqm-client<26,>=25; extra == "qiskit"
+Requires-Dist: iqm-client[qiskit]<26,>=25; extra == "qiskit"
 
 IQM Pulla
 #########

{iqm_pulla-7.15.0 → iqm_pulla-7.17.0}/src/iqm_pulla.egg-info/requires.txt

@@ -1,5 +1,5 @@
 iqm-exa-common<27,>=26
-iqm-station-control-client<4,>=3
+iqm-station-control-client<5,>=4
 iqm-pulse<10,>=9
 iqm-data-definitions<3.0,>=2.6
 pylatexenc==2.10
@@ -7,7 +7,7 @@ pydantic<3.0,>=2.10.4
 
 [notebook]
 iqm-exa-common<27,>=26
-iqm-station-control-client<4,>=3
+iqm-station-control-client<5,>=4
 iqm-pulse<10,>=9
 notebook<7,>=6.4.11
 matplotlib<4,>=3.6.3
@@ -15,14 +15,14 @@ nbclient~=0.5.10
 
 [qir]
 iqm-exa-common<27,>=26
-iqm-station-control-client<4,>=3
+iqm-station-control-client<5,>=4
 iqm-pulse<10,>=9
 iqm-pyqir==0.12.0
 iqm-qiskit-qir==0.8.0
 
 [qiskit]
 iqm-exa-common<27,>=26
-iqm-station-control-client<4,>=3
+iqm-station-control-client<5,>=4
 iqm-pulse<10,>=9
-iqm-client<25,>=24
-iqm-client[qiskit]<25,>=24
+iqm-client<26,>=25
+iqm-client[qiskit]<26,>=25

{iqm_pulla-7.15.0 → iqm_pulla-7.17.0}/tests/conftest.py

@@ -113,16 +113,13 @@ def pulla_on_spark(request, monkeypatch):
             response = Response()
             response.status_code = HTTPStatus.OK
             response.json = lambda: {
-                "task_id": "c2d31ae9-e749-4835-8450-0df10be5d1c1",
-                "sweep_id": "8a28be71-b819-419d-bfcb-9ed9186b7473",
+                "job_id": "c2d31ae9-e749-4835-8450-0df10be5d1c1",
                 # TODO SW-1387: Use v1 API
-                # "task_href": f"{root_url}/station/v1/tasks/c2d31ae9-e749-4835-8450-0df10be5d1c1",
+                # "job_href": f"{root_url}/station/v1/jobs/c2d31ae9-e749-4835-8450-0df10be5d1c1",
                 # "sweep_href": f"{root_url}/station/v1/sweeps/8a28be71-b819-419d-bfcb-9ed9186b7473",
-                "task_href": f"{root_url}/station/tasks/c2d31ae9-e749-4835-8450-0df10be5d1c1",
-                "sweep_href": f"{root_url}/station/sweeps/8a28be71-b819-419d-bfcb-9ed9186b7473",
+                "job_href": f"{root_url}/station/jobs/c2d31ae9-e749-4835-8450-0df10be5d1c1",
             }
             return response
-
         return HTTPResponse(404)
 
     monkeypatch.setattr(requests, "get", mocked_requests_get)

iqm_pulla-7.17.0/version.txt

@@ -0,0 +1 @@
+7.17.0

iqm_pulla-7.15.0/requirements/qiskit.txt

@@ -1,5 +0,0 @@
-iqm-exa-common>=26,<27
-iqm-station-control-client>=3,<4
-iqm-pulse>=9,<10
-iqm-client>=24,<25
-iqm-client[qiskit]>=24,<25

iqm_pulla-7.15.0/version.txt

@@ -1 +0,0 @@
-7.15.0