Fixed issue with generating multiple OTP - now prints a nice list for Copy/Paste. Began splitting client / server functionality. Demoted selector and setup to util from service. Fixed some typos.

services/agenthandler.py

@@ -27,7 +27,7 @@ import pandas as pd
 from models.agent import Agent
 from models.policy import Policy
 from services.API import AirlockAPIWrapper
-from services.selector import Selector
+from utils.selector import Selector
 from utils.utils import colorText, load_env, load_env_json
 
 logger = logging.getLogger(__name__)
@@ -94,43 +94,44 @@ def findAllAgents(api):
 
     return agents
 
-
-
 def findAgents(api, return_dataframe):
     agents = selectAgents(api)
     working_dir = load_env("WORKING_DIR")
-    if agents:
-        agent_dicts = [asdict(agent) for agent in agents]
-        agent_df = pd.DataFrame(agent_dicts)
 
-        if return_dataframe:
-            logging.debug("Returning DataFrame to caller.")
-            return agent_df
-        else:
-            print(agent_df)
-            logging.debug("Displayed DataFrame to console.")
-
-            # Ask user if they want to export
-            user_input = input("\nWould you like to export the results to a CSV file? (y/n): ").strip().lower()
-            if user_input == 'y':
-                timestamp = datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
-                filename = f"agentsearch_{timestamp}.csv"
-                file_path = os.path.join(working_dir, filename)
-
-                agent_df.to_csv(file_path, index=False)
-                logging.info(f"Exported DataFrame to {file_path}")
-
-                print(
-                    colorText(
-                        f"\n✅ Matched devices exported to: {working_dir}\\{filename}",
-                        "green",
-                    )
-                )
-            else:
-                logging.debug("User declined to export the DataFrame.")
-    else:
-        logging.warning("No agents found.")
+    if not agents:
+        logging.warning("No agents or policies found.")
         print("No agents matched the criteria.")
+        return
+
+    # Convert enriched agents to DataFrame
+    agent_dicts = [asdict(agent) for agent in agents]
+    agent_df = pd.DataFrame(agent_dicts)
+
+    if return_dataframe:
+        logging.debug("Returning DataFrame to caller.")
+        return agent_df
+
+    # Otherwise, print and optionally export
+    print(agent_df)
+    logging.debug("Displayed DataFrame to console.")
+
+    user_input = input("\nWould you like to export the results to a CSV file? (y/n): ").strip().lower()
+    if user_input == 'y':
+        timestamp = datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
+        filename = f"agentsearch_{timestamp}.csv"
+        file_path = os.path.join(working_dir, filename)
+
+        agent_df.to_csv(file_path, index=False)
+        logging.info(f"Exported DataFrame to {file_path}")
+
+        print(
+            colorText(
+                f"\n✅ Matched devices exported to: {working_dir}\\{filename}",
+                "green",
+            )
+        )
+    else:
+        logging.debug("User declined to export the DataFrame.")
 
 def selectAgents(api: AirlockAPIWrapper) -> List[Agent]:
     print(colorText("🔍 Device Search", "cyan"))
@@ -143,6 +144,7 @@ def selectAgents(api: AirlockAPIWrapper) -> List[Agent]:
     print(colorText("u-hVenderBroke\n", "cyan"))
 
     print(colorText("Paste or type your device names below:", "white"))
+    policies = [Policy(**row.to_dict()) for _, row in api.policy_find_all().iterrows()]
 
     device_input_lines = []
     empty_line_count = 0
@@ -185,6 +187,10 @@ def selectAgents(api: AirlockAPIWrapper) -> List[Agent]:
         logger.debug(f"✅ Found {len(matched_agents)} matching device(s).")        
         print(colorText(f"✅ Found {len(matched_agents)} matching device(s).", "green"))
 
+        # Enrich each agent using its class method
+    for agent in matched_agents:
+        agent.enrich_with_policies(policies)
+
     return matched_agents
 
 def moveAgentToRelatedPolicy(