Upload db.py with huggingface_hub

db.py

@@ -874,6 +874,102 @@ def get_dsa_mfi_comparison(chart_no, dsa_class=None):
     return dates, out, pct_by_date, labels_by_rid
 
 
+def get_patients_with_both():
+    """Patients having BOTH active PRA and DSA reports."""
+    conn = get_conn()
+    rows = conn.execute('''
+        SELECT p.id, p.patient_name, p.chart_no,
+               (SELECT COUNT(*) FROM reports WHERE patient_id=p.id AND COALESCE(is_deleted,0)=0) AS pra_count,
+               (SELECT COUNT(*) FROM dsa_reports WHERE patient_id=p.id AND COALESCE(is_deleted,0)=0) AS dsa_count,
+               (SELECT MAX(report_date) FROM reports WHERE patient_id=p.id AND COALESCE(is_deleted,0)=0) AS pra_latest,
+               (SELECT MAX(report_date) FROM dsa_reports WHERE patient_id=p.id AND COALESCE(is_deleted,0)=0) AS dsa_latest
+        FROM patients p
+        ORDER BY p.patient_name
+    ''').fetchall()
+    conn.close()
+    out = []
+    for r in rows:
+        d = dict(r)
+        if d['pra_count'] > 0 and d['dsa_count'] > 0:
+            d['latest_date'] = max(d['pra_latest'] or '', d['dsa_latest'] or '')
+            out.append(d)
+    out.sort(key=lambda x: x['latest_date'], reverse=True)
+    return out
+
+
+def get_combined_reports(chart_no):
+    """Active PRA + DSA reports for a patient, interleaved by date."""
+    conn = get_conn()
+    pra_rows = conn.execute('''
+        SELECT r.id, r.report_date, r.pra_class AS class_label, r.pra_percent AS pct,
+               r.overall, r.specificity, r.comment, r.submitted_by,
+               'PRA' AS source
+        FROM reports r JOIN patients p ON p.id=r.patient_id
+        WHERE p.chart_no=? AND COALESCE(r.is_deleted,0)=0
+    ''', (chart_no,)).fetchall()
+    dsa_rows = conn.execute('''
+        SELECT r.id, r.report_date, r.dsa_class AS class_label, r.pct_sa AS pct,
+               r.overall, r.specificity, r.comment, r.submitted_by,
+               'DSA' AS source
+        FROM dsa_reports r JOIN patients p ON p.id=r.patient_id
+        WHERE p.chart_no=? AND COALESCE(r.is_deleted,0)=0
+    ''', (chart_no,)).fetchall()
+    pra_list = [{**dict(r), 'antibodies': []} for r in pra_rows]
+    dsa_list = [{**dict(r), 'antibodies': []} for r in dsa_rows]
+    # Pull antibodies for each
+    for r in pra_list:
+        ab = conn.execute('SELECT * FROM antibody_strength WHERE report_id=? ORDER BY id',
+                          (r['id'],)).fetchall()
+        r['antibodies'] = [dict(a) for a in ab]
+    for r in dsa_list:
+        ab = conn.execute('SELECT * FROM dsa_antibody_strength WHERE report_id=? ORDER BY id',
+                          (r['id'],)).fetchall()
+        r['antibodies'] = [dict(a) for a in ab]
+    conn.close()
+    all_rows = pra_list + dsa_list
+    all_rows.sort(key=lambda r: (r['report_date'], r['source'], r['class_label']), reverse=True)
+    return all_rows
+
+
+def get_combined_mfi(chart_no, class_label='I'):
+    """Combined (PRA + DSA) MFI trend for one Class.
+    Returns:
+      dates: sorted unique date labels from both sources
+      antigens: [{allele, antigen (sero), pra_mfi: {date: max_mfi}, dsa_mfi: {date: max_mfi}}, ...]
+    """
+    pra_full = f'PRA Class {class_label}'
+    dsa_full = f'DSA Class {class_label}'
+
+    pra_dates, pra_ag, _, _ = get_mfi_comparison(chart_no, pra_full)
+    dsa_dates, dsa_ag, _, _ = get_dsa_mfi_comparison(chart_no, dsa_full)
+
+    combined = {}
+    for ag in pra_ag:
+        key = ag['allele']
+        rec = combined.setdefault(key, {'allele': key, 'antigen': ag['antigen'],
+                                        'pra_mfi': {}, 'dsa_mfi': {}})
+        rec['antigen'] = rec.get('antigen') or ag['antigen']
+        for d, v in ag['mfi_by_date'].items():
+            rec['pra_mfi'][d] = v.get('max_mfi')
+    for ag in dsa_ag:
+        key = ag['allele']
+        rec = combined.setdefault(key, {'allele': key, 'antigen': ag['antigen'],
+                                        'pra_mfi': {}, 'dsa_mfi': {}})
+        rec['antigen'] = rec.get('antigen') or ag['antigen']
+        for d, v in ag['mfi_by_date'].items():
+            rec['dsa_mfi'][d] = v.get('max_mfi')
+
+    import re as _re
+    def date_key(lbl):
+        parts = lbl.split(' ')[0].split('/')
+        try:
+            return (int(parts[0]), int(parts[1]), int(parts[2]), lbl)
+        except (IndexError, ValueError):
+            return (9999, 0, 0, lbl)
+    all_dates = sorted(set(pra_dates) | set(dsa_dates), key=date_key)
+    return all_dates, list(combined.values())
+
+
 def delete_dsa_report(report_id):
     backup_db()
     conn = get_conn()