keithley-tempcontrol 0.17.0__tar.gz → 0.17.1__tar.gz

{keithley_tempcontrol-0.17.0 → keithley_tempcontrol-0.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: keithley-tempcontrol
-Version: 0.17.0
+Version: 0.17.1
 Summary: Keithley Temperature Control for CGSE
 Author: IvS KU Leuven
 Maintainer-email: Rik Huygen <rik.huygen@kuleuven.be>, Sara Regibo <sara.regibo@kuleuven.be>

{keithley_tempcontrol-0.17.0 → keithley_tempcontrol-0.17.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "keithley-tempcontrol"
-version = "0.17.0"
+version = "0.17.1"
 description = "Keithley Temperature Control for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{keithley_tempcontrol-0.17.0 → keithley_tempcontrol-0.17.1}/src/egse/tempcontrol/keithley/daq6510_cs.py

@@ -166,6 +166,7 @@ def start():
 
     with remote_logging():
         from egse.env import setup_env
+
         setup_env()
 
         try:
@@ -198,6 +199,7 @@ def stop():
     multiprocessing.current_process().name = "daq6510_cs (stop)"
 
     from egse.env import setup_env
+
     setup_env()
 
     try:
@@ -217,6 +219,7 @@ def status():
     multiprocessing.current_process().name = "daq6510_cs (status)"
 
     from egse.env import setup_env
+
     setup_env()
 
     endpoint = get_endpoint(SERVICE_TYPE, PROTOCOL, HOSTNAME, COMMANDING_PORT)

{keithley_tempcontrol-0.17.0 → keithley_tempcontrol-0.17.1}/src/egse/tempcontrol/keithley/daq6510_dev.py

@@ -23,6 +23,9 @@ DEV_HOST = dev_settings.get("HOSTNAME")
 DEV_PORT = dev_settings.get("PORT")
 READ_TIMEOUT = dev_settings.get("TIMEOUT")  # [s], can be smaller than timeout (for DAQ6510Proxy) (e.g. 1s)
 
+SEPARATOR = b"\n"
+SEPARATOR_STR = SEPARATOR.decode()
+
 
 class DAQ6510Command(ClientServerCommand):
     def get_cmd_string(self, *args, **kwargs) -> str:
@@ -36,7 +39,7 @@ class DAQ6510Command(ClientServerCommand):
         """
 
         out = super().get_cmd_string(*args, **kwargs)
-        return out + "\n"
+        return out + SEPARATOR_STR
 
 
 class DAQ6510(DeviceInterface, DeviceTransport):
@@ -107,6 +110,8 @@ class DAQ6510(DeviceInterface, DeviceTransport):
                 logger.debug(f"Sending {cmd}...")
                 self.write(cmd)
 
+        return responses
+
     def is_simulator(self) -> bool:
         return False
 
@@ -243,7 +248,7 @@ class DAQ6510(DeviceInterface, DeviceTransport):
         """
 
         try:
-            command += "\n" if not command.endswith("\n") else ""
+            command += SEPARATOR_STR if not command.endswith(SEPARATOR_STR) else ""
 
             self._sock.sendall(command.encode())
 
@@ -258,7 +263,7 @@ class DAQ6510(DeviceInterface, DeviceTransport):
                 raise DeviceConnectionError(DEVICE_NAME, msg)
             raise
 
-    def trans(self, command: str) -> str:
+    def trans(self, command: str) -> bytes:
         """Sends a single command to the device controller and block until a response from the controller.
 
         This is seen as a transaction.
@@ -277,7 +282,7 @@ class DAQ6510(DeviceInterface, DeviceTransport):
         try:
             # Attempt to send the complete command
 
-            command += "\n" if not command.endswith("\n") else ""
+            command += SEPARATOR_STR if not command.endswith(SEPARATOR_STR) else ""
 
             self._sock.sendall(command.encode())
 
@@ -323,10 +328,7 @@ class DAQ6510(DeviceInterface, DeviceTransport):
                     break
         except socket.timeout:
             logger.warning(f"Socket timeout error for {self.hostname}:{self.port}")
-            return b"\r\n"
-        except TimeoutError as exc:
-            logger.warning(f"Socket timeout error: {exc}")
-            return b"\r\n"
+            return SEPARATOR
         finally:
             self._sock.settimeout(saved_timeout)
 

{keithley_tempcontrol-0.17.0 → keithley_tempcontrol-0.17.1}/src/egse/tempcontrol/keithley/daq6510_sim.py

@@ -1,21 +1,23 @@
-from __future__ import annotations
-
 import contextlib
 import datetime
-import logging
 import re
 import socket
 import time
+from typing import Annotated
 
 import typer
+
+from egse.log import logging
 from egse.settings import Settings
 from egse.system import SignalCatcher
 
-logger = logging.getLogger("daq6510-sim")
+logger = logging.getLogger("egse.daq6510-sim")
 
 HOST = "localhost"
 DAQ_SETTINGS = Settings.load("Keithley DAQ6510")
 
+SEPARATOR = b"\n"
+SEPARATOR_STR = SEPARATOR.decode()
 
 device_time = datetime.datetime.now(datetime.timezone.utc)
 reference_time = device_time
@@ -79,7 +81,7 @@ COMMAND_PATTERNS_ACTIONS_RESPONSES = {
 
 
 def write(conn, response: str):
-    response = f"{response}\n".encode()
+    response = f"{response}{SEPARATOR_STR}".encode()
     logger.debug(f"write: {response = }")
     conn.sendall(response)
 
@@ -196,7 +198,7 @@ def run_simulator():
                     logger.info(f"{exc.__class__.__name__} caught: {exc.args}")
 
 
-def send_request(cmd: str, type_: str = "query"):
+def send_request(cmd: str, cmd_type: str = "query") -> str | None:
     from egse.tempcontrol.keithley.daq6510_dev import DAQ6510
 
     response = None
@@ -204,12 +206,12 @@ def send_request(cmd: str, type_: str = "query"):
     daq_dev = DAQ6510(hostname="localhost", port=5025)
     daq_dev.connect()
 
-    if type_.lower().strip() == "query":
+    if cmd_type.lower().strip() == "query":
         response = daq_dev.query(cmd)
-    elif type_.lower().strip() == "write":
+    elif cmd_type.lower().strip() == "write":
         daq_dev.write(cmd)
     else:
-        logger.info(f"Unknown type {type_} for send_request.")
+        logger.info(f"Unknown command type {cmd_type} for send_request.")
 
     daq_dev.disconnect()
 
@@ -234,15 +236,14 @@ def stop():
 
 
 @app.command()
-def command(type_: str, cmd: str):
-    response = send_request(cmd, type_)
+def command(
+    cmd: str,
+    cmd_type: Annotated[str, typer.Argument(help="either 'write', 'query'")] = "query",
+):
+    """Send an SCPI command directly to the simulator. The response will be in the log info."""
+    response = send_request(cmd, cmd_type)
     logger.info(f"{response}")
 
 
 if __name__ == "__main__":
-    logging.basicConfig(
-        level=logging.DEBUG,
-        format="%(asctime)s  %(threadName)-12s %(levelname)-8s %(name)-12s %(module)-20s %(message)s",
-    )
-
     app()