Update app.py

app.py

@@ -486,21 +486,27 @@ def analyze_composite(msg1, date1, msg2, date2, msg3, date3, *answers_and_none):
     dates_used = [r[1] or "Undated" for r in results]  # Store dates for future mapping
 
    
-    # --- Composite Abuse Score with Aggression Weighting ---
+    # --- Composite Abuse Score with Weighted Patterns ---
     composite_abuse_scores = []
 
-    for top_label, score_dict in results:
-        pattern_scores = score_dict.get("pattern_scores", {})
+    for result, _ in results:
+        abuse_score, threshold_labels, top_patterns, _, _, _ = result
         weighted_score = 0
+        total_weight = 0
 
-        for label, score in pattern_scores.items():
-            if label == "aggression":
-                weighted_score += score * 1.5  # Boost aggression impact
-            else:
-                weighted_score += score
+    for label, score in top_patterns:
+        weight = PATTERN_WEIGHTS.get(label, 1.0)
+        weighted_score += score * weight
+        total_weight += weight
 
-        composite_abuse_scores.append(weighted_score)
+    if total_weight > 0:
+        final_score = (weighted_score / total_weight) * 100
+    else:
+        final_score = 0
+
+    composite_abuse_scores.append(final_score)
 
+composite_abuse = int(round(sum(composite_abuse_scores) / len(composite_abuse_scores)))
 # Average and scale to percentage
     composite_abuse = int(round(sum(composite_abuse_scores) / len(composite_abuse_scores) * 100))