Update app.py

app.py

@@ -20,6 +20,8 @@ from reportlab.pdfbase import pdfmetrics
 from reportlab.pdfbase.ttfonts import TTFont
 
 # --- Configuration & Setup ---
+# Use the current working directory as the base for all paths for robustness.
+CWD = Path.cwd()
 LAYOUTS = {
     "A4 Portrait": {"size": A4},
     "A4 Landscape": {"size": landscape(A4)},
@@ -28,9 +30,9 @@ LAYOUTS = {
     "Legal Portrait": {"size": legal},
     "Legal Landscape": {"size": landscape(legal)},
 }
-OUTPUT_DIR = Path("generated_pdfs")
-PREVIEW_DIR = Path("previews")
-FONT_DIR = Path("fonts")
+OUTPUT_DIR = CWD / "generated_pdfs"
+PREVIEW_DIR = CWD / "previews"
+FONT_DIR = CWD / "fonts"
 EMOJI_FONT_NAME = "NotoColorEmoji"
 
 # Create necessary directories
@@ -43,6 +45,7 @@ FONT_DIR.mkdir(exist_ok=True)
 
 def download_and_register_fonts():
     """Downloads default fonts if needed, then finds and registers all .ttf files."""
+    print("--- Font Registration Process Starting ---")
     fonts_to_download = {
         "DejaVuSans.ttf": "https://github.com/dejavu-fonts/dejavu-fonts/blob/main/ttf/DejaVuSans.ttf?raw=true",
         "NotoColorEmoji.ttf": "https://github.com/googlefonts/noto-emoji/blob/main/fonts/NotoColorEmoji.ttf?raw=true"
@@ -60,14 +63,17 @@ def download_and_register_fonts():
                 print(f"Failed to download {filename}: {e}")
 
     font_names = []
-    for font_path in FONT_DIR.glob("*.ttf"):
+    print(f"Scanning for fonts in: {FONT_DIR.absolute()}")
+    font_files = list(FONT_DIR.glob("*.ttf"))
+    print(f"Found {len(font_files)} .ttf files: {[f.name for f in font_files]}")
+
+    for font_path in font_files:
         try:
             font_name = font_path.stem
+            print(f"Registering font: '{font_name}' from {font_path.name}")
             pdfmetrics.registerFont(TTFont(font_name, str(font_path)))
             
             # CRITICAL FIX for bold/italic error:
-            # Register dummy bold/italic variants for all fonts, including emoji fonts.
-            # ReportLab will use these fallbacks instead of crashing if a true variant is not found.
             pdfmetrics.registerFont(TTFont(f"{font_name}-Bold", str(font_path)))
             pdfmetrics.registerFont(TTFont(f"{font_name}-Italic", str(font_path)))
             pdfmetrics.registerFont(TTFont(f"{font_name}-BoldItalic", str(font_path)))
@@ -77,6 +83,8 @@ def download_and_register_fonts():
                 font_names.append(font_name)
         except Exception as e:
             print(f"Could not register font {font_path.name}: {e}")
+    print(f"Successfully registered user-selectable fonts: {font_names}")
+    print("--- Font Registration Process Finished ---")
     return sorted(font_names)
 
 def apply_emoji_font(text: str) -> str:
@@ -93,20 +101,17 @@ def apply_emoji_font(text: str) -> str:
 
 def markdown_to_story(markdown_text: str, font_name: str):
     """Converts markdown to a ReportLab story, handling emojis and page breaks."""
-    # This function remains largely the same but relies on the global font registration fix.
     styles = getSampleStyleSheet()
     style_normal = ParagraphStyle('BodyText', fontName=font_name, spaceAfter=6, leading=14)
     style_h1 = ParagraphStyle('h1', parent=styles['h1'], fontName=font_name, spaceBefore=12, fontSize=20, leading=24)
     style_code = ParagraphStyle('Code', fontName='Courier', backColor=colors.whitesmoke)
     
     story = []
-    # Process content line-by-line
     for line in markdown_text.split('\n'):
         line_with_emoji = apply_emoji_font(line)
         formatted_line = re.sub(r'_(.*?)_', r'<i>\1</i>', re.sub(r'\*\*(.*?)\*\*', r'<b>\1</b>', line_with_emoji))
         
         if line.startswith("# "): story.append(Paragraph(formatted_line[2:], style_h1))
-        # ... other markdown elements would be handled similarly
         else: story.append(Paragraph(formatted_line, style_normal))
     return story
 
@@ -119,7 +124,7 @@ def create_pdf_preview(pdf_path: Path):
         pix = page.get_pixmap()
         pix.save(str(preview_path))
         doc.close()
-        return preview_path
+        return str(preview_path)
     except Exception as e:
         print(f"Could not create preview for {pdf_path.name}: {e}")
         return None
@@ -137,7 +142,6 @@ def generate_pdfs_api(files, layouts, fonts, num_columns, progress=gr.Progress(t
     OUTPUT_DIR.mkdir()
     PREVIEW_DIR.mkdir()
 
-    # Group files by a common stem (e.g., AARON_1.md and AARON_2.png are grouped under "AARON")
     grouped_files = defaultdict(lambda: {'md': [], 'img': []})
     for f in files:
         file_path = Path(f.name)
@@ -155,7 +159,6 @@ def generate_pdfs_api(files, layouts, fonts, num_columns, progress=gr.Progress(t
             for font_name in fonts:
                 merger = PdfWriter()
                 
-                # --- Process Markdown ---
                 if assets['md']:
                     md_content = "\n\n---PAGE_BREAK---\n\n".join([p.read_text(encoding='utf-8') for p in assets['md']])
                     md_buffer = io.BytesIO()
@@ -173,18 +176,14 @@ def generate_pdfs_api(files, layouts, fonts, num_columns, progress=gr.Progress(t
                     doc.build(story)
                     merger.append(fileobj=md_buffer)
 
-                # --- Process Images ---
                 for img_path in assets['img']:
                     with Image.open(img_path) as img:
                         img_width, img_height = img.size
-                    
                     img_buffer = io.BytesIO()
-                    # Page size is determined by the image itself
                     doc = SimpleDocTemplate(img_buffer, pagesize=(img_width, img_height), leftMargin=0, rightMargin=0, topMargin=0, bottomMargin=0)
                     doc.build([ReportLabImage(img_path, width=img_width, height=img_height)])
                     merger.append(fileobj=img_buffer)
                 
-                # --- Save Merged PDF ---
                 if len(merger.pages) > 0:
                     time_str = datetime.datetime.now().strftime('%m-%d-%a_%I%M%p').upper()
                     filename = f"{stem}_{time_str}_{layout_name.replace(' ','-')}_{font_name}_Cols{num_columns}.pdf"
@@ -194,16 +193,15 @@ def generate_pdfs_api(files, layouts, fonts, num_columns, progress=gr.Progress(t
                     generated_pdf_paths.append(output_path)
                     log_updates += f"Generated: {filename}\n"
 
-    # --- Create Previews for Gallery ---
     gallery_previews = [create_pdf_preview(p) for p in generated_pdf_paths]
     final_gallery = [g for g in gallery_previews if g is not None]
     
-    return final_gallery, log_updates
+    return final_gallery, log_updates, [str(p) for p in generated_pdf_paths]
 
 # --- Gradio UI Definition ---
 AVAILABLE_FONTS = download_and_register_fonts()
 SAMPLE_MARKDOWN = "# Sample Document 🚀\n\nThis shows **bold**, _italic_, and emojis like 😊 and 💻.\n\n### A Table\n| Flavor | Rating |\n|---|---|\n| Chocolate 🍫| 10/10 |\n| Vanilla 🍦| 9/10 |\n\n```python\n# Code blocks too!\ndef hello():\n    return 'Hello from PDF!'\n```"
-with open("sample.md", "w") as f: f.write(SAMPLE_MARKDOWN)
+with open(CWD / "sample.md", "w") as f: f.write(SAMPLE_MARKDOWN)
 
 with gr.Blocks(theme=gr.themes.Soft(), title="Advanced PDF Generator") as demo:
     gr.Markdown("# 📄 Advanced PDF Generator")
@@ -212,7 +210,7 @@ with gr.Blocks(theme=gr.themes.Soft(), title="Advanced PDF Generator") as demo:
     with gr.Row():
         with gr.Column(scale=1):
             gr.Markdown("### ⚙️ Generation Settings")
-            uploaded_files = gr.File(label="Upload Markdown & Image Files", file_count="multiple", file_types=[".md", ".png", ".jpg"])
+            uploaded_files = gr.File(label="Upload Markdown & Image Files", file_count="multiple", file_types=[".md", ".png", ".jpg", ".jpeg"])
             num_columns_slider = gr.Slider(label="Number of Columns for Text", minimum=1, maximum=4, step=1, value=1)
             selected_layouts = gr.CheckboxGroup(choices=list(LAYOUTS.keys()), label="Select Page Layouts", value=["A4 Portrait"])
             selected_fonts = gr.CheckboxGroup(choices=AVAILABLE_FONTS, label="Select Text Fonts", value=[AVAILABLE_FONTS[0]] if AVAILABLE_FONTS else [])
@@ -222,16 +220,21 @@ with gr.Blocks(theme=gr.themes.Soft(), title="Advanced PDF Generator") as demo:
             gr.Markdown("### 🖼️ PDF Preview Gallery")
             gallery_output = gr.Gallery(label="Generated PDF Previews", show_label=False, elem_id="gallery", columns=3, height="auto")
             log_output = gr.Markdown(label="Generation Log", value="Logs will appear here...")
+            downloadable_files_output = gr.Files(label="Download Generated PDFs")
             
-    def auto_run_demo():
+    def auto_run_demo(request: gr.Request):
         """Function to run on app load to generate a sample PDF."""
         print("Running initial demo generation...")
-        demo_files = [gr.File(name="sample.md", data=b'')] # Gradio needs a File object
-        previews, logs = generate_pdfs_api(demo_files, ["A4 Portrait"], [AVAILABLE_FONTS[0]] if AVAILABLE_FONTS else [], 1)
-        return previews, logs
+        # Create a dummy file object for Gradio
+        with open(CWD / "sample.md", "rb") as f:
+            sample_bytes = f.read()
+        
+        demo_files = [gr.processing_utils.SavedFile(name=str(CWD / "sample.md"), data=sample_bytes, is_file=True)]
+        previews, logs, files = generate_pdfs_api(demo_files, ["A4 Portrait"], [AVAILABLE_FONTS[0]] if AVAILABLE_FONTS else [], 1)
+        return previews, logs, files
 
-    demo.load(auto_run_demo, inputs=None, outputs=[gallery_output, log_output])
-    generate_btn.click(fn=generate_pdfs_api, inputs=[uploaded_files, selected_layouts, selected_fonts, num_columns_slider], outputs=[gallery_output, log_output])
+    demo.load(auto_run_demo, inputs=None, outputs=[gallery_output, log_output, downloadable_files_output])
+    generate_btn.click(fn=generate_pdfs_api, inputs=[uploaded_files, selected_layouts, selected_fonts, num_columns_slider], outputs=[gallery_output, log_output, downloadable_files_output])
 
 if __name__ == "__main__":
     demo.launch()