Update app.py

app.py

@@ -528,6 +528,13 @@ def analyze_composite(msg1, msg2, msg3, *answers_and_none):
     """Analyze multiple messages and checklist responses"""
     logger.debug("\n🔄 STARTING NEW ANALYSIS")
     logger.debug("=" * 50)
+    
+    # Define severity categories at the start
+    high = {'control'}
+    moderate = {'gaslighting', 'dismissiveness', 'obscure language', 'insults', 
+               'contradictory statements', 'guilt tripping'}
+    low = {'blame shifting', 'projection', 'recovery'}
+    
     try:
         # Process checklist responses
         logger.debug("\n📋 CHECKLIST PROCESSING")
@@ -577,6 +584,7 @@ def analyze_composite(msg1, msg2, msg3, *answers_and_none):
         # Detect threats
         logger.debug("\n🚨 THREAT DETECTION")
         logger.debug("=" * 50)
+        
         def normalize(text):
             import unicodedata
             text = text.lower().strip()
@@ -592,13 +600,6 @@ def analyze_composite(msg1, msg2, msg3, *answers_and_none):
         immediate_threats = [detect_threat_motifs(m, THREAT_MOTIFS) for m, _ in active]
         flat_threats = [t for sublist in immediate_threats for t in sublist]
         threat_risk = "Yes" if flat_threats else "No"
-        
-        if flat_threats:
-            logger.debug("⚠️ DETECTED THREATS:")
-            for threat in flat_threats:
-                logger.debug(f"  • {threat}")
-        else:
-            logger.debug("✓ No explicit threats detected")
         # Analyze each message
         logger.debug("\n🔍 INDIVIDUAL MESSAGE ANALYSIS")
         logger.debug("=" * 50)
@@ -636,21 +637,35 @@ def analyze_composite(msg1, msg2, msg3, *answers_and_none):
         tone_tags = [r[0][6] for r in results]
         dates_used = [r[1] for r in results]
 
-        # Pattern Analysis
+        # Pattern Analysis Summary
         logger.debug("\n📈 PATTERN ANALYSIS SUMMARY")
         logger.debug("=" * 50)
         predicted_labels = [label for r in results for label in r[0][1]]
         
         if predicted_labels:
             logger.debug("Detected Patterns Across All Messages:")
-            for label in set(predicted_labels):
-                count = predicted_labels.count(label)
-                if label in high:
-                    logger.debug(f"  ❗ HIGH: {label} (×{count})")
-                elif label in moderate:
-                    logger.debug(f"  ⚠️ MODERATE: {label} (×{count})")
-                elif label in low:
-                    logger.debug(f"  📝 LOW: {label} (×{count})")
+            pattern_counts = Counter(predicted_labels)
+            
+            # Log high severity patterns first
+            high_patterns = [p for p in pattern_counts if p in high]
+            if high_patterns:
+                logger.debug("\n❗ HIGH SEVERITY PATTERNS:")
+                for p in high_patterns:
+                    logger.debug(f"  • {p} (×{pattern_counts[p]})")
+            
+            # Then moderate
+            moderate_patterns = [p for p in pattern_counts if p in moderate]
+            if moderate_patterns:
+                logger.debug("\n⚠️ MODERATE SEVERITY PATTERNS:")
+                for p in moderate_patterns:
+                    logger.debug(f"  • {p} (×{pattern_counts[p]})")
+            
+            # Then low
+            low_patterns = [p for p in pattern_counts if p in low]
+            if low_patterns:
+                logger.debug("\n📝 LOW SEVERITY PATTERNS:")
+                for p in low_patterns:
+                    logger.debug(f"  • {p} (×{pattern_counts[p]})")
         else:
             logger.debug("✓ No patterns detected across messages")
 
@@ -667,30 +682,49 @@ def analyze_composite(msg1, msg2, msg3, *answers_and_none):
                 counts['low'] += 1
 
         logger.debug("Pattern Distribution:")
-        logger.debug(f"  ❗ High Severity: {counts['high']}")
-        logger.debug(f"  ⚠️ Moderate Severity: {counts['moderate']}")
-        logger.debug(f"  📝 Low Severity: {counts['low']}")
-
+        if counts['high'] > 0:
+            logger.debug(f"  ❗ High Severity: {counts['high']}")
+        if counts['moderate'] > 0:
+            logger.debug(f"  ⚠️ Moderate Severity: {counts['moderate']}")
+        if counts['low'] > 0:
+            logger.debug(f"  📝 Low Severity: {counts['low']}")
+        
+        total_patterns = sum(counts.values())
+        if total_patterns > 0:
+            logger.debug(f"\nSeverity Percentages:")
+            logger.debug(f"  • High: {(counts['high']/total_patterns)*100:.1f}%")
+            logger.debug(f"  • Moderate: {(counts['moderate']/total_patterns)*100:.1f}%")
+            logger.debug(f"  • Low: {(counts['low']/total_patterns)*100:.1f}%")
         # Risk Assessment
         logger.debug("\n🎯 RISK ASSESSMENT")
         logger.debug("=" * 50)
         if counts['high'] >= 2 and counts['moderate'] >= 2:
             pattern_escalation_risk = "Critical"
-            logger.debug("❗ CRITICAL RISK: Multiple high and moderate patterns")
+            logger.debug("❗❗ CRITICAL RISK")
+            logger.debug("  • Multiple high and moderate patterns detected")
+            logger.debug(f"  • High patterns: {counts['high']}")
+            logger.debug(f"  • Moderate patterns: {counts['moderate']}")
         elif (counts['high'] >= 2 and counts['moderate'] >= 1) or \
              (counts['moderate'] >= 3) or \
              (counts['high'] >= 1 and counts['moderate'] >= 2):
             pattern_escalation_risk = "High"
-            logger.debug("⚠️ HIGH RISK: Significant pattern combination")
+            logger.debug("❗ HIGH RISK")
+            logger.debug("  • Significant pattern combination detected")
+            logger.debug(f"  • High patterns: {counts['high']}")
+            logger.debug(f"  • Moderate patterns: {counts['moderate']}")
         elif (counts['moderate'] == 2) or \
              (counts['high'] == 1 and counts['moderate'] == 1) or \
              (counts['moderate'] == 1 and counts['low'] >= 2) or \
              (counts['high'] == 1 and sum(counts.values()) == 1):
             pattern_escalation_risk = "Moderate"
-            logger.debug("⚡ MODERATE RISK: Concerning pattern combination")
+            logger.debug("⚠️ MODERATE RISK")
+            logger.debug("  • Concerning pattern combination detected")
+            logger.debug(f"  • Pattern distribution: H:{counts['high']}, M:{counts['moderate']}, L:{counts['low']}")
         else:
             pattern_escalation_risk = "Low"
-            logger.debug("📝 LOW RISK: Limited pattern severity")
+            logger.debug("📝 LOW RISK")
+            logger.debug("  • Limited pattern severity detected")
+            logger.debug(f"  • Pattern distribution: H:{counts['high']}, M:{counts['moderate']}, L:{counts['low']}")
 
         # Checklist Risk Assessment
         logger.debug("\n📋 CHECKLIST RISK ASSESSMENT")
@@ -700,21 +734,30 @@ def analyze_composite(msg1, msg2, msg3, *answers_and_none):
             "Moderate" if escalation_score >= 10 else
             "Low"
         )
-        logger.debug(f"Risk Level: {checklist_escalation_risk}")
         if escalation_score is not None:
             logger.debug(f"Score: {escalation_score}/29")
+            logger.debug(f"Risk Level: {checklist_escalation_risk}")
+            if escalation_score >= 20:
+                logger.debug("❗❗ CRITICAL: Score indicates severe risk")
+            elif escalation_score >= 10:
+                logger.debug("⚠️ MODERATE: Score indicates concerning risk")
+            else:
+                logger.debug("📝 LOW: Score indicates limited risk")
+        else:
+            logger.debug("❓ Risk Level: Unknown (checklist not completed)")
+
         # Escalation Analysis
         logger.debug("\n📈 ESCALATION ANALYSIS")
         logger.debug("=" * 50)
         escalation_bump = 0
         for result, msg_id in results:
             abuse_score, _, _, sentiment, stage, darvo_score, tone_tag = result
-            logger.debug(f"\n🔍 Message {msg_id} Escalation Factors:")
+            logger.debug(f"\n🔍 Message {msg_id} Risk Factors:")
             
             factors = []
             if darvo_score > 0.65:
                 escalation_bump += 3
-                factors.append("▲ +3: High DARVO score ({darvo_score:.3f})")
+                factors.append(f"▲ +3: High DARVO score ({darvo_score:.3f})")
             if tone_tag in ["forced accountability flip", "emotional threat"]:
                 escalation_bump += 2
                 factors.append(f"▲ +2: Concerning tone ({tone_tag})")
@@ -741,8 +784,8 @@ def analyze_composite(msg1, msg2, msg3, *answers_and_none):
 
         combined_score = rank(pattern_escalation_risk) + rank(checklist_escalation_risk) + escalation_bump
         logger.debug("Risk Components:")
-        logger.debug(f"  • Pattern Risk: {pattern_escalation_risk} (+{rank(pattern_escalation_risk)})")
-        logger.debug(f"  • Checklist Risk: {checklist_escalation_risk} (+{rank(checklist_escalation_risk)})")
+        logger.debug(f"  • Pattern Risk ({pattern_escalation_risk}): +{rank(pattern_escalation_risk)}")
+        logger.debug(f"  • Checklist Risk ({checklist_escalation_risk}): +{rank(checklist_escalation_risk)}")
         logger.debug(f"  • Escalation Bump: +{escalation_bump}")
         logger.debug(f"  = Combined Score: {combined_score}")
         
@@ -753,7 +796,6 @@ def analyze_composite(msg1, msg2, msg3, *answers_and_none):
             "Low"
         )
         logger.debug(f"\n⚠️ Final Escalation Risk: {escalation_risk}")
-
         # Generate Output Text
         logger.debug("\n📝 GENERATING OUTPUT")
         logger.debug("=" * 50)
@@ -797,7 +839,7 @@ def analyze_composite(msg1, msg2, msg3, *answers_and_none):
         avg_darvo = round(sum(darvo_scores) / len(darvo_scores), 3)
         logger.debug(f"Average DARVO Score: {avg_darvo}")
 
-        # Generate Final Output
+        # Generate Final Report
         logger.debug("\n📄 GENERATING FINAL REPORT")
         logger.debug("=" * 50)
         out = f"Abuse Intensity: {composite_abuse}%\n"
@@ -838,6 +880,7 @@ def analyze_composite(msg1, msg2, msg3, *answers_and_none):
         
         out += risk_descriptions[risk_level]
         out += f"\n\n{RISK_STAGE_LABELS[most_common_stage]}"
+        logger.debug("Added risk description and stage information")
 
         # Add DARVO Analysis
         if avg_darvo > 0.25:
@@ -859,7 +902,7 @@ def analyze_composite(msg1, msg2, msg3, *answers_and_none):
             for t in set(flat_threats):
                 out += f"• \"{t}\"\n"
             out += "\n⚠️ These phrases may indicate an imminent risk to physical safety."
-            logger.debug(f"Added {len(flat_threats)} threat warnings")
+            logger.debug(f"Added {len(set(flat_threats))} unique threat warnings")
         else:
             out += "\n\n🧩 **Immediate Danger Threats:** None explicitly detected.\n"
             out += "This does *not* rule out risk, but no direct threat phrases were matched."
@@ -876,6 +919,7 @@ def analyze_composite(msg1, msg2, msg3, *answers_and_none):
         
         # Add Escalation Text
         out += "\n\n" + escalation_text
+        logger.debug("Added escalation text to output")
         
         logger.debug("\n✅ ANALYSIS COMPLETE")
         logger.debug("=" * 50)
@@ -891,6 +935,7 @@ def analyze_composite(msg1, msg2, msg3, *answers_and_none):
 
 
 
+
 # Gradio Interface Setup
 def create_interface():
     try: