Fixed set_root_path() relative path

Author: JeanLucPons

.github/workflows/tests.yml

@@ -19,14 +19,16 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.10
+    - name: Set up Python 3.12
       uses: actions/setup-python@v3
       with:
-        python-version: ">=3.10"
+        python-version: ">=3.12"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install numpy
+        pip install scipy
+        pip install pydantic
         pip install flake8 pytest
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
     - name: Lint with flake8

docs/conf.py

@@ -26,7 +26,7 @@
 
 
 TOPLEVEL_DIR = pathlib.Path(__file__).parent.parent.absolute()
-ABOUT_FILE = TOPLEVEL_DIR / "pyAML" / "__init__.py"
+ABOUT_FILE = TOPLEVEL_DIR / "pyaml" / "__init__.py"
 
 if str(TOPLEVEL_DIR) not in sys.path:
     sys.path.insert(0, str(TOPLEVEL_DIR))

pyaml/configuration/__init__.py

@@ -11,7 +11,6 @@ def set_root_folder(path: str | Path):
     """
     Set the root path for configuration files.
     """
-    #ROOT["path"] = Path(path).resolve()
     ROOT["path"] = Path(path)
 
 
@@ -21,13 +20,5 @@ def get_root_folder() -> Path:
     """
     return ROOT["path"]
 
-
-def get_config_file_path(path: str | Path) -> Path:
-    """Ensure the path is absolute and resolved."""
-    path = Path(path)
-    if not path.is_absolute():
-        path = get_root_folder() / path
-    return path.resolve()
-
 from .fileloader import load
 from .factory import depthFirstBuild

pyaml/pyaml.py

@@ -5,7 +5,8 @@
 from pydantic import BaseModel,ConfigDict
 from .instrument import Instrument
 from .configuration.factory import depthFirstBuild
-from pyaml.configuration import load
+from pyaml.configuration import load,set_root_folder
+import os
 
 # Define the main class name for this module
 PYAMLCLASS = "PyAML"
@@ -35,6 +36,10 @@ def pyaml(fileName:str) -> PyAML:
     """Load an accelerator middle layer"""
 
     # Asume that all files are referenced from folder where main AML file is stored
-    aml_cfg = load(fileName)
+    if not os.path.exists(fileName):
+       raise Exception(f"{fileName} file nnot found")
+    rootfolder = os.path.abspath(os.path.dirname(fileName))
+    set_root_folder(rootfolder)
+    aml_cfg = load(os.path.basename(fileName))
     aml:PyAML = depthFirstBuild(aml_cfg)
     return aml

tests/test_aml.py

@@ -1,15 +1,13 @@
 from pyaml.pyaml import pyaml,PyAML
 from pyaml.instrument import Instrument
-from pyaml.configuration import set_root_folder
 import pyaml as pyaml_pkg
 from pyaml.lattice.element_holder import MagnetType
 from pyaml.magnet.model import MagnetModel
 import at
 
 #def test_aml(config_root_dir):
-set_root_folder("tests/config")
 
-ml:PyAML = pyaml("sr.yaml")
+ml:PyAML = pyaml("tests/config/sr.yaml")
 sr:Instrument = ml.get('sr')
 sr.design.get_lattice().disable_6d()
 sr.design.get_magnet(MagnetType.HCORRECTOR,"SH1A-C01-H").strength.set(0.000010)

tests/test_tune.py

@@ -1,16 +1,14 @@
 from pyaml.pyaml import pyaml,PyAML
 from pyaml.instrument import Instrument
-from pyaml.configuration import set_root_folder
 import pyaml as pyaml_pkg
 from pyaml.lattice.element_holder import MagnetType
 from pyaml.arrays.magnet_array import MagnetArray
 import numpy as np
 import at
 
 #def test_aml(config_root_dir):
-set_root_folder("tests/config")
 
-ml:PyAML = pyaml("EBSTune.yaml")
+ml:PyAML = pyaml("tests/config/EBSTune.yaml")
 sr:Instrument = ml.get('sr')
 sr.design.get_lattice().disable_6d()