UI Improvements

flows/localApproval.py

@@ -23,13 +23,13 @@ import time
 import dotenv
 import numpy as np
 import pandas as pd
-from utils.setup import get_base_directory
+
 from models.agent import Agent
 from services.agenthandler import findAllAgents, moveAgentToRelatedPolicy, selectAgents
 from services.API import AirlockAPIWrapper
-
-from utils.utils import colorText
 from utils.configmanager import get_protected_json, load_env, load_env_json
+from utils.setup import get_base_directory
+from utils.utils import colorText, get_sanitized_input
 
 logger = logging.getLogger(__name__)
 
@@ -38,14 +38,15 @@ dotenv.load_dotenv()
 
 def getLocalApprovals(api: AirlockAPIWrapper):
     working_dir = load_env("WORKING_DIR")
+    base_dir = get_base_directory
     result = api.otp_find_awaiting()
     local_approval = pd.DataFrame(result["response"]["otpusage"])
-    if os.path.exists(f"{working_dir}\\Scheduling\\newest_local_approval.parquet"):
-        previous_run = pd.read_parquet(f"{working_dir}\\Scheduling\\newest_local_approval.parquet")
+    if os.path.exists(f"{base_dir}\\cache\\newest_local_approval.parquet"):
+        previous_run = pd.read_parquet(f"{base_dir}\\cache\\newest_local_approval.parquet")
         previous_run.to_parquet(
-            f"{working_dir}\\Scheduling\\last_local_approval.parquet", index=False
+            f"{base_dir}\\cache\\last_local_approval.parquet", index=False
         )
-        os.remove(f"{working_dir}\\Scheduling\\newest_local_approval.parquet")
+        os.remove(f"{base_dir}\\cache\\newest_local_approval.parquet")
 
     # Only keep rows presumably created by the generate local approval function
     local_approval = local_approval[
@@ -58,7 +59,7 @@ def getLocalApprovals(api: AirlockAPIWrapper):
 
     if not local_approval.empty:
         local_approval.to_parquet(
-            f"{working_dir}\\Scheduling\\newest_local_approval.parquet", index=False
+            f"{base_dir}\\cache\\newest_local_approval.parquet", index=False
         )
 
     return local_approval
@@ -181,7 +182,8 @@ def moveToLocalApproval(api: AirlockAPIWrapper):
         print(f"{i}. {option}")
 
     try:
-        choice = int(input("Enter the number of your choice: "))
+
+        choice = int(get_sanitized_input("Enter the number of your choice:"))
         if 1 <= choice <= len(possible_durations):
             duration_selected = possible_durations[choice - 1]
             print(colorText(f"You selected: {duration_selected}", "yellow"))