cgse 0.16.0__tar.gz → 0.16.2__tar.gz

{cgse-0.16.0 → cgse-0.16.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgse
-Version: 0.16.0
+Version: 0.16.2
 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.0 → cgse-0.16.2}/docs/user_guide/cli.md

@@ -2,7 +2,7 @@
 # CLI Commands CGSE
 
 The CGSE comes with a suite of CLI commands to start and stop services, get 
-status reports and check the installation.It's actually a suite of `cgse` 
+status reports and check the installation. It's actually a suite of `cgse` 
 sub-commands that is extendable by external packages. This section will 
 describe the commands that are available from the `cgse` packages.
 

{cgse-0.16.0 → cgse-0.16.2}/libs/cgse-common/pyproject.toml

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

{cgse-0.16.0 → cgse-0.16.2}/libs/cgse-common/src/egse/env.py

@@ -384,7 +384,7 @@ def set_log_file_location(location: str | Path | None):
     _env.set("LOG_FILE_LOCATION", location)
 
 
-def get_log_file_location(site_id: str = None) -> str:
+def get_log_file_location(site_id: str = None, check_exists: bool = False) -> str:
     """
     Returns the full path of the location of the log files. The log file location is read from the environment
     variable `${PROJECT}_LOG_FILE_LOCATION`. The location shall be independent of any setting that is subject to change.
@@ -392,8 +392,12 @@ def get_log_file_location(site_id: str = None) -> str:
     If the environment variable is not set, a default log file location is created from the data storage location as
     follows: `<PROJECT>_DATA_STORAGE_LOCATION/<SITE_ID>/log`.
 
+    There is no check for the existence of the returned location. The caller function shall check if the
+    returned value is a directory and if it exists.
+
     Args:
         site_id: the site identifier
+        check_exists: check if the location that will be returned is a directory and exists
 
     Returns:
         The full path of location of the log files as a string.
@@ -417,6 +421,10 @@ def get_log_file_location(site_id: str = None) -> str:
         data_root = data_root.rstrip("/")
         log_data_root = f"{data_root}/log"
 
+    if check_exists:
+        if not Path(log_data_root).is_dir():
+            raise ValueError(f"The location that was constructed doesn't exist: {log_data_root}")
+
     return log_data_root
 
 

{cgse-0.16.0 → cgse-0.16.2}/libs/cgse-common/src/egse/system.py

@@ -48,6 +48,7 @@ from typing import Callable
 from typing import Iterable
 from typing import List
 from typing import Optional
+from typing import TextIO
 from typing import Tuple
 from typing import Type
 from typing import Union
@@ -60,6 +61,7 @@ from rich.tree import Tree
 from typer.core import TyperCommand
 
 import signal
+from egse.env import get_log_file_location
 from egse.log import logger
 
 EPOCH_1958_1970 = 378691200
@@ -2307,6 +2309,28 @@ def caffeinate(pid: int = None):
         subprocess.Popen([shutil.which("caffeinate"), "-i", "-w", str(pid)])
 
 
+def redirect_output_to_log(output_fn: str, append: bool = False) -> TextIO:
+    """
+    Open file in the log folder where process output will be redirected.
+
+    When no location can be determined, the user's home directory will be used.
+
+    The file is opened in text mode at the given location and the stream (file descriptor) will be returned.
+    """
+
+    try:
+        location = get_log_file_location()
+        output_path = Path(location, output_fn).expanduser()
+    except ValueError:
+        output_path = Path.home() / output_fn
+
+    out = open(output_path, "a" if append else "w")
+
+    logger.info(f"Output will be redirected to {output_path!s}")
+
+    return out
+
+
 ignore_m_warning("egse.system")
 
 if __name__ == "__main__":

{cgse-0.16.0 → cgse-0.16.2}/libs/cgse-coordinates/pyproject.toml

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

{cgse-0.16.0 → cgse-0.16.2}/libs/cgse-core/pyproject.toml

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

{cgse-0.16.0 → cgse-0.16.2}/libs/cgse-core/src/cgse_core/_start.py

@@ -1,14 +1,15 @@
 import subprocess
 import sys
-from pathlib import Path
 
 import rich
 
+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 = open(Path("~/.rm_cs.start.out").expanduser(), "w")
+    out = redirect_output_to_log(".rm_cs.start.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.registry.server", "start", "--log-level", log_level],
@@ -22,7 +23,7 @@ def start_rm_cs(log_level: str):
 def start_log_cs():
     rich.print("Starting the logging core service...")
 
-    out = open(Path("~/.log_cs.start.out").expanduser(), "w")
+    out = redirect_output_to_log(".log_cs.start.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.logger.log_cs", "start"],
@@ -36,7 +37,7 @@ def start_log_cs():
 def start_sm_cs():
     rich.print("Starting the storage manager core service...")
 
-    out = open(Path("~/.sm_cs.start.out").expanduser(), "w")
+    out = redirect_output_to_log(".sm_cs.start.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.storage.storage_cs", "start"],
@@ -50,7 +51,7 @@ def start_sm_cs():
 def start_cm_cs():
     rich.print("Starting the configuration manager core service...")
 
-    out = open(Path("~/.cm_cs.start.out").expanduser(), "w")
+    out = redirect_output_to_log(".cm_cs.start.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.confman.confman_cs", "start"],
@@ -64,7 +65,7 @@ def start_cm_cs():
 def start_pm_cs():
     rich.print("Starting the process manager core service...")
 
-    out = open(Path("~/.pm_cs.start.out").expanduser(), "w")
+    out = redirect_output_to_log(".pm_cs.start.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.procman.procman_cs", "start"],
@@ -78,7 +79,7 @@ def start_pm_cs():
 def start_notifyhub():
     rich.print("Starting the notification hub core service...")
 
-    out = open(Path("~/.notifyhub.start.out").expanduser(), "w")
+    out = redirect_output_to_log(".nh_cs.start.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.notifyhub.server", "start"],

{cgse-0.16.0 → cgse-0.16.2}/libs/cgse-core/src/cgse_core/_stop.py

@@ -8,13 +8,14 @@ import rich
 from egse.log import logger
 from egse.process import is_process_running
 from egse.system import Timer
+from egse.system import redirect_output_to_log
 from egse.system import waiting_for
 
 
 def stop_rm_cs():
     rich.print("Terminating the service registry manager core service...")
 
-    out = open(Path("~/.rm_cs.stop.out").expanduser(), "w")
+    out = redirect_output_to_log(".rm_cs.stop.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.registry.server", "stop"],
@@ -34,7 +35,7 @@ def stop_rm_cs():
 def stop_log_cs():
     rich.print("Terminating the logging core service...")
 
-    out = open(Path("~/.log_cs.stop.out").expanduser(), "w")
+    out = redirect_output_to_log(".log_cs.stop.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.logger.log_cs", "stop"],
@@ -48,7 +49,7 @@ def stop_log_cs():
 def stop_sm_cs():
     rich.print("Terminating the storage manager core service...")
 
-    out = open(Path("~/.sm_cs.stop.out").expanduser(), "w")
+    out = redirect_output_to_log(".sm_cs.stop.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.storage.storage_cs", "stop"],
@@ -68,7 +69,7 @@ def stop_sm_cs():
 def stop_cm_cs():
     rich.print("Terminating the configuration manager core service...")
 
-    out = open(Path("~/.cm_cs.stop.out").expanduser(), "w")
+    out = redirect_output_to_log(".cm_cs.stop.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.confman.confman_cs", "stop"],
@@ -88,7 +89,8 @@ def stop_cm_cs():
 def stop_pm_cs():
     rich.print("Terminating the process manager core service...")
 
-    out = open(Path("~/.pm_cs.stop.out").expanduser(), "w")
+    out = redirect_output_to_log(".pm_cs.stop.log")
+
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.procman.procman_cs", "stop"],
@@ -108,7 +110,7 @@ def stop_pm_cs():
 def stop_notifyhub():
     rich.print("Terminating the notification hub core service...")
 
-    out = open(Path("~/.notifyhub.stop.out").expanduser(), "w")
+    out = redirect_output_to_log(".nh_cs.stop.log")
 
     subprocess.Popen(
         [sys.executable, "-m", "egse.notifyhub.server", "stop"],

{cgse-0.16.0 → cgse-0.16.2}/libs/cgse-core/src/cgse_core/settings.yaml

@@ -3,7 +3,12 @@ PACKAGES:
 
 Service Registry:
     
-    CLEANUP_INTERVAL:               30
+    CLEANUP_INTERVAL:                30
+    REQUESTER_PORT:                6100
+    PUBLISHER_PORT:                6101
+    HEARTBEAT_PORT:                6102
+    DATABASE_PATH:  service_registry.db
+
 
 Logging Control Server:                          # LOG_CS
 
@@ -11,8 +16,8 @@ Logging Control Server:                          # LOG_CS
     PROCESS_NAME:                log_cs
     MAX_NR_LOG_FILES:                20          # The maximum number of log files that will be maintained in a roll-over
     MAX_SIZE_LOG_FILES:              20          # The maximum size one log file can become
-    RECEIVER_PORT:                 4248
-    COMMANDER_PORT:                4249
+    RECEIVER_PORT:                 6105
+    COMMANDER_PORT:                6106
     TEXTUALOG_IP_ADDRESS:     127.0.0.1          # The IP address of the textualog listening server
     TEXTUALOG_LISTENING_PORT:     19996          # The port number on which the textualog server is listening
 
@@ -20,9 +25,9 @@ Configuration Manager Control Server:            # CM_CS
 
     SERVICE_TYPE:                 CM_CS
     PROCESS_NAME:                 cm_cs
-    COMMANDING_PORT:               6000          # The port on which the controller listens to commands - REQ-REP
-    MONITORING_PORT:               6001          # The port on which the controller sends periodic status information of the device - PUB-SUB
-    SERVICE_PORT:                  6002          # The port on which the controller listens for configuration and administration - REQ-REP
+    COMMANDING_PORT:               6110          # The port on which the controller listens to commands - REQ-REP
+    MONITORING_PORT:               6111          # The port on which the controller sends periodic status information of the device - PUB-SUB
+    SERVICE_PORT:                  6112          # The port on which the controller listens for configuration and administration - REQ-REP
     DELAY:                            1          # The delay time between publishing status information [seconds]
     STORAGE_MNEMONIC:                CM          # The mnemonic to be used in the filename storing the housekeeping data
 
@@ -30,30 +35,35 @@ Storage Manager Control Server:                  # SM_CS
 
     SERVICE_TYPE:                 SM_CS
     PROCESS_NAME:                 sm_cs
-    COMMANDING_PORT:               6010          # The port on which the controller listens to commands - REQ-REP
-    MONITORING_PORT:               6011          # The port on which the controller sends periodic status information of the device - PUB-SUB
-    SERVICE_PORT:                  6012          # The port on which the controller listens for configuration and administration - REQ-REP
+    COMMANDING_PORT:               6115          # The port on which the controller listens to commands - REQ-REP
+    MONITORING_PORT:               6116          # The port on which the controller sends periodic status information of the device - PUB-SUB
+    SERVICE_PORT:                  6117          # The port on which the controller listens for configuration and administration - REQ-REP
     DELAY:                            1          # The delay time between publishing status information [seconds]
 
 Process Manager Control Server:                  # PM_CS
 
     SERVICE_TYPE:                 PM_CS
     PROCESS_NAME:                 pm_cs
-    COMMANDING_PORT:               6020          # The port on which the controller listens to commands - REQ-REP
-    MONITORING_PORT:               6021          # The port on which the controller sends periodic status information of the devide - PUB-SUB
-    SERVICE_PORT:                  6022          # The port number on which the controller listens for configuration and administration - REQ-REP
+    COMMANDING_PORT:               6120          # The port on which the controller listens to commands - REQ-REP
+    MONITORING_PORT:               6121          # The port on which the controller sends periodic status information of the devide - PUB-SUB
+    SERVICE_PORT:                  6122          # The port number on which the controller listens for configuration and administration - REQ-REP
     DELAY:                            1          # The delay time between publishing status information [seconds]
     STORAGE_MNEMONIC:                PM          # The mnemonic to be used in the filename storing the housekeeping data
 
 Notify Hub:
     
     SERVICE_TYPE:            NOTIFY_HUB
+    SERVICE_ID:                 nh_cs_1
     PROCESS_NAME:                 nh_cs
-    COLLECTOR_PORT:                4245
-    PUBLISHER_PORT:                4246
-    REQUESTS_PORT:                 4247
+    COLLECTOR_PORT:                6125
+    PUBLISHER_PORT:                6126
+    REQUESTS_PORT:                 6167
     
 Metrics Hub:
     
     SERVICE_TYPE:           METRICS_HUB
+    SERVICE_ID:                 mh_cs_1
     PROCESS_NAME:                 mh_cs
+    COLLECTOR_PORT:                6130
+    PUBLISHER_PORT:                6131
+    REQUESTS_PORT:                 6132

{cgse-0.16.0 → cgse-0.16.2}/libs/cgse-core/src/egse/confman/__init__.py

@@ -128,6 +128,7 @@ from egse.command import ClientServerCommand
 from egse.command import stringify_function_call
 from egse.config import find_file
 from egse.config import find_files
+from egse.connect import get_endpoint
 from egse.control import ControlServer
 from egse.control import is_control_server_active
 from egse.decorators import dynamic_interface
@@ -992,27 +993,22 @@ class ConfigurationManagerProxy(Proxy, ConfigurationManagerInterface):
     """
     The Configuration Manager Proxy class is used to connect to the Configuration Manager
     Control Server and send commands and requests for the configuration manager.
+
+    When the port number passed is 0 (zero), the endpoint is requested from the
+    service registry.
+
+    Args:
+        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]
     """
 
     def __init__(
         self, protocol: str = PROTOCOL, hostname: str = HOSTNAME, port: int = COMMANDING_PORT, timeout=PROXY_TIMEOUT
     ):
-        """
-        Args:
-            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]
-        """
-        if port == 0:
-            with RegistryClient() as reg:
-                endpoint = reg.get_endpoint(settings.SERVICE_TYPE)
-
-            if not endpoint:
-                raise RuntimeError(f"No service registered as {settings.SERVICE_TYPE}")
-        else:
-            endpoint = connect_address(protocol, hostname, port)
+        endpoint = get_endpoint(settings.SERVICE_TYPE, protocol, hostname, port)
 
         super().__init__(endpoint, timeout=timeout)
 

{cgse-0.16.0/libs/cgse-common → cgse-0.16.2/libs/cgse-core}/src/egse/connect.py

@@ -4,12 +4,57 @@ import time
 from enum import Enum
 
 from egse.log import logging
+from egse.registry.client import RegistryClient
+from egse.zmq_ser import connect_address
 
 logger = logging.getLogger("egse.connect")
 
 # random.seed(time.monotonic())  # uncomment for testing only, main application should set a seed.
 
 
+def get_endpoint(
+    service_type: str,
+    protocol: str = None,
+    hostname: str = None,
+    port: int = 0,
+):
+    """
+    Returns the endpoint for a service, either from the registry or by constructing
+    it from protocol, hostname and port.
+
+    If port is 0 (the default), attempt to retrieve the endpoint from the service registry.
+
+    Args:
+        service_type: The service type to look up in the registry.
+        protocol: Protocol to use if constructing the endpoint.
+        hostname: Hostname to use if constructing the endpoint.
+        port: Port to use if constructing the endpoint.
+
+    Returns:
+        The endpoint string.
+
+    Raises:
+        RuntimeError: If no endpoint can be determined.
+    """
+    endpoint = None
+
+    if port == 0:
+        with RegistryClient() as reg:
+            endpoint = reg.get_endpoint(service_type)
+        if endpoint:
+            logger.info(f"Endpoint for {service_type} found in registry: {endpoint}")
+        else:
+            logger.warning(f"No endpoint for {service_type} found in registry.")
+
+    if not 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}")
+
+    return endpoint
+
+
 class ConnectionState(Enum):
     DISCONNECTED = "disconnected"
     CONNECTING = "connecting"

{cgse-0.16.0 → cgse-0.16.2}/libs/cgse-core/src/egse/dummy.py

@@ -1,6 +1,13 @@
 """
 This module provides a dummy implementation for classes of the commanding chain.
 
+This is only a simplified implementation that is used for testing purposes.
+
+If you need a more elaborate example of a device and commanding chain implementation,
+check out the `cgse-dummy` project in PyPI. That project is a full implementation of
+all aspects in device access, commanding, and services. It also handles both
+synchronous and asynchronous implementations.
+
 Start the control server with:
 
     py -m egse.dummy start-cs

{cgse-0.16.0 → cgse-0.16.2}/libs/cgse-core/src/egse/logger/__init__.py

@@ -37,6 +37,7 @@ from egse.log import PackageFilter
 from egse.log import egse_logger
 from egse.log import logger
 from egse.log import root_logger
+from egse.registry.client import RegistryClient
 from egse.settings import Settings
 from egse.system import is_in_ipython
 from egse.system import type_name
@@ -62,26 +63,25 @@ def get_log_file_name():
     return settings.get("FILENAME", "general.log")
 
 
-def get_endpoint_from_registry(port: str = "commander"):
+def get_endpoint_from_registry(service_type: str, port_type: str = "commander"):
     """Returns the endpoint that was constructed from information from the service registry."""
-    from egse.registry.client import RegistryClient
 
     # logger.debug(f"Calling get_endpoint_from_registry(\"{port}\")")
 
     try:
         with RegistryClient() as reg:
-            if port == "commander":
-                endpoint = reg.get_endpoint(SERVICE_TYPE)
-            elif port == "receiver":
-                service = reg.discover_service(SERVICE_TYPE)
+            if port_type == "commander":
+                endpoint = reg.get_endpoint(service_type)
+            elif port_type == "receiver":
+                service = reg.discover_service(service_type)
                 endpoint = (
                     f"{service.get('protocol', 'tcp')}://{service['host']}:{service['metadata']['receiver_port']}"
                 )
             else:
-                logger.error(f"Incorrect argument {port=}, no endpoint returned.")
+                logger.error(f"Incorrect argument {port_type=}, no endpoint returned.")
                 endpoint = None
     except Exception:  # noqa
-        logger.warning(f"Couldn't retrieve endpoint for {SERVICE_TYPE}. Is the log_cs process running?")
+        logger.warning(f"Couldn't retrieve endpoint for {service_type}. Is the service registry process running?")
         endpoint = None
 
     return endpoint
@@ -92,7 +92,7 @@ class ZeroMQHandler(logging.Handler):
         super().__init__()
 
         if RECEIVER_PORT == 0:
-            endpoint = get_endpoint_from_registry(port="receiver")
+            endpoint = get_endpoint_from_registry(service_type=SERVICE_TYPE, port_type="receiver")
         else:
             endpoint = f"{PROTOCOL}://{HOSTNAME}:{RECEIVER_PORT}"
 

{cgse-0.16.0 → cgse-0.16.2}/libs/cgse-core/src/egse/notifyhub/__init__.py

@@ -11,6 +11,10 @@ from egse.settings import Settings
 
 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")
+
 # 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.
 DEFAULT_COLLECTOR_PORT = settings.get("COLLECTOR_PORT", 0)

{cgse-0.16.0 → cgse-0.16.2}/libs/cgse-core/src/egse/notifyhub/server.py

@@ -18,6 +18,8 @@ from egse.logger import remote_logging
 from egse.notifyhub import DEFAULT_COLLECTOR_PORT
 from egse.notifyhub import DEFAULT_PUBLISHER_PORT
 from egse.notifyhub import DEFAULT_REQUESTS_PORT
+from egse.notifyhub import PROCESS_NAME
+from egse.notifyhub import SERVICE_TYPE
 from egse.notifyhub import STATS_INTERVAL
 from egse.notifyhub.client import AsyncNotificationHubClient
 from egse.registry import MessageType
@@ -30,12 +32,13 @@ from .event import NotificationEvent
 REQUEST_POLL_TIMEOUT = 1.0
 """time to wait for while listening for requests [seconds]."""
 
-app = typer.Typer(name="notify_hub")
+
+app = typer.Typer(name=PROCESS_NAME)
 
 
 class AsyncNotificationHub:
     def __init__(self):
-        self.server_id = "notification-hub-1"
+        self.server_id = PROCESS_NAME
 
         self.context: zmq.asyncio.Context = zmq.asyncio.Context()
 
@@ -51,8 +54,8 @@ class AsyncNotificationHub:
         # Register notification hub to the service registry
         self.registry_client = AsyncRegistryClient(timeout=REQUEST_TIMEOUT)
         self.service_id = None
-        self.service_name = "Notification Hub"
-        self.service_type = "notification-hub"
+        self.service_name = PROCESS_NAME
+        self.service_type = SERVICE_TYPE
         self.is_service_registered: bool = False
         """True if the service is registered to the service registry."""
 
@@ -123,7 +126,7 @@ class AsyncNotificationHub:
 
         self.service_id = await self.registry_client.register(
             name=self.service_name,
-            host=get_host_ip(),
+            host=get_host_ip() or "127.0.0.1",
             port=DEFAULT_REQUESTS_PORT,
             service_type=self.service_type,
             metadata={"pub_port": DEFAULT_PUBLISHER_PORT, "collector_port": DEFAULT_COLLECTOR_PORT},

{cgse-0.16.0 → cgse-0.16.2}/libs/cgse-core/src/egse/procman/__init__.py

@@ -5,6 +5,7 @@ from pathlib import Path
 from typing import Union
 
 from egse.command import ClientServerCommand
+from egse.connect import get_endpoint
 from egse.control import is_control_server_active
 from egse.decorators import dynamic_interface
 from egse.listener import EventInterface, Event
@@ -20,10 +21,15 @@ from egse.zmq_ser import connect_address
 HERE = Path(__file__).parent
 LOGGER = logging.getLogger("egse.procman")
 
-CTRL_SETTINGS = Settings.load("Process Manager Control Server")
+settings = Settings.load("Process Manager Control Server")
 COMMAND_SETTINGS = Settings.load(location=HERE, filename="procman.yaml")
 PROXY_TIMEOUT = 10_000
 
+SERVICE_TYPE = settings.get("SERVICE_TYPE", "pm_cs")
+PROTOCOL = settings.get("PROTOCOL", "tcp")
+HOSTNAME = settings.get("HOSTNAME", "localhost")
+COMMANDING_PORT = settings.get("COMMANDING_PORT", 0)  # dynamically assigned by the system if 0
+
 
 def is_process_manager_active(timeout: float = 0.5) -> bool:
     """Checks if the Process Manager Control Server is active.
@@ -39,7 +45,7 @@ def is_process_manager_active(timeout: float = 0.5) -> bool:
     """
 
     with RegistryClient() as client:
-        endpoint = client.get_endpoint(CTRL_SETTINGS.SERVICE_TYPE)
+        endpoint = client.get_endpoint(settings.SERVICE_TYPE)
 
     if endpoint is None:
         return False
@@ -394,11 +400,14 @@ class ProcessManagerController(ProcessManagerInterface):
 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 = None, hostname: str = None, port: int = -1, timeout=PROXY_TIMEOUT):
-        """Initialisation of a new Proxy for Process Management.
+    def __init__(
+        self, protocol: str = PROTOCOL, hostname: str = HOSTNAME, port: int = COMMANDING_PORT, timeout=PROXY_TIMEOUT
+    ):
+        """
+        Initialisation of a new Proxy for Process Management.
 
-        If no connection details (transport protocol, hostname, and port) are not provided, these are taken from the
-        settings file.
+        The connection details (transport protocol, hostname, and port) are by default taken from the
+        settings file. When the `port` is 0 (zero) the endpoint is retrieved from the service registry.
 
         Args:
             protocol (str): Transport protocol
@@ -406,15 +415,6 @@ class ProcessManagerProxy(Proxy, ProcessManagerInterface):
             port (int): TCP port on which the Control Server is listening for commands
         """
 
-        if hostname is None:
-            with RegistryClient() as reg:
-                service = reg.discover_service(CTRL_SETTINGS.SERVICE_TYPE)
-
-                if service:
-                    protocol = service.get("protocol", "tcp")
-                    hostname = service["host"]
-                    port = service["port"]
-                else:
-                    raise RuntimeError(f"No service registered as {CTRL_SETTINGS.SERVICE_TYPE}")
+        endpoint = get_endpoint(settings.SERVICE_TYPE, protocol, hostname, port)
 
-        super().__init__(connect_address(protocol, hostname, port), timeout=timeout)
+        super().__init__(endpoint, timeout=timeout)

{cgse-0.16.0 → cgse-0.16.2}/libs/cgse-core/src/egse/registry/__init__.py

@@ -1,6 +1,9 @@
-import logging
 from enum import Enum
 
+from egse.log import logging
+
+logger = logging.getLogger("egse.registry")
+
 # Default ports that are assigned to REQ-REP and PUB-SUB protocols of the registry services
 DEFAULT_RS_REQ_PORT = 4242  # Handle requests
 DEFAULT_RS_PUB_PORT = 4243  # Publish events
@@ -19,9 +22,6 @@ class MessageType(Enum):
     HEARTBEAT = b"HB"  # Heartbeat/health check
 
 
-logger = logging.getLogger("egse.registry")
-
-
 def is_service_registry_active(timeout: float = 0.5):
     """Check if the service registry is running and active.