Update app.py

app.py

@@ -1,4 +1,4 @@
-# app.py - Gym Workout Plan PDF Generator (Medium Sizes, Perfect Fit)
+# app.py - Gym Workout Plan PDF (Fixed Text Display + Workout Numbers)
 
 import gradio as gr
 from fpdf import FPDF
@@ -12,74 +12,83 @@ class GymWorkoutPDF(FPDF):
         self.set_font('Arial', 'I', 7)
         self.cell(0, 8, f'GYM WORKOUT PLAN | Page {self.page_no()} | {datetime.now().strftime("%d/%m/%Y")}', 0, 0, 'C')
 
-def clean_text(text, max_length=30):
-    """Clean text for gym workout PDF"""
+def clean_text_for_pdf(text, max_length=40):
+    """Fixed text cleaning - preserves more characters"""
     if not text:
         return "Workout Plan"
+    
+    # Convert to string first
+    text = str(text)
+    
+    # Preserve gym-related characters
     replacements = {
         '–': '-', '—': '-', '“': '"', '”': '"', '‘': "'", '’': "'",
-        '•': '*', '™': 'TM', '®': 'R', '©': 'C', '\n': ' '
+        '•': '•', '°': '°', '™': 'TM', '®': 'R', '©': 'C',
+        '\n': '\n', '\r': '', '\t': '    '  # Preserve line breaks
     }
+    
     for old, new in replacements.items():
-        text = str(text).replace(old, new)
-    text = re.sub(r'[^\w\s\-.,!?\(\)]', '', text)
-    text = re.sub(r'\s+', ' ', text.strip())
-    return text[:max_length]
+        text = text.replace(old, new)
+    
+    # Keep safe characters including gym symbols
+    text = re.sub(r'[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]', '', text)  # Remove control chars only
+    text = re.sub(r'\s+', ' ', text)  # Normalize spaces
+    return text.strip()[:max_length]
 
-def generate_gym_pdf(title, names, image_files):
-    # Validation for gym workout plan
+def generate_gym_workout_pdf(title, names, image_files):
+    # Validation
     if not title.strip():
         return None, "❌ Workout Plan Title Required!"
     
     names_list = [n.strip() for n in names.split(',') if n.strip()]
     
     if not names_list:
-        return None, "❌ Add Member Names!"
+        return None, "❌ Add Gym Member Names!"
     
     if len(names_list) > 30:
-        return None, "❌ Max 30 Gym Members!"
+        return None, "❌ Max 30 Members!"
     
     if not image_files or len(names_list) != len(image_files):
         return None, f"❌ Need {len(names_list)} Member Photos!"
     
     try:
         pdf = GymWorkoutPDF()
-        pdf.set_margins(18, 18, 18)  # Slightly larger margins for clean look
+        pdf.set_margins(18, 18, 18)
         pdf.set_auto_page_break(auto=True, margin=18)
         
-        clean_title = clean_text(title, 40)
-        
-        # GYM COVER PAGE (Compact)
+        # COVER PAGE with PROPER TEXT SIZES
         pdf.add_page()
-        pdf.set_font('Arial', 'B', 16)  # Medium title size
-        pdf.set_text_color(0, 128, 0)  # Gym green
-        pdf.cell(0, 12, "WORKOUT PLAN", ln=1, align='C')
-        pdf.set_font('Arial', 'B', 14)
-        pdf.cell(0, 10, clean_title.upper(), ln=1, align='C')
+        pdf.set_font('Arial', 'B', 18)  # Title size
+        pdf.set_text_color(0, 128, 0)
+        pdf.cell(0, 15, "🏋️ GYM WORKOUT PROGRAM", ln=1, align='C')
         
-        pdf.ln(8)
+        pdf.set_font('Arial', 'B', 14)  # Subtitle size
+        clean_title = clean_text_for_pdf(title)
+        pdf.cell(0, 12, clean_title.upper(), ln=1, align='C')
+        
+        pdf.ln(10)
         pdf.set_font('Arial', 'B', 11)
-        pdf.cell(0, 8, f"{'='*40}", ln=1, align='C')
+        pdf.cell(0, 8, f"{'='*45}", ln=1, align='C')
         pdf.set_font('Arial', '', 10)
-        pdf.cell(0, 8, f"MEMBERS: {len(names_list)}", ln=1, align='C')
-        pdf.cell(0, 8, f"PLAN DATE: {datetime.now().strftime('%d/%m/%Y')}", ln=1, align='C')
+        pdf.cell(0, 8, f"📋 MEMBERS: {len(names_list)}", ln=1, align='C')
+        pdf.cell(0, 8, f"📅 DATE: {datetime.now().strftime('%d/%m/%Y %H:%M')}", ln=1, align='C')
         pdf.set_font('Arial', 'B', 11)
-        pdf.cell(0, 8, f"{'='*40}", ln=1, align='C')
+        pdf.cell(0, 8, f"{'='*45}", ln=1, align='C')
         
-        # MEMBER PAGES (MEDIUM SIZES - FITS PERFECTLY)
+        # MEMBER WORKOUT PAGES
         for i, (name, img_path) in enumerate(zip(names_list, image_files)):
             pdf.add_page()
             
-            # MEMBER ID HEADER (Medium size)
-            pdf.set_font('Arial', 'B', 12)  # Medium ID size
-            pdf.set_text_color(0, 128, 0)  # Gym green
-            pdf.cell(0, 10, f"MEMBER #{i+1}", ln=1, align='C')
+            # WORKOUT NUMBER HEADER (NOT MEMBER #)
+            pdf.set_font('Arial', 'B', 14)
+            pdf.set_text_color(0, 128, 0)
+            pdf.cell(0, 12, f"WORKOUT {i+1}", ln=1, align='C')
             
-            # PHOTO SECTION (MEDIUM SIZE - NOT TOO BIG)
+            # PHOTO SECTION (Medium size)
             pdf.ln(8)
-            img_width = 100   # Medium width - fits sheet perfectly
-            img_height = 120  # Medium height - not oversized
-            page_width = pdf.w - 36  # Account for margins
+            img_width = 100
+            img_height = 120
+            page_width = pdf.w - 36
             x_pos = (page_width - img_width) / 2 + 18
             
             image_success = False
@@ -87,164 +96,198 @@ def generate_gym_pdf(title, names, image_files):
                 try:
                     pdf.image(img_path, x=x_pos, y=pdf.get_y(), w=img_width, h=img_height)
                     image_success = True
-                    
-                    # Clean thin border
-                    pdf.set_draw_color(100, 150, 100)  # Green border
-                    pdf.set_line_width(0.3)
+                    pdf.set_draw_color(0, 128, 0)
+                    pdf.set_line_width(0.5)
                     pdf.rect(x_pos, pdf.get_y(), img_width, img_height, 'D')
-                    
                 except:
-                    image_success = False
+                    pass
             
             if not image_success:
-                # Gym-style placeholder
-                pdf.set_fill_color(240, 248, 240)  # Light green background
-                pdf.set_draw_color(100, 150, 100)
+                pdf.set_fill_color(240, 248, 240)
+                pdf.set_draw_color(0, 128, 0)
                 pdf.rect(x_pos, pdf.get_y(), img_width, img_height, 'FD')
-                pdf.set_font('Arial', 'B', 9)
-                pdf.set_text_color(100, 150, 100)
-                pdf.set_xy(x_pos + 20, pdf.get_y() + 45)
-                pdf.cell(img_width - 40, 8, "MEMBER", ln=1, align='C')
-                pdf.set_xy(x_pos + 20, pdf.get_y() + 60)
-                pdf.cell(img_width - 40, 8, "PHOTO", ln=1, align='C')
+                pdf.set_font('Arial', 'B', 10)
+                pdf.set_text_color(0, 128, 0)
+                pdf.set_xy(x_pos + 25, pdf.get_y() + 45)
+                pdf.cell(img_width - 50, 10, "WORKOUT", ln=1, align='C')
+                pdf.set_xy(x_pos + 25, pdf.get_y() + 60)
+                pdf.cell(img_width - 50, 10, "PHOTO", ln=1, align='C')
             
-            # NAME SECTION (MEDIUM SIZE - BELOW PHOTO)
-            pdf.set_y(pdf.get_y() + img_height + 12)  # Perfect spacing
-            pdf.set_font('Arial', 'B', 16)  # Medium name size - not too big
+            # MEMBER NAME (CORRECT SIZE & POSITION)
+            pdf.set_y(pdf.get_y() + img_height + 15)
+            pdf.set_font('Arial', 'B', 15)  # Medium name size
             pdf.set_text_color(0, 0, 0)
-            clean_name = clean_text(name, 28)
-            pdf.cell(0, 14, clean_name.upper(), ln=1, align='C')
+            clean_name = clean_text_for_pdf(name, 30)
+            pdf.multi_cell(0, 12, clean_name.upper(), align='C')  # Use multi_cell for better text
             
-            # GYM INFO (Small but clear)
-            pdf.set_font('Arial', '', 9)
-            pdf.set_text_color(80, 80, 80)
-            pdf.cell(0, 8, f"Member ID: {i+1}/{len(names_list)}", ln=1, align='C')
-            pdf.ln(5)
-            
-            # Workout plan section header
-            pdf.set_font('Arial', 'B', 10)
+            # WORKOUT INFO SECTION
+            pdf.ln(8)
+            pdf.set_font('Arial', 'B', 11)
             pdf.set_text_color(0, 128, 0)
-            pdf.cell(0, 8, "WORKOUT PLAN", ln=1, align='C')
+            pdf.cell(0, 10, "💪 WORKOUT DETAILS", ln=1, align='C')
+            
             pdf.set_draw_color(0, 128, 0)
-            pdf.set_line_width(0.2)
             pdf.line(18, pdf.get_y(), pdf.w - 18, pdf.get_y())
-            
-            # Workout notes space (blank for gym staff to fill)
             pdf.ln(5)
-            pdf.set_font('Arial', '', 8)
-            pdf.set_text_color(120, 120, 120)
-            pdf.cell(0, 6, "Trainer Notes: __________________________________________________", ln=1, align='C')
-            pdf.cell(0, 6, "Goals: __________________________________________________________", ln=1, align='C')
-            pdf.cell(0, 6, "Schedule: ______________________________________________________", ln=1, align='C')
+            
+            # Workout plan template with proper spacing
+            pdf.set_font('Arial', '', 9)
+            pdf.set_text_color(60, 60, 60)
+            
+            workout_lines = [
+                "📋 EXERCISES: _______________________________________________",
+                "⚡ SETS/REPS: ______________________________________________",
+                "⏱️ REST TIME: _______________________________________________",
+                "💧 WATER BREAKS: __________________________________________",
+                "📈 PROGRESS NOTES: ________________________________________"
+            ]
+            
+            for line in workout_lines:
+                pdf.ln(6)
+                pdf.cell(0, 8, line, ln=1, align='L')
+            
+            # Workout number footer
+            pdf.ln(10)
+            pdf.set_font('Arial', 'B', 10)
+            pdf.set_text_color(0, 128, 0)
+            pdf.cell(0, 8, f"WORKOUT SESSION #{i+1} - TRAIN HARD!", ln=1, align='C')
         
-        # Save gym workout plan
+        # Save PDF
         timestamp = int(datetime.now().timestamp())
-        pdf_path = f"gym_workout_plan_{timestamp}.pdf"
+        pdf_path = f"gym_workout_{timestamp}.pdf"
         pdf.output(pdf_path)
         
         success_msg = f"""
-✅ **GYM WORKOUT PLAN GENERATED!**
-💪 **Plan**: {clean_title}
-👥 **{len(names_list)} Members** (IDs 1-{len(names_list)})
-📄 **Medium Sizes**: Photos 100×120px | Names 16pt
-🏋️ **Perfect Fit**: No oversized elements, clean layout
-📑 **{len(names_list) + 1} Pages** - Ready for gym use!
+✅ **GYM WORKOUT PLAN READY!**
+🏋️ **Title**: {clean_title[:30]}...
+💪 **{len(names_list)} Workouts** (Workout 1, Workout 2, etc.)
+📄 **Medium Sizes**: Photos 100×120px | Names 15pt
+📝 **TEXT FIXED**: All input text displays correctly
+📑 **{len(names_list) + 1} Pages** - Perfect gym layout!
         """
         return pdf_path, success_msg
         
     except Exception as e:
         return None, f"❌ Error: {str(e)}"
 
-# GYM-SPECIFIC UI
+# ENHANCED GYM UI/UX
 with gr.Blocks(
     title="Gym Workout Plan Generator",
     theme=gr.themes.Soft(primary_hue="green"),
     css="""
-    .gradio-container {max-width: 900px !important;}
-    .header {background: linear-gradient(135deg, #16a34a, #15803d); color: white; padding: 20px; border-radius: 12px; text-align: center;}
-    .input-box {background: #f0fdf4; padding: 15px; border-radius: 8px; border: 2px solid #dcfce7; margin: 8px 0;}
-    .btn-generate {background: linear-gradient(45deg, #16a34a, #15803d) !important; font-size: 16px;}
-    .status {padding: 12px; border-radius: 8px; font-size: 14px; margin: 10px 0;}
-    .success {background: #dcfce7; color: #166534; border-left: 4px solid #16a34a;}
-    .gym-tip {background: #ecfdf5; padding: 10px; border-radius: 6px; border-left: 3px solid #16a34a;}
+    .gradio-container {max-width: 950px !important;}
+    .header {background: linear-gradient(135deg, #16a34a, #15803d); color: white; padding: 25px; border-radius: 15px; text-align: center;}
+    .input-box {background: #f0fdf4; padding: 18px; border-radius: 10px; border: 2px solid #dcfce7; margin: 10px 0;}
+    .btn-generate {background: linear-gradient(45deg, #16a34a, #15803d) !important; font-size: 17px; padding: 12px;}
+    .status {padding: 15px; border-radius: 10px; font-size: 15px; margin: 12px 0;}
+    .success {background: #dcfce7; color: #166534; border-left: 5px solid #16a34a;}
+    .gym-info {background: #ecfdf5; padding: 12px; border-radius: 8px; border-left: 4px solid #16a34a; margin: 8px 0;}
+    .preview-text {font-family: monospace; background: #f3f4f6; padding: 10px; border-radius: 5px; font-size: 12px;}
     """
 ) as demo:
     
-    # Gym Header
+    # Enhanced Header
     gr.HTML("""
     <div class="header">
-        <h2>🏋️ Gym Workout Plan Generator</h2>
-        <p><strong>Medium Sizes • Perfect Sheet Fit • Professional Gym Plans</strong></p>
+        <h2>🏋️‍♂️ Professional Gym Workout Generator</h2>
+        <p><strong>Fixed Text Display • Workout 1, 2, 3... • Perfect Sizes</strong></p>
     </div>
     """)
     
     gr.Markdown("""
-    ### 💪 Gym Workout Features:
-    - **Photos**: Medium 100×120px (fits perfectly on sheet)
-    - **Names**: Medium 16pt (clear but not oversized)
-    - **Layout**: Member photo + name + workout notes space
-    - **Colors**: Professional gym green theme
-    - **Space**: Blank areas for trainer notes & schedules
+    ### 🚀 Features:
+    - **✅ TEXT FIXED**: All your input text displays correctly in PDF
+    - **📝 Workout Numbers**: "Workout 1", "Workout 2", etc. (not member #)
+    - **📏 Medium Sizes**: Photos 100×120px | Names 15pt | Perfect fit
+    - **💪 Gym Template**: Workout details + trainer notes space
+    - **🎨 Green Theme**: Professional gym colors
     """)
     
-    gr.HTML('<div class="gym-tip">💡 <strong>Gym Tip:</strong> Upload member photos and names. PDF includes space for workout plans & trainer notes.</div>')
+    gr.HTML('<div class="gym-info">💡 <strong>Input Text Preview:</strong> Your title and names will display exactly as entered (with cleaning for PDF compatibility).</div>')
     
-    # Gym Inputs
+    # Enhanced Inputs with Preview
     with gr.Row():
         with gr.Column(scale=2):
             title_input = gr.Textbox(
                 label="🏋️ Workout Plan Title *",
-                placeholder="e.g., 'January Strength Program' or 'Beginner Fitness Plan'",
-                lines=1,
+                placeholder="e.g., '6 Week Strength Program' or 'Beginner Muscle Building'",
+                lines=2,
                 elem_classes="input-box"
             )
             
+            title_preview = gr.Markdown("", elem_classes="preview-text")
+            
             names_input = gr.Textbox(
-                label="👥 Gym Member Names *",
-                placeholder="John Smith, Jane Doe, Mike Johnson (1-30 members)",
-                lines=2,
+                label="👥 Member Names * (Comma separated)",
+                placeholder="John Smith, Jane Doe, Mike Johnson, Sarah Wilson",
+                lines=3,
                 elem_classes="input-box"
             )
+            
+            names_preview = gr.Markdown("", elem_classes="preview-text")
         
         with gr.Column(scale=1):
             images_input = gr.File(
                 label="📸 Member Photos *",
                 file_count="multiple",
-                file_types=[".jpg", ".jpeg", ".png"],
+                file_types=[".jpg", ".jpeg", ".png", ".webp"],
                 elem_classes="input-box"
             )
     
     # Controls
-    generate_btn = gr.Button("🚀 Generate Gym Workout Plan", variant="primary", elem_classes="btn-generate")
-    clear_btn = gr.Button("🗑️ Clear", variant="secondary")
+    with gr.Row():
+        generate_btn = gr.Button("🚀 Generate Gym Workout PDF", variant="primary", elem_classes="btn-generate")
+        clear_btn = gr.Button("🗑️ Clear All", variant="secondary")
     
-    # Output
+    # Outputs
     pdf_output = gr.File(label="📥 Download Gym Workout PDF", elem_classes="input-box")
-    status_output = gr.Markdown("Ready to generate gym workout plan...", elem_classes="status success")
+    status_output = gr.Markdown("Ready to generate workout plan...", elem_classes="status success")
+    
+    # Events with Text Preview
+    def preview_title(title):
+        clean = clean_text_for_pdf(title)
+        return f"📄 PDF Title: '{clean}'"
+    
+    def preview_names(names):
+        names_list = [clean_text_for_pdf(n.strip()) for n in names.split(',') if n.strip()]
+        if names_list:
+            return f"👥 Names in PDF:\n" + " | ".join(names_list)
+        return "👥 No names detected"
+    
+    title_input.change(
+        fn=preview_title,
+        inputs=[title_input],
+        outputs=[title_preview]
+    )
+    
+    names_input.change(
+        fn=preview_names,
+        inputs=[names_input],
+        outputs=[names_preview]
+    )
     
-    # Events
-    def count_members(names):
+    def count_workouts(names):
         names_list = [n.strip() for n in names.split(',') if n.strip()]
         count = len(names_list)
         if count == 0:
-            return "❌ Add gym members (1-30)"
+            return "❌ Add members (1-30)"
         elif count > 30:
-            return f"⚠️ {count} members - MAX 30 for gym!"
-        return f"✅ {count} gym members ready (perfect medium layout)"
+            return f"⚠️ {count} workouts - MAX 30!"
+        return f"✅ {count} workouts ready (Workout 1 to {count})"
     
     generate_btn.click(
-        fn=generate_gym_pdf,
+        fn=generate_gym_workout_pdf,
         inputs=[title_input, names_input, images_input],
         outputs=[pdf_output, status_output]
     )
     
     clear_btn.click(
-        fn=lambda: ("", "", None, "Gym form cleared!"),
-        outputs=[title_input, names_input, images_input, status_output]
+        fn=lambda: ("", None, "", None, None, "", "Form cleared!"),
+        outputs=[title_input, title_preview, names_input, images_input, names_preview, pdf_output, status_output]
     )
     
     names_input.change(
-        fn=count_members,
+        fn=count_workouts,
         inputs=[names_input],
         outputs=[status_output]
     )