iqm-exa-common 26.10__tar.gz → 26.12__tar.gz

{iqm_exa_common-26.10 → iqm_exa_common-26.12}/CHANGELOG.rst

@@ -2,6 +2,24 @@
 Changelog
 =========
 
+Version 26.12 (2025-04-10)
+==========================
+
+Features
+--------
+
+- Fix vulnerability issue with YAML loading, use safe_load to avoid potential harmful remote code execution.
+  :issue:`SW-1378`
+
+Version 26.11 (2025-04-07)
+==========================
+
+Features
+--------
+
+- Add new error class ConflictError designed for client-server communication via station control client.
+  :issue:`SW-1361`
+
 Version 26.10 (2025-04-07)
 ==========================
 

{iqm_exa_common-26.10/src/iqm_exa_common.egg-info → iqm_exa_common-26.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-exa-common
-Version: 26.10
+Version: 26.12
 Summary: Framework for control and measurement of superconducting qubits: common library
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License:                                  Apache License
@@ -219,6 +219,8 @@ Requires-Dist: pydantic<3.0,>=2.10.4
 Requires-Dist: python-dotenv==0.21.1
 Requires-Dist: xarray==2024.10.0
 Requires-Dist: requests==2.32.3
+Requires-Dist: ruamel-yaml==0.17.32
+Requires-Dist: ruamel-yaml-clib==0.2.8
 
 EXA-common
 ==========

{iqm_exa_common-26.10 → iqm_exa_common-26.12}/requirements/base.in

@@ -4,3 +4,5 @@ pydantic >= 2.10.4, < 3.0
 python-dotenv == 0.21.1
 xarray == 2024.10.0
 requests == 2.32.3
+ruamel-yaml==0.17.32
+ruamel-yaml-clib==0.2.8

{iqm_exa_common-26.10 → iqm_exa_common-26.12}/requirements/base.txt

@@ -3,4 +3,6 @@ numpy >= 1.25.2, < 3.0
 pydantic >= 2.10.4, < 3.0
 python-dotenv == 0.21.1
 xarray == 2024.10.0
-requests == 2.32.3
+requests == 2.32.3
+ruamel-yaml==0.17.32
+ruamel-yaml-clib==0.2.8

{iqm_exa_common-26.10 → iqm_exa_common-26.12}/src/exa/common/errors/server_errors.py

@@ -45,6 +45,13 @@ class NotFoundError(StationControlError):
     """
 
 
+class ConflictError(StationControlError):
+    """This error happens when there is a conflict with the current state of the resource.
+
+    For example, when doing duplicate submissions for the same unique data.
+    """
+
+
 class ValidationError(StationControlError):
     """Error raised when something is unprocessable in general, for example if the input value is not acceptable."""
 
@@ -66,6 +73,7 @@ ERROR_TO_STATUS_CODE_MAPPING = {
     UnauthorizedError: HTTPStatus.UNAUTHORIZED,  # 401
     ForbiddenError: HTTPStatus.FORBIDDEN,  # 403
     NotFoundError: HTTPStatus.NOT_FOUND,  # 404
+    ConflictError: HTTPStatus.CONFLICT,  # 409
     ValidationError: HTTPStatus.UNPROCESSABLE_ENTITY,  # 422
     InternalServerError: HTTPStatus.INTERNAL_SERVER_ERROR,  # 500
     ServiceUnavailableError: HTTPStatus.SERVICE_UNAVAILABLE,  # 503

iqm_exa_common-26.12/src/exa/common/helpers/yaml_helper.py

@@ -0,0 +1,43 @@
+#  ********************************************************************************
+#    _____  ____ _
+#   / _ \ \/ / _` |  Framework for control
+#  |  __/>  < (_| |  and measurement of
+#   \___/_/\_\__,_|  superconducting qubits
+#
+#  Copyright (c) 2019-2025 IQM Finland Oy.
+#  All rights reserved. Confidential and proprietary.
+#
+#  Distribution or reproduction of any information contained herein
+#  is prohibited without IQM Finland Oy’s prior written permission.
+#  ********************************************************************************
+"""YAML utilities."""
+
+import logging
+from pathlib import Path
+from typing import Any
+
+from ruamel.yaml import YAML, YAMLError
+
+logger = logging.getLogger(__name__)
+yaml = YAML(typ="safe", pure=True)
+
+
+def load_yaml(path: Path | str) -> dict[str, Any]:
+    """Load a YAML file from the given path and raise error if the file can't be loaded."""
+    path = path if isinstance(path, Path) else Path(path)
+    with path.open(encoding="utf-8") as file:
+        try:
+            data = yaml.load(file)
+        except YAMLError as err:
+            raise ValueError(f"Failed to load YAML file from {path}.") from err
+    logger.debug("Loaded a YAML file from %s.", path)
+    return data
+
+
+def dump_yaml(data: dict[str, Any], path: Path | str) -> None:
+    """Dump a YAML data to the given path. Create missing directories if necessary."""
+    path = path if isinstance(path, Path) else Path(path)
+    path.parent.mkdir(parents=True, exist_ok=True)
+    with path.open("w", encoding="utf-8") as file:
+        yaml.dump(data, file)
+    logger.debug("Saved a YAML file to %s.", path)

{iqm_exa_common-26.10 → iqm_exa_common-26.12/src/iqm_exa_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-exa-common
-Version: 26.10
+Version: 26.12
 Summary: Framework for control and measurement of superconducting qubits: common library
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License:                                  Apache License
@@ -219,6 +219,8 @@ Requires-Dist: pydantic<3.0,>=2.10.4
 Requires-Dist: python-dotenv==0.21.1
 Requires-Dist: xarray==2024.10.0
 Requires-Dist: requests==2.32.3
+Requires-Dist: ruamel-yaml==0.17.32
+Requires-Dist: ruamel-yaml-clib==0.2.8
 
 EXA-common
 ==========

{iqm_exa_common-26.10 → iqm_exa_common-26.12}/src/iqm_exa_common.egg-info/SOURCES.txt

@@ -59,6 +59,7 @@ src/exa/common/helpers/deprecation.py
 src/exa/common/helpers/json_helper.py
 src/exa/common/helpers/numpy_helper.py
 src/exa/common/helpers/software_version_helper.py
+src/exa/common/helpers/yaml_helper.py
 src/exa/common/logger/__init__.py
 src/exa/common/logger/logger.py
 src/exa/common/qcm_data/__init__.py

{iqm_exa_common-26.10 → iqm_exa_common-26.12}/src/iqm_exa_common.egg-info/requires.txt

@@ -4,3 +4,5 @@ pydantic<3.0,>=2.10.4
 python-dotenv==0.21.1
 xarray==2024.10.0
 requests==2.32.3
+ruamel-yaml==0.17.32
+ruamel-yaml-clib==0.2.8

iqm_exa_common-26.12/version.txt

@@ -0,0 +1 @@
+26.12

iqm_exa_common-26.10/version.txt

@@ -1 +0,0 @@
-26.10