cgse 0.16.4__tar.gz → 0.16.5__tar.gz

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

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

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

{cgse-0.16.4 → cgse-0.16.5}/libs/cgse-common/src/egse/env.py

@@ -573,6 +573,15 @@ def print_env():
         console.print(f"  {get_local_settings_env_name():{col_width}s}: {get_local_settings_path()}")
 
 
+def bool_env(var_name: str) -> bool:
+    """Return True if the environment variable is set to 1, true, yes, or on. All case-insensitive."""
+
+    if value := os.getenv(var_name):
+        return value.strip().lower() in {"1", "true", "yes", "on"}
+
+    return False
+
+
 @contextlib.contextmanager
 def env_var(**kwargs: str | int | float | bool | None):
     """

{cgse-0.16.4 → cgse-0.16.5}/libs/cgse-common/tests/test_env.py

@@ -2,6 +2,7 @@ import logging
 
 import pytest
 
+from egse.env import bool_env
 from egse.env import get_conf_repo_location
 from egse.env import get_project_name
 from egse.env import get_site_id
@@ -207,3 +208,13 @@ def test_main(capsys):
         assert "PYTHONSTARTUP=my_script.py" in captured.out  # noqa
 
     _LOGGER.info(f"{get_project_name() = }, {get_site_id() = }")
+
+
+def test_bool_env():
+    for option in ["1", "true", "True", "TRUE", "on", "On", "ON", "yes", "Yes", "YES"]:
+        with env_var(VERBOSE_DEBUG=option):
+            assert bool_env("VERBOSE_DEBUG")
+
+    for option in ["0", "false", "no", "off"]:
+        with env_var(VERBOSE_DEBUG=option):
+            assert not bool_env("VERBOSE_DEBUG")

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

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

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

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

{cgse-0.16.4 → cgse-0.16.5}/libs/cgse-core/src/cgse_core/_start.py

@@ -9,7 +9,7 @@ from egse.system import redirect_output_to_log
 def start_rm_cs(log_level: str):
     rich.print("Starting the service registry manager core service...")
 
-    out = redirect_output_to_log(".rm_cs.start.log")
+    out = redirect_output_to_log("rm_cs.start.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.registry.server", "start", "--log-level", log_level],
@@ -23,7 +23,7 @@ def start_rm_cs(log_level: str):
 def start_log_cs():
     rich.print("Starting the logging core service...")
 
-    out = redirect_output_to_log(".log_cs.start.log")
+    out = redirect_output_to_log("log_cs.start.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.logger.log_cs", "start"],
@@ -37,7 +37,7 @@ def start_log_cs():
 def start_sm_cs():
     rich.print("Starting the storage manager core service...")
 
-    out = redirect_output_to_log(".sm_cs.start.log")
+    out = redirect_output_to_log("sm_cs.start.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.storage.storage_cs", "start"],
@@ -51,7 +51,7 @@ def start_sm_cs():
 def start_cm_cs():
     rich.print("Starting the configuration manager core service...")
 
-    out = redirect_output_to_log(".cm_cs.start.log")
+    out = redirect_output_to_log("cm_cs.start.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.confman.confman_cs", "start"],
@@ -65,7 +65,7 @@ def start_cm_cs():
 def start_pm_cs():
     rich.print("Starting the process manager core service...")
 
-    out = redirect_output_to_log(".pm_cs.start.log")
+    out = redirect_output_to_log("pm_cs.start.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.procman.procman_cs", "start"],
@@ -79,7 +79,7 @@ def start_pm_cs():
 def start_notifyhub():
     rich.print("Starting the notification hub core service...")
 
-    out = redirect_output_to_log(".nh_cs.start.log")
+    out = redirect_output_to_log("nh_cs.start.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.notifyhub.server", "start"],

{cgse-0.16.4 → cgse-0.16.5}/libs/cgse-core/src/cgse_core/_stop.py

@@ -15,7 +15,7 @@ from egse.system import waiting_for
 def stop_rm_cs():
     rich.print("Terminating the service registry manager core service...")
 
-    out = redirect_output_to_log(".rm_cs.stop.log")
+    out = redirect_output_to_log("rm_cs.stop.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.registry.server", "stop"],
@@ -35,7 +35,7 @@ def stop_rm_cs():
 def stop_log_cs():
     rich.print("Terminating the logging core service...")
 
-    out = redirect_output_to_log(".log_cs.stop.log")
+    out = redirect_output_to_log("log_cs.stop.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.logger.log_cs", "stop"],
@@ -49,7 +49,7 @@ def stop_log_cs():
 def stop_sm_cs():
     rich.print("Terminating the storage manager core service...")
 
-    out = redirect_output_to_log(".sm_cs.stop.log")
+    out = redirect_output_to_log("sm_cs.stop.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.storage.storage_cs", "stop"],
@@ -69,7 +69,7 @@ def stop_sm_cs():
 def stop_cm_cs():
     rich.print("Terminating the configuration manager core service...")
 
-    out = redirect_output_to_log(".cm_cs.stop.log")
+    out = redirect_output_to_log("cm_cs.stop.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.confman.confman_cs", "stop"],
@@ -89,7 +89,7 @@ def stop_cm_cs():
 def stop_pm_cs():
     rich.print("Terminating the process manager core service...")
 
-    out = redirect_output_to_log(".pm_cs.stop.log")
+    out = redirect_output_to_log("pm_cs.stop.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.procman.procman_cs", "stop"],
@@ -109,7 +109,7 @@ def stop_pm_cs():
 def stop_notifyhub():
     rich.print("Terminating the notification hub core service...")
 
-    out = redirect_output_to_log(".nh_cs.stop.log")
+    out = redirect_output_to_log("nh_cs.stop.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.notifyhub.server", "stop"],

{cgse-0.16.4 → cgse-0.16.5}/libs/cgse-core/src/cgse_core/services.py

@@ -75,12 +75,6 @@ def stop_core_services():
 @core.command(name="status")
 def status_core_services(full: bool = False, suppress_errors: bool = True):
     """Print the status of the core services."""
-    # from scripts._status import status_log_cs, status_sm_cs, status_cm_cs
-
-    logging.basicConfig(
-        level=logging.WARNING,
-        format="[%(asctime)s] %(threadName)-12s %(levelname)-8s %(name)-20s %(lineno)5d:%(module)-20s %(message)s",
-    )
 
     rich.print("[green]Status of the core services...[/]")
 

{cgse-0.16.4 → cgse-0.16.5}/libs/cgse-core/src/cgse_core/settings.yaml

@@ -52,7 +52,7 @@ Process Manager Control Server:                  # PM_CS
 
 Notify Hub:
     
-    SERVICE_TYPE:            NOTIFY_HUB
+    SERVICE_TYPE:                 NH_CS
     SERVICE_ID:                 nh_cs_1
     PROCESS_NAME:                 nh_cs
     COLLECTOR_PORT:                6125
@@ -61,7 +61,7 @@ Notify Hub:
     
 Metrics Hub:
     
-    SERVICE_TYPE:           METRICS_HUB
+    SERVICE_TYPE:                 MH_CS
     SERVICE_ID:                 mh_cs_1
     PROCESS_NAME:                 mh_cs
     COLLECTOR_PORT:                6130

{cgse-0.16.4 → cgse-0.16.5}/libs/cgse-core/src/egse/connect.py

@@ -1,3 +1,4 @@
+from egse.env import bool_env
 from egse.log import logging
 from egse.zmq_ser import connect_address
 
@@ -5,6 +6,8 @@ logger = logging.getLogger("egse.connect")
 
 # random.seed(time.monotonic())  # uncomment for testing only, main application should set a seed.
 
+VERBOSE_DEBUG = bool_env("VERBOSE_DEBUG")
+
 
 def get_endpoint(
     service_type: str,
@@ -37,7 +40,8 @@ def get_endpoint(
         with RegistryClient() as reg:
             endpoint = reg.get_endpoint(service_type)
         if endpoint:
-            logger.info(f"Endpoint for {service_type} found in registry: {endpoint}")
+            if VERBOSE_DEBUG:
+                logger.debug(f"Endpoint for {service_type} found in registry: {endpoint}")
         else:
             logger.warning(f"No endpoint for {service_type} found in registry.")
 
@@ -45,6 +49,7 @@ def get_endpoint(
         if port == 0:
             raise RuntimeError(f"No service registered as {service_type} and no port provided.")
         endpoint = connect_address(protocol, hostname, port)
-        logger.info(f"Endpoint constructed from protocol/hostname/port: {endpoint}")
+        if VERBOSE_DEBUG:
+            logger.debug(f"Endpoint constructed from protocol/hostname/port: {endpoint}")
 
     return endpoint

{cgse-0.16.4 → cgse-0.16.5}/libs/cgse-core/src/egse/notifyhub/__init__.py

@@ -13,7 +13,7 @@ settings = Settings.load("Notify Hub")
 
 PROCESS_NAME = settings.get("PROCESS_NAME", "nh_cs")
 SERVICE_ID = settings.get("SERVICE_ID", "nh_cs_1")
-SERVICE_TYPE = settings.get("SERVICE_TYPE", "NOTIFY_HUB")
+SERVICE_TYPE = settings.get("SERVICE_TYPE", "NH_CS")
 
 # Default ports that are assigned to PUSH-PULL, PUB-SUB, ROUTER-DEALER protocols of the notification hub.
 # The actual ports are defined in the Settings.yaml, use local settings to change them.

{cgse-0.16.4 → cgse-0.16.5}/libs/cgse-core/src/egse/storage/storage_cs.py

@@ -6,6 +6,11 @@ The Storage manager is implemented as a standard control server.
 
 """
 
+__all__ = [
+    "StorageControlServer",
+    "StorageProxy",
+]
+
 import logging
 import multiprocessing
 import sys

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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