Update report.py

report.py

@@ -122,23 +122,25 @@ import matplotlib.pyplot as plt
 import markdown
 from bs4 import BeautifulSoup
 from PIL import Image as PILImage
+from reportlab.lib.colors import black
 
 class ReportGenerator:
     def __init__(self):
         self.styles = getSampleStyleSheet()
         self.styles['BodyText'].alignment = TA_JUSTIFY
         
-        # Modify existing styles instead of adding new ones
         self.styles['Bullet'].leftIndent = 20
         self.styles['Bullet'].firstLineIndent = 0
         self.styles['Bullet'].alignment = TA_LEFT
         
-        # Adjust heading styles for better hierarchy
         self.styles['Heading1'].fontSize = 18
         self.styles['Heading2'].fontSize = 16
         self.styles['Heading3'].fontSize = 14
         self.styles['Heading4'].fontSize = 12
 
+        # Add a new style for bold text
+        self.styles.add(ParagraphStyle(name='Bold', parent=self.styles['BodyText'], fontName='Helvetica-Bold'))
+
     def create_combined_pdf(self, intervention_fig, student_metrics_fig, recommendations):
         buffer = io.BytesIO()
         doc = SimpleDocTemplate(buffer, pagesize=letter, topMargin=0.5*inch, bottomMargin=0.5*inch)
@@ -154,57 +156,13 @@ class ReportGenerator:
         return buffer
 
     def _add_chart(self, fig, title):
-        elements = []
-        elements.append(Paragraph(title, self.styles['Heading2']))
-        img_buffer = io.BytesIO()
-        
-        if hasattr(fig, 'write_image'):  # Plotly figure
-            fig.write_image(img_buffer, format="png", width=700, height=400)
-        elif isinstance(fig, plt.Figure):  # Matplotlib figure
-            fig.set_size_inches(10, 6)  # Set a consistent size
-            fig.savefig(img_buffer, format='png', dpi=100, bbox_inches='tight')
-            plt.close(fig)
-        else:
-            raise ValueError(f"Unsupported figure type: {type(fig)}")
-        
-        img_buffer.seek(0)
-        
-        # Use PIL to get image dimensions
-        with PILImage.open(img_buffer) as img:
-            img_width, img_height = img.size
-        
-        # Calculate width and height to maintain aspect ratio
-        max_width = 6.5 * inch  # Maximum width (letter width is 8.5 inches, leaving margins)
-        max_height = 4 * inch   # Maximum height
-        
-        aspect = img_width / float(img_height)
-        
-        if img_width > max_width:
-            img_width = max_width
-            img_height = img_width / aspect
-        
-        if img_height > max_height:
-            img_height = max_height
-            img_width = img_height * aspect
-        
-        # Reset buffer position
-        img_buffer.seek(0)
-        
-        # Create ReportLab Image with calculated dimensions
-        img = Image(img_buffer, width=img_width, height=img_height)
-        
-        elements.append(img)
-        elements.append(Spacer(1, 12))
-        return elements
+        # ... (unchanged)
 
     def _add_recommendations(self, recommendations):
         elements = []
         elements.append(Paragraph("MTSS.ai Analysis", self.styles['Heading1']))
         
-        # Convert markdown to HTML
         html = markdown.markdown(recommendations)
-        
-        # Parse HTML
         soup = BeautifulSoup(html, 'html.parser')
         
         for element in soup.find_all(['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'ul']):
@@ -213,11 +171,24 @@ class ReportGenerator:
                 style = f'Heading{min(level, 4)}'
                 elements.append(Paragraph(element.text, self.styles[style]))
             elif element.name == 'p':
-                elements.append(Paragraph(element.text, self.styles['BodyText']))
+                elements.append(self._create_paragraph_with_inline_styles(element))
             elif element.name == 'ul':
                 for li in element.find_all('li'):
-                    bullet_text = '• ' + li.text
+                    bullet_text = '• ' + self._get_text_with_inline_styles(li)
                     elements.append(Paragraph(bullet_text, self.styles['Bullet']))
             elements.append(Spacer(1, 6))
         
-        return elements
+        return elements
+
+    def _create_paragraph_with_inline_styles(self, element):
+        text = self._get_text_with_inline_styles(element)
+        return Paragraph(text, self.styles['BodyText'])
+
+    def _get_text_with_inline_styles(self, element):
+        text = ""
+        for child in element.children:
+            if isinstance(child, str):
+                text += child
+            elif child.name == 'strong' or child.name == 'b':
+                text += f'<b>{child.text}</b>'
+        return text