Update src/report_generator.py

src/report_generator.py

@@ -2,6 +2,7 @@ import json
 import os
 import re
 import tempfile
+import base64
 from datetime import datetime
 import streamlit as st
 from reportlab.lib.pagesizes import A4
@@ -16,6 +17,44 @@ from text_processors import format_conversation_history
 from model import orchestrator_chat
 
 
+# Function to encode images to base64 (similar to app.py)
+def get_image_base64(image_path):
+    try:
+        if os.path.exists(image_path):
+            with open(image_path, "rb") as img_file:
+                return base64.b64encode(img_file.read()).decode()
+        else:
+            print(f"Image not found: {image_path}")
+            return None
+    except Exception as e:
+        print(f"Error loading image: {e}")
+        return None
+
+
+# Function to get reportlab Image object or None
+def get_reportlab_image(image_path, width=1.5*inch, height=1.0*inch):
+    try:
+        if os.path.exists(image_path):
+            return Image(image_path, width=width, height=height)
+        else:
+            # Try to find it in alternate locations
+            alt_paths = [
+                f"assets/{os.path.basename(image_path)}",
+                f"assets/Logo/{os.path.basename(image_path)}",
+                image_path.replace("src/assets", "assets")
+            ]
+            
+            for path in alt_paths:
+                if os.path.exists(path):
+                    return Image(path, width=width, height=height)
+                    
+            print(f"Image not found: {image_path}")
+            return None
+    except Exception as e:
+        print(f"Error creating image: {str(e)}")
+        return None
+
+
 def extract_medical_json(conversation_text: str) -> dict:
     """
     Extract medical report data from conversation text into structured JSON.
@@ -138,12 +177,13 @@ def build_medical_report(data: dict) -> bytes:
     # Initialize elements list
     elems = []
 
-    # Add logo and company header
-    logo_path = "src/assets/logo.png"  # Adjust path as needed
+    # Add logo and company header - use path from app.py
+    logo_path = "src/assets/Logo_no_background.png" 
     
-    # Create a table for the header (logo on left, company info on right)
-    logo_img = Image(logo_path, width=1.5*inch, height=1.0*inch)
+    # Get logo image using our helper
+    logo_img = get_reportlab_image(logo_path)
     
+    # Create a table for the header (logo on left, company info on right)
     company_info = Paragraph(
         """
         <b>Daease</b><br/>
@@ -153,19 +193,42 @@ def build_medical_report(data: dict) -> bytes:
         styles['CompanyInfo']
     )
     
-    header_table = Table([[logo_img, company_info]], colWidths=[doc.width/2.0]*2)
-    header_table.setStyle(TableStyle([
-        ('VALIGN', (0, 0), (-1, -1), 'TOP'),
-        ('ALIGN', (0, 0), (0, 0), 'LEFT'),
-        ('ALIGN', (1, 0), (1, 0), 'RIGHT'),
-        ('BOTTOMPADDING', (0, 0), (-1, -1), 10),
-    ]))
+    if logo_img:
+        # Use the logo in the header table
+        header_table = Table([[logo_img, company_info]], colWidths=[doc.width/2.0]*2)
+        header_table.setStyle(TableStyle([
+            ('VALIGN', (0, 0), (-1, -1), 'TOP'),
+            ('ALIGN', (0, 0), (0, 0), 'LEFT'),
+            ('ALIGN', (1, 0), (1, 0), 'RIGHT'),
+            ('BOTTOMPADDING', (0, 0), (-1, -1), 10),
+        ]))
+    else:
+        # Fallback to text-only header if logo can't be loaded
+        header_table = Table([['Daease', company_info]], colWidths=[doc.width/2.0]*2)
+        header_table.setStyle(TableStyle([
+            ('VALIGN', (0, 0), (-1, -1), 'TOP'),
+            ('ALIGN', (0, 0), (0, 0), 'LEFT'),
+            ('ALIGN', (1, 0), (1, 0), 'RIGHT'),
+            ('BOTTOMPADDING', (0, 0), (-1, -1), 10),
+            ('FONTNAME', (0, 0), (0, 0), 'Helvetica-Bold'),
+            ('FONTSIZE', (0, 0), (0, 0), 14),
+            ('TEXTCOLOR', (0, 0), (0, 0), colors.navy),
+        ]))
     
     elems.append(header_table)
     elems.append(Spacer(1, 0.3*inch))
 
-    # Add title
-    elems.append(Paragraph("Daease Medical Consultation Report", styles['ReportTitle']))
+    # Add title - with more prominent styling
+    title_style = ParagraphStyle(
+        name='ReportTitleEnhanced',
+        fontName='Helvetica-Bold',
+        fontSize=18, 
+        leading=22,
+        alignment=TA_CENTER,
+        spaceAfter=0.3*inch,
+        textColor=colors.navy
+    )
+    elems.append(Paragraph("Daease Medical Consultation Report", title_style))
     elems.append(Spacer(1, 0.2*inch))
 
     # Add a horizontal line
@@ -179,31 +242,51 @@ def build_medical_report(data: dict) -> bytes:
     # Patient info in a clean table
     patient = data.get('patient', {})
     
-    # Format the patient table data
+    # Format the patient table data with improved styling
     patient_data = [
-        ['Patient Information', ''],
-        ['Name:', patient.get('name', '–')],
-        ['Age:', patient.get('age', '–')],
-        ['Gender:', patient.get('gender', '–')],
-        ['Visit Date:', data.get('visit_date', datetime.now().strftime("%Y-%m-%d"))]
+        ['Patient Information', '', ''],
+        ['Name:', patient.get('name', '–'), ''],
+        ['Age:', patient.get('age', '–'), ''],
+        ['Gender:', patient.get('gender', '–'), ''],
+        ['Visit Date:', data.get('visit_date', datetime.now().strftime("%Y-%m-%d")), '']
     ]
     
-    patient_table = Table(patient_data, colWidths=[doc.width * 0.3, doc.width * 0.7])
+    # Create a more structured patient table with better column distribution
+    patient_table = Table(
+        patient_data, 
+        colWidths=[doc.width * 0.2, doc.width * 0.5, doc.width * 0.3],
+        rowHeights=[0.4*inch, 0.3*inch, 0.3*inch, 0.3*inch, 0.3*inch]
+    )
     patient_table.setStyle(TableStyle([
-        ('BACKGROUND', (0, 0), (1, 0), colors.navy),
-        ('TEXTCOLOR', (0, 0), (1, 0), colors.white),
-        ('FONTNAME', (0, 0), (1, 0), 'Helvetica-Bold'),
-        ('SPAN', (0, 0), (1, 0)),
-        ('ALIGN', (0, 0), (1, 0), 'CENTER'),
+        # Header row styling
+        ('BACKGROUND', (0, 0), (2, 0), colors.navy),
+        ('TEXTCOLOR', (0, 0), (2, 0), colors.white),
+        ('FONTNAME', (0, 0), (2, 0), 'Helvetica-Bold'),
+        ('SPAN', (0, 0), (2, 0)),  # Span all columns in header
+        ('ALIGN', (0, 0), (2, 0), 'CENTER'),
+        
+        # Label column styling (first column)
+        ('FONTNAME', (0, 1), (0, -1), 'Helvetica-Bold'),
+        ('ALIGN', (0, 1), (0, -1), 'RIGHT'),
+        ('RIGHTPADDING', (0, 1), (0, -1), 10),
+        
+        # Value column styling (second column)
+        ('ALIGN', (1, 1), (1, -1), 'LEFT'),
+        
+        # Table borders and grid
         ('VALIGN', (0, 0), (-1, -1), 'MIDDLE'),
-        ('GRID', (0, 0), (-1, -1), 0.5, colors.grey),
-        ('BOX', (0, 0), (-1, -1), 1, colors.darkblue),
+        ('GRID', (0, 0), (1, -1), 0.5, colors.lightgrey),
+        ('BOX', (0, 0), (1, -1), 1, colors.darkblue),
+        
+        # Alternating row colors for better readability
+        ('BACKGROUND', (0, 1), (1, 1), colors.whitesmoke),
+        ('BACKGROUND', (0, 3), (1, 3), colors.whitesmoke),
     ]))
     
     elems.append(patient_table)
     elems.append(Spacer(1, 0.3*inch))
 
-    # Helper to add sections as tables
+    # Helper to add sections as tables with improved styling
     def add_section_table(title, content):
         if isinstance(content, list):
             content = '\n'.join(map(str, content))
@@ -213,26 +296,43 @@ def build_medical_report(data: dict) -> bytes:
         if not content or content.strip() == '':
             content = '–'
             
+        # Create a gradient-like effect with nested tables
         section_data = [
-            [title, ''],
-            [Paragraph(content, styles['NormalText']), '']
+            # Header row with gradient-like styling
+            [Paragraph(f"<b>{title}</b>", 
+                      ParagraphStyle(
+                          name='TableHeader',
+                          fontName='Helvetica-Bold',
+                          fontSize=11,
+                          textColor=colors.white,
+                          alignment=TA_LEFT
+                      ))],
+            # Content row
+            [Paragraph(content, styles['NormalText'])]
         ]
         
-        # Create table and span the content cell
-        table = Table(section_data, colWidths=[doc.width * 0.97, doc.width * 0.03])
+        # Create the main table
+        table = Table(section_data, colWidths=[doc.width * 0.97], rowHeights=[0.35*inch, None])
         table.setStyle(TableStyle([
-            ('BACKGROUND', (0, 0), (1, 0), colors.lightblue),
-            ('TEXTCOLOR', (0, 0), (1, 0), colors.navy),
-            ('FONTNAME', (0, 0), (1, 0), 'Helvetica-Bold'),
-            ('SPAN', (0, 0), (1, 0)),  # Span the header row
-            ('SPAN', (0, 1), (1, 1)),  # Span the content row
-            ('ALIGN', (0, 0), (0, 0), 'LEFT'),
-            ('VALIGN', (0, 0), (-1, -1), 'MIDDLE'),
+            # Header styling with gradient-like effect
+            ('BACKGROUND', (0, 0), (0, 0), colors.navy),
+            ('LINEBELOW', (0, 0), (0, 0), 1, colors.darkblue),
+            ('LEFTPADDING', (0, 0), (0, 0), 10),
+            ('TOPPADDING', (0, 0), (0, 0), 6),
+            ('BOTTOMPADDING', (0, 0), (0, 0), 6),
+            
+            # Content styling
+            ('LEFTPADDING', (0, 1), (0, 1), 10),
+            ('RIGHTPADDING', (0, 1), (0, 1), 10),
+            ('TOPPADDING', (0, 1), (0, 1), 8),
+            ('BOTTOMPADDING', (0, 1), (0, 1), 8),
+            ('BACKGROUND', (0, 1), (0, 1), colors.white),
+            
+            # Border styling
             ('BOX', (0, 0), (-1, -1), 1, colors.lightgrey),
-            ('LINEBELOW', (0, 0), (1, 0), 1, colors.navy),
         ]))
         
-        elems.append(KeepTogether([table, Spacer(1, 0.1*inch)]))
+        elems.append(KeepTogether([table, Spacer(1, 0.15*inch)]))
 
     # Add all medical information sections as tables
     add_section_table("Chief Complaint", data.get('chief_complaint'))
@@ -249,27 +349,51 @@ def build_medical_report(data: dict) -> bytes:
     # Add AI signature section
     elems.append(Spacer(1, 0.4*inch))
     
-    # Try to add AI signature image if available
-    signature_path = "assets/Logo/LOGO.png"  # Fallback to logo if no signature available
-    try:
-        signature_img = Image(signature_path, width=1.2*inch, height=0.8*inch)
-        signature_table = Table([
-            [Paragraph("<i>Generated by</i>", styles['NormalText'])],
-            [signature_img],
-            [Paragraph("<b>Daease AI Medical Assistant</b>", styles['NormalText'])]
-        ], colWidths=[doc.width * 0.3])
+    # Add a horizontal line before signature
+    sig_line = Table([['']],  colWidths=[doc.width], rowHeights=[1])
+    sig_line.setStyle(TableStyle([
+        ('LINEABOVE', (0, 0), (-1, -1), 0.5, colors.grey),
+    ]))
+    elems.append(sig_line)
+    elems.append(Spacer(1, 0.2*inch))
+    
+    # Create a robust signature section
+    signature_text = Paragraph("<i>Generated by</i>", styles['NormalText'])
+    ai_name = Paragraph("<b>Daease AI Medical Assistant</b>", styles['NormalText'])
+    
+    # Use the same logo path for signature
+    signature_img = get_reportlab_image("src/assets/logo.png", width=1.2*inch, height=0.8*inch)
+    
+    if signature_img:
+        # Create a 3-column table for better alignment
+        sig_table = Table(
+            [[signature_text, '', ''], 
+             [signature_img, '', ''], 
+             [ai_name, '', '']], 
+            colWidths=[doc.width * 0.3, doc.width * 0.35, doc.width * 0.35]
+        )
         
-        signature_table.setStyle(TableStyle([
+        sig_table.setStyle(TableStyle([
             ('ALIGN', (0, 0), (0, -1), 'CENTER'),
             ('VALIGN', (0, 0), (0, -1), 'MIDDLE'),
         ]))
-        elems.append(signature_table)
-    except:
-        # Fallback if image can't be loaded
-        elems.append(Paragraph("<i>Generated by Daease AI Medical Assistant</i>", styles['NormalText']))
+        elems.append(sig_table)
+    else:
+        # Text-only fallback for signature
+        sig_text = Paragraph(
+            "<i>Generated by</i><br/><b>Daease AI Medical Assistant</b>", 
+            ParagraphStyle(
+                name='SignatureText',
+                fontName='Helvetica-Bold',
+                fontSize=10,
+                alignment=TA_LEFT,
+                spaceAfter=0.1*inch
+            )
+        )
+        elems.append(sig_text)
     
-    # Add disclaimer
-    elems.append(Spacer(1, 0.2*inch))
+    # Add disclaimer with more distinctive styling
+    elems.append(Spacer(1, 0.3*inch))
     disclaimer = Paragraph(
         "<i>Disclaimer: This report is generated by AI for informational purposes only. "
         "It should not replace professional medical advice, diagnosis, or treatment. "
@@ -278,7 +402,11 @@ def build_medical_report(data: dict) -> bytes:
             name='Disclaimer',
             fontName='Helvetica-Oblique',
             fontSize=8,
-            textColor=colors.grey
+            textColor=colors.grey,
+            borderWidth=1,
+            borderColor=colors.lightgrey,
+            borderPadding=5,
+            borderRadius=2
         )
     )
     elems.append(disclaimer)
@@ -349,7 +477,7 @@ def generate_and_download_report():
             st.session_state.pdf_data = pdf_bytes  # Store PDF data for email
             
             # Display success message
-            st.success("Report is ready!")
+            st.success("Your medical report is ready!")
             
             # Create two columns for the download and email buttons
             col1, col2 = st.columns(2)
@@ -357,7 +485,7 @@ def generate_and_download_report():
             with col1:
                 # Offer download
                 st.download_button(
-                    label="Download Report",
+                    label="📥 Download Report",
                     data=pdf_bytes,
                     file_name=f"medical_report_{datetime.now().strftime('%Y%m%d')}.pdf",
                     mime="application/pdf",
@@ -366,7 +494,7 @@ def generate_and_download_report():
             
             with col2:
                 # Email button that shows email form when clicked
-                if st.button("Email Report"):
+                if st.button("📧 Email Report"):
                     st.session_state.show_email_form = True
                     st.rerun()