Update veto.py

veto.py

@@ -1,8 +1,10 @@
 from typing import Dict, Any, Tuple
+
 from config import (
-    VETO_VOLUME_MIN_SCORE,
-    VETO_VOLATILITY_MAX,
-    VETO_STRUCTURE_MIN_SCORE,
+    VETO_VOLUME_MIN,
+    VETO_VOL_RATIO_MAX,
+    VETO_STRUCTURE_MIN,
+    VETO_CLIMAX,
 )
 
 
@@ -14,20 +16,41 @@ def apply_veto(
     reasons = []
 
     volume_score = volume_data.get("volume_score", 0.0)
-    if volume_score < VETO_VOLUME_MIN_SCORE:
-        reasons.append(f"volume_weak (score={volume_score:.2f})")
-
     vol_ratio = regime_data.get("vol_ratio", 1.0)
-    if vol_ratio > VETO_VOLATILITY_MAX:
-        reasons.append(f"volatility_extreme (ratio={vol_ratio:.2f})")
+    climax = volume_data.get("climax", False)
+    weak = volume_data.get("weak", False)
+    trend = regime_data.get("trend", "ranging")
+    vol_expanding = regime_data.get("vol_expanding", False)
+    vol_contracting = regime_data.get("vol_contracting", False)
+    atr_trend = regime_data.get("atr_trend", "falling")
 
-    if structure_score < VETO_STRUCTURE_MIN_SCORE:
-        reasons.append(f"structure_conflicting (score={structure_score:.2f})")
+    if volume_score < VETO_VOLUME_MIN:
+        reasons.append(f"WEAK_VOLUME (score={volume_score:.2f}, threshold={VETO_VOLUME_MIN})")
 
-    climax = volume_data.get("climax", False)
-    if climax:
-        reasons.append("climax_volume_detected")
+    if weak:
+        reasons.append(f"VOL_BELOW_MA (ratio={volume_data.get('vol_ratio', 0):.2f})")
+
+    if vol_ratio > VETO_VOL_RATIO_MAX:
+        reasons.append(f"EXTREME_VOLATILITY (ratio={vol_ratio:.2f}, max={VETO_VOL_RATIO_MAX})")
+
+    if structure_score < VETO_STRUCTURE_MIN:
+        reasons.append(f"CONFLICTING_STRUCTURE (score={structure_score:.2f}, threshold={VETO_STRUCTURE_MIN})")
+
+    if VETO_CLIMAX and climax:
+        reasons.append("CLIMAX_VOLUME (potential exhaustion)")
+
+    if trend == "bearish" and vol_expanding:
+        reasons.append("BEARISH_TREND_EXPANDING_VOL (high-risk combination)")
+
+    if vol_contracting and volume_score < 0.4:
+        reasons.append(f"VOL_CONTRACTING_WEAK_FLOW (vol_ratio={vol_ratio:.2f})")
 
     if reasons:
-        return True, "; ".join(reasons)
+        return True, " | ".join(reasons)
     return False, ""
+
+
+def veto_summary(vetoed: bool, reason: str) -> str:
+    if vetoed:
+        return f"VETOED — {reason}"
+    return "APPROVED"