Refactor database connection handling and update CI workflow to use T…

…OEP_TOKEN environment variable
openego · Feb 6, 2025 · 5ecc9cf · 5ecc9cf
1 parent 6484d2f
commit 5ecc9cf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/.github/workflows/tests-coverage.yml b/.github/workflows/tests-coverage.yml
@@ -66,12 +66,16 @@ jobs:
         run: |
           python -m pip install pytest pytest-notebook
           python -m pytest --runslow --runonlinux --disable-warnings --color=yes -v
+        env:
+          TOEP_TOKEN: ${{ secrets.TOEP_TOKEN_KH }}
 
       - name: Run tests Windows
         if: runner.os == 'Windows'
         run: |
           python -m pip install pytest pytest-notebook
           python -m pytest --runslow --disable-warnings --color=yes -v
+        env:
+          TOEP_TOKEN: ${{ secrets.TOEP_TOKEN_KH }}
 
       - name: Run tests, coverage and send to coveralls
         if: runner.os == 'Linux' && matrix.python-version == 3.9 && matrix.name-suffix == 'coverage'
@@ -80,5 +84,5 @@ jobs:
           coverage run --source=edisgo -m pytest --runslow --runonlinux --disable-warnings --color=yes -v
           coveralls
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TOEP_TOKEN: ${{ secrets.TOEP_TOKEN_KH }}
           COVERALLS_SERVICE_NAME: github
diff --git a/edisgo/io/db.py b/edisgo/io/db.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+import os
 
 from contextlib import contextmanager
 from pathlib import Path
@@ -169,9 +170,17 @@ def engine(path: Path | str = None, ssh: bool = False) -> Engine:
     """
 
     if not ssh:
+        if "TOEP_TOKEN_KH" in os.environ:
+            env_var = os.environ["TOEP_TOKEN_KH"]
+        else:
+            try:
+                with open("TOEP_TOKEN.txt") as file:
+                    env_var = file.read().strip()
+            except FileNotFoundError:
+                env_var = [""]
         database_url = "toep.iks.cs.ovgu.de"
         return create_engine(
-            "postgresql+oedialect://:@" f"{database_url}",
+            f"postgresql+oedialect://{env_var}@{database_url}",
             echo=False,
         )
 

diff --git a/edisgo/tools/config.py b/edisgo/tools/config.py
@@ -37,6 +37,7 @@
 
 import edisgo
 
+from edisgo.io.db import engine as toep_engine
 from edisgo.io.db import session_scope_egon_data
 
 logger = logging.getLogger(__name__)
@@ -181,10 +182,10 @@ def get_database_alias_dictionaries(self) -> tuple[dict[str, str], dict[str, str
             - schema_mapping: A dictionary mapping source schema names to target schema
                 names.
         """
-        OEP_CONNECTION = "postgresql+oedialect://:@{platform}"
-        platform = "toep.iks.cs.ovgu.de"
-        conn_str = OEP_CONNECTION.format(platform=platform)
-        engine = sa.create_engine(conn_str)
+        # OEP_CONNECTION = "postgresql+oedialect://:@{platform}"
+        # platform = "toep.iks.cs.ovgu.de"
+        # conn_str = OEP_CONNECTION.format(platform=platform)
+        engine = toep_engine()
         dictionary_schema_name = (
             "model_draft"  # Replace with the actual schema name if needed
         )