Update app.py

app.py

@@ -13,11 +13,9 @@ from networkx.drawing.nx_pydot import graphviz_layout
 logging.basicConfig(level=logging.INFO)
 
 def get_wkhtmltopdf_path():
-    # Try using shutil.which first
     path = shutil.which("wkhtmltopdf")
     if path:
         return path
-    # Then check common locations
     for candidate in ["/usr/local/bin/wkhtmltopdf", "/usr/bin/wkhtmltopdf"]:
         if os.path.exists(candidate):
             return candidate
@@ -26,17 +24,15 @@ def get_wkhtmltopdf_path():
 def process_uploaded_file(file):
     """
     Process the file input from Gradio.
-    If file is a dict:
-      - If "data" exists and is non-empty, write it to a temporary file.
-      - Otherwise, if "name" exists and points to a file, use it.
-    If file is a string, check that it's not a directory.
+    If 'file' is a dict, check if it contains valid file data.
+    Otherwise, if it's a string, ensure it's a file (not a directory).
     """
+    logging.info(f"Processing uploaded file: {file}")
     if isinstance(file, dict):
-        # Prefer file content from "data" if available
+        # If "data" exists and is non-empty, write it to a temporary file.
         if "data" in file and file["data"]:
             temp_path = "/tmp/uploaded.csv"
             try:
-                # Write as binary if data is bytes; otherwise, write as text.
                 mode = "wb" if isinstance(file["data"], bytes) else "w"
                 with open(temp_path, mode) as f:
                     f.write(file["data"])
@@ -45,11 +41,14 @@ def process_uploaded_file(file):
             except Exception as e:
                 logging.error(f"Error writing uploaded file data: {e}")
                 return None
-        # Otherwise, try using the "name" if it points to a real file.
-        elif "name" in file and file["name"] and os.path.isfile(file["name"]):
-            return file["name"]
+        elif "name" in file and file["name"]:
+            if os.path.isfile(file["name"]):
+                return file["name"]
+            else:
+                logging.error("Uploaded file 'name' is not a file.")
+                return None
         else:
-            logging.error("File dictionary does not contain valid 'data' or file path.")
+            logging.error("Uploaded file dict does not contain valid keys.")
             return None
     else:
         # If file is a string, ensure it is not a directory.
@@ -59,16 +58,23 @@ def process_uploaded_file(file):
         return file
 
 def generate_chart(file, title):
+    logging.info(f"generate_chart called with file: {file} and title: {title}")
     if file is None:
         return None, "Please upload a CSV file."
     
     file_path = process_uploaded_file(file)
     if file_path is None:
-        return None, "Error processing uploaded file. Please try again."
+        return None, "Error processing uploaded file. Please ensure you upload a valid CSV file."
+    
+    # Check if the resulting file path is a directory (should never happen)
+    if os.path.isdir(file_path):
+        logging.error(f"Processed file path '{file_path}' is a directory.")
+        return None, "Uploaded file is a directory. Please upload a valid CSV file."
 
     try:
         df = pd.read_csv(file_path)
     except Exception as e:
+        logging.error(f"Error reading CSV: {e}")
         return None, f"Error reading CSV: {e}"
     
     # Validate required columns
@@ -76,7 +82,7 @@ def generate_chart(file, title):
     if not expected_columns.issubset(set(df.columns)):
         return None, "CSV must contain Name, Role, and Reporting To columns."
     
-    # Build a directed graph from CSV data
+    # Build the directed graph
     G = nx.DiGraph()
     for _, row in df.iterrows():
         node_label = f"{row['Name']}\n({row['Role']})"
@@ -94,34 +100,30 @@ def generate_chart(file, title):
     if len(G.nodes) == 0:
         return None, "No nodes to display in the chart."
     
-    # Determine layout: use Graphviz "dot" if available; otherwise, use spring_layout.
+    # Use Graphviz 'dot' layout if available; otherwise, fall back to spring_layout.
     if shutil.which("dot") is not None:
         try:
             logging.info("Using dot for layout.")
             pos = graphviz_layout(G, prog="dot")
         except Exception as e:
             logging.error(f"Error using dot for layout: {e}")
-            logging.info("Falling back to spring_layout.")
             pos = nx.spring_layout(G)
     else:
-        logging.info("dot not found. Using spring_layout as fallback.")
+        logging.info("dot not found; using spring_layout.")
         pos = nx.spring_layout(G)
     
-    # Create the plot with a 3D shadow effect
+    # Create the chart plot
     plt.figure(figsize=(10, 6))
     ax = plt.gca()
     for node, (x, y) in pos.items():
-        # Draw shadow rectangle for a 3D effect
         shadow = plt.Rectangle((x - 40 + 5, y - 20 - 5), 80, 40,
                                color='gray', alpha=0.3, zorder=1, ec="none")
         ax.add_patch(shadow)
-        # Draw node rectangle with rounded edges
         rect = plt.Rectangle((x - 40, y - 20), 80, 40, color='lightblue',
                              ec='black', lw=1.5, zorder=2, joinstyle="round")
         ax.add_patch(rect)
         plt.text(x, y, node, horizontalalignment='center', verticalalignment='center',
                  fontsize=10, zorder=3)
-    # Draw edges between nodes
     for (u, v) in G.edges():
         if u in pos and v in pos:
             x1, y1 = pos[u]
@@ -129,18 +131,14 @@ def generate_chart(file, title):
             plt.plot([x1, x2], [y1, y2], color="gray", zorder=1)
     
     plt.axis('off')
-    
-    # Save the chart as an image
     chart_path = "/tmp/chart.png"
     plt.savefig(chart_path, format="png", dpi=300, bbox_inches="tight")
     plt.close()
     
-    # Convert the image to base64 for embedding in HTML (for PDF conversion)
     with open(chart_path, "rb") as img_file:
         encoded_string = base64.b64encode(img_file.read()).decode()
     img_html = f"<img src='data:image/png;base64,{encoded_string}' style='width:100%;'/>"
     
-    # Build HTML content for PDF generation
     html_content = f"""
     <html>
       <head>
@@ -158,7 +156,7 @@ def generate_chart(file, title):
     wkhtmltopdf_path = get_wkhtmltopdf_path()
     if wkhtmltopdf_path is None:
         logging.error("wkhtmltopdf not found, skipping PDF generation.")
-        pdf_path = ""  # Return empty PDF output if wkhtmltopdf is not available.
+        pdf_path = ""
     else:
         logging.info(f"wkhtmltopdf found at: {wkhtmltopdf_path}")
         config = pdfkit.configuration(wkhtmltopdf=wkhtmltopdf_path)