Update main.py

main.py

@@ -771,26 +771,57 @@ from fastapi.responses import FileResponse  # Add this import at the top
 
 
      
+# [Previous imports remain exactly the same...]
+
 @app.post("/visualize/natural")
 @limiter.limit("5/minute")
 async def visualize_with_natural_language(
     request: Request,
     file: UploadFile = File(...),
-    prompt: str = Form(""),  # Make prompt optional
+    prompt: str = Form(""),
     style: str = Form("seaborn-v0_8")
 ):
     try:
-        file_ext, content = await process_uploaded_file(file)
+        # First verify the file exists and has content
+        if not file.filename:
+            raise HTTPException(400, "No file uploaded")
+
+        # Read content first (don't rely just on extension)
+        content = await file.read()
+        if not content:
+            raise HTTPException(400, "Empty file uploaded")
+
+        # Verify Excel signature (magic numbers)
+        def is_valid_excel(content: bytes) -> bool:
+            excel_signatures = [
+                b'\x50\x4B\x03\x04',  # ZIP header (modern Excel)
+                b'\xD0\xCF\x11\xE0'   # OLE header (older Excel)
+            ]
+            return any(content.startswith(sig) for sig in excel_signatures)
+
+        if not is_valid_excel(content):
+            raise HTTPException(400, "File doesn't contain Excel data")
+
+        # Now check extension for supported types
+        file_ext = file.filename.split('.')[-1].lower()
         if file_ext not in {"xlsx", "xls"}:
-            raise HTTPException(400, "Only Excel files are supported for visualization")
-        
-        # Use our robust reader
-        df = read_any_excel(content)
-        
+            raise HTTPException(400, "Only Excel files (.xlsx, .xls) are supported for visualization")
+
+        # Now try to process
+        try:
+            df = pd.read_excel(BytesIO(content))
+        except Exception as e:
+            logger.error(f"Excel read error: {str(e)}")
+            raise HTTPException(400, f"Invalid Excel file: {str(e)}")
+
+        if df.empty:
+            raise HTTPException(400, "The Excel file contains no data")
+
         # Generate smart prompt if none provided
         if not prompt.strip():
             prompt = generate_smart_prompt(df)
-        
+            logger.info(f"Generated automatic prompt: {prompt}")
+
         # Generate visualization request
         vis_request = interpret_natural_language(prompt, df.columns.tolist())
         if not vis_request:
@@ -807,7 +838,11 @@ async def visualize_with_natural_language(
         
         # Execute the visualization code safely
         local_vars = {'plt': plt, 'sns': sns, 'df': df}
-        exec(visualization_code, globals(), local_vars)
+        try:
+            exec(visualization_code, globals(), local_vars)
+        except Exception as e:
+            logger.error(f"Visualization code execution failed: {str(e)}")
+            raise HTTPException(400, f"Failed to generate visualization: {str(e)}")
         
         # Save to bytes buffer
         buffer = BytesIO()
@@ -825,23 +860,17 @@ async def visualize_with_natural_language(
             "interpreted_parameters": vis_request.dict()
         }
 
-    except HTTPException:
+    except HTTPException as he:
+        logger.error(f"HTTPException in visualization: {he.detail}")
         raise
     except Exception as e:
-        logger.error(f"Natural language visualization failed: {str(e)}\n{traceback.format_exc()}")
+        logger.error(f"Unexpected error in visualization: {str(e)}\n{traceback.format_exc()}")
         raise HTTPException(500, detail=f"Visualization failed: {str(e)}")
-        return {
-            "status": "success",
-            "image_data": image_base64,
-            "code": visualization_code,
-            "interpreted_parameters": vis_request.dict()
-        }
 
-    except HTTPException:
-        raise
-    except Exception as e:
-        logger.error(f"Natural language visualization failed: {str(e)}\n{traceback.format_exc()}")
-        raise HTTPException(500, detail=f"Visualization failed: {str(e)}")
+# [Rest of your code remains exactly the same...]
+
+
+
 @app.get("/visualize/styles")
 @limiter.limit("10/minute")
 async def list_available_styles(request: Request):