Update app.py

app.py

@@ -1533,12 +1533,31 @@ def rag_ui():
 # --------------------------
 # REPORTS: PDF builders
 # --------------------------
+import io, os, json
+from datetime import datetime
+from reportlab.platypus import SimpleDocTemplate, Paragraph, Spacer, Table, TableStyle, PageBreak, Image as RLImage
+from reportlab.lib.styles import getSampleStyleSheet, ParagraphStyle
+from reportlab.lib.pagesizes import A4
+from reportlab.lib.units import mm
+from reportlab.lib import colors
+import streamlit as st
+
+# Theme colors
+THEME = {"accent": colors.HexColor("#FF6600")}
+
+# --------------------------
+# CLASSIFICATION REPORT BUILDER
+# --------------------------
 def build_classification_pdf_bytes(site: dict):
     """
     Build classification-only PDF (returns bytes)
     """
     buf = io.BytesIO()
-    doc = SimpleDocTemplate(buf, pagesize=A4, leftMargin=20*mm, rightMargin=20*mm, topMargin=20*mm, bottomMargin=20*mm)
+    doc = SimpleDocTemplate(
+        buf, pagesize=A4,
+        leftMargin=20*mm, rightMargin=20*mm,
+        topMargin=20*mm, bottomMargin=20*mm
+    )
     styles = getSampleStyleSheet()
     title = ParagraphStyle("title", parent=styles["Title"], fontSize=20, textColor=THEME["accent"], alignment=1)
     h1 = ParagraphStyle("h1", parent=styles["Heading1"], fontSize=14, textColor=THEME["accent"])
@@ -1546,46 +1565,60 @@ def build_classification_pdf_bytes(site: dict):
 
     elems = []
     elems.append(Paragraph("Classification Report — GeoMate V2", title))
-    elems.append(Spacer(1,8))
+    elems.append(Spacer(1, 8))
     elems.append(Paragraph(f"Site: {site.get('Site Name','-')}", h1))
-    elems.append(Spacer(1,6))
+    elems.append(Paragraph(f"Coordinates: {site.get('Coordinates','-')}", body))
+    elems.append(Spacer(1, 6))
 
     # Inputs table
     inputs = site.get("classifier_inputs", {})
-    data = [["Parameter","Value"]]
-    for k,v in inputs.items():
-        data.append([k, str(v)])
-    t = Table(data, colWidths=[80*mm, 80*mm])
-    t.setStyle(TableStyle([("GRID",(0,0),(-1,-1),0.5,colors.grey),
-                           ("BACKGROUND",(0,0),(-1,0),THEME["accent"]),
-                           ("TEXTCOLOR",(0,0),(-1,0),colors.white)]))
-    elems.append(t)
-    elems.append(Spacer(1,8))
+    if inputs:
+        data = [["Parameter", "Value"]]
+        for k, v in inputs.items():
+            data.append([k, str(v)])
+        t = Table(data, colWidths=[80*mm, 80*mm])
+        t.setStyle(TableStyle([
+            ("GRID", (0,0), (-1,-1), 0.5, colors.grey),
+            ("BACKGROUND", (0,0), (-1,0), THEME["accent"]),
+            ("TEXTCOLOR", (0,0), (-1,0), colors.white)
+        ]))
+        elems.append(t)
+        elems.append(Spacer(1, 8))
 
     # Results
     elems.append(Paragraph("Results", h1))
     elems.append(Paragraph(f"USCS: {site.get('USCS','N/A')}", body))
     elems.append(Paragraph(f"AASHTO: {site.get('AASHTO','N/A')} (GI: {site.get('GI','N/A')})", body))
-    elems.append(Spacer(1,8))
+
+    # OCR data inclusion
+    if site.get("ocr_text"):
+        elems.append(Spacer(1, 8))
+        elems.append(Paragraph("OCR Extracted Notes", h1))
+        elems.append(Paragraph(site.get("ocr_text","No OCR data found."), body))
 
     # GSD curve inclusion if present
     gsd = site.get("GSD")
     if gsd:
-        elems.append(Paragraph("GSD Parameters", h1))
+        elems.append(Spacer(1, 8))
+        elems.append(Paragraph("Grain Size Distribution (GSD)", h1))
         elems.append(Paragraph(f"D10: {gsd.get('D10')}, D30: {gsd.get('D30')}, D60: {gsd.get('D60')}", body))
-        # If a plot image is stored in site, include (we store last plot as /tmp/gsd_plot.png)
         gsd_img_path = "/tmp/geomate_gsd_plot.png"
         if os.path.exists(gsd_img_path):
-            elems.append(Spacer(1,6))
+            elems.append(Spacer(1, 6))
             elems.append(RLImage(gsd_img_path, width=150*mm, height=80*mm))
-    elems.append(Spacer(1,10))
+
+    elems.append(Spacer(1, 10))
     elems.append(Paragraph("Decision path", h1))
     elems.append(Paragraph(site.get("classifier_decision_path","Not recorded"), body))
+
     doc.build(elems)
     pdf = buf.getvalue()
     buf.close()
     return pdf
 
+# --------------------------
+# FULL REPORT BUILDER
+# --------------------------
 def build_full_geotech_pdf_bytes(sites_list: list, external_refs: list):
     """
     Build a full geotechnical report covering all selected sites.
@@ -1593,7 +1626,11 @@ def build_full_geotech_pdf_bytes(sites_list: list, external_refs: list):
     Returns bytes of PDF.
     """
     buf = io.BytesIO()
-    doc = SimpleDocTemplate(buf, pagesize=A4, leftMargin=20*mm, rightMargin=20*mm, topMargin=20*mm, bottomMargin=20*mm)
+    doc = SimpleDocTemplate(
+        buf, pagesize=A4,
+        leftMargin=20*mm, rightMargin=20*mm,
+        topMargin=20*mm, bottomMargin=20*mm
+    )
     styles = getSampleStyleSheet()
     title = ParagraphStyle("title", parent=styles["Title"], fontSize=20, textColor=THEME["accent"], alignment=1)
     h1 = ParagraphStyle("h1", parent=styles["Heading1"], fontSize=14, textColor=THEME["accent"])
@@ -1601,65 +1638,69 @@ def build_full_geotech_pdf_bytes(sites_list: list, external_refs: list):
 
     elems = []
     elems.append(Paragraph("Full Geotechnical Investigation Report — GeoMate V2", title))
-    elems.append(Spacer(1,6))
+    elems.append(Spacer(1, 6))
     elems.append(Paragraph(f"Date: {datetime.today().strftime('%Y-%m-%d')}", body))
-    elems.append(Spacer(1,10))
+    elems.append(Spacer(1, 10))
 
-    # For each site: include summary, field data, lab results, GSD, map link (if snapshot exists)
+    # For each site
     for s in sites_list:
         elems.append(Paragraph(f"Site: {s.get('Site Name','Unnamed')}", h1))
-        elems.append(Paragraph(f"Location: {s.get('Coordinates','Not provided')}", body))
-        elems.append(Spacer(1,6))
-        elems.append(Paragraph("1. Site Description & Geology", body))
-        elems.append(Paragraph(s.get("site_description","Not provided"), body))
-        elems.append(Spacer(1,6))
-
-        elems.append(Paragraph("2. Field Investigation & Laboratory Testing", body))
-        # show available fields
-        lines = [
-            f"Load Bearing Capacity: {s.get('Load Bearing Capacity','Not provided')}",
-            f"Skin Shear Strength: {s.get('Skin Shear Strength','Not provided')}",
-            f"Relative Compaction: {s.get('Relative Compaction','Not provided')}",
-            f"Rate of Consolidation: {s.get('Rate of Consolidation','Not provided')}",
-            f"Nature of Construction: {s.get('Nature of Construction','Not provided')}"
-        ]
-        for L in lines:
-            elems.append(Paragraph(L, body))
-        elems.append(Spacer(1,8))
-
-        # GSD & plot
+        elems.append(Paragraph(f"Coordinates: {s.get('Coordinates','Not provided')}", body))
+        elems.append(Spacer(1, 6))
+
+        # OCR notes
+        if s.get("ocr_text"):
+            elems.append(Paragraph("OCR Extracted Notes", h1))
+            elems.append(Paragraph(s.get("ocr_text"), body))
+            elems.append(Spacer(1, 6))
+
+        # Classification
+        elems.append(Paragraph("Classification", h1))
+        elems.append(Paragraph(f"USCS: {s.get('USCS','N/A')}", body))
+        elems.append(Paragraph(f"AASHTO: {s.get('AASHTO','N/A')} (GI: {s.get('GI','N/A')})", body))
+
+        # Earth Engine / Map snapshots
+        if s.get("map_snapshot") and os.path.exists(s["map_snapshot"]):
+            elems.append(Spacer(1, 6))
+            elems.append(Paragraph("Site Map Snapshot", h1))
+            elems.append(RLImage(s["map_snapshot"], width=140*mm, height=80*mm))
+
+        # GSD
         gsd = s.get("GSD")
         if gsd:
-            elems.append(Paragraph("3. Grain Size Distribution", body))
-            elems.append(Paragraph(f"D10: {gsd.get('D10')}, D30: {gsd.get('D30')}, D60: {gsd.get('D60')}, Cu: {gsd.get('Cu')}, Cc: {gsd.get('Cc')}", body))
-            # Include saved image path if exists
+            elems.append(Spacer(1, 6))
+            elems.append(Paragraph("Grain Size Distribution", h1))
+            elems.append(Paragraph(
+                f"D10: {gsd.get('D10')}, D30: {gsd.get('D30')}, "
+                f"D60: {gsd.get('D60')}, Cu: {gsd.get('Cu')}, Cc: {gsd.get('Cc')}",
+                body
+            ))
             gsd_img = "/tmp/geomate_gsd_plot.png"
             if os.path.exists(gsd_img):
-                elems.append(Spacer(1,6))
+                elems.append(Spacer(1, 6))
                 elems.append(RLImage(gsd_img, width=150*mm, height=80*mm))
-        elems.append(Spacer(1,8))
-
-        # Earth Engine extracted data
-        elems.append(Paragraph("4. Locator-derived Data", body))
-        elems.append(Paragraph(f"Flood Data: {json.dumps(s.get('Flood Data','Not provided'))[:300]}", body))
-        elems.append(Paragraph(f"Seismic Data: {json.dumps(s.get('Seismic Data','Not provided'))[:300]}", body))
-        elems.append(Paragraph(f"Topography: {json.dumps(s.get('Topography','Not provided'))[:300]}", body))
-        elems.append(Spacer(1,8))
-
-        # Recommendations (simple placeholder text derived from site properties)
-        elems.append(Paragraph("5. Recommendations (preliminary)", body))
-        # Basic logic to create recommendations
-        if s.get("USCS") and s.get("USCS").startswith("C"):
-            elems.append(Paragraph(" - Soils have clayey character; consider consolidation and settlement checks. Use stiffened raft or piles for heavy loads.", body))
+
+        # Recommendations (basic rules from classification)
+        elems.append(Spacer(1, 8))
+        elems.append(Paragraph("Recommendations", h1))
+        if s.get("USCS") and s["USCS"].startswith("C"):
+            elems.append(Paragraph(" - Clayey soils: check consolidation/settlement. Consider raft or pile foundations.", body))
         else:
-            elems.append(Paragraph(" - Soils are likely granular; shallow foundations possible with suitable compaction and drainage.", body))
+            elems.append(Paragraph(" - Granular soils: shallow foundations possible with compaction and drainage.", body))
 
         elems.append(PageBreak())
 
-    # External references
-    if external_refs:
+    # References (FAISS RAG + manual)
+    refs = []
+    for s in sites_list:
+        if s.get("rag_sources"):
+            refs.extend(s["rag_sources"])
+    refs = list(set(refs))  # remove duplicates
+    refs.extend(external_refs)
+
+    if refs:
         elems.append(Paragraph("References", h1))
-        for r in external_refs:
+        for r in refs:
             elems.append(Paragraph(r, body))
 
     doc.build(elems)
@@ -1676,12 +1717,21 @@ def reports_ui():
     # Classification-only
     st.subheader("Classification-only report")
     sites = ss.get("sites", [])
+    if not sites:
+        st.warning("No sites available.")
+        return
+
     site_names = [s.get("Site Name","Unnamed") for s in sites]
     sel_cls = st.selectbox("Select site", site_names, index=ss.get("active_site_idx",0))
     if st.button("Generate Classification PDF"):
         site = ss["sites"][site_names.index(sel_cls)]
         pdf_bytes = build_classification_pdf_bytes(site)
-        st.download_button("Download Classification PDF", data=pdf_bytes, file_name=f"classification_{sel_cls}.pdf", mime="application/pdf")
+        st.download_button(
+            "Download Classification PDF",
+            data=pdf_bytes,
+            file_name=f"classification_{sel_cls}.pdf",
+            mime="application/pdf"
+        )
 
     st.markdown("---")
 
@@ -1697,8 +1747,13 @@ def reports_ui():
             ext_refs = [l.strip() for l in ext_refs_text.splitlines() if l.strip()]
             with st.spinner("Building PDF (this may take a few seconds)..."):
                 pdf_bytes = build_full_geotech_pdf_bytes(chosen_sites, ext_refs)
-            st.download_button("Download Full Geotechnical Report", data=pdf_bytes, file_name="geomate_full_report.pdf", mime="application/pdf")
-
+            st.download_button(
+                "Download Full Geotechnical Report",
+                data=pdf_bytes,
+                file_name="geomate_full_report.pdf",
+                mime="application/pdf"
+            )
+    
 # --------------------------
 # Final UI main function (glue)
 # --------------------------