Cleaning up menu, added Move to Audit/Enforcement

utils/utils.py

@@ -13,7 +13,7 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import json
+
 import logging
 import os
 import platform
@@ -22,48 +22,14 @@ import subprocess
 import tempfile
 import tkinter as tk
 from tkinter import filedialog, messagebox, simpledialog
-from typing import Callable, Optional, TypeVar
+from utils.configmanager import load_env
+
 
 import pandas as pd
 
 logger = logging.getLogger(__name__)
 
-T = TypeVar("T")
 
-def load_env_json(key: str, default: str):
-    raw = os.getenv(key, default)
-    try:
-        return json.loads(raw)
-    except json.JSONDecodeError:
-        try:
-            escaped = raw.encode('unicode_escape').decode('utf-8')
-            return json.loads(escaped)
-        except Exception as e:
-            logging.error(f"Failed to parse {key}: {e}")
-            return json.loads(default)
-
-def load_env(key: str, cast_type: Callable[[str], T] = str, default: Optional[T] = None) -> Optional[T]:
-    """
-    Safely retrieves an environment variable and casts it to the desired type.
-
-    Parameters:
-        key (str): The name of the environment variable.
-        cast_type (Callable[[str], T], optional): Function to cast the value. Defaults to str.
-        default (Optional[T], optional): Default value if the variable is not set or invalid.
-
-    Returns:
-        Optional[T]: The casted value or the default.
-    """
-    value = os.getenv(key)
-    if value is None:
-        logger.warning(f"Environment variable '{key}' not set.")
-        return default
-    try:
-        value = value.strip("'\"")  # Strip surrounding quotes
-        return cast_type(value)
-    except (ValueError, TypeError):
-        logger.warning(f"Invalid value for env var '{key}': {value}. Expected type {cast_type.__name__}.")
-        return default
 
 
 def import_to_dataframe(file_path: str) -> pd.DataFrame:
@@ -171,7 +137,6 @@ def regulator(paths, case_insensitive=True):
     print(f"Regulator is providing: {pattern}")
     return pattern
 
-
 def displayIntro():
     print(
         colorText(