horiba-sdk 0.6.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

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/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/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/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/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.dist-info → horiba_sdk-0.7.0.dist-info}/METADATA

@@ -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.dist-info → horiba_sdk-0.7.0.dist-info}/RECORD

@@ -2,15 +2,15 @@ horiba_sdk/__init__.py,sha256=J8jCV90BJ2SCDFSpacDeAAsJa8PFqBUDpREOJeAgXug,679
 horiba_sdk/communication/__init__.py,sha256=nhS1rw1ZojM8zmRIx0VEFtYge0IH-B_L4zNBUNBJZYE,1564
 horiba_sdk/communication/abstract_communicator.py,sha256=E80dfOjrfuNay3W5jeSn4T2tUas6vygRcF46kSoP5j8,1498
 horiba_sdk/communication/communication_exception.py,sha256=d2ouOoVI6Q69_JL1bUEjjQOmjiO0CEm8K20WsaUuhB0,583
-horiba_sdk/communication/messages.py,sha256=NFwHD2UzIZx8htuUh7b75tjJ2bqgvuaKhJuXwHyoLZ8,2706
+horiba_sdk/communication/messages.py,sha256=7PCCkIpicq0CbN95nLoxIpsXlPd0c5lKbW92rn8h-6w,2701
 horiba_sdk/communication/websocket_communicator.py,sha256=IFP6dfuqiwGsNymPtT4Hqmii_8n2pO1Jv_k31GfrM8s,8331
 horiba_sdk/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-horiba_sdk/core/acquisition_format.py,sha256=pHcHZck75BbJ4nn2FOZ9cUXq9juZUjoNxKdLUhIIINI,358
+horiba_sdk/core/acquisition_format.py,sha256=CWyLgCotx60-vBAv6ZzMoCpKDXFtS43Q5reiKcYmF6U,350
 horiba_sdk/core/clean_count_mode.py,sha256=7guLd3eUV3Y2Cnj3w0JJ7ry74I8a6MFQiqbK5pTb3oU,185
 horiba_sdk/core/resolution.py,sha256=VOQonjPBqZ2TbtiNVDBT3TI1Aymj1pPYWMoobFaXjG8,1029
-horiba_sdk/core/stitching/__init__.py,sha256=pIafucQx6EuKVPWyvn4IIP6qf-FsNM7o9scKi3XE95g,336
+horiba_sdk/core/stitching/__init__.py,sha256=Ih8CHdb9VnoM1DHAO-T3w7IGxZHZqSlnI2AeAuJq7qc,337
 horiba_sdk/core/stitching/labspec6_spectra_stitch.py,sha256=8oc1DoEtnBhYaOXfLFQBBc12DEh_wRVDI_lu9ELnP6Q,3093
-horiba_sdk/core/stitching/linear_spectra_stitch.py,sha256=5ofmMUL7JFFsIO7dsn3AbJTlW7xVGRCQ5UEv48lh9QA,3974
+horiba_sdk/core/stitching/linear_spectra_stitch.py,sha256=epA2_pMlJVJ83oBn_4W1IWb3ImIzag61E2XrR-0MpCI,3968
 horiba_sdk/core/stitching/simple_cut_spectra_stitch.py,sha256=yMqy1T_GwViG4pBwZIDg557gFPR8qMhJv8v1-9eQnTY,2920
 horiba_sdk/core/stitching/spectra_stitch.py,sha256=Y63e4_sm2fU6GKYphopCWec1n29yMX-fDIyIrjKRuoc,447
 horiba_sdk/core/stitching/y_displacement_spectra_stitch.py,sha256=YA1RefdJCe5U22gkqQQNi5mLgZ4A7dZxBiezkP0FsAI,3189
@@ -21,7 +21,7 @@ horiba_sdk/devices/__init__.py,sha256=YYsJL2CSJwc2vsAjFQEKXjA5_QAnKlxSwlx32EgzFM
 horiba_sdk/devices/abstract_device_discovery.py,sha256=04ZCEB5IZkUuJxSisS78eW6lAQNXG4uaDoPv-eBccBA,178
 horiba_sdk/devices/abstract_device_manager.py,sha256=RXj5_pzFHpiolJe3ZfFsofwpD1hlwUMwYD1DyWMmlI0,1717
 horiba_sdk/devices/ccd_discovery.py,sha256=nGuskZ07Y9myI__dU8LeLnrNiJEBpGPby21EEwgSVUk,2376
-horiba_sdk/devices/device_manager.py,sha256=Sof-VEfmEhSJ0WmnT72IGC3XhTuLuznBVayV8bx20jQ,11569
+horiba_sdk/devices/device_manager.py,sha256=0C5qZK7ekZL7A68yXWiUHRYCVqQ1fjioL3861DP1gkY,11548
 horiba_sdk/devices/fake_device_manager.py,sha256=Tr4Z067smYfy-ya29PO4PK4EWF6Sa1R2UQFZCWfPePE,5015
 horiba_sdk/devices/fake_icl_server.py,sha256=aVmUZfBddz_w6HX2L6KS_9ei-a4SKtkh5Q8MuUV3szA,2757
 horiba_sdk/devices/fake_responses/ccd.json,sha256=sMg-UqU6W1I01n2kEbkFc5J0XF8E3JVdOjB-1MhufzM,17020
@@ -41,7 +41,7 @@ horiba_sdk/icl_error/abstract_error_db.py,sha256=IJ3wGb6DWxnY35VIUwZX0X80IPi5k4Q
 horiba_sdk/icl_error/error_list.json,sha256=wyDYZPeH2sYMRPoL-JBoDul4uaYvoqp7SJg0zypfl40,5977
 horiba_sdk/icl_error/icl_error.py,sha256=IElsKl5nvLjprIV_ub9MacJmdSS327iNwOXhSiJXTc0,755
 horiba_sdk/icl_error/icl_error_db.py,sha256=5Jbs_ZlMp8Bjr4u8reIxxfOSFYYkzWTfKIqOQ4oUSXQ,2603
-horiba_sdk-0.6.0.dist-info/LICENSE,sha256=JD-7TpNZoT7emooLwaTU9bJZbFbeM1ba90b8gpCYxzM,1083
-horiba_sdk-0.6.0.dist-info/METADATA,sha256=vE4RC5UDB0BpcldfDCLroIk4wjlWbJj3CuuH87gUTpc,14391
-horiba_sdk-0.6.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-horiba_sdk-0.6.0.dist-info/RECORD,,
+horiba_sdk-0.7.0.dist-info/LICENSE,sha256=JD-7TpNZoT7emooLwaTU9bJZbFbeM1ba90b8gpCYxzM,1083
+horiba_sdk-0.7.0.dist-info/METADATA,sha256=l-MRWVpfMYjW3dovj-kzSGahIZTe8mQsT5nxh1aaOfw,14391
+horiba_sdk-0.7.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+horiba_sdk-0.7.0.dist-info/RECORD,,