Update report.py

report.py

@@ -156,7 +156,48 @@ class ReportGenerator:
         return buffer
 
     def _add_chart(self, fig, title):
-        # ... (unchanged)
+        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
 
     def _add_recommendations(self, recommendations):
         elements = []
@@ -189,6 +230,10 @@ class ReportGenerator:
         for child in element.children:
             if isinstance(child, str):
                 text += child
-            elif child.name == 'strong' or child.name == 'b':
+            elif child.name in ['strong', 'b']:
                 text += f'<b>{child.text}</b>'
+            elif child.name in ['em', 'i']:
+                text += f'<i>{child.text}</i>'
+            elif child.name == 'u':
+                text += f'<u>{child.text}</u>'
         return text