iqm-station-control-client 6.0.0__tar.gz → 7.1.0__tar.gz

{iqm_station_control_client-6.0.0 → iqm_station_control_client-7.1.0}/CHANGELOG.rst

@@ -2,6 +2,23 @@
 Changelog
 =========
 
+Version 7.1.0 (2025-06-10)
+==========================
+
+Features
+--------
+
+- Update dependency on exa-common
+
+
+Version 7.0.0 (2025-06-02)
+==========================
+
+Features
+--------
+
+- Revert changes from :issue:`SW-1513`.
+
 Version 6.0.0 (2025-05-30)
 ==========================
 

{iqm_station_control_client-6.0.0/src/iqm_station_control_client.egg-info → iqm_station_control_client-7.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-station-control-client
-Version: 6.0.0
+Version: 7.1.0
 Summary: Python client for communicating with Station Control Service
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License:                                  Apache License

{iqm_station_control_client-6.0.0 → iqm_station_control_client-7.1.0}/src/iqm/station_control/client/iqm_server/iqm_server_client.py

@@ -295,9 +295,9 @@ def payload_to_sweep(job_payload: bytes) -> SweepDefinition:
 def to_job_status(job_status: proto.JobStatus) -> JobStatus:
     match job_status:
         case proto.JobStatus.IN_QUEUE:
-            return JobStatus.EXECUTION_PENDING
+            return JobStatus.PENDING_EXECUTION
         case proto.JobStatus.EXECUTING:
-            return JobStatus.EXECUTION_STARTED
+            return JobStatus.EXECUTION_START
         case proto.JobStatus.FAILED:
             return JobStatus.FAILED
         case proto.JobStatus.COMPLETED:

{iqm_station_control_client-6.0.0 → iqm_station_control_client-7.1.0}/src/iqm/station_control/client/station_control.py

@@ -34,10 +34,10 @@ import requests
 from exa.common.data.setting_node import SettingNode
 from exa.common.data.value import ObservationValue
 from exa.common.errors.server_errors import (
-    STATUS_CODE_TO_ERROR_MAPPING,
     InternalServerError,
     NotFoundError,
     StationControlError,
+    map_from_status_code_to_error,
 )
 from exa.common.qcm_data.qcm_data_client import QCMDataClient
 from iqm.station_control.client.list_models import (
@@ -699,7 +699,7 @@ class StationControlClient:
         max_seen_position = 0
         while True:
             job = self._poll_job(job_id)
-            if job.job_status >= JobStatus.EXECUTION_STARTED:
+            if job.job_status >= JobStatus.EXECUTION_START:
                 if max_seen_position:
                     update_progress_callback([("Progress in queue", max_seen_position, max_seen_position)])
                 return job.job_status
@@ -820,7 +820,7 @@ class StationControlClient:
             except json.JSONDecodeError:
                 error_message = response.text
 
-            error_class = STATUS_CODE_TO_ERROR_MAPPING[response.status_code]
+            error_class = map_from_status_code_to_error(response.status_code)
             raise error_class(error_message)
         return response
 

{iqm_station_control_client-6.0.0 → iqm_station_control_client-7.1.0}/src/iqm/station_control/interface/models/jobs.py

@@ -66,29 +66,24 @@ class JobStatus(Enum):
     RECEIVED = "received"
 
     # Validating the job
+    VALIDATING = "validating"
+    ACCEPTED = "accepted"
 
-    VALIDATION_STARTED = "validation_started"
-    VALIDATION_ENDED = "validation_ended"
-
-    FETCH_CALIBRATION_STARTED = "fetch_calibration_started"
-    FETCH_CALIBRATION_ENDED = "fetch_calibration_ended"
+    PREPARING_CALIBRATION = "preparing_calibration"
 
     # Running PulLA
-    COMPILATION_STARTED = "compilation_started"
-    COMPILATION_ENDED = "compilation_ended"
+    PENDING_COMPILATION = "pending_compilation"
+    COMPILING = "compiling"
+    COMPILED = "compiled"
 
     # Executing sweep
-    SAVE_SWEEP_METADATA_STARTED = "save_sweep_metadata_started"
-    SAVE_SWEEP_METADATA_ENDED = "save_sweep_metadata_ended"
-    EXECUTION_PENDING = "execution_pending"
-    EXECUTION_STARTED = "execution_started"
-    EXECUTION_ENDED = "execution_ended"
-    EXECUTION_STAGE_COMPLETED = "execution_completed"
-
-    # Extracting artifacts from results
-    POST_PROCESSING_STARTED = "post_processing_started"
-    POST_PROCESSING_ENDED = "post_processing_ended"
-
+    STORING_SWEEP_METADATA = "storing_sweep_metadata"
+    METADATA_STORED = "metadata_stored"
+    PENDING_EXECUTION = "pending_execution"
+    EXECUTION_START = "execution_start"
+    EXECUTION_END = "execution_end"
+    PENDING_POST_PROCESSING = "pending_post_processing"
+    POST_PROCESSING = "post_processing"
     READY = "ready"
 
     # Job failed, can happen at any stage
@@ -117,7 +112,7 @@ class JobStatus(Enum):
         """Enable comparison according to definition order.
 
         Examples:
-            >>> JobStatus.VALIDATION_STARTED < JobStatus.COMPILATION_ENDED
+            >>> JobStatus.ACCEPTED < JobStatus.COMPILED
             True
 
         """

{iqm_station_control_client-6.0.0 → iqm_station_control_client-7.1.0/src/iqm_station_control_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-station-control-client
-Version: 6.0.0
+Version: 7.1.0
 Summary: Python client for communicating with Station Control Service
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License:                                  Apache License

iqm_station_control_client-7.1.0/version.txt

@@ -0,0 +1 @@
+7.1.0

iqm_station_control_client-6.0.0/version.txt

@@ -1 +0,0 @@
-6.0.0