iqm-client 25.2.0__py3-none-any.whl → 25.4.0__py3-none-any.whl

iqm/iqm_client/authentication.py

@@ -130,7 +130,8 @@ class TokenManager:
             )
         else:
             raise ClientConfigurationError(
-                f"Invalid combination of authentication parameters specified: {list(auth_parameters)}",
+                f"""Invalid combination of authentication parameters specified: {list(auth_parameters)},
+                Use either ['token'] or ['username', 'password'].""",
             )
 
     def get_bearer_token(self, retries: int = 1) -> str | None:

iqm/iqm_client/iqm_client.py

@@ -170,6 +170,7 @@ class IQMClient:
         *,
         timeout: float,
         retry: bool = False,
+        allow_errors: bool = False,
     ) -> requests.Response:
         """Make a HTTP GET request to an IQM server endpoint.
 
@@ -180,6 +181,7 @@ class IQMClient:
             endpoint_args: Arguments for the endpoint.
             timeout: HTTP request timeout (in seconds).
             retry: Iff True, keep trying if you get a 502 error.
+            allow_errors: Iff true, don't raise exceptions for error responses.
 
         Returns:
             HTTP response to the request.
@@ -199,9 +201,10 @@ class IQMClient:
             )
 
         response = self._retry_request_on_error(request) if retry else request()
-        self._check_not_found_error(response)
-        self._check_authentication_errors(response)
-        response.raise_for_status()
+        if not allow_errors:
+            self._check_not_found_error(response)
+            self._check_authentication_errors(response)
+            response.raise_for_status()
         return response
 
     def _deserialize_response(
@@ -672,91 +675,60 @@ class IQMClient:
         )
         status = status_response.json()
         if Status(status["status"]) not in Status.terminal_statuses():
-            return RunResult.from_dict(
-                {
-                    "measurements": [],
-                    "status": status["status"],
-                    "message": "",
-                    "metadata": {
-                        "calibration_set_id": None,
-                        "circuits_batch": [],
-                        "parameters": None,
-                        "timestamps": {},
-                    },
-                }
-            )
+            return RunResult.from_dict({"status": status["status"], "metadata": {}})
 
-        result = self._retry_request_on_error(
-            lambda: requests.get(
-                self._api.url(APIEndpoint.GET_JOB_RESULT, str(job_id)),
-                headers=self._default_headers(),
-                timeout=timeout_secs,
-            )
-        )
-        if result.status_code != 404:
-            result.raise_for_status()
-        measurements = [] if result.status_code == 404 else result.json()
-        request_parameters = (
-            {}
-            if result.status_code == 404
-            else requests.get(
-                self._api.url(APIEndpoint.GET_JOB_REQUEST_PARAMETERS, str(job_id)),
-                headers=self._default_headers(),
-                timeout=timeout_secs,
-            ).json()
-        )
-        calibration_set_id = (
-            None
-            if result.status_code == 404
-            else requests.get(
-                self._api.url(APIEndpoint.GET_JOB_CALIBRATION_SET_ID, str(job_id)),
-                headers=self._default_headers(),
-                timeout=timeout_secs,
-            ).json()
-        )
-        circuits_batch = (
-            []
-            if result.status_code == 404
-            else requests.get(
-                self._api.url(APIEndpoint.GET_JOB_CIRCUITS_BATCH, str(job_id)),
-                headers=self._default_headers(),
-                timeout=timeout_secs,
-            ).json()
+        result = self._get_request(
+            APIEndpoint.GET_JOB_RESULT, (str(job_id),), timeout=timeout_secs, retry=True, allow_errors=True
         )
-        timeline = (
-            []
-            if result.status_code == 404
-            else requests.get(
-                self._api.url(APIEndpoint.GET_JOB_TIMELINE, str(job_id)),
-                headers=self._default_headers(),
-                timeout=timeout_secs,
-            ).json()
-        )
-        error_message_response = requests.get(
-            self._api.url(APIEndpoint.GET_JOB_ERROR_LOG, str(job_id)),
-            headers=self._default_headers(),
-            timeout=timeout_secs,
+
+        error_log_response = self._get_request(
+            APIEndpoint.GET_JOB_ERROR_LOG, (str(job_id),), timeout=timeout_secs, allow_errors=True
         )
-        error_message = error_message_response.text if error_message_response.status_code == 200 else None
+        if error_log_response.status_code == 200:
+            error_log = error_log_response.json()
+            if isinstance(error_log, dict) and "user_error_message" in error_log:
+                error_message = error_log["user_error_message"]
+            else:
+                # backwards compatibility for older error_log format
+                # TODO: remove when not needed anymore
+                error_message = error_log_response.text
+        else:
+            error_message = None
+
+        if result.status_code == 404:
+            return RunResult.from_dict({"status": status["status"], "message": error_message, "metadata": {}})
+        else:
+            result.raise_for_status()
+
+        measurements = result.json()
+        request_parameters = self._get_request(
+            APIEndpoint.GET_JOB_REQUEST_PARAMETERS, (str(job_id),), timeout=timeout_secs, allow_errors=True
+        ).json()
+        calibration_set_id = self._get_request(
+            APIEndpoint.GET_JOB_CALIBRATION_SET_ID, (str(job_id),), timeout=timeout_secs, allow_errors=True
+        ).json()
+        circuits_batch = self._get_request(
+            APIEndpoint.GET_JOB_CIRCUITS_BATCH, (str(job_id),), timeout=timeout_secs, allow_errors=True
+        ).json()
+        timeline = self._get_request(
+            APIEndpoint.GET_JOB_TIMELINE, (str(job_id),), timeout=timeout_secs, allow_errors=True
+        ).json()
+
         return RunResult.from_dict(
             {
                 "measurements": measurements,
                 "status": status["status"],
                 "message": error_message,
                 "metadata": {
-                    "`": calibration_set_id,
+                    "calibration_set_id": calibration_set_id,
                     "circuits_batch": circuits_batch,
-                    "parameters": (
-                        None
-                        if result.status_code == 404
-                        else {
-                            "shots": request_parameters["shots"],
-                            "max_circuit_duration_over_t2": request_parameters["max_circuit_duration_over_t2"],
-                            "heralding_mode": request_parameters["heralding_mode"],
-                            "move_validation_mode": request_parameters["move_validation_mode"],
-                            "move_gate_frame_tracking_mode": request_parameters["move_gate_frame_tracking_mode"],
-                        }
-                    ),
+                    "parameters": {
+                        "shots": request_parameters["shots"],
+                        "max_circuit_duration_over_t2": request_parameters["max_circuit_duration_over_t2"],
+                        "heralding_mode": request_parameters["heralding_mode"],
+                        "move_validation_mode": request_parameters["move_validation_mode"],
+                        "move_gate_frame_tracking_mode": request_parameters["move_gate_frame_tracking_mode"],
+                    },
                     "timestamps": {datapoint["status"]: datapoint["timestamp"] for datapoint in timeline},
                 },
             }

{iqm_client-25.2.0.dist-info → iqm_client-25.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-client
-Version: 25.2.0
+Version: 25.4.0
 Summary: Client library for accessing an IQM quantum computer
 Author-email: IQM Finland Oy <developers@meetiqm.com>
 License: Apache License

{iqm_client-25.2.0.dist-info → iqm_client-25.4.0.dist-info}/RECORD

@@ -19,9 +19,9 @@ iqm/cirq_iqm/examples/demo_iqm_execution.py,sha256=6NTEMbrWInA5kW44ajzEam3PBITCO
 iqm/cirq_iqm/examples/usage.ipynb,sha256=Kyfyu_MwqzTavHVNjgrWJo1tZPeJwTw7ExcU0MFYNRk,34208
 iqm/iqm_client/__init__.py,sha256=D-8W54EcQIxk_1JZo_86GYlR1YitHhPIiFwwLJ2IfGE,1411
 iqm/iqm_client/api.py,sha256=V57vslYSn5g1IgXWtWuxp3hD1DbY18dKUexRdxEuX78,8268
-iqm/iqm_client/authentication.py,sha256=Zbc5DpTwrcwNePKyZ_7KAFxwQFSVyZelQR_CWRCmlME,12187
+iqm/iqm_client/authentication.py,sha256=4MO7VRIH1cIkjidIDqGfnemvc04UHEAfs-sZWXwBcLw,12258
 iqm/iqm_client/errors.py,sha256=ty2P-sg80zlAoL3_kC3PlprgDUv4PI-KFhmmxaaapS0,1429
-iqm/iqm_client/iqm_client.py,sha256=w6jhi70MorKMCiASu706Y_PORCSE_3R-F_h8q5bugnw,50647
+iqm/iqm_client/iqm_client.py,sha256=SFImZk5DrAq51hr2G5sk242mO-8LYz-Mlc6Rc_JIuZE,50019
 iqm/iqm_client/models.py,sha256=YjlerNleeE1kOmzRsux-o02h7XSqv0u0KQEERufdxKk,50302
 iqm/iqm_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iqm/iqm_client/transpile.py,sha256=-iIZaxaTaQLy6pMkRG15VN8X1ZE_iNhX3pjsNjqg6P8,36935
@@ -56,10 +56,10 @@ iqm/qiskit_iqm/fake_backends/fake_apollo.py,sha256=eT2vd3kQBi1rrvxCpePymBCfFK84d
 iqm/qiskit_iqm/fake_backends/fake_deneb.py,sha256=RzQXmLXmBARDiMKVxk5Aw9fVbc6IYlW0A5jibk9iYD0,3156
 iqm/qiskit_iqm/fake_backends/fake_garnet.py,sha256=GI0xafTCj1Um09qVuccO6GPOGBm6ygul_O40Wu220Ys,5555
 iqm/qiskit_iqm/fake_backends/iqm_fake_backend.py,sha256=wJtfsxjPYbDKmzaz5R4AuaXvvPHa21WyPtRgNctL9eY,16785
-iqm_client-25.2.0.dist-info/AUTHORS.rst,sha256=qsxeK5A3-B_xK3hNbhFHEIkoHNpo7sdzYyRTs7Bdtm8,795
-iqm_client-25.2.0.dist-info/LICENSE.txt,sha256=2DXrmQtVVUV9Fc9RBFJidMiTEaQlG2oAtlC9PMrEwTk,11333
-iqm_client-25.2.0.dist-info/METADATA,sha256=XOVnYXYoVM8N1Nld_jDXAVELROOcY-DyFcgcTAGz7W0,17079
-iqm_client-25.2.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_client-25.2.0.dist-info/entry_points.txt,sha256=Kk2qfRwk8vbIJ7qCAvmaUogfRRn6t92_hBFhe6kqAE4,1317
-iqm_client-25.2.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_client-25.2.0.dist-info/RECORD,,
+iqm_client-25.4.0.dist-info/AUTHORS.rst,sha256=qsxeK5A3-B_xK3hNbhFHEIkoHNpo7sdzYyRTs7Bdtm8,795
+iqm_client-25.4.0.dist-info/LICENSE.txt,sha256=2DXrmQtVVUV9Fc9RBFJidMiTEaQlG2oAtlC9PMrEwTk,11333
+iqm_client-25.4.0.dist-info/METADATA,sha256=Ipu01b2XtcWWZ5KE9rMipahHIUR5vvBxgSfYHjrCvaA,17079
+iqm_client-25.4.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_client-25.4.0.dist-info/entry_points.txt,sha256=Kk2qfRwk8vbIJ7qCAvmaUogfRRn6t92_hBFhe6kqAE4,1317
+iqm_client-25.4.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_client-25.4.0.dist-info/RECORD,,