cgse-common 2025.0.3__tar.gz → 2025.0.4__tar.gz

{cgse_common-2025.0.3 → cgse_common-2025.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgse-common
-Version: 2025.0.3
+Version: 2025.0.4
 Summary: Software framework to support hardware testing
 Author: IVS KU Leuven
 Maintainer-email: Rik Huygen <rik.huygen@kuleuven.be>, Sara Regibo <sara.regibo@kuleuven.be>

{cgse_common-2025.0.3 → cgse_common-2025.0.4}/pyproject.toml

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

{cgse_common-2025.0.3 → cgse_common-2025.0.4}/src/egse/command.py

@@ -95,7 +95,7 @@ import re
 from collections import namedtuple
 from typing import Callable
 
-from egse.control import Success
+from egse.response import Success
 from egse.exceptions import Error
 
 logger = logging.getLogger(__name__)

{cgse_common-2025.0.3 → cgse_common-2025.0.4}/src/egse/env.py

@@ -40,6 +40,8 @@ WARNING:
 from __future__ import annotations
 
 __all__ = [
+    "get_project_name",
+    "get_site_id",
     "get_data_storage_location",
     "set_data_storage_location",
     "get_data_storage_location_env_name",
@@ -164,6 +166,14 @@ def _check_no_value(var_name, value):
         )
 
 
+def get_project_name():
+    return _env.get("PROJECT") or None
+
+
+def get_site_id():
+    return _env.get("SITE_ID") or None
+
+
 def get_data_storage_location_env_name() -> str:
     """Returns the name of the environment variable for the project."""
     project = _env.get("PROJECT")

{cgse_common-2025.0.3 → cgse_common-2025.0.4}/src/egse/hk.py

@@ -16,9 +16,9 @@ import dateutil.parser as date_parser
 import numpy as np
 from egse.config import find_files
 from egse.env import get_data_storage_location
+from egse.env import get_site_id
 from egse.obsid import ObservationIdentifier
 from egse.obsid import obsid_from_storage
-from egse.settings import Settings
 from egse.setup import Setup
 from egse.setup import SetupError
 from egse.setup import load_setup
@@ -30,8 +30,6 @@ from egse.system import time_since_epoch_1958
 
 _LOGGER = logging.getLogger(__name__)
 
-SITE_ID = Settings.load("SITE").ID
-
 
 class TmDictionaryColumns(str, Enum):
     """ Enumeration of the relevant columns in the TM dictionary spreadsheet.
@@ -50,7 +48,7 @@ class TmDictionaryColumns(str, Enum):
     STORAGE_MNEMONIC = "Storage mnemonic"
     CORRECT_HK_NAMES = "CAM EGSE mnemonic"
     ORIGINAL_EGSE_HK_NAMES = "Original name in EGSE"
-    SYNOPTICS_ORIGIN = f"Origin of synoptics at {SITE_ID}"
+    SYNOPTICS_ORIGIN = f"Origin of synoptics at {get_site_id()}"
     TIMESTAMP_NAMES = "Name of corresponding timestamp"
     DESCRIPTION = "Description"
     DASHBOARD = "MON screen"
@@ -120,7 +118,7 @@ def get_housekeeping(hk_name: str, obsid: Union[ObservationIdentifier, str, int]
         try:
             return _get_housekeeping_obsid(hk_name, data_dir, obsid=obsid, time_window=time_window, setup=setup)
         except (ValueError, StopIteration, FileNotFoundError) as exc:
-            raise HKError(f"No HK found for {hk_name} for obsid {obsid} at {SITE_ID}") from exc
+            raise HKError(f"No HK found for {hk_name} for obsid {obsid} at {get_site_id()}") from exc
 
     # Specified OD
 
@@ -129,14 +127,14 @@ def get_housekeeping(hk_name: str, obsid: Union[ObservationIdentifier, str, int]
         try:
             return _get_housekeeping_od(hk_name, data_dir, od=od, time_window=time_window, setup=setup)
         except (ValueError, StopIteration, FileNotFoundError) as exc:
-            raise HKError(f"No HK found for {hk_name} for OD {od} at {SITE_ID}") from exc
+            raise HKError(f"No HK found for {hk_name} for OD {od} at {get_site_id()}") from exc
 
     # Didn't specify neither the obsid nor the OD
 
     try:
         return _get_housekeeping_daily(hk_name, data_dir, time_window=time_window, setup=setup)
     except (ValueError, StopIteration, FileNotFoundError) as exc:
-        raise HKError(f"No HK found for {hk_name} for today at {SITE_ID}") from exc
+        raise HKError(f"No HK found for {hk_name} for today at {get_site_id()}") from exc
 
 
 def _get_housekeeping(hk_name: str, timestamp_name: str, hk_dir: str, files, time_window: int = None):
@@ -272,7 +270,7 @@ def _get_housekeeping_od(hk_name: str, data_dir, od: str, time_window: int = Non
         raise HKError(f"Cannot determine which EGSE component generated HK parameter {hk_name}")
 
     hk_dir += f"{od}/"
-    hk_files = [f"{od}_{SITE_ID}_{origin}.csv"]
+    hk_files = [f"{od}_{get_site_id()}_{origin}.csv"]
 
     return _get_housekeeping(hk_name, timestamp_name, hk_dir, hk_files, time_window=time_window)
 
@@ -326,7 +324,7 @@ def _get_housekeeping_obsid(hk_name: str, data_dir, obsid: Union[ObservationIden
 
     if len(hk_files) == 0:
 
-        raise HKError(f"No HK found for the {origin} at {SITE_ID} for obsid {obsid}")
+        raise HKError(f"No HK found for the {origin} at {get_site_id()} for obsid {obsid}")
 
     hk_files = [hk_files[-1].name]
 
@@ -387,7 +385,7 @@ def _get_housekeeping_daily(hk_name: str, data_dir, time_window: int = None, set
 
         timestamp = datetime.datetime.now(tz=datetime.timezone.utc).strftime("%Y%m%d")
         hk_dir += f"{timestamp}/"
-        filename = f"{timestamp}_{SITE_ID}_{origin}.csv"
+        filename = f"{timestamp}_{get_site_id()}_{origin}.csv"
 
         timestamp_index, hk_index = get_indices(hk_dir + filename, hk_name, timestamp_name)
         return get_last_non_empty(hk_dir + filename, timestamp_index, hk_index)
@@ -412,7 +410,7 @@ def _get_housekeeping_daily(hk_name: str, data_dir, time_window: int = None, set
 
         # Determine which columns will be needed from which file
 
-        filename = f"{start_od}/{start_od}_{SITE_ID}_{origin}.csv"
+        filename = f"{start_od}/{start_od}_{get_site_id()}_{origin}.csv"
 
         if Path(hk_dir + filename).exists():
 
@@ -456,7 +454,7 @@ def _get_housekeeping_daily(hk_name: str, data_dir, time_window: int = None, set
         while day <= last_day:
 
             od = f"{day.year}{day.month:02d}{day.day:02d}"
-            filename = f"{od}/{od}_{SITE_ID}_{origin}.csv"
+            filename = f"{od}/{od}_{get_site_id()}_{origin}.csv"
 
             if Path(hk_dir + filename).exists():
 
@@ -684,7 +682,7 @@ def read_conversion_dict(storage_mnemonic: str, use_site: bool = False, setup: O
 
     if use_site:
 
-        th_prefix = f"G{SITE_ID}_"
+        th_prefix = f"G{get_site_id()}_"
 
         th_conversion_dict = {}
 

{cgse_common-2025.0.3 → cgse_common-2025.0.4}/src/egse/setup.py

@@ -237,7 +237,7 @@ def _load_pandas(resource_name: str, separator: str):
 
     parts = resource_name[8:].rsplit("/", 1)
     [in_dir, fn] = parts if len(parts) > 1 else [None, parts[0]]
-    conf_location = os.environ['PLATO_CONF_DATA_LOCATION']
+    conf_location = get_conf_data_location()
 
     try:
         pandas_file_location = Path(conf_location) / in_dir / fn