Config changes (#476)

* database path updates

* Update config getters to return Paths where needed

* Update lint.yml

* Update lint.yml

---------

Co-authored-by: GundulaW <gundulawinter@gmail.com>

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ jobs:
           python-version: "3.10"
       - name: Install dependencies
         run: |
-          pip install ruff
+          pip install ruff==0.4.8 # Make sure these are the same as the versions in pyproject.toml
       # Include `--format=github` to enable automatic inline annotations.
       - name: Run Ruff
         run: ruff check . --fix
@@ -25,7 +25,7 @@ jobs:
           python-version: "3.10"
       - name: Install dependencies
         run: |
-          pip install black
+          pip install black==24.1.1 # Make sure these are the same as the versions in pyproject.toml
       - name: Check black version
         run: black --version
       - name: Run black

flood_adapt/config.py

@@ -123,10 +123,8 @@ def get_database_root() -> Union[Path, None]:
         The path to the root of the database if the DATABASE_ROOT environment variable is set,
         None otherwise.
     """
-    try:
+    if os.environ.get("DATABASE_ROOT", None):
         return Path(os.environ["DATABASE_ROOT"])
-    except KeyError:
-        return None
 
 
 def get_system_folder() -> Union[Path, None]:
@@ -138,10 +136,8 @@ def get_system_folder() -> Union[Path, None]:
     Path or None
         The system folder path if the SYSTEM_FOLDER environment variable is set, otherwise None.
     """
-    try:
+    if os.environ.get("SYSTEM_FOLDER", None):
         return Path(os.environ["SYSTEM_FOLDER"])
-    except KeyError:
-        return None
 
 
 def get_database_name() -> Union[str, None]:
@@ -153,10 +149,7 @@ def get_database_name() -> Union[str, None]:
     str or None
         The database name if the DATABASE_NAME environment variable is set, otherwise None.
     """
-    try:
-        return Path(os.environ["DATABASE_NAME"])
-    except KeyError:
-        return None
+    return os.environ.get("DATABASE_NAME", None)
 
 
 def parse_config(config_path: Path, overwrite: bool = True) -> dict:

flood_adapt/dbs_controller.py

@@ -107,7 +107,7 @@ def __init__(
         self.database_name = database_name
 
         # Set the paths
-        self.base_path = Path(database_path / database_name)
+        self.base_path = Path(database_path) / database_name
         self.input_path = self.base_path / "input"
         self.static_path = self.base_path / "static"
         self.output_path = self.base_path / "output"