Update f1_edges_main.py

f1_edges_main.py

@@ -7,9 +7,29 @@ from pathlib import Path
 from typing import List, Dict, Set, Tuple
 import numpy as np
 from collections import Counter
-from f1_edges_main import*
+from f1_edges_functions import*
 
 
+
+def _normalize_name(name: str) -> str:
+    return re.sub(r'[^a-z0-9]', '', str(name).lower())
+
+def _normalize_if_type(if_name: str) -> str:
+    n = if_name.lower()
+    if 'se' in n: return "Serial"
+    if 'eth' in n: return "Ethernet"
+    return "Ethernet"
+
+
+def custom_print(message: str = "", end: str = "\n"):
+    global LOG_FILE
+    full_message = message + end
+    if LOG_FILE:
+        LOG_FILE.write(full_message)
+        LOG_FILE.flush() 
+    sys.stdout.write(full_message)
+    sys.stdout.flush()
+
 def main():
     parser = argparse.ArgumentParser(description="Calculate edge F1 metrics (TP/FP/FN/P/R/F1) for topology JSON.")
     parser.add_argument("--gen", type=Path, nargs="+", required=True,
@@ -29,7 +49,6 @@ def main():
         args.output = results_dir / args.output
 
     global LOG_FILE
-    # Try to open the log file
     try:
         LOG_FILE = open(args.output, "w", encoding="utf-8")
         custom_print(f"{C.OKGREEN}✅ Detailed output saved to: {args.output}{C.ENDC}")
@@ -42,12 +61,10 @@ def main():
     current_ref_path = None
     ref_nodes = []
 
-    # Collect all generated file paths
     gen_files = []
     for p in args.gen:
         path = Path(p)
         if path.is_dir():
-            # Ne traiter que les fichiers du dossier principal, pas des sous-dossiers
             for json_file in sorted(path.glob("*.json")):
                 gen_files.append(json_file) 
         elif path.is_file() and path.suffix.lower() == ".json":
@@ -97,7 +114,7 @@ def main():
         # Check if devices list is empty
         gen_devices = gen_data.get("result", {}).get("network_topology", {}).get("devices", [])
         if len(gen_devices) == 0:
-            custom_print(f"{C.WARNING}⚠️  Empty devices list detected - format with devices: []{C.ENDC}")
+            custom_print(f"{C.WARNING}Empty devices list detected - format with devices: []{C.ENDC}")
             custom_print(f"{C.FAIL}Generated topology is empty, no mapping processing will be performed{C.ENDC}")
             
             # Calculate FN = total connections in the reference
@@ -496,7 +513,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
-
-# sudo systemctl stop ollama
-# OLLAMA_FLASH_ATTENTION=1 ollama serve