Update app.py

app.py

@@ -37,43 +37,64 @@ THRESHOLDS = {
     "projection":      0.09, "recovery phase":           0.33, "threat":    0.15
 }
 
-
-# ——— 3) Emotional-tone tagging (no abuse_score / DARVO) —————————————————————————————
+# ——— 3) Emotional-tone tagging (detailed categories) —————————————————————————————
 def get_emotional_tone_tag(emotion_profile, patterns):
-    anger   = emotion_profile.get("anger",   0)
-    disgust = emotion_profile.get("disgust", 0)
+    # unpack emotion scores
     sadness = emotion_profile.get("sadness", 0)
     joy     = emotion_profile.get("joy",     0)
     neutral = emotion_profile.get("neutral", 0)
+    disgust = emotion_profile.get("disgust", 0)
+    anger   = emotion_profile.get("anger",   0)
     fear    = emotion_profile.get("fear",    0)
 
-    # 1) Vulnerable: sadness high + recovery-phase
-    if sadness > 0.4 and "recovery phase" in patterns:
-        return "vulnerable"
-
-    # 2) Supportive: joy very high + no other patterns (or only recovery-phase)
-    if joy > 0.5 and (not patterns or patterns == ["recovery phase"]):
-        return "supportive"
-
-    # 3) Confrontational: anger/disgust high + aggressive patterns
-    if (anger + disgust) > 0.5 and any(p in patterns for p in ["insults", "control", "threat"]):
-        return "confrontational"
-
-    # 4) Manipulative: neutral high + manipulation patterns
-    if neutral > 0.4 and any(p in patterns for p in ["gaslighting", "dismissiveness", "projection", "guilt tripping", "blame shifting"]):
-        return "manipulative"
-
-    # 5) Feigned Warmth: joy high but manipulative patterns present
-    if joy > 0.5 and any(p in patterns for p in ["gaslighting", "dismissiveness", "projection", "guilt tripping", "blame shifting"]):
-        return "feigned warmth"
-
-    # 6) Defensive: anger high + contradictory statements
-    if anger > 0.4 and "contradictory statements" in patterns:
-        return "defensive"
-
-    # 7) Neutral: pure neutral dominates all
-    if neutral > max(anger, disgust, sadness, joy, fear):
-        return "neutral"
+    # 1. Performative Regret
+    if (
+        sadness > 0.4 and
+        any(p in patterns for p in ["blame shifting", "guilt tripping", "recovery phase"])
+    ):
+        return "performative regret"
+
+    # 2. Coercive Warmth
+    if (
+        (joy > 0.3 or sadness > 0.4) and
+        any(p in patterns for p in ["control", "gaslighting"])
+    ):
+        return "coercive warmth"
+
+    # 3. Cold Invalidation
+    if (
+        (neutral + disgust) > 0.5 and
+        any(p in patterns for p in ["dismissiveness", "projection", "obscure language"])
+    ):
+        return "cold invalidation"
+
+    # 4. Genuine Vulnerability
+    if (
+        (sadness + fear) > 0.5 and
+        all(p == "recovery phase" for p in patterns)
+    ):
+        return "genuine vulnerability"
+
+    # 5. Emotional Threat
+    if (
+        (anger + disgust) > 0.5 and
+        any(p in patterns for p in ["control", "threat", "insults", "dismissiveness"])
+    ):
+        return "emotional threat"
+
+    # 6. Weaponized Sadness
+    if (
+        sadness > 0.6 and
+        any(p in patterns for p in ["guilt tripping", "projection"])
+    ):
+        return "weaponized sadness"
+
+    # 7. Toxic Resignation
+    if (
+        neutral > 0.5 and
+        any(p in patterns for p in ["dismissiveness", "obscure language"])
+    ):
+        return "toxic resignation"
 
     return None
 
@@ -95,7 +116,13 @@ def analyze_message(text):
         if prob >= THRESHOLDS[label]
     ]
 
-    # 4) tone tagging
+    # 4) add recovery-phase on apology keywords
+    low = text.lower()
+    if any(k in low for k in ["sorry", "apolog", "forgive"]):
+        if "recovery phase" not in active_patterns:
+            active_patterns.append("recovery phase")
+
+    # 5) tone tagging with detailed rules
     tone_tag = get_emotional_tone_tag(emotion_profile, active_patterns)
 
     return {
@@ -105,7 +132,7 @@ def analyze_message(text):
     }
 
 
-# ——— 5) Composite wrapper (handles .txt or image + text boxes) ——————————————————————
+# ——— 5) Composite wrapper (handles uploads + text boxes) ——————————————————————————
 def analyze_composite(uploaded_file, *texts):
     outputs = []
 
@@ -153,10 +180,12 @@ message_inputs = [gr.Textbox(label=f"Message {i+1}") for i in range(3)]
 
 iface = gr.Interface(
     fn=analyze_composite,
-    inputs=[gr.File(file_types=[".txt", ".png", ".jpg", ".jpeg"], label="Upload text or image")] + message_inputs,
+    inputs=[
+        gr.File(file_types=[".txt", ".png", ".jpg", ".jpeg"], label="Upload text or image")
+    ] + message_inputs,
     outputs=gr.Textbox(label="Analysis"),
-    title="Tether Analyzer (streamlined)",
-    description="Emotion profiling, pattern tags, and tone tagging—no motif detection, no abuse score or DARVO."
+    title="Tether Analyzer (detailed tone tags)",
+    description="Emotion profiling, pattern tags, and nuanced tone categories—no abuse score or DARVO."
 )
 
 if __name__ == "__main__":