iqm-exa-common 26.2__py3-none-any.whl → 26.4__py3-none-any.whl

exa/common/data/base_model.py

@@ -11,12 +11,9 @@ class BaseModel(pydantic.BaseModel):
     """
 
     model_config = ConfigDict(
-        # extra="forbid",  # Forbid any extra attributes
-        # TODO (Marko): Use "ignore" at least temporarily
-        #  Data sent by old server code might include extra attributes like "parent_name",
-        #  which fails with a new client using extra="ignore".
-        #  Before merging to master, consider if we want to be strict with extra="forbid",
-        #  or would it be better to use extra="ignore" (shouldn't be needed if we update the server code anyway).
+        # TODO: Consider setting extra="forbid", extra="ignore" is needed only if new clients use older servers
+        #  After station control API versioning, backwards compatibility works, i.e. old clients can use newer servers.
+        #  Reverse shouldn't be needed, since we don't promise any forwards compatibility.
         extra="ignore",  # Ignore any extra attributes
         validate_assignment=True,  # Validate the data when the model is changed
         validate_default=True,  # Validate default values during validation

exa/common/data/parameter.py

@@ -70,7 +70,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.exa_error import InvalidParameterValueError
+from exa.common.errors.server_errors import ValidationError
 
 CastType = str | list["CastType"] | None
 
@@ -225,9 +225,7 @@ class Parameter(BaseModel):
         )
         if self.element_indices is not None:
             if self.collection_type is not CollectionType.SCALAR:
-                raise InvalidParameterValueError(
-                    "Element-wise parameter must have CollectionType.SCALAR collection type."
-                )
+                raise ValidationError("Element-wise parameter must have 'CollectionType.SCALAR' collection type.")
 
             match self.element_indices:
                 case [_i, *_more_is] as idxs:
@@ -236,7 +234,7 @@ class Parameter(BaseModel):
                 case int(idx):
                     idxs = [idx]
                 case _:
-                    raise InvalidParameterValueError("element_indices must be one or more ints.")
+                    raise ValidationError("Parameter 'element_indices' must be one or more ints.")
             object.__setattr__(self, "element_indices", idxs)
 
             object.__setattr__(self, "_parent_name", self.name)
@@ -379,12 +377,12 @@ class Parameter(BaseModel):
             The element-wise parameter.
 
         Raises:
-            InvalidParameterValueError: If ``self`` is not collection-valued.
+            UnprocessableEntityError: If ``self`` is not collection-valued.
 
         """
         if self.collection_type is CollectionType.SCALAR:
-            raise InvalidParameterValueError(
-                "Cannot create an element-wise parameter from a parameter with CollectionType.SCALAR."
+            raise ValidationError(
+                "Cannot create an element-wise parameter from a parameter with 'CollectionType.SCALAR'."
             )
         return Parameter(
             name=self.name,
@@ -433,7 +431,7 @@ class Setting(BaseModel):
             # To avoid extra complexity, let Pydantic deal with the raw data and change the value in "after" validation.
             object.__setattr__(self, "value", self.parameter.collection_type.cast(self.value))
         if self.value is not None and not self.parameter.validate(self.value):
-            raise InvalidParameterValueError("Invalid value {} for parameter {}.".format(self.value, self.parameter))
+            raise ValidationError(f"Invalid value '{self.value}' for parameter '{self.parameter}'.")
         return self
 
     def update(self, value: ObservationValue) -> Setting:

exa/common/data/value.py

@@ -43,7 +43,6 @@ Uncertainty = Annotated[
     WithJsonSchema(core_schema.any_schema()),
 ]
 
-# TODO (Marko): Consider if we want to rename these?
-#  We have "as" imports so seems like more descriptive name would be better.
+# TODO: Consider if we want to rename these permanently to avoid unnecessary "as" imports
 ObservationValue = Value
 ObservationUncertainty = Uncertainty

exa/common/errors/exa_error.py

@@ -1,3 +1,6 @@
+import warnings
+
+
 class ExaError(Exception):
     """Base class for exa errors.
 
@@ -10,25 +13,21 @@ class ExaError(Exception):
         super().__init__(message, *args)
         self.message = message
 
+    def __str__(self):
+        return self.message
+
 
 class UnknownSettingError(ExaError, AttributeError):
     """This SettingNode does not have a given key."""
 
 
-class InvalidParameterValueError(ExaError, ValueError):
-    """The value set does not conform to the parameter restrictions."""
+class EmptyComponentListError(ExaError, ValueError):
+    """Error raised when an empty list is given as components for running an experiment."""
 
 
 class InvalidSweepOptionsTypeError(ExaError, TypeError):
     """The type of sweep options is invalid."""
 
     def __init__(self, options: str, *args):
+        warnings.warn("InvalidSweepOptionsTypeError is deprecated.", DeprecationWarning)
         super().__init__(f"Options have unsupported type of {options}", *args)
-
-
-class RequestError(ExaError):
-    """Error raised when something went wrong on the server after sending a request."""
-
-
-class EmptyComponentListError(ExaError, ValueError):
-    """Error raised when an empty list is given as components for running an experiment."""

exa/common/errors/server_errors.py

@@ -0,0 +1,74 @@
+# Copyright 2024 IQM
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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."""
+
+from http import HTTPStatus
+
+from exa.common.errors.exa_error import ExaError
+
+
+class StationControlError(ExaError):
+    """Base class for station control errors used in client-server communication."""
+
+    # 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.
+
+
+class BadRequestError(StationControlError):
+    """Error raised when the request syntax is invalid or the method is unsupported in general."""
+
+
+class UnauthorizedError(StationControlError):
+    """Error raised when the user is not authorized."""
+
+
+class ForbiddenError(StationControlError):
+    """Error raised when the operation is forbidden for the user."""
+
+
+class NotFoundError(StationControlError):
+    """Error raised when nothing was found with the given parameters.
+
+    This should be used when it's expected that something is found, for example when trying to find with an exact ID.
+    """
+
+
+class ValidationError(StationControlError):
+    """Error raised when something is unprocessable in general, for example if the input value is not acceptable."""
+
+
+class InternalServerError(StationControlError):
+    """Error raised when an unexpected error happened on the server side.
+
+    This error should never be raised when something expected happens,
+    and whenever the client encounters this, it should be considered as a server bug.
+    """
+
+
+class ServiceUnavailableError(StationControlError):
+    """Error raised when the service is unavailable."""
+
+
+ERROR_TO_STATUS_CODE_MAPPING = {
+    BadRequestError: HTTPStatus.BAD_REQUEST,  # 400
+    UnauthorizedError: HTTPStatus.UNAUTHORIZED,  # 401
+    ForbiddenError: HTTPStatus.FORBIDDEN,  # 403
+    NotFoundError: HTTPStatus.NOT_FOUND,  # 404
+    ValidationError: HTTPStatus.UNPROCESSABLE_ENTITY,  # 422
+    InternalServerError: HTTPStatus.INTERNAL_SERVER_ERROR,  # 500
+    ServiceUnavailableError: HTTPStatus.SERVICE_UNAVAILABLE,  # 503
+}
+
+STATUS_CODE_TO_ERROR_MAPPING = {value: key for key, value in ERROR_TO_STATUS_CODE_MAPPING.items()}

exa/common/qcm_data/qcm_data_client.py

@@ -24,7 +24,8 @@ from typing import Any
 from packaging.version import Version
 import requests
 
-from exa.common.errors.exa_error import ExaError, RequestError
+from exa.common.errors.exa_error import ExaError
+from exa.common.errors.server_errors import NotFoundError, ValidationError
 from exa.common.qcm_data.file_adapter import FileAdapter
 
 MIN_SUPPORTED_CONTENT_FORMAT_VERSION = Version("1.0")
@@ -70,10 +71,7 @@ class QCMDataClient:
 
     @root_url.setter
     def root_url(self, root_url: str) -> None:
-        """Sets the remote QCM Data service URL.
-
-        Cache for :func:`get_chad` has to be reset when the URL changes.
-        """
+        """Sets the remote QCM Data service URL."""
         if self._root_url != root_url:
             self._root_url = root_url
 
@@ -90,14 +88,14 @@ class QCMDataClient:
         url_tail = f"/cheddars/{chip_label}?target=in-house"
         try:
             response = self._send_request(self.session.get, f"{self.root_url}{url_tail}")
-        except RequestError as err:
+        except NotFoundError as err:
             if self._fallback_root_url:
                 response = self._send_request(self.session.get, f"{self._fallback_root_url}{url_tail}")
             else:
                 raise err
         data = response.json().get("data")
         if not data:
-            raise RequestError(f"Chip design record for {chip_label} does not contain data.")
+            raise ValidationError(f"Chip design record for {chip_label} does not contain data.")
         self._validate_chip_design_record(data, chip_label)
         return data
 
@@ -113,7 +111,7 @@ class QCMDataClient:
                 error_message = response_dict["detail"]
             except json.JSONDecodeError:
                 error_message = response.text
-            raise RequestError(f"{url} returned error code {response.status_code}: {error_message}")
+            raise NotFoundError(error_message)
         return response
 
     @staticmethod

{iqm_exa_common-26.2.dist-info → iqm_exa_common-26.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-exa-common
-Version: 26.2
+Version: 26.4
 Summary: Framework for control and measurement of superconducting qubits: common library
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License: Apache License

{iqm_exa_common-26.2.dist-info → iqm_exa_common-26.4.dist-info}/RECORD

@@ -24,13 +24,14 @@ exa/common/control/sweep/option/start_stop_base_options.py,sha256=hZCIflh8NzK48c
 exa/common/control/sweep/option/start_stop_options.py,sha256=HaQFNlhRPep2yrn_LuOkuZ0imwBEidpD0BTPWf-Svf4,3038
 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=WWbQk5-9coz3qj4IzkEKvIkdcwHISi7XPb14K7ZTPHg,1936
-exa/common/data/parameter.py,sha256=uUMyVt4wfKkwehd9CHbBPOGQ_PSnlI06pNMPjBySDGs,22999
+exa/common/data/base_model.py,sha256=A008Gn4cVQloiCWqJOGal5C1vq_ItyOWXnFvZcHPsuc,1785
+exa/common/data/parameter.py,sha256=oPeFy_YGfbioGd6EQfzLkp01ACs8BeEULVBQgM89k-Q,22918
 exa/common/data/setting_node.py,sha256=WldawevXuOb2uN-bjZ04hWijKqX_MOdkyMsgxOZbrek,43190
 exa/common/data/settingnode_v2.html.jinja2,sha256=mo-rlLLmU-Xxf6znJAisispAZK8sbV-2C13byKAtj_Q,3166
-exa/common/data/value.py,sha256=etAYhIKyRmy30uzSd7MpzUhGhvCXcfhMq-PPteG8EcY,1893
+exa/common/data/value.py,sha256=mtMws5UPGx1pCADK6Q2Tx4BwCXznvVRSNQRfcQ3NMmY,1853
 exa/common/errors/__init__.py,sha256=ArMBdpmx1EUenBpzrSNG63kmUf7PM0gCqSYnaCnL9Qk,597
-exa/common/errors/exa_error.py,sha256=eB_c-Qp1OchcBMr3LSyYitity4SochQh-nAghZmGLJU,975
+exa/common/errors/exa_error.py,sha256=J8Tew1ORSrhhLn2hPfEq1mISUycHKnqTq1ZWphPW4mE,884
+exa/common/errors/server_errors.py,sha256=4BLTUtlJRLTyR1mW2b_mAtkj90UCNZ8pS8-p_SWWfYM,2810
 exa/common/helpers/__init__.py,sha256=IgtVD3tojIFA4MTV2mT5uYM6jb2qny9kBIIhEZT2PuI,610
 exa/common/helpers/data_helper.py,sha256=vhzJ63g1S2JqnCj0WJJuqWcuiIwKATnQeHdWw_3gkZg,1934
 exa/common/helpers/json_helper.py,sha256=VTcYU8FRgv3tXPifuogUWmVAzt_4JoQ_laTHolyodtA,2672
@@ -43,12 +44,12 @@ exa/common/qcm_data/chad_model.py,sha256=MQ1xuRODOA6uzb3GJ4fgYx9cXS8z1DeRGw6HYKA
 exa/common/qcm_data/chip_topology.py,sha256=OJU8-CXV7wfdxrn0HqryNZmxGRoffrg0vi0aMaiYbbY,19328
 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=tuNEosERVjtGYEq7RWaBzxST7OvRAWxN-VRYmhJLLN8,6094
+exa/common/qcm_data/qcm_data_client.py,sha256=0clAbZ3HPBH9lFOe8cVmaq8hPHG5m3pyPG4O6EI97Kk,6022
 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.2.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
-iqm_exa_common-26.2.dist-info/METADATA,sha256=1FCjQmlvRiroZkS0XkBlj58DYjZNaQgke19qR1_2JK8,14548
-iqm_exa_common-26.2.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_exa_common-26.2.dist-info/top_level.txt,sha256=Clphg2toaZ3_jSFRPhjMNEmLurkMNMc4lkK2EFYsSlM,4
-iqm_exa_common-26.2.dist-info/RECORD,,
+iqm_exa_common-26.4.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
+iqm_exa_common-26.4.dist-info/METADATA,sha256=am6t-uFa9XTRZ-sPyfDbq0_-JMZselY8tyE85wfLIRA,14548
+iqm_exa_common-26.4.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_exa_common-26.4.dist-info/top_level.txt,sha256=Clphg2toaZ3_jSFRPhjMNEmLurkMNMc4lkK2EFYsSlM,4
+iqm_exa_common-26.4.dist-info/RECORD,,