Update pdf_generator.py

pdf_generator.py

@@ -1,21 +1,20 @@
-from io import BytesIO
+import io
 import re
 from reportlab.lib import colors
 from reportlab.lib.pagesizes import A4
 from reportlab.lib.styles import getSampleStyleSheet, ParagraphStyle
-from reportlab.platypus import SimpleDocTemplate, Paragraph, Spacer, Table, TableStyle, Flowable
+from reportlab.platypus import SimpleDocTemplate, Paragraph, Spacer, Flowable
 from reportlab.lib.units import mm
 from reportlab.graphics.shapes import Drawing, Rect, String, Line
 
 class SliderFlowable(Flowable):
-    def __init__(self, name, value, min_val, max_val, is_percentage=False, is_integer=False):
+    def __init__(self, name, value, min_val, max_val, is_percentage=False):
         Flowable.__init__(self)
         self.name = name
         self.value = value
         self.min_val = min_val
         self.max_val = max_val
         self.is_percentage = is_percentage
-        self.is_integer = is_integer
         self.width = 400
         self.height = 80
 
@@ -38,13 +37,13 @@ class SliderFlowable(Flowable):
         drawing.add(String(0, 60, self.name, fontSize=12, fillColor=colors.HexColor("#26004d")))
 
         # Add range labels
-        min_str = self.format_label(self.min_val)
-        max_str = self.format_label(self.max_val)
+        min_str = f"{self.min_val:.1f}%" if self.is_percentage else f"{self.min_val:.1f}"
+        max_str = f"{self.max_val:.1f}%" if self.is_percentage else f"{self.max_val:.1f}"
         drawing.add(String(40, 10, min_str, fontSize=10, fillColor=colors.HexColor("#26004d")))
         drawing.add(String(340, 10, max_str, fontSize=10, fillColor=colors.HexColor("#26004d")))
-        
+
         # Add value label
-        value_str = self.format_label(self.value)
+        value_str = f"{self.value:.1f}%" if self.is_percentage else f"{self.value:.1f}"
         drawing.add(String(value_width - 20, 55, value_str, fontSize=10, fillColor=colors.HexColor("#26004d")))
 
         # Add value marker
@@ -52,14 +51,6 @@ class SliderFlowable(Flowable):
 
         drawing.drawOn(self.canv, 0, 0)
 
-    def format_label(self, value):
-        if self.is_percentage:
-            return f"{value:.2f}%"
-        elif self.is_integer:
-            return f"{int(value)}"
-        else:
-            return f"{value:.2f}"
-
 def create_styles():
     styles = getSampleStyleSheet()
     styles['Title'].fontName = 'Helvetica-Bold'
@@ -103,15 +94,12 @@ def create_page_template(canvas, doc):
     canvas.drawString(30, 20, f"Page {doc.page}")
     canvas.restoreState()
 
-def generate_pdf(session_state):
-    buffer = BytesIO()
+def generate_pdf(pages, answers):
+    buffer = io.BytesIO()
     doc = SimpleDocTemplate(buffer, pagesize=A4, rightMargin=20*mm, leftMargin=20*mm, topMargin=20*mm, bottomMargin=20*mm)
     styles = create_styles()
     story = [Paragraph("AI Trust and Opacity Evaluation", styles['Title'])]
 
-    pages = session_state.pages
-    answers = session_state.answers
-
     for page in pages[:-1]:  # Skip the last page
         if 'input_key' in page and page['input_key'] is not None:
             story.append(Paragraph(page['title'], styles['Heading1']))
@@ -124,62 +112,51 @@ def generate_pdf(session_state):
             if page.get('input_type') == 'combined':
                 option = answers.get(page['input_key'], "")
                 conclusion = answers.get(f"{page['input_key']}_conclusion", "")
-                answer = f"Option selected: {option}\n\nConclusion: {conclusion}"
-
-            # Create a table for the answer to allow multi-line text within a block
-            data = [[Paragraph(str(answer), styles['Answer'])]]
-            t = Table(data, colWidths=[450])
-            t.setStyle(TableStyle([
-                ('BACKGROUND', (0, 0), (-1, -1), colors.HexColor("#f0f2fd")),
-                ('TEXTCOLOR', (0, 0), (-1, -1), colors.HexColor("#26004d")),
-                ('ALIGN', (0, 0), (-1, -1), 'LEFT'),
-                ('VALIGN', (0, 0), (-1, -1), 'TOP'),
-                ('INNERGRID', (0, 0), (-1, -1), 0.25, colors.HexColor("#9999ff")),
-                ('BOX', (0, 0), (-1, -1), 0.25, colors.HexColor("#9999ff")),
-            ]))
-            story.append(t)
-            story.append(Spacer(1, 12))
+                story.append(Paragraph(f"<b>Option selected:</b> {option}", styles['Answer']))
+                story.append(Paragraph(f"<b>Conclusion:</b> {conclusion}", styles['Answer']))
+            else:
+                story.append(Paragraph(f"<b>Answer:</b> {answer}", styles['Answer']))
 
             # Add quantitative criteria visualization if applicable
-            if page['input_key'] == 'useful_assets':
-                story.extend(process_quantitative_criteria(answers['useful_assets'], styles))
+            if page['input_key'] in ['technological_literacy', 'cognitive_mismatch']:
+                story.extend(process_quantitative_criteria(answer, styles))
+
+            story.append(Spacer(1, 12))
 
     doc.build(story, onFirstPage=create_page_template, onLaterPages=create_page_template)
     buffer.seek(0)
     return buffer
 
-def process_quantitative_criteria(answers, styles):
+def process_quantitative_criteria(answer, styles):
     story = []
-    quantitative_criteria = answers.get('quantitative', [])
-    for i, criterion in enumerate(quantitative_criteria):
-        parsed = parse_quantitative_criteria(criterion)
+    lines = answer.split('\n')
+    for line in lines:
+        parsed = parse_quantitative_criteria(line)
         if parsed:
-            name, min_val, max_val, is_percentage, is_integer = parsed
-            value = answers.get(f'quant_value_{i}', min_val)
-            slider = SliderFlowable(name, value, min_val, max_val, is_percentage=is_percentage, is_integer=is_integer)
+            name, value, min_val, max_val, is_percentage = parsed
+            if is_percentage:
+                slider = SliderFlowable(name, value*100, min_val*100, max_val*100, is_percentage=True)
+            else:
+                slider = SliderFlowable(name, value, min_val, max_val, is_percentage=False)
             story.append(slider)
-            story.append(Paragraph(f"{name}: {value:.1f}%" if is_percentage else (f"{name}: {int(value)}" if is_integer else f"{name}: {value:.2f}"), styles['BodyText']))
     return story
 
 def parse_quantitative_criteria(input_string):
-    match = re.match(r'(.+?)\s*\[([-+]?(?:\d*\.*\d+)(?:%)?)\s*-\s*([-+]?(?:\d*\.*\d+)(?:%)?)\]', input_string)
+    match = re.match(r'(.+):\s*([-+]?(?:\d*\.*\d+)(?:%)?)(?:\s*\[([-+]?(?:\d*\.*\d+)(?:%)?)\s*-\s*([-+]?(?:\d*\.*\d+)(?:%)?)?\])?', input_string)
     if match:
-        name, min_val, max_val = match.groups()
+        name, value, min_val, max_val = match.groups()
         name = name.strip()
 
-        def parse_value(val):
-            if '%' in val:
-                return float(val.rstrip('%')), True
-            elif '.' in val:
-                return float(val), False
-            else:
-                return int(val), False
-
-        min_val, is_min_percent = parse_value(min_val)
-        max_val, is_max_percent = parse_value(max_val)
+        # Handle percentage inputs
+        is_percentage = '%' in value or '%' in min_val or '%' in max_val
+        value = float(value.rstrip('%'))
+        min_val = float(min_val.rstrip('%') if min_val else 0)
+        max_val = float(max_val.rstrip('%') if max_val else 100)
 
-        is_percentage = is_min_percent or is_max_percent
-        is_integer = isinstance(min_val, int) and isinstance(max_val, int) and not is_percentage
+        if is_percentage:
+            value /= 100
+            min_val /= 100
+            max_val /= 100
 
-        return name, min_val, max_val, is_percentage, is_integer
+        return name, value, min_val, max_val, is_percentage
     return None