Update src/streamlit_app.py

src/streamlit_app.py

@@ -352,10 +352,12 @@ def matches_email_filters(info, sender_filter, target_filter):
     return sender_match and target_match, forwarded
 
 
-def is_rj(info):
+def is_rj(info, sender_filter=DEFAULT_SENDER):
     subj = (info.get("subject") or "").lower()
     html = info.get("body_html") or ""
     text = html_to_text(html).lower()
+    if normalize_email(info.get("from")) == normalize_email(sender_filter):
+        return True
     if "rj emails--overview" in subj:
         return False
     has_fwd = 'id="divRplyFwdMsg"' in html or ("from:" in text and "sent:" in text)
@@ -377,8 +379,9 @@ def build_rj(messages, sender_filter, target_filter):
         matches_target, fwd = matches_email_filters(info, sender_filter, target_filter)
         if not matches_target:
             continue
-        if not is_rj(info):
+        if not is_rj(info, sender_filter):
             continue
+        original_body_html = reply_marker_html(info.get("body_html", ""))
         rows.append({
             "email_id": info.get("id") or f"msg_{i}",
             "fw_subject": info.get("subject"),
@@ -388,7 +391,8 @@ def build_rj(messages, sender_filter, target_filter):
             "fw_received_time": info.get("received_time"),
             "fw_body_html": info.get("body_html", ""),
             **{k: fwd.get(k, "") for k in fwd},
-            "original_body_html": reply_marker_html(info.get("body_html", "")),
+            "original_body_html": original_body_html,
+            "parse_body_html": original_body_html or info.get("body_html", ""),
         })
     return rows
 
@@ -407,7 +411,7 @@ def build_target_emails(messages, sender_filter, target_filter):
             "to": ", ".join(info.get("to", [])),
             "cc": ", ".join(info.get("cc", [])),
             "received_time": info.get("received_time"),
-            "is_rj_forward": is_rj(info),
+            "is_rj_forward": is_rj(info, sender_filter),
             "forwarded_from": forwarded.get("forwarded_from", ""),
             "forwarded_to": forwarded.get("forwarded_to", ""),
             "forwarded_cc": forwarded.get("forwarded_cc", ""),
@@ -621,7 +625,7 @@ if st.button("▶ Run", disabled=not st.session_state.token):
     with st.spinner("Extracting cash tables..."):
         cash_rows, wd_rows, dep_rows = [], [], []
         for email in st.session_state.rj_emails:
-            for section, df in extract_tables(email.get("original_body_html", "")):
+            for section, df in extract_tables(email.get("parse_body_html", "")):
                 rows = df.to_dict("records")
                 for r in rows:
                     r.update({