Update api/routes.py

api/routes.py

@@ -554,7 +554,7 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
         raise HTTPException(status_code=403, detail="Only clinicians can generate patient PDFs")
 
     try:
-        # Determine if input is ObjectId or fallback to fhir_id
+        # Determine if patient_id is ObjectId or fhir_id
         try:
             obj_id = ObjectId(patient_id)
             query = { "$or": [ { "_id": obj_id }, { "fhir_id": patient_id } ] }
@@ -567,86 +567,125 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
             logger.warning(f"Patient not found: {patient_id}")
             raise HTTPException(status_code=404, detail="Patient not found")
 
-        # Generate LaTeX content
-        latex = f"""
-\\documentclass[a4paper,12pt]{{article}}
-\\usepackage[utf8]{{inputenc}}
-\\usepackage[T1]{{fontenc}}
-\\usepackage{{geometry}}
-\\geometry{{margin=1in}}
-\\usepackage{{booktabs,longtable,fancyhdr}}
-\\pagestyle{{fancy}}
-\\fancyhf{{}}
-\\fancyhead[L]{{Patient Report}}
-\\fancyhead[R]{{Generated: \\today}}
-\\fancyfoot[C]{{\\thepage}}
-
-\\begin{{document}}
-
-\\begin{{center}}
-    \\Large\\textbf{{Patient Medical Report}} \\\\
-    \\vspace{{0.2cm}}
-    \\textit{{Generated on {datetime.now().strftime('%A, %B %d, %Y at %I:%M %p')}}}
-\\end{{center}}
-
-\\section*{{Demographics}}
-\\begin{{itemize}}
-    \\item \\textbf{{FHIR ID:}} {patient.get("fhir_id", "")}
-    \\item \\textbf{{Full Name:}} {patient.get("full_name", "")}
-    \\item \\textbf{{Gender:}} {patient.get("gender", "")}
-    \\item \\textbf{{Date of Birth:}} {patient.get("date_of_birth", "")}
-    \\item \\textbf{{Age:}} {calculate_age(patient.get("date_of_birth", ""))}
-    \\item \\textbf{{Address:}} {patient.get("address", "")}, {patient.get("city", "")}, {patient.get("state", "")}, {patient.get("postal_code", "")}, {patient.get("country", "")}
-    \\item \\textbf{{Marital Status:}} {patient.get("marital_status", "")}
-    \\item \\textbf{{Language:}} {patient.get("language", "")}
-\\end{{itemize}}
-
-\\section*{{Clinical Notes}}
-\\begin{{longtable}}{{p{{3cm}}p{{3cm}}p{{7cm}}}}
-\\toprule
-\\textbf{{Date}} & \\textbf{{Type}} & \\textbf{{Text}} \\\\
-\\midrule
-\\endhead
-{" \\\\ \n".join([f"{n.get('date', '')} & {n.get('type', '')} & {n.get('text', '')}" for n in patient.get("notes", [])])}
-\\bottomrule
-\\end{{longtable}}
-
-\\section*{{Conditions}}
-\\begin{{longtable}}{{p{{2cm}}p{{3cm}}p{{2cm}}p{{2cm}}p{{3cm}}}}
-\\toprule
-\\textbf{{ID}} & \\textbf{{Code}} & \\textbf{{Status}} & \\textbf{{Onset}} & \\textbf{{Verification}} \\\\
-\\midrule
-\\endhead
-{" \\\\ \n".join([f"{c.get('id','')} & {c.get('code','')} & {c.get('status','')} & {c.get('onset_date','')} & {c.get('verification_status','')}" for c in patient.get("conditions", [])])}
-\\bottomrule
-\\end{{longtable}}
-
-\\section*{{Medications}}
-\\begin{{longtable}}{{p{{2cm}}p{{4cm}}p{{2cm}}p{{2cm}}p{{2cm}}}}
-\\toprule
-\\textbf{{ID}} & \\textbf{{Name}} & \\textbf{{Status}} & \\textbf{{Date}} & \\textbf{{Dosage}} \\\\
-\\midrule
-\\endhead
-{" \\\\ \n".join([f"{m.get('id','')} & {m.get('name','')} & {m.get('status','')} & {m.get('prescribed_date','')} & {m.get('dosage','')}" for m in patient.get("medications", [])])}
-\\bottomrule
-\\end{{longtable}}
-
-\\section*{{Encounters}}
-\\begin{{longtable}}{{p{{2cm}}p{{4cm}}p{{2cm}}p{{3cm}}p{{3cm}}}}
-\\toprule
-\\textbf{{ID}} & \\textbf{{Type}} & \\textbf{{Status}} & \\textbf{{Start}} & \\textbf{{Provider}} \\\\
-\\midrule
-\\endhead
-{" \\\\ \n".join([f"{e.get('id','')} & {e.get('type','')} & {e.get('status','')} & {e.get('period',{}).get('start','')} & {e.get('service_provider','')}" for e in patient.get("encounters", [])])}
-\\bottomrule
-\\end{{longtable}}
-
-\\end{{document}}
+        # Format LaTeX content using .format() to avoid f-string escape issues
+        latex_template = r"""
+\documentclass[a4paper,12pt]{article}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage{geometry}
+\geometry{margin=1in}
+\usepackage{booktabs,longtable,fancyhdr}
+\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[L]{Patient Report}
+\fancyhead[R]{Generated: \today}
+\fancyfoot[C]{\thepage}
+
+\begin{document}
+
+\begin{center}
+    \Large\textbf{Patient Medical Report} \\
+    \vspace{0.2cm}
+    \textit{Generated on %(generated_on)s}
+\end{center}
+
+\section*{Demographics}
+\begin{itemize}
+    \item \textbf{FHIR ID:} %(fhir_id)s
+    \item \textbf{Full Name:} %(full_name)s
+    \item \textbf{Gender:} %(gender)s
+    \item \textbf{Date of Birth:} %(dob)s
+    \item \textbf{Age:} %(age)s
+    \item \textbf{Address:} %(address)s
+    \item \textbf{Marital Status:} %(marital_status)s
+    \item \textbf{Language:} %(language)s
+\end{itemize}
+
+\section*{Clinical Notes}
+\begin{longtable}{p{3cm}p{3cm}p{7cm}}
+\toprule
+\textbf{Date} & \textbf{Type} & \textbf{Text} \\
+\midrule
+%(notes)s
+\bottomrule
+\end{longtable}
+
+\section*{Conditions}
+\begin{longtable}{p{2cm}p{3cm}p{2cm}p{2cm}p{3cm}}
+\toprule
+\textbf{ID} & \textbf{Code} & \textbf{Status} & \textbf{Onset} & \textbf{Verification} \\
+\midrule
+%(conditions)s
+\bottomrule
+\end{longtable}
+
+\section*{Medications}
+\begin{longtable}{p{2cm}p{4cm}p{2cm}p{2cm}p{2cm}}
+\toprule
+\textbf{ID} & \textbf{Name} & \textbf{Status} & \textbf{Date} & \textbf{Dosage} \\
+\midrule
+%(medications)s
+\bottomrule
+\end{longtable}
+
+\section*{Encounters}
+\begin{longtable}{p{2cm}p{4cm}p{2cm}p{3cm}p{3cm}}
+\toprule
+\textbf{ID} & \textbf{Type} & \textbf{Status} & \textbf{Start} & \textbf{Provider} \\
+\midrule
+%(encounters)s
+\bottomrule
+\end{longtable}
+
+\end{document}
         """
 
-        # Save and compile to PDF
+        # Build the LaTeX-safe rows
+        notes = "\n".join([
+            "{} & {} & {} \\\\".format(n.get("date", ""), n.get("type", ""), n.get("text", "").replace("&", "\\&"))
+            for n in patient.get("notes", [])
+        ])
+        conditions = "\n".join([
+            "{} & {} & {} & {} & {} \\\\".format(
+                c.get("id", ""), c.get("code", ""), c.get("status", ""), c.get("onset_date", ""), c.get("verification_status", "")
+            )
+            for c in patient.get("conditions", [])
+        ])
+        medications = "\n".join([
+            "{} & {} & {} & {} & {} \\\\".format(
+                m.get("id", ""), m.get("name", ""), m.get("status", ""), m.get("prescribed_date", ""), m.get("dosage", "")
+            )
+            for m in patient.get("medications", [])
+        ])
+        encounters = "\n".join([
+            "{} & {} & {} & {} & {} \\\\".format(
+                e.get("id", ""), e.get("type", ""), e.get("status", ""), e.get("period", {}).get("start", ""), e.get("service_provider", "")
+            )
+            for e in patient.get("encounters", [])
+        ])
+
+        latex_filled = latex_template % {
+            "generated_on": datetime.now().strftime("%A, %B %d, %Y at %I:%M %p"),
+            "fhir_id": patient.get("fhir_id", ""),
+            "full_name": patient.get("full_name", ""),
+            "gender": patient.get("gender", ""),
+            "dob": patient.get("date_of_birth", ""),
+            "age": calculate_age(patient.get("date_of_birth", "")) or "N/A",
+            "address": "{}, {}, {}, {}, {}".format(
+                patient.get("address", ""), patient.get("city", ""), patient.get("state", ""),
+                patient.get("postal_code", ""), patient.get("country", "")
+            ),
+            "marital_status": patient.get("marital_status", ""),
+            "language": patient.get("language", ""),
+            "notes": notes or "No notes available \\\\",
+            "conditions": conditions or "No conditions available \\\\",
+            "medications": medications or "No medications available \\\\",
+            "encounters": encounters or "No encounters available \\\\"
+        }
+
+        # Write LaTeX to file
         with NamedTemporaryFile(suffix=".tex", mode="w", delete=False) as tex_file:
-            tex_file.write(latex)
+            tex_file.write(latex_filled)
             tex_path = tex_file.name
 
         try:
@@ -655,15 +694,15 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
             with open(pdf_path, "rb") as f:
                 pdf_bytes = f.read()
 
-            # Clean up
             subprocess.run(["latexmk", "-c", tex_path], check=True)
             os.remove(tex_path)
             os.remove(pdf_path)
 
-            # Send PDF as response
-            response = Response(content=pdf_bytes, media_type="application/pdf")
-            response.headers["Content-Disposition"] = f"attachment; filename=patient_{patient.get('fhir_id', 'unknown')}_record.pdf"
-            return response
+            return Response(
+                content=pdf_bytes,
+                media_type="application/pdf",
+                headers={"Content-Disposition": f"attachment; filename=patient_{patient.get('fhir_id', 'unknown')}_record.pdf"}
+            )
 
         except subprocess.CalledProcessError as e:
             logger.error(f"LaTeX compilation failed: {e.stderr}")
@@ -672,6 +711,7 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
     except Exception as e:
         logger.error(f"PDF generation error: {e}")
         raise HTTPException(status_code=500, detail="Failed to generate PDF")
+
 @router.post("/signup", status_code=status.HTTP_201_CREATED)
 async def signup(data: SignupForm):
     logger.info(f"Signup attempt for email: {data.email}")