cgse 0.16.7__tar.gz → 0.16.8__tar.gz

{cgse-0.16.7 → cgse-0.16.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgse
-Version: 0.16.7
+Version: 0.16.8
 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.7 → cgse-0.16.8}/libs/cgse-common/pyproject.toml

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

{cgse-0.16.7 → cgse-0.16.8}/libs/cgse-coordinates/pyproject.toml

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

{cgse-0.16.7 → cgse-0.16.8}/libs/cgse-core/pyproject.toml

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

{cgse-0.16.7 → cgse-0.16.8}/libs/cgse-core/src/egse/proxy.py

@@ -13,6 +13,7 @@ from types import MethodType
 
 import zmq
 
+from egse.connect import VERBOSE_DEBUG
 from egse.decorators import dynamic_interface
 from egse.log import logger
 from egse.mixin import DynamicClientCommandMixin
@@ -102,7 +103,7 @@ class BaseProxy(ControlServerConnectionInterface):
         for a reply from the control server.
         """
 
-        self._logger = logging.getLogger(self.__class__.__name__)
+        self._logger = logger
 
         self._ctx = zmq.Context.instance()
         self._poller = zmq.Poller()
@@ -123,7 +124,8 @@ class BaseProxy(ControlServerConnectionInterface):
             self.disconnect_cs()
 
     def connect_cs(self):
-        self._logger.log(0, f"Trying to connect {self.__class__.__name__} to {self._endpoint}")
+        if VERBOSE_DEBUG:
+            self._logger.debug(f"Trying to connect {self.__class__.__name__} to {self._endpoint}")
 
         self._socket = self._ctx.socket(zmq.REQ)
         self._socket.connect(self._endpoint)
@@ -135,7 +137,8 @@ class BaseProxy(ControlServerConnectionInterface):
         self._poller.unregister(self._socket)
 
     def reconnect_cs(self):
-        self._logger.log(20, f"Trying to reconnect {self.__class__.__name__} to {self._endpoint}")
+        if VERBOSE_DEBUG:
+            self._logger.debug(f"Trying to reconnect {self.__class__.__name__} to {self._endpoint}")
 
         if not self._socket.closed:
             self._socket.close(linger=0)
@@ -145,7 +148,8 @@ class BaseProxy(ControlServerConnectionInterface):
         self._poller.register(self._socket, zmq.POLLIN)
 
     def reset_cs_connection(self):
-        self._logger.debug(f"Trying to reset the connection from {self.__class__.__name__} to {self._endpoint}")
+        if VERBOSE_DEBUG:
+            self._logger.debug(f"Trying to reset the connection from {self.__class__.__name__} to {self._endpoint}")
 
         self.disconnect_cs()
         self.connect_cs()
@@ -191,7 +195,9 @@ class BaseProxy(ControlServerConnectionInterface):
         if self._socket.closed:
             self.reconnect_cs()
 
-        self._logger.log(0, f"Sending '{data}'")
+        if VERBOSE_DEBUG:
+            self._logger.debug(f"Sending '{data}'")
+
         self._socket.send(pickle_string)
 
         while True:
@@ -202,7 +208,8 @@ class BaseProxy(ControlServerConnectionInterface):
                 if not pickle_string:
                     break
                 response = pickle.loads(pickle_string)
-                self._logger.log(0, f"Receiving response: {response}")
+                if VERBOSE_DEBUG:
+                    self._logger.debug(f"Receiving response: {response}")
                 return response
             else:
                 # timeout - server unavailable
@@ -227,7 +234,8 @@ class BaseProxy(ControlServerConnectionInterface):
 
     def ping(self):
         return_code = self.send("Ping", retries=0, timeout=1.0)
-        self._logger.log(0, f"Check if control server is available: Ping - {return_code}")
+        if VERBOSE_DEBUG:
+            self._logger.debug(f"Check if control server is available: Ping - {return_code}")
         return return_code == "Pong"
 
     def get_endpoint(self) -> str:

{cgse-0.16.7 → cgse-0.16.8}/libs/cgse-core/src/egse/registry/client.py

@@ -461,6 +461,9 @@ class RegistryClient:
             self.logger.warning("Cannot start heartbeat: no service is registered")
             return None
 
+        # Cancel an existing heartbeat thread if present
+        self.stop_heartbeat()
+
         # If interval not specified, use 1/3 of TTL
         if interval is None:
             interval = max(1, self._ttl // 3)
@@ -479,7 +482,7 @@ class RegistryClient:
                         self.logger.warning("ServiceRegistry not responding.")
                         return
                     else:
-                        self.logger.info("Health check succeeded, reregistering ?")
+                        self.logger.info("Health check succeeded, reregistering...")
                         self.reregister()
 
                 else:
@@ -609,8 +612,6 @@ class AsyncRegistryClient:
         # Default to receiving all events
         self.sub_socket.setsockopt_string(zmq.SUBSCRIBE, "")
 
-        self._connect_hb_socket()
-
     def _connect_hb_socket(self):
         self.hb_socket = self.context.socket(zmq.REQ)
         self.hb_socket.setsockopt(zmq.LINGER, 0)  # Don't wait for unsent messages on close()
@@ -627,11 +628,10 @@ class AsyncRegistryClient:
             self.sub_socket.close(linger=0)
         self.sub_socket = None
 
-        self._disconnect_hb_socket()
-
     def _disconnect_hb_socket(self):
         if self.hb_socket:
-            self.hb_socket.close(linger=0)
+            self.hb_socket.setsockopt(zmq.LINGER, 0)
+            self.hb_socket.close()
         self.hb_socket = None
 
     def _get_service_cache_lock(self):
@@ -653,10 +653,10 @@ class AsyncRegistryClient:
         Returns:
             The response from the registry as a dictionary.
         """
-        self.logger.debug(f"Sending request: {request}")
 
         timeout = timeout or self.timeout
         try:
+            self.logger.debug(f"Sending request: {request}")
             await self.req_socket.send_multipart([msg_type.value, json.dumps(request).encode()])
 
             try:
@@ -714,9 +714,9 @@ class AsyncRegistryClient:
             except asyncio.TimeoutError:
                 self.logger.error(f"Heartbeat request timed out after {HEART_BEAT_TIMEOUT:.2f}s")
                 # Reset the socket to avoid invalid state
-                self.hb_socket.close()
-                self.hb_socket = self.context.socket(zmq.REQ)
-                self.hb_socket.connect(self.registry_req_endpoint)
+                self._disconnect_hb_socket()
+                await asyncio.sleep(HEART_BEAT_RECONNECT)
+                self._connect_hb_socket()
                 return {"success": False, "error": "Heartbeat request timed out"}
         except zmq.ZMQError as exc:
             self.logger.error(f"ZMQ error: {exc}", exc_info=True)
@@ -816,6 +816,25 @@ class AsyncRegistryClient:
             self.logger.error(f"Failed to deregister service: {response.get('error')}")
             return False
 
+    async def reregister(self) -> str | None:
+        if not self._service_id:
+            self.logger.warning("Cannot reregister: no service is registered")
+            return None
+
+        if not self._service_info:
+            self.logger.warning(
+                "Cannot reregister: no service info was saved by this registry client or service already deregistered."
+            )
+            return None
+
+        return await self.register(
+            name=self._service_info["name"],
+            host=self._service_info["host"],
+            port=self._service_info["port"],
+            service_type=self._service_info["type"],
+            metadata=self._service_info["metadata"],
+        )
+
     async def start_heartbeat(self, interval: int | None = None) -> asyncio.Task | None:
         """
         Start sending heartbeats to the registry.
@@ -840,6 +859,8 @@ class AsyncRegistryClient:
         self._running = True
 
         async def heartbeat_loop():
+            self._connect_hb_socket()
+
             try:
                 while self._running and self._service_id:
                     try:
@@ -849,8 +870,17 @@ class AsyncRegistryClient:
 
                         if not response.get("success"):
                             self.logger.warning(f"Heartbeat failed: {response.get('error')}")
+
+                            # Do a health check
+                            if not await self.health_check():
+                                self.logger.warning("ServiceRegistry not responding.")
+                                continue
+                            else:
+                                self.logger.info("Health check succeeded, reregistering...")
+                                await self.reregister()
+
                         else:
-                            self.logger.info(response.get("message"))
+                            self.logger.debug(response.get("message"))
                     except Exception as exc:
                         self.logger.error(f"Error in heartbeat loop: {exc}", exc_info=True)
 
@@ -858,6 +888,8 @@ class AsyncRegistryClient:
                     await asyncio.sleep(interval)
             except asyncio.CancelledError:
                 self.logger.info("Heartbeat task cancelled")
+            finally:
+                self._disconnect_hb_socket()
 
         # Start the heartbeat task
         self._heartbeat_task = task = asyncio.create_task(heartbeat_loop())

{cgse-0.16.7 → cgse-0.16.8}/libs/cgse-core/src/egse/registry/server.py

@@ -490,6 +490,7 @@ class AsyncRegistryServer:
             "status": "ok",
             "req_port": self.req_port,
             "pub_port": self.pub_port,
+            "hb_port": self.hb_port,
             "services": services,
         }
 
@@ -577,6 +578,7 @@ async def status(
                 Status: {response["status"]}
                 Requests port: {response["req_port"]}
                 Notifications port: {response["pub_port"]}
+                Heartbeat port: {response["hb_port"]}
                 Registrations: {", ".join([f"({x['name']}, {x['health']})" for x in response["services"]])}\
             """
         )

{cgse-0.16.7 → cgse-0.16.8}/libs/cgse-gui/pyproject.toml

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

{cgse-0.16.7 → cgse-0.16.8}/projects/generic/cgse-tools/pyproject.toml

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

{cgse-0.16.7 → cgse-0.16.8}/projects/generic/keithley-tempcontrol/pyproject.toml

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

{cgse-0.16.7 → cgse-0.16.8}/projects/generic/lakeshore-tempcontrol/pyproject.toml

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

{cgse-0.16.7 → cgse-0.16.8}/projects/generic/symetrie-hexapod/pyproject.toml

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

{cgse-0.16.7 → cgse-0.16.8}/projects/plato/plato-fits/pyproject.toml

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

{cgse-0.16.7 → cgse-0.16.8}/projects/plato/plato-hdf5/pyproject.toml

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

{cgse-0.16.7 → cgse-0.16.8}/projects/plato/plato-spw/pyproject.toml

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

{cgse-0.16.7 → cgse-0.16.8}/pyproject.toml

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