horiba-sdk 0.6.0__tar.gz → 0.7.0__tar.gz

{horiba_sdk-0.6.0 → horiba_sdk-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: horiba-sdk
-Version: 0.6.0
+Version: 0.7.0
 Summary: 'horiba-sdk' is a package that provides source code for the development with Horiba devices
 Home-page: https://github.com/ThatsTheEnd/horiba-python-sdk
 License: MIT

{horiba_sdk-0.6.0 → horiba_sdk-0.7.0}/horiba_sdk/communication/messages.py

@@ -1,6 +1,6 @@
 import json
 from itertools import count
-from typing import Any, Dict, List, Optional, Union, final
+from typing import Any, Optional, Union, final
 
 
 class Command:
@@ -21,7 +21,7 @@ class Command:
 
     _id_counter = count(start=1)  # Starts counting from 1
 
-    def __init__(self, command: str, parameters: Dict[str, Any]):
+    def __init__(self, command: str, parameters: dict[str, Any]):
         self.id = next(self._id_counter)  # Automatically assigns the next unique ID
         self.command = command
         self.parameters = parameters
@@ -44,9 +44,10 @@ class Response:
 
     def __init__(
         self,
-        id: int, command: str, 
-        results: Optional[Union[Dict[str, Any], Any]] = None, 
-        errors: Optional[List[str]] = None
+        id: int,
+        command: str,
+        results: Optional[Union[dict[str, Any], Any]] = None,
+        errors: Optional[list[str]] = None,
     ):
         self.id = id
         self.command = command

{horiba_sdk-0.6.0 → horiba_sdk-0.7.0}/horiba_sdk/core/acquisition_format.py

@@ -14,7 +14,6 @@ class AcquisitionFormat(Enum):
 
     """
 
-    SPECTRA = 0
-    IMAGE = 1
+    SPECTRA_IMAGE = 1
     CROP = 2
     FAST_KINETICS = 3

{horiba_sdk-0.6.0 → horiba_sdk-0.7.0}/horiba_sdk/core/stitching/__init__.py

@@ -3,4 +3,4 @@ from .simple_cut_spectra_stitch import SimpleCutSpectraStitch
 from .spectra_stitch import SpectraStitch
 from .y_displacement_spectra_stitch import YDisplacementSpectraStitch
 
-__all__ = ['LinearSpectraStitch', 'SimpleCutSpectraStitch', 'YDisplacementSpectraStitch', 'SpectraStitch']
+__all__ = ['LinearSpectraStitch', 'SimpleCutSpectraStitch', 'YDisplacementSpectraStitch', 'SpectraStitch']

{horiba_sdk-0.6.0 → horiba_sdk-0.7.0}/horiba_sdk/core/stitching/linear_spectra_stitch.py

@@ -1,4 +1,4 @@
-from typing import Any, List
+from typing import Any
 
 from loguru import logger
 from numpy import argsort, array, concatenate, dtype, interp, ndarray
@@ -10,7 +10,7 @@ from horiba_sdk.core.stitching.spectra_stitch import SpectraStitch
 class LinearSpectraStitch(SpectraStitch):
     """Stitches a list of spectra using a linear model"""
 
-    def __init__(self, spectra_list: List[List[List[float]]]) -> None:
+    def __init__(self, spectra_list: list[list[list[float]]]) -> None:
         """Constructs a linear stitch of spectra.
 
         .. warning:: The spectra in the list must overlap
@@ -24,7 +24,7 @@ class LinearSpectraStitch(SpectraStitch):
         for i in range(1, len(spectra_list)):
             stitched_spectrum = self._stitch_spectra(stitched_spectrum, spectra_list[i])
 
-        self._stitched_spectrum: List[List[float]] = stitched_spectrum
+        self._stitched_spectrum: list[list[float]] = stitched_spectrum
 
     @override
     def stitch_with(self, other_stitch: SpectraStitch) -> SpectraStitch:
@@ -48,7 +48,7 @@ class LinearSpectraStitch(SpectraStitch):
         """
         return self._stitched_spectrum
 
-    def _stitch_spectra(self, spectrum1: List[List[float]], spectrum2: List[List[float]]) -> List[List[float]]:
+    def _stitch_spectra(self, spectrum1: list[list[float]], spectrum2: list[list[float]]) -> list[list[float]]:
         fx1 = spectrum1[0]
         fy1 = spectrum1[1][0]
         fx2 = spectrum2[0]
@@ -77,9 +77,9 @@ class LinearSpectraStitch(SpectraStitch):
         overlap_start = max(x1_min, x2_min)
         overlap_end = min(x1_max, x2_max)
 
-        logger.debug(f"Spectrum 1 range: {x1_min} to {x1_max}")
-        logger.debug(f"Spectrum 2 range: {x2_min} to {x2_max}")
-        logger.debug(f"Overlap region: {overlap_start} to {overlap_end}")
+        logger.debug(f'Spectrum 1 range: {x1_min} to {x1_max}')
+        logger.debug(f'Spectrum 2 range: {x2_min} to {x2_max}')
+        logger.debug(f'Overlap region: {overlap_start} to {overlap_end}')
 
         if overlap_start >= overlap_end:
             logger.error(f'No overlap between spectra: [{x1_min}, {x1_max}] and [{x2_min}, {x2_max}]')

{horiba_sdk-0.6.0 → horiba_sdk-0.7.0}/horiba_sdk/devices/device_manager.py

@@ -67,7 +67,7 @@ class DeviceManager(AbstractDeviceManager):
         icl_ip: str = '127.0.0.1',
         icl_port: str = '25010',
         enable_binary_messages: bool = True,
-        enable_logging: bool = False
+        enable_logging: bool = False,
     ):
         """
         Initializes the DeviceManager with the specified communicator class.
@@ -82,7 +82,7 @@ class DeviceManager(AbstractDeviceManager):
         # By default, logging is disabled for a library, so if desired it can be enabled
         root_name_space: str = __name__.split('.')[0]
         if enable_logging:
-            logger.info(f"Initializing logger for namespace: {root_name_space}")
+            logger.info(f'Initializing logger for namespace: {root_name_space}')
             logger.enable(root_name_space)
         else:
             logger.disable(root_name_space)
@@ -232,9 +232,7 @@ class DeviceManager(AbstractDeviceManager):
         await monochromators_discovery.execute(error_on_no_device)
         self._monochromators = monochromators_discovery.monochromators()
 
-        spectracq3_discovery: SpectrAcq3Discovery = SpectrAcq3Discovery(
-            self._icl_communicator, self._icl_error_db
-        )
+        spectracq3_discovery: SpectrAcq3Discovery = SpectrAcq3Discovery(self._icl_communicator, self._icl_error_db)
         await spectracq3_discovery.execute(error_on_no_device)
         self._spectracq3_devices = spectracq3_discovery.spectracq3_devices()
 

{horiba_sdk-0.6.0 → horiba_sdk-0.7.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "horiba-sdk"
-version = "0.6.0"
+version = "0.7.0"
 description = "'horiba-sdk' is a package that provides source code for the development with Horiba devices"
 readme = "README.md"
 authors = ["ZühlkeEngineering <nikolaus.naredi-rainer@zuehlke.com>"]