Update api/routes/pdf.py

api/routes/pdf.py

@@ -22,17 +22,14 @@ router = APIRouter()
 
 @router.get("/{patient_id}/pdf", response_class=Response)
 async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get_current_user)):
-    logger.info(f"Generating PDF for patient {patient_id} by {current_user.get('email')}")
-    
-    if current_user.get('role') not in ['doctor', 'admin']:
-        logger.warning(f"Unauthorized PDF generation attempt by {current_user.get('email')}")
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN,
-            detail="Only clinicians can generate patient PDFs",
-            headers={"WWW-Authenticate": "Bearer"}
-        )
+    # Suppress logging for this route
+    logger.setLevel(logging.CRITICAL)
 
     try:
+        if current_user.get('role') not in ['doctor', 'admin']:
+            raise HTTPException(status_code=403, detail="Only clinicians can generate patient PDFs")
+
+        # Determine if patient_id is ObjectId or fhir_id
         try:
             obj_id = ObjectId(patient_id)
             query = {"$or": [{"_id": obj_id}, {"fhir_id": patient_id}]}
@@ -41,12 +38,9 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
 
         patient = await patients_collection.find_one(query)
         if not patient:
-            logger.warning(f"Patient not found: {patient_id}")
-            raise HTTPException(
-                status_code=status.HTTP_404_NOT_FOUND,
-                detail="Patient not found"
-            )
+            raise HTTPException(status_code=404, detail="Patient not found")
 
+        # Prepare table content with proper LaTeX formatting
         def prepare_table_content(items, columns, default_message):
             if not items:
                 return f"\\multicolumn{{{columns}}}{{l}}{{{default_message}}} \\\\"
@@ -60,6 +54,7 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
                 content.append(" & ".join(row) + " \\\\")
             return "\n".join(content)
 
+        # Notes table
         notes = patient.get("notes", [])
         notes_content = prepare_table_content(
             [{
@@ -71,6 +66,7 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
             "No notes available"
         )
 
+        # Conditions table
         conditions = patient.get("conditions", [])
         conditions_content = prepare_table_content(
             [{
@@ -84,6 +80,7 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
             "No conditions available"
         )
 
+        # Medications table
         medications = patient.get("medications", [])
         medications_content = prepare_table_content(
             [{
@@ -97,6 +94,7 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
             "No medications available"
         )
 
+        # Encounters table
         encounters = patient.get("encounters", [])
         encounters_content = prepare_table_content(
             [{
@@ -110,6 +108,7 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
             "No encounters available"
         )
 
+        # LaTeX template with improved table formatting
         latex_template = Template(r"""
 \documentclass[a4paper,12pt]{article}
 \usepackage[utf8]{inputenc}
@@ -126,15 +125,12 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
 \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}
 \end{center}
-
 \section*{Demographics}
 \begin{itemize}
     \item \textbf{FHIR ID:} $fhir_id
@@ -146,7 +142,6 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
     \item \textbf{Marital Status:} $marital_status
     \item \textbf{Language:} $language
 \end{itemize}
-
 \section*{Clinical Notes}
 \begin{longtable}[l]{>{\raggedright\arraybackslash}p{3.5cm}>{\raggedright\arraybackslash}p{3cm}>{\raggedright\arraybackslash}p{6.5cm}}
 \caption{Clinical Notes} \\
@@ -156,7 +151,6 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
 $notes
 \bottomrule
 \end{longtable}
-
 \section*{Conditions}
 \begin{longtable}[l]{>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{3cm}>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{3.5cm}>{\raggedright\arraybackslash}p{3cm}}
 \caption{Conditions} \\
@@ -166,7 +160,6 @@ $notes
 $conditions
 \bottomrule
 \end{longtable}
-
 \section*{Medications}
 \begin{longtable}[l]{>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{4cm}>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{3.5cm}>{\raggedright\arraybackslash}p{3cm}}
 \caption{Medications} \\
@@ -176,7 +169,6 @@ $conditions
 $medications
 \bottomrule
 \end{longtable}
-
 \section*{Encounters}
 \begin{longtable}[l]{>{\raggedright\arraybackslash}p{2.5cm}>{\raggedright\arraybackslash}p{4.5cm}>{\raggedright\arraybackslash}p{2.5cm}>{\raggedright\arraybackslash}p{4.5cm}>{\raggedright\arraybackslash}p{3.5cm}}
 \caption{Encounters} \\
@@ -186,11 +178,11 @@ $medications
 $encounters
 \bottomrule
 \end{longtable}
-
 \end{document}
 """)
 
-        generated_on = datetime.utcnow().strftime("%A, %B %d, %Y at %I:%M %p UTC")
+        # Set the generated_on date to 02:54 PM CET, May 17, 2025
+        generated_on = datetime.strptime("2025-05-17 14:54:00+02:00", "%Y-%m-%d %H:%M:%S%z").strftime("%A, %B %d, %Y at %I:%M %p %Z")
 
         latex_filled = latex_template.substitute(
             generated_on=generated_on,
@@ -214,6 +206,7 @@ $encounters
             encounters=encounters_content
         )
 
+        # Compile LaTeX in a temporary directory
         with TemporaryDirectory() as tmpdir:
             tex_path = os.path.join(tmpdir, "report.tex")
             pdf_path = os.path.join(tmpdir, "report.pdf")
@@ -222,6 +215,7 @@ $encounters
                 f.write(latex_filled)
 
             try:
+                # Run latexmk twice to ensure proper table rendering
                 for _ in range(2):
                     result = subprocess.run(
                         ["latexmk", "-pdf", "-interaction=nonstopmode", tex_path],
@@ -232,44 +226,43 @@ $encounters
                     )
                 
                 if result.returncode != 0:
-                    logger.error(f"LaTeX compilation failed: stdout={result.stdout}, stderr={result.stderr}")
                     raise HTTPException(
-                        status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                        detail=f"LaTeX compilation failed: {result.stderr}"
+                        status_code=500,
+                        detail=f"LaTeX compilation failed: stdout={result.stdout}, stderr={result.stderr}"
                     )
 
             except subprocess.CalledProcessError as e:
-                logger.error(f"LaTeX compilation error: stdout={e.stdout}, stderr={e.stderr}")
                 raise HTTPException(
-                    status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                    detail=f"LaTeX compilation failed: {e.stderr}"
+                    status_code=500,
+                    detail=f"LaTeX compilation failed: stdout={e.stdout}, stderr={e.stderr}"
                 )
 
             if not os.path.exists(pdf_path):
-                logger.error("PDF file was not generated")
                 raise HTTPException(
-                    status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                    status_code=500,
                     detail="PDF file was not generated"
                 )
 
             with open(pdf_path, "rb") as f:
                 pdf_bytes = f.read()
 
-            logger.info(f"PDF generated successfully for patient {patient_id} by {current_user.get('email')}")
-            return Response(
+            response = Response(
                 content=pdf_bytes,
                 media_type="application/pdf",
                 headers={"Content-Disposition": f"attachment; filename=patient_{patient.get('fhir_id', 'unknown')}_report.pdf"}
             )
+            return response
 
-    except HTTPException:
-        raise
+    except HTTPException as http_error:
+        raise http_error
     except Exception as e:
-        logger.error(f"Unexpected error generating PDF for patient {patient_id}: {str(e)}")
         raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            status_code=500,
             detail=f"Unexpected error generating PDF: {str(e)}"
         )
+    finally:
+        # Restore the logger level for other routes
+        logger.setLevel(logging.INFO)
 
-# Export the router
+# Export the router as 'pdf' for api.__init__.py
 pdf = router