pyglaze 0.4.1__py3-none-any.whl → 0.4.5__py3-none-any.whl

pyglaze/__init__.py

@@ -1 +1 @@
-__version__ = "0.4.1"
+__version__ = "0.4.5"

pyglaze/datamodels/pulse.py

@@ -174,7 +174,7 @@ class Pulse:
         """
         extrema = [scan._get_min_or_max_idx(wrt_max=wrt_max) for scan in scans]  # noqa: SLF001
         n_before = min(extrema)
-        n_after = min(len(scan) - index - 1 for scan, index in zip(scans, extrema))
+        n_after = min(len(scan) - index for scan, index in zip(scans, extrema))
         roughly_aligned = [
             cls._from_slice(scan, slice(index - n_before, index + n_after))
             for index, scan in zip(extrema, scans)

pyglaze/device/ampcom.py

@@ -15,6 +15,8 @@ from bitstring import BitArray
 from serial import serialutil
 
 from pyglaze.device.configuration import (
+    BYTES_PER_CHANNEL,
+    N_CHANNELS,
     DeviceConfiguration,
     Interval,
     LeDeviceConfiguration,
@@ -78,7 +80,7 @@ class _LeAmpCom:
 
         We expect to receive 3 arrays of floats (delays, X and Y), each with self.scanning_points elements.
         """
-        return self.scanning_points * 12
+        return self.scanning_points * N_CHANNELS * BYTES_PER_CHANNEL
 
     @property
     def serial_number_bytes(self: _LeAmpCom) -> int:
@@ -150,9 +152,11 @@ class _LeAmpCom:
         angle = np.arctan2(np.array(Ys), np.array(Xs))
         return r, np.rad2deg(angle)
 
-    def _encode_send_response(self: _LeAmpCom, command: str) -> str:
+    def _encode_send_response(
+        self: _LeAmpCom, command: str, *, check_ack: bool = True
+    ) -> str:
         self._encode_and_send(command)
-        return self._get_response(command)
+        return self._get_response(command, check_ack=check_ack)
 
     def _encode_and_send(self: _LeAmpCom, command: str) -> None:
         self.__ser.write(command.encode(self.ENCODING))
@@ -180,13 +184,13 @@ class _LeAmpCom:
     @_BackoffRetry(
         backoff_base=1e-2, max_tries=3, logger=logging.getLogger(LOGGER_NAME)
     )
-    def _get_response(self: _LeAmpCom, command: str) -> str:
+    def _get_response(self: _LeAmpCom, command: str, *, check_ack: bool = True) -> str:
         response = self.__ser.read_until().decode(self.ENCODING).strip()
 
         if len(response) == 0:
             msg = f"Command: '{command}'. Empty response received"
             raise serialutil.SerialException(msg)
-        if response[: len(self.OK_RESPONSE)] != self.OK_RESPONSE:
+        if check_ack and response[: len(self.OK_RESPONSE)] != self.OK_RESPONSE:
             msg = f"Command: '{command}'. Expected response '{self.OK_RESPONSE}', received: '{response}'"
             raise DeviceComError(msg)
         return response
@@ -220,13 +224,14 @@ class _LeAmpCom:
         ]
 
     def _get_status(self: _LeAmpCom) -> _LeStatus:
-        msg = self._encode_send_response(self.STATUS_COMMAND)
-        if msg == _LeStatus.SCANNING.value:
+        response = self._encode_send_response(self.STATUS_COMMAND, check_ack=False)
+
+        if response == _LeStatus.SCANNING.value:
             return _LeStatus.SCANNING
-        if msg == _LeStatus.IDLE.value:
+        if response == _LeStatus.IDLE.value:
             return _LeStatus.IDLE
-        msg = f"Unknown status: {msg}"
-        raise ValueError(msg)
+        msg = f"Unknown status: {response}"
+        raise DeviceComError(msg)
 
 
 class _LeStatus(Enum):
@@ -238,8 +243,8 @@ def _serial_factory(config: DeviceConfiguration) -> serial.Serial | LeMockDevice
     if "mock_device" in config.amp_port:
         return _mock_device_factory(config)
 
-    return serial.Serial(
-        port=config.amp_port,
+    return serial.serial_for_url(
+        url=config.amp_port,
         baudrate=config.amp_baudrate,
         timeout=config.amp_timeout_seconds,
     )

pyglaze/device/configuration.py

@@ -11,6 +11,14 @@ if TYPE_CHECKING:
 T = TypeVar("T", bound="DeviceConfiguration")
 
 
+# Serial protocol constants for timeout calculation
+SERIAL_BITS_PER_BYTE = 10  # 8 data bits + start + stop bits
+N_CHANNELS = 3  # delays, X, Y arrays transmitted
+BYTES_PER_CHANNEL = 4  # 32-bit float = 4 bytes
+TIMEOUT_SAFETY_FACTOR = 2.5  # Safety multiplier for network/processing delays
+TIMEOUT_BASELINE_S = 0.05  # Fixed additive latency
+
+
 @dataclass
 class Interval:
     """An interval with a lower and upper bounds between 0 and 1 to scan."""
@@ -50,9 +58,10 @@ class Interval:
 class DeviceConfiguration(ABC):
     """Base class for device configurations."""
 
-    amp_timeout_seconds: float
+    amp_timeout_seconds: float | None
     amp_port: str
     amp_baudrate: ClassVar[int]
+    n_points: int
 
     @property
     @abstractmethod
@@ -92,11 +101,22 @@ class LeDeviceConfiguration(DeviceConfiguration):
     n_points: int = 1000
     scan_intervals: list[Interval] = field(default_factory=lambda: [Interval(0.0, 1.0)])
     integration_periods: int = 10
-    amp_timeout_seconds: float = 0.2
+    amp_timeout_seconds: float | None = None
     modulation_frequency: int = 10000  # Hz
 
     amp_baudrate: ClassVar[int] = 1000000  # bit/s
 
+    def __post_init__(self: LeDeviceConfiguration) -> None:
+        """Calculate dynamic timeout if not explicitly set."""
+        if self.amp_timeout_seconds is None:
+            # Calculate timeout based on data transfer requirements
+            bytes_to_receive = self.n_points * N_CHANNELS * BYTES_PER_CHANNEL
+            bits_to_transfer = bytes_to_receive * SERIAL_BITS_PER_BYTE
+            transfer_time = bits_to_transfer / self.amp_baudrate
+            self.amp_timeout_seconds = (
+                transfer_time + TIMEOUT_BASELINE_S
+            ) * TIMEOUT_SAFETY_FACTOR
+
     @property
     def _sweep_length_ms(self: LeDeviceConfiguration) -> float:
         return self.n_points * self._time_constant_ms

pyglaze/devtools/mock_device.py

@@ -154,6 +154,8 @@ class LeMockDevice(MockDevice):
             self._scan_start_time = time.time()
         elif msg == "R":
             self._scan_has_finished()
+        elif msg == "H":
+            self.state = _LeMockState.RECEIVED_STATUS_REQUEST
         elif msg == "s":
             self.state = _LeMockState.RECEIVED_SERIAL_NUMBER_REQUEST
         elif msg == "v":

{pyglaze-0.4.1.dist-info → pyglaze-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyglaze
-Version: 0.4.1
+Version: 0.4.5
 Summary: Pyglaze is a library used to operate the devices of Glaze Technologies
 Author: GLAZE Technologies ApS
 License: BSD 3-Clause License

{pyglaze-0.4.1.dist-info → pyglaze-0.4.5.dist-info}/RECORD

@@ -1,13 +1,13 @@
-pyglaze/__init__.py,sha256=pMtTmSUht-XtbR_7Doz6bsQqopJJd8rZ8I8zy2HwwoA,22
+pyglaze/__init__.py,sha256=ErkLkI2TDBX1OIqi2GGa20CPeu4ZculEi-XffRbLU6M,22
 pyglaze/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyglaze/datamodels/__init__.py,sha256=DJLByl2C7pC4RM4Uh6PW-McM5RIGBjcopzGywCKhSlI,111
-pyglaze/datamodels/pulse.py,sha256=QeVw_GYe9BuEvwr7A40pC23ZFx3rgR-soYqu3vm58DE,23192
+pyglaze/datamodels/pulse.py,sha256=ZGYJTZCVEx-KkjJdHHexbdAlzXfOMIA1KtsaADQ-qCg,23188
 pyglaze/datamodels/waveform.py,sha256=T0wV7saJNPowwQs518VLypul-p1bg_1REPTflw8UNzM,5810
 pyglaze/device/__init__.py,sha256=rxF1h54dHTwq5JVvLjxDeirY4njMfr8c9qs0yJ5GRhE,119
-pyglaze/device/ampcom.py,sha256=ecnkrMI1wFatTvPQjlZ5LTG2xkrTLIVkOw1hU_Hojso,10714
-pyglaze/device/configuration.py,sha256=YmIOWY-K1ixSWZgrpEElE7zBVr4EbFWtPIZ0sRn4RpU,4899
+pyglaze/device/ampcom.py,sha256=0SO4SpFu-bjHN_8hObp-jHUTb3a-r_Op74-_AssZGyc,10933
+pyglaze/device/configuration.py,sha256=CKi7wgE1OKPNOf0OXdb-Gq7kaY5rFDZJo7jEA4xC-CY,5857
 pyglaze/devtools/__init__.py,sha256=9EW20idoaZv_5GuSgDmfpTPjfCZ-Rl27EV3oJebmwnQ,90
-pyglaze/devtools/mock_device.py,sha256=B-CF5ZG1GZ5P_6LwtURbx9lysbm-nCgtRl43FBJCg6k,9880
+pyglaze/devtools/mock_device.py,sha256=H4aItDp9NPbgXr0OiHJm8LUX94cLvdltoLWGH38vATQ,9967
 pyglaze/devtools/thz_pulse.py,sha256=WUAz3QTdw_ak0yVyU1zzABrqyCzWhUFRUHP5K_i3ppU,963
 pyglaze/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyglaze/helpers/_types.py,sha256=p9xSAP5Trr1FcCWl7ynCWqDOUZKgMQYzMUXSwDpAKHg,599
@@ -19,8 +19,8 @@ pyglaze/scanning/_asyncscanner.py,sha256=cS-XOGWaFsYJ5ShkchyHQo8HtPCADGEGnf-isHx
 pyglaze/scanning/_exceptions.py,sha256=vS28Dijj76jVuF6cSDBKqM9SQIa9rbIyUaHF-RA3PyM,213
 pyglaze/scanning/client.py,sha256=xgsZLRFVe_rcLQD7AIcztKZ_wY6mp3v4ID3Zq40SbP0,2459
 pyglaze/scanning/scanner.py,sha256=69Bawx3m6toHH3bhHSRduVN527-aeveFI9l6WcaKWs8,7712
-pyglaze-0.4.1.dist-info/licenses/LICENSE,sha256=LCP3sGBX7LxuQopcjeug1fW4tngWCHF4zB7QCgB28xM,1504
-pyglaze-0.4.1.dist-info/METADATA,sha256=bcQPzXT80qllfMgwMU-yXoob8RSdNaDzQ1xnBnwBTfs,3508
-pyglaze-0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyglaze-0.4.1.dist-info/top_level.txt,sha256=X7d5rqVVuWNmtK4-Uh4sgOLlqye8vaHZOr5RYba0REo,8
-pyglaze-0.4.1.dist-info/RECORD,,
+pyglaze-0.4.5.dist-info/licenses/LICENSE,sha256=LCP3sGBX7LxuQopcjeug1fW4tngWCHF4zB7QCgB28xM,1504
+pyglaze-0.4.5.dist-info/METADATA,sha256=3mg1CyUifbIFnE5aS_6u31sFDjEcIFq2Ys9GoTHPA9E,3508
+pyglaze-0.4.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyglaze-0.4.5.dist-info/top_level.txt,sha256=X7d5rqVVuWNmtK4-Uh4sgOLlqye8vaHZOr5RYba0REo,8
+pyglaze-0.4.5.dist-info/RECORD,,