iqm-exa-common 26.21.0__py3-none-any.whl → 26.23.0__py3-none-any.whl

exa/common/data/parameter.py

@@ -71,7 +71,7 @@ import xarray as xr
 from exa.common.control.sweep.sweep_values import SweepValues
 from exa.common.data.base_model import BaseModel
 from exa.common.data.value import ObservationValue
-from exa.common.errors.server_errors import ValidationError
+from exa.common.errors.station_control_errors import ValidationError
 
 CastType = str | list["CastType"] | None
 

exa/common/errors/{server_errors.py → station_control_errors.py}

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Errors used in the client-server communication."""
+"""Errors used in the station control client-server communication."""
 
 from http import HTTPStatus
 
@@ -19,11 +19,11 @@ from exa.common.errors.exa_error import ExaError
 
 
 class StationControlError(ExaError):
-    """Base class for station control errors used in client-server communication."""
+    """Base class for station control errors."""
 
     # TODO: StationControlError shouldn't need to inherit ExaError
     #  Some clients might still expect ExaErrors, thus inheriting here to avoid issues because of that.
-    #  Ideally, we would keep server errors (raised by station control) and any client side errors separately.
+    #  Ideally, we would keep server errors (raised by station control) and any client side errors separate.
 
 
 class BadRequestError(StationControlError):
@@ -64,10 +64,18 @@ class InternalServerError(StationControlError):
     """
 
 
+class BadGatewayError(StationControlError):
+    """Error raised when there are invalid responses from another server/proxy."""
+
+
 class ServiceUnavailableError(StationControlError):
     """Error raised when the service is unavailable."""
 
 
+class GatewayTimeoutError(StationControlError):
+    """Error raised when the gateway server did not receive a timely response."""
+
+
 _ERROR_TO_STATUS_CODE_MAPPING = {
     BadRequestError: HTTPStatus.BAD_REQUEST,  # 400
     UnauthorizedError: HTTPStatus.UNAUTHORIZED,  # 401
@@ -76,7 +84,9 @@ _ERROR_TO_STATUS_CODE_MAPPING = {
     ConflictError: HTTPStatus.CONFLICT,  # 409
     ValidationError: HTTPStatus.UNPROCESSABLE_ENTITY,  # 422
     InternalServerError: HTTPStatus.INTERNAL_SERVER_ERROR,  # 500
+    BadGatewayError: HTTPStatus.BAD_GATEWAY,  # 502
     ServiceUnavailableError: HTTPStatus.SERVICE_UNAVAILABLE,  # 503
+    GatewayTimeoutError: HTTPStatus.GATEWAY_TIMEOUT,  # 504
 }
 
 _STATUS_CODE_TO_ERROR_MAPPING = {value: key for key, value in _ERROR_TO_STATUS_CODE_MAPPING.items()}
@@ -84,9 +94,15 @@ _STATUS_CODE_TO_ERROR_MAPPING = {value: key for key, value in _ERROR_TO_STATUS_C
 
 def map_from_error_to_status_code(error: StationControlError) -> HTTPStatus:
     """Map a StationControlError to an HTTPStatus code."""
-    return _ERROR_TO_STATUS_CODE_MAPPING.get(type(error), HTTPStatus.INTERNAL_SERVER_ERROR)
+    direct_mapping = _ERROR_TO_STATUS_CODE_MAPPING.get(type(error))
+    if direct_mapping is not None:
+        return direct_mapping
+    for error_type, status_code in _ERROR_TO_STATUS_CODE_MAPPING.items():
+        if isinstance(error, error_type):
+            return status_code
+    return HTTPStatus.INTERNAL_SERVER_ERROR
 
 
-def map_from_status_code_to_error(status_code: HTTPStatus) -> StationControlError:
+def map_from_status_code_to_error(status_code: HTTPStatus) -> type[StationControlError]:
     """Map an HTTPStatus code to a StationControlError."""
     return _STATUS_CODE_TO_ERROR_MAPPING.get(status_code, InternalServerError)

exa/common/qcm_data/qcm_data_client.py

@@ -25,7 +25,7 @@ from packaging.version import Version
 import requests
 
 from exa.common.errors.exa_error import ExaError
-from exa.common.errors.server_errors import NotFoundError, ValidationError
+from exa.common.errors.station_control_errors import NotFoundError, ValidationError
 from exa.common.qcm_data.file_adapter import FileAdapter
 
 MIN_SUPPORTED_CONTENT_FORMAT_VERSION = Version("1.0")

{iqm_exa_common-26.21.0.dist-info → iqm_exa_common-26.23.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-exa-common
-Version: 26.21.0
+Version: 26.23.0
 Summary: Framework for control and measurement of superconducting qubits: common library
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License: Apache License
@@ -213,7 +213,7 @@ Classifier: Intended Audience :: Science/Research
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
-Requires-Dist: iqm-data-definitions <3.0,>=2.6
+Requires-Dist: iqm-data-definitions <3.0,>=2.13
 Requires-Dist: numpy <3.0,>=1.26.4
 Requires-Dist: pydantic <3.0,>=2.10.4
 Requires-Dist: python-dotenv ==0.21.1

{iqm_exa_common-26.21.0.dist-info → iqm_exa_common-26.23.0.dist-info}/RECORD

@@ -25,13 +25,13 @@ exa/common/control/sweep/option/start_stop_options.py,sha256=HaQFNlhRPep2yrn_LuO
 exa/common/control/sweep/option/sweep_options.py,sha256=BhKB7RHP0VXJ9iUQKVzeQOM4j_x9AsMhRJgoR3gkiaY,933
 exa/common/data/__init__.py,sha256=F5SRe5QHBTjef4XJVQ63kO5Oxc_AiZnPbV560i7La0Y,644
 exa/common/data/base_model.py,sha256=Zap09R91zHY3iYtfO-SqxfKdewCf3q5FNi1uefTtSfQ,1796
-exa/common/data/parameter.py,sha256=OTlBPtuMkiHNozIVzsgUn5wOg3cvaXUcqVpTOHyN12c,23193
+exa/common/data/parameter.py,sha256=h-IJOY5v12bZq_PmprpqgNpvGS3lrTf3-FjgWHtcBP4,23202
 exa/common/data/setting_node.py,sha256=6Sqim4PkD9mL-9sVwokTxQQIrDZhzhld-VSp8L3HH0w,43232
 exa/common/data/settingnode_v2.html.jinja2,sha256=mo-rlLLmU-Xxf6znJAisispAZK8sbV-2C13byKAtj_Q,3166
 exa/common/data/value.py,sha256=mtMws5UPGx1pCADK6Q2Tx4BwCXznvVRSNQRfcQ3NMmY,1853
 exa/common/errors/__init__.py,sha256=ArMBdpmx1EUenBpzrSNG63kmUf7PM0gCqSYnaCnL9Qk,597
 exa/common/errors/exa_error.py,sha256=iw8ueZgqx1JXkfjRoJfPUsSE7cfhzIWpdDaFuka9Ss0,990
-exa/common/errors/server_errors.py,sha256=Ir460DVR0g7d9wbKM6uMA1zrxC-a7MLUuW0JpQ2O8J0,3533
+exa/common/errors/station_control_errors.py,sha256=NEVW9QC-jJM36CQ8b9IIg9hZv5Utph9LXirxk5ZiuNM,4122
 exa/common/helpers/__init__.py,sha256=IgtVD3tojIFA4MTV2mT5uYM6jb2qny9kBIIhEZT2PuI,610
 exa/common/helpers/data_helper.py,sha256=qg-RBCGGP947IbZAoFQ0oQrmp2EgzCSgh6kinX2MD9A,1903
 exa/common/helpers/deprecation.py,sha256=nY8484iun63JOBfBeh49Q6VD5xZ4_gT9fjPmH1RAXoI,397
@@ -46,12 +46,12 @@ exa/common/qcm_data/chad_model.py,sha256=kQFCwr7ToONvXySCCrc-_nZDyXJxgYIjtw-IpNw
 exa/common/qcm_data/chip_topology.py,sha256=Q9S7NlSzKwN2gEk6vPKuqYpjcFLJocqe7BTEtMGaod0,19990
 exa/common/qcm_data/file_adapter.py,sha256=U1XZm_PEswkW7kAztbWFLMufz4mPKPupWbh5yJXdZCI,2263
 exa/common/qcm_data/immutable_base_model.py,sha256=QXmKIWQbsbWQvovXwKT1d9jtyf2LNJtjQquIwO52zOU,901
-exa/common/qcm_data/qcm_data_client.py,sha256=0clAbZ3HPBH9lFOe8cVmaq8hPHG5m3pyPG4O6EI97Kk,6022
+exa/common/qcm_data/qcm_data_client.py,sha256=v8gW-nAYxCdVEO4Uncl3DwH85D67Gi2n2aEpUR0vuqY,6031
 exa/common/sweep/__init__.py,sha256=uEKk5AtzSgSnf8Y0geRPwUpqXIBIXpeCxsN64sX7F1o,591
 exa/common/sweep/database_serialization.py,sha256=NUu1umxRQZpKtRmw1vNDsSbnofqbHvKFg_xQ2mdhY6k,7469
 exa/common/sweep/util.py,sha256=-QE2AaH-WDkYAVH5-Z-30leLgY0x4efmby4kc1JTCgY,3732
-iqm_exa_common-26.21.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
-iqm_exa_common-26.21.0.dist-info/METADATA,sha256=eSrsYP6qM-ZO_GzG17CkxRp_YG3xLnjq3peVp2M6hlA,14628
-iqm_exa_common-26.21.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_exa_common-26.21.0.dist-info/top_level.txt,sha256=Clphg2toaZ3_jSFRPhjMNEmLurkMNMc4lkK2EFYsSlM,4
-iqm_exa_common-26.21.0.dist-info/RECORD,,
+iqm_exa_common-26.23.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
+iqm_exa_common-26.23.0.dist-info/METADATA,sha256=A_U9ew0QZxte2FokRXml1Vll5dY1Kd1B-gxp9FWesUU,14629
+iqm_exa_common-26.23.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_exa_common-26.23.0.dist-info/top_level.txt,sha256=Clphg2toaZ3_jSFRPhjMNEmLurkMNMc4lkK2EFYsSlM,4
+iqm_exa_common-26.23.0.dist-info/RECORD,,