Update app.py

app.py

@@ -23,7 +23,7 @@ def process_uploaded_file(file):
             return None
         return file
 
-    # If file is a dict, expect the "data" key to contain the file content.
+    # If file is a dict, expect the "data" key to contain file content.
     if isinstance(file, dict):
         if "data" in file and file["data"]:
             temp_path = "/tmp/uploaded.csv"
@@ -48,16 +48,9 @@ def process_uploaded_file(file):
     return None
 
 # -------------------------
-# HTML Org Chart Generation
+# Build tree structure from CSV
 # -------------------------
 def build_tree(df):
-    """
-    Build a tree structure from CSV data.
-    Returns:
-      - employees: dict mapping employee name to HTML-formatted label
-      - children: dict mapping manager name to list of subordinate names.
-      - roots: list of root node names.
-    """
     employees = {}
     children = {}
     all_emps = set()
@@ -83,18 +76,25 @@ def build_tree(df):
         roots = [df.iloc[0]["Name"].strip()]
     return employees, children, roots
 
-def generate_node_html(node, employees, children):
-    """
-    Recursively generate HTML for a node and its children using nested <ul> tags.
-    """
+# -------------------------
+# Recursive HTML generation with cycle detection
+# -------------------------
+def generate_node_html(node, employees, children, visited=None):
+    if visited is None:
+        visited = set()
+    if node in visited:
+        # Cycle detected; indicate with a note.
+        return f"<li><div class='node'>{employees.get(node, node)} (cycle)</div></li>"
+    visited.add(node)
     label = employees.get(node, node)
     html = f"<li><div class='node'>{label}</div>"
     if node in children and children[node]:
         html += "<ul>"
         for child in children[node]:
-            html += generate_node_html(child, employees, children)
+            html += generate_node_html(child, employees, children, visited)
         html += "</ul>"
     html += "</li>"
+    visited.remove(node)
     return html
 
 def generate_org_chart_html(df, title):
@@ -116,7 +116,7 @@ def generate_org_chart_html(df, title):
                 margin: 20px;
             }}
             .org-chart ul {{
-                padding-top: 20px;
+                padding-top: 20px; 
                 position: relative;
                 display: inline-block;
             }}
@@ -171,10 +171,10 @@ def generate_org_chart_html(df, title):
     return html_content
 
 # -------------------------
-# Main Function: Generate Chart & PDF
+# Main function: Generate Chart & PDF
 # -------------------------
 def generate_chart(file, title):
-    logging.info(f"generate_chart called with file: {file} and title: {title}")
+    logging.info("Starting chart generation...")
     if not file:
         return None, "Please upload a CSV file."
     file_path = process_uploaded_file(file)
@@ -185,6 +185,7 @@ def generate_chart(file, title):
         return None, "Uploaded file is a directory. Please upload a valid CSV file."
     try:
         df = pd.read_csv(file_path)
+        logging.info(f"CSV read successfully with {df.shape[0]} rows.")
     except Exception as e:
         logging.error(f"Error reading CSV: {e}")
         return None, f"Error reading CSV: {e}"
@@ -192,13 +193,14 @@ def generate_chart(file, title):
     if not expected_columns.issubset(set(df.columns)):
         return None, "CSV must contain Name, Role, and Reporting To columns."
     
-    # Generate the HTML org chart.
+    # Generate HTML org chart.
     html_content = generate_org_chart_html(df, title)
     
     # Generate PDF using WeasyPrint.
     pdf_path = "/tmp/chart.pdf"
     try:
         HTML(string=html_content).write_pdf(pdf_path)
+        logging.info("PDF generated successfully.")
     except Exception as e:
         logging.error(f"Error generating PDF: {e}")
         dummy_pdf = "/tmp/no_pdf.pdf"
@@ -208,10 +210,12 @@ def generate_chart(file, title):
     
     # Convert PDF to PNG for preview using pdf2image.
     try:
+        from pdf2image import convert_from_path
         images = convert_from_path(pdf_path, dpi=150)
         if images and len(images) > 0:
             image_path = "/tmp/chart.png"
             images[0].save(image_path, 'PNG')
+            logging.info("PDF converted to PNG successfully.")
         else:
             image_path = ""
     except Exception as e:
@@ -221,7 +225,7 @@ def generate_chart(file, title):
     return image_path, pdf_path
 
 # -------------------------
-# Template Download Helper
+# Template download helper
 # -------------------------
 def download_template():
     template_path = "/tmp/template.csv"
@@ -247,17 +251,14 @@ with gr.Blocks() as demo:
         "Upload a CSV file (with columns: **Name, Role, Reporting To**) to generate an interactive organization chart. "
         "Use the button below to download a CSV template."
     )
-    
     with gr.Row():
         template_button = gr.Button("Download CSV Template")
         file_input = gr.File(label="Upload CSV File")
     title_input = gr.Textbox(label="Enter PDF Title", placeholder="Company Org Chart")
     submit_button = gr.Button("Generate Chart")
-    
     image_output = gr.Image(label="Generated Chart (PNG)")
     pdf_output = gr.File(label="Download PDF")
     template_output = gr.File(label="CSV Template")
-    
     template_button.click(download_template, outputs=template_output)
     submit_button.click(generate_chart, inputs=[file_input, title_input], outputs=[image_output, pdf_output])