cgse-core 0.17.2__tar.gz → 0.17.4__tar.gz

{cgse_core-0.17.2 → cgse_core-0.17.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgse-core
-Version: 0.17.2
+Version: 0.17.4
 Summary: Core services for the CGSE framework
 Author: IvS KU Leuven
 Maintainer-email: Rik Huygen <rik.huygen@kuleuven.be>, Sara Regibo <sara.regibo@kuleuven.be>

{cgse_core-0.17.2 → cgse_core-0.17.4}/pyproject.toml

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

{cgse_core-0.17.2 → cgse_core-0.17.4}/src/cgse_core/_stop.py

@@ -1,9 +1,8 @@
 import logging
 import subprocess
-import sys
-from pathlib import Path
 
 import rich
+import sys
 
 from egse.log import logger
 from egse.process import is_process_running

{cgse_core-0.17.2 → cgse_core-0.17.4}/src/egse/control.py

@@ -558,7 +558,8 @@ class ControlServer(metaclass=abc.ABCMeta):
                 try:
                     hk_dict = save_average_execution_time(self.device_protocol.get_housekeeping)
 
-                    self.store_housekeeping_information(hk_dict)
+                    if storage_manager:
+                        self.store_housekeeping_information(hk_dict)
                     self.propagate_metrics(hk_dict)
                 except Exception as exc:
                     logger.error(

{cgse_core-0.17.2 → cgse_core-0.17.4}/src/egse/dummy.py

@@ -18,9 +18,9 @@ and stop the server with:
 
 Commands that can be used with the proxy:
 
-  * info – returns an info message from the dummy device, e.g. "Dummy Device <__version__>"
-  * get_value – returns a random float between 0.0 and 1.0
-  * division – returns the result of the division between arguments 'a' and 'b'.
+  * info - returns an info message from the dummy device, e.g. "Dummy Device <__version__>"
+  * get_value - returns a random float between 0.0 and 1.0
+  * division - returns the result of the division between arguments 'a' and 'b'.
     This can be used also to induce a ZeroDivisionError that should return a Failure
     object.
 
@@ -318,11 +318,10 @@ class DummyDeviceEthernetInterface(DeviceConnectionInterface, DeviceTransport):
     Args:
         hostname (str): the IP address or fully qualified hostname of the Dummy Device
             controller.
-
         port (int): the IP port number to connect to.
     """
 
-    def __init__(self, hostname: str = None, port: int = None):
+    def __init__(self, hostname: str | None = None, port: int | None = None):
         super().__init__()
 
         # Basic connection settings, loaded from the configuration YAML file
@@ -359,7 +358,8 @@ class DummyDeviceEthernetInterface(DeviceConnectionInterface, DeviceTransport):
         try:
             self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         except socket.error as exc:
-            self.sock.close()
+            if self.sock is not None:
+                self.sock.close()
             raise DeviceConnectionError("Dummy Device", "Failed to create socket.") from exc
 
         # Attempt to establish a connection to the remote host
@@ -412,7 +412,8 @@ class DummyDeviceEthernetInterface(DeviceConnectionInterface, DeviceTransport):
         """
         try:
             logger.debug(f"Disconnecting from {self.hostname}")
-            self.sock.close()
+            if self.sock is not None:
+                self.sock.close()
             self.is_connection_open = False
         except Exception as exc:
             raise DeviceConnectionError(DEV_NAME, f"Could not close socket to {self.hostname}") from exc
@@ -448,6 +449,8 @@ class DummyDeviceEthernetInterface(DeviceConnectionInterface, DeviceTransport):
         buf_size = 1024 * 10
         response = bytes()
 
+        assert self.sock is not None
+
         # Set a timeout of READ_TIMEOUT to the socket.recv
 
         saved_timeout = self.sock.gettimeout()
@@ -487,6 +490,8 @@ class DummyDeviceEthernetInterface(DeviceConnectionInterface, DeviceTransport):
                 there was a socket related error.
         """
 
+        assert self.sock is not None
+
         # logger.debug(f"{command.encode() = }")
 
         try:
@@ -514,6 +519,9 @@ class DummyDeviceEthernetInterface(DeviceConnectionInterface, DeviceTransport):
             DeviceTimeoutError: when the sendall() timed out, and a DeviceConnectionError if
                 there was a socket related error.
         """
+
+        assert self.sock is not None
+
         # logger.debug(f"{command.encode() = }")
 
         try:
@@ -657,7 +665,8 @@ def process_command(command_string: str) -> str | None:
 
     try:
         action, response = COMMAND_ACTIONS_RESPONSES[command_string]
-        action and action()
+        if action:
+            action()
         if error_msg:
             return error_msg
         else:

{cgse_core-0.17.2 → cgse_core-0.17.4}/src/egse/procman/procman_cs.py

@@ -154,7 +154,7 @@ def stop():
 
     if COMMANDING_PORT == 0:
         with RegistryClient() as reg:
-            service = reg.discover_service(settings.SERVICE_TYPE)
+            service = reg.discover_service(SERVICE_TYPE)
             rich.print("service = ", service)
             if service:
                 hostname = service["host"]

{cgse_core-0.17.2 → cgse_core-0.17.4}/src/egse/procman/procman_ui.py

@@ -44,6 +44,9 @@ from egse.zmq_ser import set_address_port
 
 MAX_SLEEP = 10
 
+DEVICE_CMD_ENTRY_POINT = "cgse.service.device_command"
+GUI_SCRIPTS_ENTRY_POINT = "gui_scripts"
+
 
 class ControlServerStatus(Enum):
     """Status of the Control Server of a device."""
@@ -78,7 +81,7 @@ def get_cgse_cmd(device_proxy: str) -> str:
 
     module_name = device_proxy[7:].rsplit(".", 1)[0]
     entry_point_values = []
-    for ep in sorted(entry_points("cgse.service"), key=lambda x: x.name):
+    for ep in sorted(entry_points(DEVICE_CMD_ENTRY_POINT), key=lambda x: x.name):
         entry_point_values.append(ep.value)
 
     similarity_scores = [
@@ -108,7 +111,7 @@ def get_cgse_ui(device_proxy: str) -> Union[str, None]:
 
     module_name = device_proxy[7:].rsplit(".", 1)[0]
     entry_point_values = []
-    for ep in sorted(entry_points("gui_scripts"), key=lambda x: x.name):
+    for ep in sorted(entry_points(GUI_SCRIPTS_ENTRY_POINT), key=lambda x: x.name):
         entry_point_values.append(ep.name)
 
     similarity_scores = [

{cgse_core-0.17.2 → cgse_core-0.17.4}/src/egse/registry/client.py

@@ -898,7 +898,8 @@ class AsyncRegistryClient:
         """Stop the running heartbeat task."""
 
         if self._heartbeat_task is None:
-            VERBOSE_DEBUG and self.logger.debug("Couldn't stop heartbeat, heartbeat_task is None")
+            if VERBOSE_DEBUG:
+                self.logger.debug("Couldn't stop heartbeat, heartbeat_task is None")
             return
 
         self._heartbeat_task.cancel()
@@ -915,7 +916,8 @@ class AsyncRegistryClient:
         """Stop the running event listener task."""
 
         if self._event_listener_task is None:
-            VERBOSE_DEBUG and self.logger.debug("Couldn't stop event_listener, event_listener_task is None")
+            if VERBOSE_DEBUG:
+                self.logger.debug("Couldn't stop event_listener, event_listener_task is None")
             return
 
         self._event_listener_task.cancel()
@@ -1148,12 +1150,14 @@ class AsyncRegistryClient:
                 self.sub_socket.close()
 
             # We can not terminate the context, because we use a global instance, i.e. a singleton context.
-            # When we try to terminate it, even after checking if it was closed,
+            # When we try to terminate it, even after checking if it was closed, it raises an exception.
             if hasattr(self, "context") and self.context:
                 self.logger.info(f"{self.context = !r}")
                 self.logger.info(f"{self.context._sockets = !r}")
+                # The zmq context instance is the global singleton instance.
+                # Terminating it here would affect other parts of the application using zmq.
                 # if not self.context.closed:
-                # self.context.term()
+                #     self.context.term()
         except Exception as exc:
             self.logger.error(f"Error during cleanup: {exc}")
 

{cgse_core-0.17.2 → cgse_core-0.17.4}/src/egse/registry/server.py

@@ -226,10 +226,10 @@ class AsyncRegistryServer:
                 try:
                     # Wait for a request with timeout to allow checking if still running
                     try:
-                        self.logger.info("Waiting for a request with 1s timeout...")
+                        # self.logger.debug("Waiting for a request with 1s timeout...")
                         message_parts = await asyncio.wait_for(self.req_socket.recv_multipart(), timeout=1.0)
                     except asyncio.TimeoutError:
-                        self.logger.debug("waiting for command request...")
+                        # self.logger.debug("waiting for command request...")
                         continue
 
                     if len(message_parts) >= 3: