cgse-core 0.17.2__py3-none-any.whl → 0.17.4__py3-none-any.whl

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.dist-info → cgse_core-0.17.4.dist-info}/METADATA

@@ -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.dist-info → cgse_core-0.17.4.dist-info}/RECORD

@@ -1,17 +1,15 @@
 cgse_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cgse_core/_start.py,sha256=m0JDrtEVRRmRA3nL8kQhEKq7eWiF5lf5kQ3fq9-JrkM,2126
 cgse_core/_status.py,sha256=Quz7hNtqSZPWn8xZ9ZmmF2i5hGY_bMUoybN2UNNBsHc,3259
-cgse_core/_stop.py,sha256=ZXTzvWjJ3bVNmNcmsP8NP5G6AHvegamyfu_cNn8qa6A,3588
+cgse_core/_stop.py,sha256=MTXtnYjrqJdwPOkQ7h1Zx-C57XeXxqrL6KijYhLL6AE,3563
 cgse_core/cgse_explore.py,sha256=8jxAxYDsjPUZftUccPCneHaqijRHxBPZuaOo0ESmBUs,460
 cgse_core/services.py,sha256=_a1d1Dcf9L0F1IF3w6kHrACE5EDnqtNUd8KzrTZDu5U,8595
 cgse_core/settings.yaml,sha256=6RcZ3aI7IUSB6GaZ8e9b_JEiql0l3l7h-VowDycv5AE,3625
 egse/_setup_core.py,sha256=ei4a7tGYfDxc16kfhrF11Tm3cOSnl48MsSGfrWu0vVg,5983
-egse/async_control.py,sha256=V4cx89EIuohZCJEMNXiwKWQFPDWRY6Oj0w5xpo3wO3A,45274
-egse/async_control_claude.py,sha256=oMI_g7euQ6Z1dowmVHfijZImiB_sMQl5sHC84DMX2Fs,31609
 egse/command.py,sha256=529_T619qG3Xif9UkxZS8mj2ibr6eljfbVsMM-K_AII,21965
 egse/connect.py,sha256=QiG5G0qnCI3EeDhmfj-gBlhI9RmKvnd0dGXu0ZBIZ90,21556
-egse/control.py,sha256=u4bWsKNW0tl4gNMaSMyUA02xXwvcxCVe2TsdfJpTkMs,28424
-egse/dummy.py,sha256=VHa2Y72kXBEYUZ4ztedy2A4XXzteXGjwHeIlvmAsMIA,22503
+egse/control.py,sha256=pKhQjp3YGkw8J4KyDTO3BUwBePSBJAQnfwqBPsZtpSs,28468
+egse/dummy.py,sha256=N1v9bCOF3saY6J_ip2h1pbgregQNeT4YEpDIhhKUKps,22721
 egse/listener.py,sha256=kD62oD7w1yBVV0M2Eq5MNEQyVaJvlsl0RyhYCzVkgQs,6493
 egse/mixin.py,sha256=fklH61C7TtaTnXx7FQjjJCgUQ2PsQv5baw0SVBBdbH0,20265
 egse/monitoring.py,sha256=0Hbd5SHUU2YWFm8gbzlyPMUMjTezKap_q9yE4T6Vkk0,9716
@@ -22,7 +20,6 @@ egse/services.yaml,sha256=0VRxQGM0TwExJl4GEXYakWSaE9W5Tav5Og-ZV7vogto,2612
 egse/confman/__init__.py,sha256=HtLxM7u7v9mc8eJ4KTFfsWiRRAMmyvI0Blo_4Yb2nC0,39993
 egse/confman/__main__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 egse/confman/confman.yaml,sha256=CaS4potNTiy2-Qqc5Zo2Lx8c5hh4wLYhtxwifh-hP5M,3018
-egse/confman/confman_acs.py,sha256=Z7QfCUiAZ8tzj7ujHTpG0Kdw7VA76x-fnsWsOntHU2Y,1044
 egse/confman/confman_cs.py,sha256=JeAWC1T9RBppPVX-arWG87wS5_QrjKN8KUszQV8XBcQ,9981
 egse/icons/busy.svg,sha256=fKNR2AxNupsAga7huDQF-kEYTThMkxgqGVZvXbma0G4,2964
 egse/icons/operational-mode.svg,sha256=P6uhgnlXF5UXiJXIlpawklTcCZQePPEI5fGONtL_Y3o,5199
@@ -34,30 +31,27 @@ egse/icons/user-interface.svg,sha256=q_KWgHJ9ATdbw-HFghoaGQIBe52ZyxyAKitHpDaFWm8
 egse/logger/__init__.py,sha256=IhqNw4Yvm26Q5w7m3NuTAL8ZkywtN9dT4OaTpc3xkuo,10782
 egse/logger/__main__.py,sha256=_etegNrUM9IWHNTOObDVY1DiLn9SJyf8eHktVBbN-OQ,1765
 egse/logger/log_cs.py,sha256=3k-HUnfrJY2072cjF0TXBv9TyNd4GzCSzazx03zfJss,14296
-egse/metricshub/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-egse/metricshub/server.py,sha256=2arZ2OOsc7L3_tHnpXNw91joYnVo1nxzqLFuwO-GSzM,8780
 egse/notifyhub/__init__.py,sha256=pbCy5PHSR7OKcD1heaMIDO6ztkyFlpsvc-i2pyOdCpU,2438
 egse/notifyhub/client.py,sha256=VOFlxcotEm3JAe5eGMDXpCRejXzDb3-7k4gIPgcgmpY,10536
 egse/notifyhub/event.py,sha256=Yo8uvnK27uzaCLjJa8IK734Hcg3eLuD_KCd7eZ80XBQ,792
 egse/notifyhub/server.py,sha256=XW4lbmz1IUhhPUB3frbgvAWUyAXZy1Wr1ofC10vAoM0,14553
 egse/notifyhub/services.py,sha256=LpKxJfFszwoQN9Kb5f5lkjjKLbvwCfHSC2mt1WZt1wc,10494
-egse/notifyhub/test.py,sha256=61-hEii3KUho_nheTz6zCuUvQtIPZ_zZWt3Gpxmhk8g,9922
 egse/procman/__init__.py,sha256=w2ilHHVuznkNCK-Syd9WVayktW8um8_EsKF5JQJDZK0,13946
 egse/procman/procman.yaml,sha256=miAq3GE4PSKm8QZDfjvmtBrYCt8GyzJDJm-JzzgdznQ,847
-egse/procman/procman_cs.py,sha256=lvuhmGdd1GmkdkXYNS9slNT9VJF09OtffZrZmCdy97I,5390
+egse/procman/procman_cs.py,sha256=2FxpDI4h-3312rt84J4rcX1QNBFFst0Q1cLy5Hex3ro,5381
 egse/procman/procman_protocol.py,sha256=kFUWQb66d5aDE7qHM9xYmsO07UB-6ro2hJ-E7o_OPlE,3778
-egse/procman/procman_ui.py,sha256=5pU4-Dtma5aY8k4PaHQpJUe-DSwjpP-V1sJpbuUMlLg,42070
+egse/procman/procman_ui.py,sha256=IzusnQymoBsiQ50lCH7gopbmNoevotC2vmRCeTTR1F8,42184
 egse/registry/__init__.py,sha256=U7ap_245Bid74nn7Ncd0GXu0aetR95dJHltGRwBCVb8,1349
 egse/registry/backend.py,sha256=-kRXncO949YETb1S2GFedhYTt1O0teiKYUUPxeQqX9E,22120
-egse/registry/client.py,sha256=VR6v-IRVpY3lUB8IGIZcfLAj6PhwakZNBuX7QPYxzxY,43165
-egse/registry/server.py,sha256=-5f-6Rk-z-sBCmDXxHZos7u_e4P0VqsLU5av0qITnzU,22291
+egse/registry/client.py,sha256=InUttsnCUDUjWHyFQ5RFAUckmFo8deQOdFshXcUVubs,43395
+egse/registry/server.py,sha256=MTBS-f0kXtxgpxJWGtUNklZL405WEokS4rp_JpmIqQE,22296
 egse/registry/service.py,sha256=r6ThO_ur9WyFb_9JkpE__C5Y2P3VAeK8j_w9SFHiIBw,15375
 egse/storage/__init__.py,sha256=xtMdHdtPT9-oqTp2bpWw7Os3qUgN8TdqZNuaj3glxn0,43147
 egse/storage/__main__.py,sha256=LI9fxlsFWmEd5LcWUB0xA8i7Yt6UHgnblB4G0aTi3pI,28
 egse/storage/persistence.py,sha256=35fvuCPuGTSCc2MfmFLLNU03xYq3CEaJQspot4f-Pvw,18274
 egse/storage/storage.yaml,sha256=l3HtPx_bAbXoV4f3_PXWAa1tP-fY2S6roSBSBiOHodE,2712
 egse/storage/storage_cs.py,sha256=172llnKef1fdiDXcnzYllw_q12bVyuGJGh_3XpeDVCU,7377
-cgse_core-0.17.2.dist-info/METADATA,sha256=JLHz7fbDXX5hP1Q9651n2oVnQy7ZZ4rmbu886KhMZ0s,582
-cgse_core-0.17.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cgse_core-0.17.2.dist-info/entry_points.txt,sha256=IwIG7aGgfUehol29ufcKd559S88t3TJdh1LMJ5YymCE,976
-cgse_core-0.17.2.dist-info/RECORD,,
+cgse_core-0.17.4.dist-info/METADATA,sha256=PXVDvD8f0HKRijUPFn_fq2Kt42FYPTE3oI9EyMbujCA,582
+cgse_core-0.17.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+cgse_core-0.17.4.dist-info/entry_points.txt,sha256=IwIG7aGgfUehol29ufcKd559S88t3TJdh1LMJ5YymCE,976
+cgse_core-0.17.4.dist-info/RECORD,,

{cgse_core-0.17.2.dist-info → cgse_core-0.17.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

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(

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:

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"]

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 = [

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}")
 

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: