iqm-station-control-client 4.2.0__py3-none-any.whl → 6.0.0__py3-none-any.whl

iqm/station_control/client/iqm_server/iqm_server_client.py

@@ -55,7 +55,7 @@ from iqm.station_control.interface.models import (
     SweepDefinition,
     SweepResults,
 )
-from iqm.station_control.interface.models.jobs import JobData, JobResult
+from iqm.station_control.interface.models.jobs import JobData, JobError, JobResult
 from iqm.station_control.interface.models.sweep import SweepBase
 
 logger = logging.getLogger(__name__)
@@ -169,7 +169,9 @@ class IqmServerClient(StationControlClient, metaclass=IqmServerClientMeta):
                     parallel_sweep_progress=[],
                     interrupted=False,
                 ),
-                job_error=job.error if job.HasField("error") else "",
+                job_error=JobError(full_error_log=job.error, user_error_message=job.error)
+                if job.HasField("error")
+                else None,
                 position=job.queue_position if job.HasField("queue_position") else None,
             )
 
@@ -293,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.PENDING_EXECUTION
+            return JobStatus.EXECUTION_PENDING
         case proto.JobStatus.EXECUTING:
-            return JobStatus.EXECUTION_START
+            return JobStatus.EXECUTION_STARTED
         case proto.JobStatus.FAILED:
             return JobStatus.FAILED
         case proto.JobStatus.COMPLETED:

iqm/station_control/client/station_control.py

@@ -699,7 +699,7 @@ class StationControlClient:
         max_seen_position = 0
         while True:
             job = self._poll_job(job_id)
-            if job.job_status >= JobStatus.EXECUTION_START:
+            if job.job_status >= JobStatus.EXECUTION_STARTED:
                 if max_seen_position:
                     update_progress_callback([("Progress in queue", max_seen_position, max_seen_position)])
                 return job.job_status

iqm/station_control/interface/models/jobs.py

@@ -38,13 +38,20 @@ class JobResult(PydanticBase):
     interrupted: bool
 
 
+class JobError(PydanticBase):
+    """Error log for a job."""
+
+    full_error_log: str
+    user_error_message: str
+
+
 class JobData(PydanticBase):
     """Job response data model"""
 
     job_id: UUID
     job_status: JobStatus
     job_result: JobResult
-    job_error: str | None
+    job_error: JobError | None
     position: int | None
 
 
@@ -59,24 +66,29 @@ class JobStatus(Enum):
     RECEIVED = "received"
 
     # Validating the job
-    VALIDATING = "validating"
-    ACCEPTED = "accepted"
 
-    PREPARING_CALIBRATION = "preparing_calibration"
+    VALIDATION_STARTED = "validation_started"
+    VALIDATION_ENDED = "validation_ended"
+
+    FETCH_CALIBRATION_STARTED = "fetch_calibration_started"
+    FETCH_CALIBRATION_ENDED = "fetch_calibration_ended"
 
     # Running PulLA
-    PENDING_COMPILATION = "pending_compilation"
-    COMPILING = "compiling"
-    COMPILED = "compiled"
+    COMPILATION_STARTED = "compilation_started"
+    COMPILATION_ENDED = "compilation_ended"
 
     # Executing sweep
-    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"
+    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"
+
     READY = "ready"
 
     # Job failed, can happen at any stage
@@ -105,7 +117,7 @@ class JobStatus(Enum):
         """Enable comparison according to definition order.
 
         Examples:
-            >>> JobStatus.ACCEPTED < JobStatus.COMPILED
+            >>> JobStatus.VALIDATION_STARTED < JobStatus.COMPILATION_ENDED
             True
 
         """

{iqm_station_control_client-4.2.0.dist-info → iqm_station_control_client-6.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-station-control-client
-Version: 4.2.0
+Version: 6.0.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-4.2.0.dist-info → iqm_station_control_client-6.0.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 iqm/station_control/client/__init__.py,sha256=BmBIBdZa10r-IWCFzZ1-0DG6GQKPIXqGXltfXop4ZeQ,942
 iqm/station_control/client/list_models.py,sha256=SjD0DbCrM9z1SSuGoQS83lyJmDLuMOatpJUoW8itW9s,2335
-iqm/station_control/client/station_control.py,sha256=F9snzBp0u4xsg0f5_FzXh-21aP4BXM0a_f79aMC0ACE,39601
+iqm/station_control/client/station_control.py,sha256=Iedc-uJ-XOTyAM3K4w1iktTp0FK3yTSPZfA6NZNh2uk,39603
 iqm/station_control/client/utils.py,sha256=cpS3hXEeeIXeqd_vBnnwo3JHS83FrNpG07SiTUwUx-I,1650
 iqm/station_control/client/iqm_server/__init__.py,sha256=nLsRHN1rnOKXwuzaq_liUpAYV3sis5jkyHccSdacV7U,624
 iqm/station_control/client/iqm_server/error.py,sha256=ZLV2-gxFLHZjZVkI3L5sWcBMiay7NT-ijIEvrXgVJT8,1166
 iqm/station_control/client/iqm_server/grpc_utils.py,sha256=ee42C31_JIXlP6ikZQbohgUQjqCvcSSxIW_9lm9MMV8,5727
-iqm/station_control/client/iqm_server/iqm_server_client.py,sha256=ZSon3fHpgfAF8M3tymSu9LfVG-LAxDY_ddQhbrR4uAU,14612
+iqm/station_control/client/iqm_server/iqm_server_client.py,sha256=a7eEw0cmuVwwCaHe3TPi9juwpgofoEGjlF7ATwndYKk,14713
 iqm/station_control/client/iqm_server/meta_class.py,sha256=pePJ0Xy0aiJg-bZWK8D87gblq6imfXLsZHjpZkf5D9s,1399
 iqm/station_control/client/iqm_server/proto/__init__.py,sha256=mOJQ_H-NEyJMffRaDSSZeXrScHaHaHEXULv-O_OJA3A,1345
 iqm/station_control/client/iqm_server/proto/calibration_pb2.py,sha256=gum0DGmqxhbfaar8SqahmSif1pB6hgo0pVcnoi3VMUo,3017
@@ -39,7 +39,7 @@ iqm/station_control/interface/list_with_meta.py,sha256=GAXIDEXKeua6-2FoQ_O1tkhx-
 iqm/station_control/interface/pydantic_base.py,sha256=MVzcsH7wG1DON-qTw6KLpUDay7_b_9CDQgymVzg9HwI,1303
 iqm/station_control/interface/models/__init__.py,sha256=JeXFg-ltPOoSY6qVclUKCVyt-7okNgCptLb3h3t3JD4,1587
 iqm/station_control/interface/models/dut.py,sha256=dd1SpcsBe4P057jvcPqv39SjzekewwP07hThFe5ulNA,1216
-iqm/station_control/interface/models/jobs.py,sha256=nQNyMauQu99LTUK38meVWXSMdX3D-Fgn8VsYDMTwYN8,3611
+iqm/station_control/interface/models/jobs.py,sha256=D7u4ZW-d86G0GYHzXHVlI_kUEvVV_Ol40oYvZWu91pE,3984
 iqm/station_control/interface/models/monitor.py,sha256=9p-hg5DWrlbCIrJ0GyQ90DrHr1Yc9DCQyfpsQCm0cDE,1328
 iqm/station_control/interface/models/observation.py,sha256=Jce4lIsUtHRIFT3nr-cbKvh3dbR2Y_yM5x0yyvUdjF8,3261
 iqm/station_control/interface/models/observation_set.py,sha256=Ko2o3-9I38NfjNF2IQPcwfbwpkTQ3PIU7fUiSaDleX8,3031
@@ -47,8 +47,8 @@ iqm/station_control/interface/models/run.py,sha256=m-iE3QMPQUOF7bsw8JCAM1Bd6bDVh
 iqm/station_control/interface/models/sequence.py,sha256=uOqMwF1x-vW6UHs2WnPD3PsuSgV3a8OTAsgn_4UENLw,2723
 iqm/station_control/interface/models/sweep.py,sha256=ZV_1zcEF5_NY0nPgC75tU7s14TE1o0croBSClIVSmCE,2493
 iqm/station_control/interface/models/type_aliases.py,sha256=3LB9viZVi8osavY5kKF8TH1crayG7-MLjgBqXDCqL2s,1018
-iqm_station_control_client-4.2.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
-iqm_station_control_client-4.2.0.dist-info/METADATA,sha256=8ZkaMqyQU3no5urP6e7d2AkXoYRj2aiPb23vF_1oubA,14009
-iqm_station_control_client-4.2.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_station_control_client-4.2.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_station_control_client-4.2.0.dist-info/RECORD,,
+iqm_station_control_client-6.0.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
+iqm_station_control_client-6.0.0.dist-info/METADATA,sha256=yNHetZ300tB5Zv4ggHLq_3DJS8rXz1ghdHOpJsTM8RA,14009
+iqm_station_control_client-6.0.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_station_control_client-6.0.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_station_control_client-6.0.0.dist-info/RECORD,,