cgse-common 0.17.1__py3-none-any.whl → 0.17.3__py3-none-any.whl

egse/scpi.py

@@ -4,20 +4,17 @@ from typing import Any
 from typing import Dict
 from typing import Optional
 
-from egse.device import AsyncDeviceInterface
 from egse.device import AsyncDeviceTransport
 from egse.device import DeviceConnectionError
 from egse.device import DeviceError
 from egse.device import DeviceTimeoutError
 from egse.log import logger
 
+# Constants that can be overridden by specific device implementations
 DEFAULT_READ_TIMEOUT = 1.0  # seconds
 DEFAULT_CONNECT_TIMEOUT = 3.0  # seconds
 IDENTIFICATION_QUERY = "*IDN?"
 
-SEPARATOR = b"\n"
-SEPARATOR_STR = SEPARATOR.decode()
-
 
 class SCPICommand:
     """Base class for SCPI commands."""
@@ -35,7 +32,7 @@ class SCPICommand:
         raise NotImplementedError("Subclasses must implement get_cmd_string().")
 
 
-class AsyncSCPIInterface(AsyncDeviceInterface, AsyncDeviceTransport):
+class AsyncSCPIInterface(AsyncDeviceTransport):
     """Generic asynchronous interface for devices that use SCPI commands over Ethernet."""
 
     def __init__(
@@ -59,9 +56,7 @@ class AsyncSCPIInterface(AsyncDeviceInterface, AsyncDeviceTransport):
             read_timeout: Timeout for read operations in seconds
             id_validation: String that should appear in the device's identification response
         """
-        super().__init__()
-
-        self._device_name = device_name
+        self.device_name = device_name
         self.hostname = hostname
         self.port = port
         self.settings = settings or {}
@@ -78,65 +73,6 @@ class AsyncSCPIInterface(AsyncDeviceInterface, AsyncDeviceTransport):
         """Prevents multiple coroutines from attempting to read, write or query from the same stream
         at the same time."""
 
-    def is_simulator(self) -> bool:
-        return False
-
-    @property
-    def device_name(self) -> str:
-        return self._device_name
-
-    async def initialize(self, commands: list[tuple[str, bool]] = None, reset_device: bool = False) -> list[str | None]:
-        """Initialize the device with optional reset and command sequence.
-
-        Performs device initialization by optionally resetting the device and then
-        executing a sequence of commands. Each command can optionally expect a
-        response that will be logged for debugging purposes.
-
-        Args:
-            commands: List of tuples containing (command_string, expects_response).
-                Each tuple specifies a command to send and whether to wait for and
-                log the response. Defaults to None (no commands executed).
-            reset_device: Whether to send a reset command (*RST) before executing
-                the command sequence. Defaults to False.
-
-        Returns:
-           Response for each of the commands, or None when no response was expected.
-
-        Raises:
-            Any exceptions raised by the underlying write() or trans() methods,
-            typically communication errors or device timeouts.
-
-        Example:
-            await device.initialize(
-                [
-                    ("*IDN?", True),           # Query device ID, expect response
-                    ("SYST:ERR?", True),       # Check for errors, expect response
-                    ("OUTP ON", False),        # Enable output, no response expected
-                ],
-                reset_device=True
-            )
-        """
-
-        commands = commands or []
-        responses = []
-
-        if reset_device:
-            logger.info(f"Resetting the {self._device_name}...")
-            await self.write("*RST")  # this also resets the user-defined buffer
-
-        for cmd, expects_response in commands:
-            if expects_response:
-                logger.debug(f"Sending {cmd}...")
-                response = (await self.trans(cmd)).decode().strip()
-                responses.append(response)
-                logger.debug(f"{response = }")
-            else:
-                logger.debug(f"Sending {cmd}...")
-                await self.write(cmd)
-                responses.append(None)
-
-        return responses
-
     async def connect(self) -> None:
         """Connect to the device asynchronously.
 
@@ -148,47 +84,47 @@ class AsyncSCPIInterface(AsyncDeviceInterface, AsyncDeviceTransport):
         async with self._connect_lock:
             # Sanity checks
             if self._is_connection_open:
-                logger.warning(f"{self._device_name}: Trying to connect to an already connected device.")
+                logger.warning(f"{self.device_name}: Trying to connect to an already connected device.")
                 return
 
             if not self.hostname:
-                raise ValueError(f"{self._device_name}: Hostname is not initialized.")
+                raise ValueError(f"{self.device_name}: Hostname is not initialized.")
 
             if not self.port:
-                raise ValueError(f"{self._device_name}: Port number is not initialized.")
+                raise ValueError(f"{self.device_name}: Port number is not initialized.")
 
             # Attempt to establish a connection
             try:
-                logger.debug(f'Connecting to {self._device_name} at "{self.hostname}" using port {self.port}')
+                logger.debug(f'Connecting to {self.device_name} at "{self.hostname}" using port {self.port}')
 
                 connect_task = asyncio.open_connection(self.hostname, self.port)
                 self._reader, self._writer = await asyncio.wait_for(connect_task, timeout=self.connect_timeout)
 
                 self._is_connection_open = True
 
-                logger.debug(f"Successfully connected to {self._device_name}.")
+                logger.debug(f"Successfully connected to {self.device_name}.")
 
             except asyncio.TimeoutError as exc:
                 raise DeviceTimeoutError(
-                    self._device_name, f"Connection to {self.hostname}:{self.port} timed out"
+                    self.device_name, f"Connection to {self.hostname}:{self.port} timed out"
                 ) from exc
             except ConnectionRefusedError as exc:
                 raise DeviceConnectionError(
-                    self._device_name, f"Connection refused to {self.hostname}:{self.port}"
+                    self.device_name, f"Connection refused to {self.hostname}:{self.port}"
                 ) from exc
             except socket.gaierror as exc:
-                raise DeviceConnectionError(self._device_name, f"Address resolution error for {self.hostname}") from exc
+                raise DeviceConnectionError(self.device_name, f"Address resolution error for {self.hostname}") from exc
             except socket.herror as exc:
-                raise DeviceConnectionError(self._device_name, f"Host address error for {self.hostname}") from exc
+                raise DeviceConnectionError(self.device_name, f"Host address error for {self.hostname}") from exc
             except OSError as exc:
-                raise DeviceConnectionError(self._device_name, f"OS error: {exc}") from exc
+                raise DeviceConnectionError(self.device_name, f"OS error: {exc}") from exc
 
             # Validate device identity if requested
             if self.id_validation:
                 logger.debug("Validating connection..")
                 if not await self.is_connected():
                     await self.disconnect()
-                    raise DeviceConnectionError(self._device_name, "Device connected but failed identity verification")
+                    raise DeviceConnectionError(self.device_name, "Device connected but failed identity verification")
 
     async def disconnect(self) -> None:
         """Disconnect from the device asynchronously.
@@ -199,20 +135,22 @@ class AsyncSCPIInterface(AsyncDeviceInterface, AsyncDeviceTransport):
         async with self._connect_lock:
             try:
                 if self._is_connection_open and self._writer is not None:
-                    logger.debug(f"Disconnecting from {self._device_name} at {self.hostname}")
+                    logger.debug(f"Disconnecting from {self.device_name} at {self.hostname}")
                     self._writer.close()
                     await self._writer.wait_closed()
                     self._writer = None
                     self._reader = None
                     self._is_connection_open = False
             except Exception as exc:
-                raise DeviceConnectionError(self._device_name, f"Could not close connection: {exc}") from exc
+                raise DeviceConnectionError(self.device_name, f"Could not close connection: {exc}") from exc
 
     async def reconnect(self) -> None:
         """Reconnect to the device asynchronously."""
-        await self.disconnect()
-        await asyncio.sleep(0.1)
-        await self.connect()
+        async with self._connect_lock:
+            if self._is_connection_open:
+                await self.disconnect()
+                await asyncio.sleep(0.1)
+            await self.connect()
 
     async def is_connected(self) -> bool:
         """Check if the device is connected and responds correctly to identification.
@@ -230,7 +168,7 @@ class AsyncSCPIInterface(AsyncDeviceInterface, AsyncDeviceTransport):
             # Validate the response if validation string is provided
             if self.id_validation and self.id_validation not in id_response:
                 logger.error(
-                    f"{self._device_name}: Device did not respond correctly to identification query. "
+                    f"{self.device_name}: Device did not respond correctly to identification query. "
                     f'Expected "{self.id_validation}" in response, got: {id_response}'
                 )
                 await self.disconnect()
@@ -239,7 +177,8 @@ class AsyncSCPIInterface(AsyncDeviceInterface, AsyncDeviceTransport):
             return True
 
         except DeviceError as exc:
-            logger.error(f"{self._device_name}: Connection test failed: {exc}", exc_info=True)
+            logger.exception(exc)
+            logger.error(f"{self.device_name}: Connection test failed")
             await self.disconnect()
             return False
 
@@ -256,20 +195,19 @@ class AsyncSCPIInterface(AsyncDeviceInterface, AsyncDeviceTransport):
         async with self._io_lock:
             try:
                 if not self._is_connection_open or self._writer is None:
-                    raise DeviceConnectionError(self._device_name, "Device not connected, use connect() first")
+                    raise DeviceConnectionError(self.device_name, "Device not connected, use connect() first")
 
-                # Ensure command ends with the proper separator or terminator
-                if not command.endswith(SEPARATOR_STR):
-                    command += SEPARATOR_STR
+                # Ensure command ends with newline
+                if not command.endswith("\n"):
+                    command += "\n"
 
-                logger.info(f"-----> {command}")
                 self._writer.write(command.encode())
                 await self._writer.drain()
 
             except asyncio.TimeoutError as exc:
-                raise DeviceTimeoutError(self._device_name, "Write operation timed out") from exc
+                raise DeviceTimeoutError(self.device_name, "Write operation timed out") from exc
             except (ConnectionError, OSError) as exc:
-                raise DeviceConnectionError(self._device_name, f"Communication error: {exc}") from exc
+                raise DeviceConnectionError(self.device_name, f"Communication error: {exc}") from exc
 
     async def read(self) -> bytes:
         """
@@ -284,7 +222,7 @@ class AsyncSCPIInterface(AsyncDeviceInterface, AsyncDeviceTransport):
         """
         async with self._io_lock:
             if not self._is_connection_open or self._reader is None:
-                raise DeviceConnectionError(self._device_name, "Device not connected, use connect() first")
+                raise DeviceConnectionError(self.device_name, "Device not connected, use connect() first")
 
             try:
                 # First, small delay to allow device to prepare response
@@ -293,19 +231,18 @@ class AsyncSCPIInterface(AsyncDeviceInterface, AsyncDeviceTransport):
                 # Try to read until newline (common SCPI terminator)
                 try:
                     response = await asyncio.wait_for(
-                        self._reader.readuntil(separator=SEPARATOR), timeout=self.read_timeout
+                        self._reader.readuntil(separator=b"\n"), timeout=self.read_timeout
                     )
-                    logger.info(f"<----- {response}")
                     return response
 
                 except asyncio.IncompleteReadError as exc:
                     # Connection closed before receiving full response
-                    logger.warning(f"{self._device_name}: Incomplete read, got {len(exc.partial)} bytes")
-                    return exc.partial if exc.partial else SEPARATOR
+                    logger.warning(f"{self.device_name}: Incomplete read, got {len(exc.partial)} bytes")
+                    return exc.partial if exc.partial else b"\r\n"
 
                 except asyncio.LimitOverrunError:
                     # Response too large for buffer
-                    logger.warning(f"{self._device_name}: Response exceeded buffer limits")
+                    logger.warning(f"{self.device_name}: Response exceeded buffer limits")
                     # Fall back to reading a large chunk
                     return await asyncio.wait_for(
                         self._reader.read(8192),  # Larger buffer for exceptional cases
@@ -313,9 +250,9 @@ class AsyncSCPIInterface(AsyncDeviceInterface, AsyncDeviceTransport):
                     )
 
             except asyncio.TimeoutError as exc:
-                raise DeviceTimeoutError(self._device_name, "Read operation timed out") from exc
+                raise DeviceTimeoutError(self.device_name, "Read operation timed out") from exc
             except Exception as exc:
-                raise DeviceConnectionError(self._device_name, f"Read error: {exc}") from exc
+                raise DeviceConnectionError(self.device_name, f"Read error: {exc}") from exc
 
     async def trans(self, command: str) -> bytes:
         """
@@ -336,13 +273,12 @@ class AsyncSCPIInterface(AsyncDeviceInterface, AsyncDeviceTransport):
         async with self._io_lock:
             try:
                 if not self._is_connection_open or self._writer is None:
-                    raise DeviceConnectionError(self._device_name, "Device not connected, use connect() first")
+                    raise DeviceConnectionError(self.device_name, "Device not connected, use connect() first")
 
                 # Ensure command ends with newline
-                if not command.endswith(SEPARATOR_STR):
-                    command += SEPARATOR_STR
+                if not command.endswith("\n"):
+                    command += "\n"
 
-                logger.info(f"-----> {command}")
                 self._writer.write(command.encode())
                 await self._writer.drain()
 
@@ -352,19 +288,18 @@ class AsyncSCPIInterface(AsyncDeviceInterface, AsyncDeviceTransport):
                 # Try to read until newline (common SCPI terminator)
                 try:
                     response = await asyncio.wait_for(
-                        self._reader.readuntil(separator=SEPARATOR), timeout=self.read_timeout
+                        self._reader.readuntil(separator=b"\n"), timeout=self.read_timeout
                     )
-                    logger.info(f"<----- {response}")
                     return response
 
                 except asyncio.IncompleteReadError as exc:
                     # Connection closed before receiving full response
-                    logger.warning(f"{self._device_name}: Incomplete read, got {len(exc.partial)} bytes")
-                    return exc.partial if exc.partial else SEPARATOR
+                    logger.warning(f"{self.device_name}: Incomplete read, got {len(exc.partial)} bytes")
+                    return exc.partial if exc.partial else b"\r\n"
 
                 except asyncio.LimitOverrunError:
                     # Response too large for buffer
-                    logger.warning(f"{self._device_name}: Response exceeded buffer limits")
+                    logger.warning(f"{self.device_name}: Response exceeded buffer limits")
                     # Fall back to reading a large chunk
                     return await asyncio.wait_for(
                         self._reader.read(8192),  # Larger buffer for exceptional cases
@@ -372,11 +307,11 @@ class AsyncSCPIInterface(AsyncDeviceInterface, AsyncDeviceTransport):
                     )
 
             except asyncio.TimeoutError as exc:
-                raise DeviceTimeoutError(self._device_name, "Communication timed out") from exc
+                raise DeviceTimeoutError(self.device_name, "Communication timed out") from exc
             except (ConnectionError, OSError) as exc:
-                raise DeviceConnectionError(self._device_name, f"Communication error: {exc}") from exc
+                raise DeviceConnectionError(self.device_name, f"Communication error: {exc}") from exc
             except Exception as exc:
-                raise DeviceConnectionError(self._device_name, f"Transaction error: {exc}") from exc
+                raise DeviceConnectionError(self.device_name, f"Transaction error: {exc}") from exc
 
     async def __aenter__(self):
         """Async context manager entry."""

egse/settings.py

@@ -380,6 +380,37 @@ class Settings:
 
         return msg.rstrip()
 
+    @classmethod
+    def from_string(cls, yaml_string: str, group: str | None = None) -> attrdict:
+        """
+        Creates a Settings object from a YAML string.
+
+        Args:
+            yaml_string (str): the YAML configuration as a string
+
+        Returns:
+            An attribute dictionary with all the settings from the given string.
+        """
+        try:
+            yaml_document = yaml.load(yaml_string, Loader=SAFE_LOADER)
+            settings = attrdict({name: value for name, value in yaml_document.items()}, label="Settings")
+        except yaml.YAMLError as exc:
+            logger.error(exc)
+            raise SettingsError("Error loading YAML document from string") from exc
+
+        if not settings:
+            logger.warning(
+                "The Settings YAML string is empty. No local settings were loaded, an empty dictionary is returned."
+            )
+
+        if group:
+            if group in settings:
+                settings = attrdict({name: value for name, value in settings[group].items()}, label=group)
+            else:
+                raise SettingsError(f"Group name '{group}' is not defined in the provided YAML string.")
+
+        return settings
+
 
 def main(args: list | None = None):  # pragma: no cover
     # We provide convenience to inspect the settings by calling this module directly from Python.

egse/system.py

@@ -10,8 +10,6 @@ The module has external dependencies to:
 
 """
 
-from __future__ import annotations
-
 import asyncio
 import builtins
 import collections
@@ -30,6 +28,7 @@ import os
 import platform  # For getting the operating system name
 import re
 import shutil
+import signal
 import socket
 import subprocess  # For executing a shell command
 import sys
@@ -60,7 +59,6 @@ from rich.text import Text
 from rich.tree import Tree
 from typer.core import TyperCommand
 
-import signal
 from egse.log import logger
 
 EPOCH_1958_1970 = 378691200
@@ -107,7 +105,7 @@ class Periodic:
         interval: float,
         *,
         name: str | None = None,
-        callback: Callable = None,
+        callback: Callable | None = None,
         repeat: int | None = None,
         skip: bool = True,
         pause: bool = False,
@@ -202,7 +200,7 @@ class Periodic:
         """Triggers the Timer's action: either call its callback, or logs a message."""
 
         if self._callback is None:
-            self._logger.warning(f"Periodic – No callback provided for interval timer {self.name}.")
+            self._logger.warning(f"Periodic - No callback provided for interval timer {self.name}.")
             return
 
         try:
@@ -211,7 +209,7 @@ class Periodic:
             self._logger.debug("Caught CancelledError on callback function in Periodic.")
             raise
         except Exception as exc:
-            self._logger.error(f"{type(exc).__name__} caught: {exc}")
+            self._logger.error(f"{type_name(exc)} caught: {exc}")
 
     @property
     def interval(self):
@@ -370,8 +368,8 @@ def ignore_m_warning(modules=None):
         modules = [modules]
 
     try:
-        import warnings
         import re
+        import warnings
 
         msg = "'{module}' found in sys.modules after import of package"
         for module in modules:
@@ -390,7 +388,10 @@ def now(utc: bool = True):
 
 
 def format_datetime(
-    dt: Union[str, datetime.datetime] = None, fmt: str = None, width: int = 6, precision: int = 3
+    dt: str | datetime.datetime | datetime.date | None = None,
+    fmt: str | None = None,
+    width: int = 6,
+    precision: int = 3,
 ) -> str:
     """Format a datetime as YYYY-mm-ddTHH:MM:SS.μs+0000.
 
@@ -452,6 +453,10 @@ def format_datetime(
     if fmt:
         timestamp = dt.strftime(fmt)
     else:
+        # If dt is a date (not datetime), convert to datetime at midnight
+        if isinstance(dt, datetime.date) and not isinstance(dt, datetime.datetime):
+            dt = datetime.datetime.combine(dt, datetime.time.min)
+
         width = min(width, precision)
         timestamp = (
             f"{dt.strftime('%Y-%m-%dT%H:%M')}:"
@@ -727,18 +732,29 @@ def get_host_ip() -> Optional[str]:
     return None
 
 
-def get_current_location():
+def get_current_location() -> tuple[str, int, str]:
     """
     Returns the location where this function is called, i.e. the filename, line number, and function name.
+
+    If the location cannot be determined, ("", 0, "") is returned.
     """
-    frame = inspect.currentframe().f_back
+    frame = inspect.currentframe()
+    logger.debug(f"{frame = }")
+    if frame is None:
+        return "", 0, ""
 
-    filename = inspect.getframeinfo(frame).filename
-    line_number = inspect.getframeinfo(frame).lineno
-    function_name = inspect.getframeinfo(frame).function
+    previous_frame = frame.f_back
+    logger.debug(f"{previous_frame = }")
+    if previous_frame is None:
+        return "", 0, ""
+
+    filename = inspect.getframeinfo(previous_frame).filename
+    line_number = inspect.getframeinfo(previous_frame).lineno
+    function_name = inspect.getframeinfo(previous_frame).function
 
     # Clean up to prevent reference cycles
     del frame
+    del previous_frame
 
     return filename, line_number, function_name
 
@@ -1364,7 +1380,7 @@ def chdir(dirname=None):
 
 
 @contextlib.contextmanager
-def env_var(**kwargs: dict[str, str]):
+def env_var(**kwargs: str):
     """
     Context manager to run some code that need alternate settings for environment variables.
 
@@ -1540,6 +1556,7 @@ def read_last_lines(filename: str | Path, num_lines: int) -> List[str]:
     sanity_check(num_lines >= 0, "the number of lines to read shall be a positive number or zero.")
 
     if not filename.exists():
+        logger.warning(f"File does not exist: {filename}")
         return []
 
     # Declaring variable to implement exponential search
@@ -2321,22 +2338,44 @@ 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:
+def redirect_output_to_log(output_fn: str, append: bool = False, overwrite=True) -> TextIO:
     """
-    Open file in the log folder where process output will be redirected.
-
+    Open the file in the log folder where the current 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.
+    The file will be opened in text mode.
+
+    Args:
+        output_fn: the name of the output file
+        append: True to append to the file, False to overwrite
+        overwrite: when False and the file exists, an exception is raised
+
+    Returns:
+        The file stream (TextIO) where output can be redirected to.
+
+    Raises:
+        FileExistsError: when the output file exists, append is False and overwrite is False.
     """
 
-    try:
-        from egse.env import get_log_file_location
+    if Path(output_fn).is_absolute():
+        output_path = Path(output_fn)
+    else:
+        try:
+            from egse.env import get_log_file_location
+
+            location = get_log_file_location()
+            output_path = Path(location, output_fn).expanduser()
+        except ValueError:
+            output_path = Path.home() / output_fn
 
-        location = get_log_file_location()
-        output_path = Path(location, output_fn).expanduser()
-    except ValueError:
-        output_path = Path.home() / output_fn
+    output_path.parent.mkdir(parents=True, exist_ok=True)
+
+    if output_path.exists() and not append:
+        if not overwrite:
+            raise FileExistsError(
+                f"Output file {output_path!s} already exists and will be overwritten. "
+                f"Use overwrite=True to allow overwriting."
+            )
 
     out = open(output_path, "a" if append else "w")
 

egse/version.py

@@ -31,7 +31,7 @@ __all__ = [
 ]
 
 
-def get_version_from_settings_file_raw(group_name: str, location: Path | str = None) -> str:
+def get_version_from_settings_file_raw(group_name: str, location: Path | str | None = None) -> str:
     """
     Reads the VERSION field from the `settings.yaml` file in raw mode, meaning the file
     is not read using the PyYAML module, but using the `readline()` function of the file
@@ -66,7 +66,7 @@ def get_version_from_settings_file_raw(group_name: str, location: Path | str = N
     return version
 
 
-def get_version_from_settings(group_name: str, location: Path = None):
+def get_version_from_settings(group_name: str, location: Path | None = None, yaml_string: str | None = None) -> str:
     """
     Reads the VERSION field from the `settings.yaml` file. This function first tries to load the proper Settings
     and Group and if that fails uses the raw method.
@@ -74,6 +74,7 @@ def get_version_from_settings(group_name: str, location: Path = None):
     Args:
         group_name: major group name that contains the VERSION field, i.e. Common-EGSE or PLATO_TEST_SCRIPTS.
         location: the location of the `settings.yaml` file or None in which case the location of this file is used.
+        yaml_string: optional YAML string to read the settings from instead of a file.
 
     Raises:
         A RuntimeError when the group_name is incorrect and unknown or the VERSION field is not found.
@@ -81,10 +82,14 @@ def get_version_from_settings(group_name: str, location: Path = None):
     Returns:
         The version from the `settings.yaml` file as a string.
     """
-    from egse.settings import Settings, SettingsError
+    from egse.settings import Settings
+    from egse.settings import SettingsError
 
     try:
-        settings = Settings.load(group_name, location=location)
+        if location is None and yaml_string is not None:
+            settings = Settings.from_string(yaml_string, group=group_name)
+        else:
+            settings = Settings.load(group_name, location=location)
         version = settings.VERSION
     except (ModuleNotFoundError, SettingsError):
         version = get_version_from_settings_file_raw(group_name, location=location)
@@ -92,7 +97,7 @@ def get_version_from_settings(group_name: str, location: Path = None):
     return version
 
 
-def get_version_from_git(location: str = None):
+def get_version_from_git(location: str | Path | None = None) -> str:
     """
     Returns the Git version number for the repository at the given location.
 
@@ -121,12 +126,12 @@ def get_version_from_git(location: str = None):
             proc = subprocess.run(
                 ["git", "describe", "--tags", "--long", "--always"], stderr=subprocess.PIPE, stdout=subprocess.PIPE
             )
-            if proc.stderr:
-                version = None
             if proc.stdout:
                 version = proc.stdout.strip().decode("ascii")
+            else:
+                version = "0.0.0"
         except subprocess.CalledProcessError:
-            version = None
+            version = "0.0.0"
 
     return version
 
@@ -144,12 +149,13 @@ def get_version_installed(package_name: str) -> str:
     from egse.system import chdir
 
     with chdir(Path(__file__).parent):
-        from importlib.metadata import version, PackageNotFoundError
+        from importlib.metadata import PackageNotFoundError
+        from importlib.metadata import version as get_version
 
         try:
-            version = version(package_name)
+            version = get_version(package_name)
         except PackageNotFoundError:
-            version = None
+            version = "0.0.0"
 
     return version
 
@@ -162,11 +168,12 @@ VERSION = get_version_installed("cgse-common")
 # The __PYPI_VERSION__ is the version number that will be used for the installation.
 # The version will appear in PyPI and also as the `installed version`.
 
-__PYPI_VERSION__ = VERSION.split("+")[0]
+__PYPI_VERSION__ = VERSION.split("+")[0] if VERSION else "0.0.0"
 
 
-if __name__ == "__main__":
+def main():
     import rich
+
     from egse.plugin import entry_points
 
     if VERSION:
@@ -178,3 +185,7 @@ if __name__ == "__main__":
     for ep in entry_points("cgse.version"):
         if installed_version := get_version_installed(ep.name):
             rich.print(f"Installed version for {ep.name}= [bold default]{installed_version}[/]")
+
+
+if __name__ == "__main__":
+    main()