cgse 0.16.5__tar.gz → 0.16.6__tar.gz

{cgse-0.16.5 → cgse-0.16.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgse
-Version: 0.16.5
+Version: 0.16.6
 Summary: Generic Common-EGSE: Commanding and monitoring lab equipment
 Author: IvS KU Leuven
 Maintainer-email: Rik Huygen <rik.huygen@kuleuven.be>, Sara Regibo <sara.regibo@kuleuven.be>

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-common/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-common"
-version = "0.16.5"
+version = "0.16.6"
 description = "Software framework to support hardware testing"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-common/src/egse/signal.py

@@ -158,7 +158,7 @@ class FileBasedSignaling:
         """Terminate the monitoring loop thread."""
         self.running = False
         if self.thread.is_alive():
-            self.thread.join(timeout=1)
+            self.thread.join(timeout=1.0)
 
 
 def create_signal_command_file(signal_dir: Path, service_id: str, command: dict) -> None:

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-common/tests/test_influxdb_plugin.py

@@ -20,7 +20,7 @@ def test_influxdb_access():
     influxdb = get_metrics_repo("influxdb", {"host": "http://localhost:8181", "database": "ARIEL", "token": token})
     influxdb.connect()
 
-    result = influxdb.query("SELECT * FROM cm ORDER BY TIME DESC LIMIT 20", mode="pandas")
+    result = influxdb.query("SELECT * FROM cm WHERE time >= now() - INTERVAL '2 days' ORDER BY TIME DESC LIMIT 20", mode="pandas")
     print(result)
     assert isinstance(result, pd.DataFrame)
 

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-common/tests/test_metrics.py

@@ -9,7 +9,10 @@ def test_get_metrics_repo():
     influxdb = get_metrics_repo("influxdb", {"host": "http://localhost:8181", "database": "ARIEL", "token": token})
     influxdb.connect()
 
-    result = influxdb.query("SELECT * FROM cm ORDER BY TIME DESC LIMIT 20", mode="pandas")
+    # Don't use a too large time interval here, or you will get an error like:
+    # 'External error: Query would exceed file limit of 432 parquet files'
+    result = influxdb.query("SELECT * FROM cm WHERE time >= now() - INTERVAL '2 days' ORDER BY TIME DESC LIMIT 20",
+                            mode="pandas")
     print(result)
 
     # result = influxdb.query("SHOW TABLES;")

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-coordinates/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-coordinates"
-version = "0.16.5"
+version = "0.16.6"
 description = "Reference Frames and Coordinate Transofrmations for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-core/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-core"
-version = "0.16.5"
+version = "0.16.6"
 description = "Core services for the CGSE framework"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-core/src/egse/confman/__init__.py

@@ -181,7 +181,7 @@ MONITORING_PORT = settings.get("MONITORING_PORT", 0)
 # CM_SETUP_ID = Gauge("CM_SETUP_ID", 'Setup ID')
 # CM_TEST_ID = Gauge("CM_TEST_ID", 'Test ID')
 
-PROXY_TIMEOUT = 10_000  # don't wait longer than 10s by default
+PROXY_TIMEOUT = 10.0  # don't wait longer than 10s by default
 
 
 def _push_setup_to_repo(filename: str, commit_msg: str) -> Failure | Success:
@@ -982,6 +982,7 @@ class ConfigurationManagerProxy(Proxy, ConfigurationManagerInterface):
             from settings file]
         port: TCP port on which the control server is listening for commands
             [default is taken from settings file]
+        timeout: number of fractional seconds before a timeout is triggered
     """
 
     def __init__(

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-core/src/egse/dummy.py

@@ -35,15 +35,11 @@ and stopped with:
 
 from __future__ import annotations
 
-import contextlib
 import multiprocessing
 import random
 import select
 import socket
 import sys
-import threading
-import time
-from functools import partial
 
 import typer
 import zmq
@@ -62,7 +58,6 @@ from egse.proxy import Proxy
 from egse.system import SignalCatcher
 from egse.system import attrdict
 from egse.system import format_datetime
-from egse.system import type_name
 from egse.zmq_ser import bind_address
 from egse.zmq_ser import connect_address
 
@@ -96,7 +91,7 @@ ctrl_settings = attrdict(
         "SERVICE_PORT": 4444,
         "MONITORING_PORT": 4445,
         "PROTOCOL": "tcp",
-        "TIMEOUT": 10_000,  # milliseconds
+        "TIMEOUT": 10.0,
         "HK_DELAY": 1.0,
     }
 )
@@ -172,7 +167,7 @@ class DummyProxy(Proxy, DummyInterface):
         protocol: the transport protocol [default is taken from settings file]
         hostname: location of the control server (IP address) [default is taken from settings file]
         port: TCP port on which the control server is listening for commands [default is taken from settings file]
-        timeout: a socket timeout in milliseconds
+        timeout: a socket timeout in seconds
     """
 
     def __init__(
@@ -180,7 +175,7 @@ class DummyProxy(Proxy, DummyInterface):
         protocol: str = ctrl_settings.PROTOCOL,
         hostname: str = ctrl_settings.HOSTNAME,
         port: int = ctrl_settings.COMMANDING_PORT,
-        timeout: int = ctrl_settings.TIMEOUT,
+        timeout: float = ctrl_settings.TIMEOUT,
     ):
         super().__init__(connect_address(protocol, hostname, port), timeout=timeout)
 

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-core/src/egse/notifyhub/services.py

@@ -111,7 +111,7 @@ class AsyncEventSubscriber:
 
         while self.running:
             try:
-                if await self.subscriber.poll(timeout=1000):
+                if await self.subscriber.poll(timeout=1000):  # timeout in milliseconds
                     topic, message_bytes = await self.subscriber.recv_multipart()
 
                     event_type = topic.decode()
@@ -269,7 +269,7 @@ class EventSubscriber:
         return self.subscriber
 
     def poll(self, timeout=1000):
-        return self.subscriber.poll(timeout=timeout)
+        return self.subscriber.poll(timeout=timeout)  # timeout in milliseconds
 
     def handle_event(self, return_event_data: bool = False) -> dict:
         topic, message_bytes = self.subscriber.recv_multipart()

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-core/src/egse/procman/__init__.py

@@ -22,7 +22,8 @@ LOGGER = logging.getLogger("egse.procman")
 
 settings = Settings.load("Process Manager Control Server")
 COMMAND_SETTINGS = Settings.load(location=HERE, filename="procman.yaml")
-PROXY_TIMEOUT = 10_000
+
+PROXY_TIMEOUT = 10.0  # don't wait longer than 10s
 
 SERVICE_TYPE = settings.get("SERVICE_TYPE", "pm_cs")
 PROTOCOL = settings.get("PROTOCOL", "tcp")
@@ -394,7 +395,11 @@ class ProcessManagerProxy(Proxy, ProcessManagerInterface):
     """Proxy for process management, used to connect to the Process Manager Control Server and send commands remotely."""
 
     def __init__(
-        self, protocol: str = PROTOCOL, hostname: str = HOSTNAME, port: int = COMMANDING_PORT, timeout=PROXY_TIMEOUT
+            self,
+            protocol: str = PROTOCOL,
+            hostname: str = HOSTNAME,
+            port: int = COMMANDING_PORT,
+            timeout: float = PROXY_TIMEOUT
     ):
         """
         Initialisation of a new Proxy for Process Management.
@@ -406,6 +411,7 @@ class ProcessManagerProxy(Proxy, ProcessManagerInterface):
             protocol (str): Transport protocol
             hostname (str): Location of the control server (IP address)
             port (int): TCP port on which the Control Server is listening for commands
+            timeout (float): number of fractional seconds before a timeout occurs
         """
 
         endpoint = get_endpoint(settings.SERVICE_TYPE, protocol, hostname, port)

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-core/src/egse/proxy.py

@@ -31,7 +31,7 @@ def set_docstring(func, cmd):
     return wrap_func
 
 
-REQUEST_TIMEOUT = 30 * 1000  # timeout in millisecond
+REQUEST_TIMEOUT = 30.0  # timeout in seconds
 REQUEST_RETRIES = 0
 
 
@@ -93,10 +93,13 @@ class ControlServerConnectionInterface:
 
 
 class BaseProxy(ControlServerConnectionInterface):
-    def __init__(self, endpoint: str, timeout: int = REQUEST_TIMEOUT):
+    def __init__(self, endpoint: str, timeout: float = REQUEST_TIMEOUT):
         """
-        The `timeout` argument specifies the number of milliseconds to wait for a reply from the
-        control server.
+        The endpoint is a string that is constructed from the protocol, hostname
+         and port number and has the format: `protocol://hostname:port`.
+
+        The `timeout` argument specifies the number of fractional seconds to wait
+        for a reply from the control server.
         """
 
         self._logger = logging.getLogger(self.__class__.__name__)
@@ -150,7 +153,7 @@ class BaseProxy(ControlServerConnectionInterface):
     def is_cs_connected(self) -> bool:
         return self.ping()
 
-    def send(self, data, retries: int = REQUEST_RETRIES, timeout: int = None):
+    def send(self, data, retries: int = REQUEST_RETRIES, timeout: float | None = None):
         """
         Sends a command to the control server and waits for a response.
 
@@ -166,14 +169,14 @@ class BaseProxy(ControlServerConnectionInterface):
         Args:
             data (str): the command that is sent to the control server, usually a
                 string, but that is not enforced.
-            timeout (int): the time to wait for a reply [in milliseconds]
+            timeout (int): the time to wait for a reply [in seconds]
             retries (int): the number of time we should retry to send the message
 
         Returns:
             response: the response from the control server or ``None`` when there was
                 a problem or a timeout.
         """
-        timeout = timeout or self._timeout
+        timeout_ms = int((timeout or self._timeout) * 1000)
 
         pickle_string = pickle.dumps(data)
 
@@ -192,7 +195,7 @@ class BaseProxy(ControlServerConnectionInterface):
         self._socket.send(pickle_string)
 
         while True:
-            socks = dict(self._poller.poll(timeout))
+            socks = dict(self._poller.poll(timeout_ms))
 
             if self._socket in socks and socks[self._socket] == zmq.POLLIN:
                 pickle_string = self._socket.recv()
@@ -223,7 +226,7 @@ class BaseProxy(ControlServerConnectionInterface):
                 self._socket.send(pickle_string)
 
     def ping(self):
-        return_code = self.send("Ping", retries=0, timeout=1000)
+        return_code = self.send("Ping", retries=0, timeout=1.0)
         self._logger.log(0, f"Check if control server is available: Ping - {return_code}")
         return return_code == "Pong"
 
@@ -278,7 +281,7 @@ class Proxy(BaseProxy, ControlServerConnectionInterface):
     during initialization, a ConnectionError will be raised.
     """
 
-    def __init__(self, endpoint, timeout: int = REQUEST_TIMEOUT):
+    def __init__(self, endpoint, timeout: float = REQUEST_TIMEOUT):
         """
         During initialization, the Proxy will connect to the control server and send a
         handshaking `Ping` command. When that succeeds the Proxy will request and load the
@@ -287,7 +290,7 @@ class Proxy(BaseProxy, ControlServerConnectionInterface):
         can fix the problem with the control server and call `connect_cs()`, followed by a call to
         `load_commands()`.
 
-        The `timeout` argument specifies the number of milliseconds
+        The `timeout` argument specifies the number of seconds
         """
 
         super().__init__(endpoint, timeout)

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-core/src/egse/services.py

@@ -227,7 +227,7 @@ class ServiceProxy(Proxy, ServiceInterface):
         protocol: str = "tcp",
         hostname: str = None,
         port: int = None,
-        timeout: int = REQUEST_TIMEOUT,
+        timeout: float = REQUEST_TIMEOUT,
     ):
         """
         The Service Proxy class is used to send service commands to the control server.
@@ -237,7 +237,7 @@ class ServiceProxy(Proxy, ServiceInterface):
             protocol: the transport protocol [default: tcp]
             hostname: the IP address of the control server
             port: the port on which the control server is listening for service commands
-            timeout: number of milliseconds before a timeout is triggered
+            timeout: number of fractional seconds before a timeout is triggered
         """
 
         if hostname is None or port is None:

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-core/src/egse/storage/__init__.py

@@ -1067,11 +1067,15 @@ class StorageProxy(Proxy, StorageInterface):
             [default is taken from settings file]
         port: TCP port on which the control server is listening for commands
             [default is taken from settings file]
-
+        timeout (float): number of fractional seconds before a timeout occurs
     """
 
     def __init__(
-        self, protocol: str = PROTOCOL, hostname: str = HOSTNAME, port: int = COMMANDING_PORT, timeout=REQUEST_TIMEOUT
+            self,
+            protocol: str = PROTOCOL,
+            hostname: str = HOSTNAME,
+            port: int = COMMANDING_PORT,
+            timeout: float = REQUEST_TIMEOUT,
     ):
         endpoint = get_endpoint(settings.SERVICE_TYPE, protocol, hostname, port)
 

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-core/tests/script_test_registry_client_server.py

@@ -62,7 +62,7 @@ def test_proper_termination_of_tasks_sync(
         registry_req_endpoint=f"tcp://{host}:{req_port}",
         registry_sub_endpoint=f"tcp://{host}:{pub_port}",
         registry_hb_endpoint=f"tcp://{host}:{hb_port}",
-        request_timeout=5000,  # 5 second timeout
+        timeout=5.0,
     )
     client.connect()
 
@@ -106,7 +106,7 @@ async def test_proper_termination_of_tasks_async(
         registry_req_endpoint=f"tcp://{host}:{req_port}",
         registry_sub_endpoint=f"tcp://{host}:{pub_port}",
         registry_hb_endpoint=f"tcp://{host}:{hb_port}",
-        request_timeout=5000,  # 5 second timeout
+        timeout=5.0,
     )
     client.connect()
 

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-core/tests/script_test_service_registry_server.py

@@ -187,7 +187,7 @@ async def send_request(request, timeout=5.0):
         logger.debug("Request sent, waiting for response")
 
         # Wait for response with poll and timeout
-        if await socket.poll(timeout=timeout * 1000) == 0:
+        if await socket.poll(timeout=int(timeout * 1000)) == 0:
             logger.error(f"Timeout polling for response to {request.get('action')}")
             raise TimeoutError(f"Timeout waiting for response to {request.get('action')}")
 

{cgse-0.16.5 → cgse-0.16.6}/libs/cgse-gui/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-gui"
-version = "0.16.5"
+version = "0.16.6"
 description = "GUI components for CGSE"
 authors = [
     {name = "Rik Huygen", email = "rik.huygen@kuleuven.be"},

{cgse-0.16.5 → cgse-0.16.6}/projects/generic/cgse-tools/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-tools"
-version = "0.16.5"
+version = "0.16.6"
 description = "Tools for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.5 → cgse-0.16.6}/projects/generic/keithley-tempcontrol/pyproject.toml

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

{cgse-0.16.5 → cgse-0.16.6}/projects/generic/keithley-tempcontrol/src/egse/tempcontrol/keithley/daq6510.py

@@ -569,7 +569,7 @@ class DAQ6510Proxy(Proxy, DAQ6510Interface):
         protocol: str = CTRL_SETTINGS.PROTOCOL,
         hostname: str = CTRL_SETTINGS.HOSTNAME,
         port: int = CTRL_SETTINGS.COMMANDING_PORT,
-        timeout: int = CTRL_SETTINGS.TIMEOUT * 1000,  # Timeout [ms]: > scan count * interval + (one scan duration)
+        timeout: float = CTRL_SETTINGS.TIMEOUT,  # Timeout [s]: > scan count * interval + (one scan duration)
     ):
         """Initialisation of a DAQ6510Proxy.
 
@@ -578,7 +578,7 @@ class DAQ6510Proxy(Proxy, DAQ6510Interface):
             hostname (str): Location of the Control Server (IP address) [default is taken from settings file]
             port (int): TCP port on which the Control Server is listening for commands [default is taken from settings
                         file]
-            timeout (int): Timeout by which to establish the connection [ms]
+            timeout (float): Timeout by which to establish the connection [s]
         """
 
         super().__init__(connect_address(protocol, hostname, port), timeout=timeout)

{cgse-0.16.5 → cgse-0.16.6}/projects/generic/lakeshore-tempcontrol/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lakeshore-tempcontrol"
-version = "0.16.5"
+version = "0.16.6"
 description = "Lakeshore Temperature Control for CGSE"
 authors = [
     {name = "IVS KU Leuven"}

{cgse-0.16.5 → cgse-0.16.6}/projects/generic/symetrie-hexapod/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "symetrie-hexapod"
-version = "0.16.5"
+version = "0.16.6"
 description = "Symetrie Hexapod implementation for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.5 → cgse-0.16.6}/projects/plato/plato-fits/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plato-fits"
-version = "0.16.5"
+version = "0.16.6"
 description = "FITS Persistence implementation for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.5 → cgse-0.16.6}/projects/plato/plato-hdf5/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plato-hdf5"
-version = "0.16.5"
+version = "0.16.6"
 description = "HDF5 Persistence sub-class for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.5 → cgse-0.16.6}/projects/plato/plato-spw/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plato-spw"
-version = "0.16.5"
+version = "0.16.6"
 description = "SpaceWire implementation for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.5 → cgse-0.16.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse"
-version = "0.16.5"
+version = "0.16.6"
 description = "Generic Common-EGSE: Commanding and monitoring lab equipment"
 authors = [
     {name = "IvS KU Leuven"}