Merge pull request #108 from python-accelerator-middle-layer/absolute-path-support

Modifications for absolute path

Author: JeanLucPons

pyaml/configuration/csvcurve.py

@@ -4,7 +4,7 @@
 from pydantic import BaseModel, ConfigDict
 
 from ..common.exception import PyAMLException
-from ..configuration import get_root_folder
+from ..configuration.fileloader import get_path
 from .curve import Curve
 
 # Define the main class name for this module
@@ -27,7 +27,7 @@ def __init__(self, cfg: ConfigModel):
         self._cfg = cfg
 
         # Load CSV curve
-        path: Path = get_root_folder() / cfg.file
+        path = get_path(cfg.file)
         try:
             self._curve = np.genfromtxt(path, delimiter=",", dtype=float, loose=False)
         except ValueError as e:

pyaml/configuration/csvmatrix.py

@@ -4,7 +4,7 @@
 from pydantic import BaseModel, ConfigDict
 
 from ..common.exception import PyAMLException
-from ..configuration import get_root_folder
+from ..configuration.fileloader import get_path
 from .matrix import Matrix
 
 # Define the main class name for this module
@@ -26,7 +26,7 @@ class CSVMatrix(Matrix):
     def __init__(self, cfg: ConfigModel):
         self._cfg = cfg
         # Load CSV matrix
-        path: Path = get_root_folder() / cfg.file
+        path = get_path(cfg.file)
         try:
             self._mat = np.genfromtxt(path, delimiter=",", dtype=float, loose=False)
         except ValueError as e:

pyaml/configuration/fileloader.py

@@ -3,6 +3,7 @@
 import io
 import json
 import logging
+import os
 from pathlib import Path
 from typing import TYPE_CHECKING, Union
 
@@ -41,6 +42,18 @@ def get_root_folder() -> Path:
     return ROOT["path"]
 
 
+def get_path(p: Path) -> Path:
+    """
+    Return unchanged input path if it is an absolute path,
+    path relative to root folder otherwise.
+    """
+    if os.path.isabs(p):
+        return p
+    else:
+        root = get_root_folder()
+        return root / p
+
+
 class PyAMLConfigCyclingException(PyAMLException):
     def __init__(self, error_filename: str, path_stack: list[Path]):
         self.error_filename = error_filename
@@ -78,7 +91,7 @@ def hasToExpand(value):
 # Loader base class (nested files expansion)
 class Loader:
     def __init__(self, filename: str, parent_path_stack: list[Path]):
-        self.path: Path = get_root_folder() / filename
+        self.path: Path = get_path(filename)
         self.files_stack: list[Path] = []
         if parent_path_stack:
             if any(