Update app.py

app.py

@@ -46,37 +46,67 @@ def parse_numbered_steps(text):
     steps = re.findall(r"\n\s*(\d+).\s*(.*)", text, re.MULTILINE)
     return [(int(num), desc.strip()) for num, desc in steps]
 
-# 1.5 Enhanced File Upload Handler
+# 1.5 FIXED File Upload Handler
 def handle_uploaded_file(uploaded_file):
-    """Enhanced file handler with better error handling and validation."""
+    """Enhanced file handler with better error handling and validation for Hugging Face Spaces."""
     if uploaded_file is None:
-        return None
+        return None, "No file uploaded"
     
     try:
-        # Validate file size (limit to 10MB)
-        if uploaded_file.size > 10 * 1024 * 1024:
-            st.error("File size too large. Please upload an image smaller than 10MB.")
-            return None
+        # Get file info
+        file_details = {
+            "filename": uploaded_file.name,
+            "filetype": uploaded_file.type,
+            "filesize": uploaded_file.size
+        }
+        
+        # Validate file size (limit to 5MB for better performance in HF Spaces)
+        max_size = 5 * 1024 * 1024  # 5MB
+        if uploaded_file.size > max_size:
+            return None, f"File size ({uploaded_file.size / 1024 / 1024:.1f}MB) exceeds limit (5MB)"
         
-        # Validate file type
-        if not uploaded_file.type.startswith('image/'):
-            st.error("Please upload a valid image file (JPG, PNG, etc.)")
-            return None
+        # Validate file type more strictly
+        allowed_types = ['image/jpeg', 'image/jpg', 'image/png', 'image/bmp', 'image/gif']
+        if uploaded_file.type not in allowed_types:
+            return None, f"Unsupported file type: {uploaded_file.type}. Allowed: JPG, PNG, BMP, GIF"
         
-        # Try to open the image to validate it's not corrupted
+        # Read file bytes with error handling
         try:
-            image = Image.open(uploaded_file)
-            image.verify()  # Verify it's a valid image
-            uploaded_file.seek(0)  # Reset file pointer after verification
-            image = Image.open(uploaded_file)  # Reopen for actual use
-            return image
+            file_bytes = uploaded_file.read()
+            if len(file_bytes) == 0:
+                return None, "File appears to be empty"
+        except Exception as read_error:
+            return None, f"Error reading file: {str(read_error)}"
+        
+        # Reset file pointer for PIL
+        uploaded_file.seek(0)
+        
+        # Try to open and validate the image
+        try:
+            image = Image.open(BytesIO(file_bytes))
+            
+            # Verify image is valid
+            image.verify()
+            
+            # Reopen for actual use (verify() closes the image)
+            image = Image.open(BytesIO(file_bytes))
+            
+            # Convert to RGB if necessary (handles RGBA, P mode, etc.)
+            if image.mode not in ('RGB', 'L'):
+                image = image.convert('RGB')
+            
+            # Resize if too large (helps with memory in HF Spaces)
+            max_dimension = 1024
+            if max(image.size) > max_dimension:
+                image.thumbnail((max_dimension, max_dimension), Image.Resampling.LANCZOS)
+            
+            return image, "Success"
+            
         except Exception as img_error:
-            st.error(f"Invalid image file: {str(img_error)}")
-            return None
+            return None, f"Invalid or corrupted image: {str(img_error)}"
             
     except Exception as e:
-        st.error(f"Error processing uploaded file: {str(e)}")
-        return None
+        return None, f"Unexpected error processing file: {str(e)}"
 
 # 1.6 TTS Generation Function with better error handling
 @st.cache_data
@@ -130,7 +160,7 @@ if "app_state" not in st.session_state:
         "prompt_sent": False, "timer_running": {}, "last_tick": {},
         "project_title": "", "project_description": "", "upcycling_options": [],
         "plan_approved": False, "initial_plan": "", "user_image": None,
-        "upload_error": None, "upload_attempts": 0
+        "upload_error": None, "upload_attempts": 0, "last_uploaded_file": None
     }
 
 # ─────────────────────────────────────────────────────────────────────────────
@@ -145,7 +175,7 @@ def reset_state():
         "prompt_sent": False, "timer_running": {}, "last_tick": {},
         "project_title": "", "project_description": "", "upcycling_options": [],
         "plan_approved": False, "initial_plan": "", "user_image": None,
-        "upload_error": None, "upload_attempts": 0
+        "upload_error": None, "upload_attempts": 0, "last_uploaded_file": None
     }
     st.success("✅ Reset complete!")
     st.rerun()
@@ -349,7 +379,7 @@ def render_step(idx, text):
         st.rerun()
 
 # ─────────────────────────────────────────────────────────────────────────────
-# 4. APP LAYOUT
+# 4. APP LAYOUT - FIXED UPLOAD SECTION
 # ─────────────────────────────────────────────────────────────────────────────
 
 st.set_page_config(page_title="NeoFix DIY Assistant", page_icon="🛠️", layout="wide")
@@ -369,37 +399,66 @@ if not st.session_state.app_state['prompt_sent']:
     col1, col2 = st.columns([3, 1])
     
     with col1:
-        # Enhanced file uploader with better error handling
         st.markdown("### 📷 Upload Project Image")
         
-        # Show upload attempts if there have been errors
+        # Show upload status
+        if st.session_state.app_state.get('upload_error'):
+            st.error(f"Upload Error: {st.session_state.app_state['upload_error']}")
+        
         if st.session_state.app_state.get('upload_attempts', 0) > 0:
             st.info(f"Upload attempts: {st.session_state.app_state['upload_attempts']}")
         
-        # File uploader with enhanced parameters
+        # IMPROVED File uploader with unique key to force refresh
+        upload_key = f"file_upload_{st.session_state.app_state.get('upload_attempts', 0)}"
         uploaded_image = st.file_uploader(
-            "Upload a photo of your project",
+            "Choose an image file",
             type=["jpg", "jpeg", "png", "bmp", "gif"],
             accept_multiple_files=False,
-            help="Supported formats: JPG, PNG, BMP, GIF. Max size: 10MB"
+            key=upload_key,
+            help="Supported: JPG, PNG, BMP, GIF (max 5MB)"
         )
         
-        # Alternative upload method using camera
-        if not uploaded_image:
-            st.markdown("##### Or take a photo:")
-            camera_image = st.camera_input("Take a picture")
-            if camera_image:
-                uploaded_image = camera_image
+        # Process uploaded image immediately
+        processed_image = None
+        upload_status = ""
         
-        # Show image preview if uploaded
-        if uploaded_image:
-            processed_image = handle_uploaded_file(uploaded_image)
-            if processed_image:
-                st.image(processed_image, caption="Uploaded image preview", use_container_width=True)
-                st.success("✅ Image uploaded successfully!")
+        if uploaded_image is not None:
+            # Check if this is a new file upload
+            current_file_id = f"{uploaded_image.name}_{uploaded_image.size}"
+            if current_file_id != st.session_state.app_state.get('last_uploaded_file'):
+                st.session_state.app_state['last_uploaded_file'] = current_file_id
+                
+                with st.spinner("Processing uploaded image..."):
+                    processed_image, upload_status = handle_uploaded_file(uploaded_image)
+                
+                if processed_image is not None:
+                    st.session_state.app_state['upload_error'] = None
+                    st.success("✅ Image uploaded and processed successfully!")
+                    st.image(processed_image, caption="Uploaded image preview", use_container_width=True)
+                else:
+                    st.session_state.app_state['upload_error'] = upload_status
+                    st.session_state.app_state['upload_attempts'] += 1
+                    st.error(f"❌ {upload_status}")
+            else:
+                # File already processed, show cached result
+                if st.session_state.app_state.get('upload_error') is None:
+                    processed_image, _ = handle_uploaded_file(uploaded_image)
+                    if processed_image:
+                        st.success("✅ Image ready for analysis!")
+                        st.image(processed_image, caption="Uploaded image preview", use_container_width=True)
+        
+        # Alternative camera input
+        st.markdown("##### Alternative: Take a photo")
+        camera_image = st.camera_input("Take a picture", key=f"camera_{st.session_state.app_state.get('upload_attempts', 0)}")
+        if camera_image and not uploaded_image:
+            with st.spinner("Processing camera image..."):
+                processed_image, upload_status = handle_uploaded_file(camera_image)
+            if processed_image is not None:
+                st.session_state.app_state['upload_error'] = None
+                st.success("✅ Photo captured and processed!")
+                st.image(processed_image, caption="Camera photo preview", use_container_width=True)
             else:
-                st.session_state.app_state['upload_attempts'] += 1
-                uploaded_image = None  # Reset if processing failed
+                st.error(f"❌ {upload_status}")
         
         context_text = st.text_area(
             "✏️ Describe the issue or your goal (optional but recommended)", 
@@ -410,33 +469,62 @@ if not st.session_state.app_state['prompt_sent']:
     with col2:
         st.markdown("### Actions")
         
-        # Enhanced Get AI Guidance button
-        if st.button("🚀 Get AI Guidance", type="primary", use_container_width=True):
+        # Get AI Guidance button - only enabled when image is ready
+        has_valid_image = (uploaded_image is not None or camera_image is not None) and st.session_state.app_state.get('upload_error') is None
+        
+        if st.button(
+            "🚀 Get AI Guidance", 
+            type="primary", 
+            use_container_width=True,
+            disabled=not has_valid_image
+        ):
+            image_to_analyze = None
+            
+            # Determine which image to use
             if uploaded_image:
-                processed_image = handle_uploaded_file(uploaded_image)
-                if processed_image:
-                    initial_analysis(processed_image, context_text)
-                    st.rerun()
-                else:
-                    st.error("❌ Please upload a valid image file!")
+                image_to_analyze, status = handle_uploaded_file(uploaded_image)
+            elif camera_image:
+                image_to_analyze, status = handle_uploaded_file(camera_image)
+            
+            if image_to_analyze is not None:
+                initial_analysis(image_to_analyze, context_text)
+                st.rerun()
             else:
+                st.error(f"❌ Image processing failed: {status}")
+        
+        # Status message for button
+        if not has_valid_image:
+            if uploaded_image is None and camera_image is None:
                 st.warning("⚠️ Please upload an image first!")
+            elif st.session_state.app_state.get('upload_error'):
+                st.warning("⚠️ Fix upload error first!")
         
         # Troubleshooting section
         with st.expander("🔧 Upload Troubleshooting"):
             st.markdown("""
-            **If uploads aren't working:**
-            1. Try refreshing the page (Ctrl+F5)
-            2. Check file size (max 10MB)
-            3. Try a different image format
-            4. Use the camera option instead
-            5. Clear your browser cache
+            **Common fixes:**
+            1. **Refresh upload**: Click button below
+            2. **Check file size**: Max 5MB
+            3. **Try different format**: JPG works best
+            4. **Use camera**: If file upload fails
+            5. **Clear browser cache**: Ctrl+Shift+Delete
             """)
             
-            if st.button("🔄 Force Refresh Upload", use_container_width=True):
+            if st.button("🔄 Reset Upload", use_container_width=True):
                 st.session_state.app_state['upload_attempts'] = 0
                 st.session_state.app_state['upload_error'] = None
+                st.session_state.app_state['last_uploaded_file'] = None
                 st.rerun()
+            
+            # Debug info
+            if st.checkbox("Show debug info"):
+                st.json({
+                    "upload_attempts": st.session_state.app_state.get('upload_attempts', 0),
+                    "upload_error": st.session_state.app_state.get('upload_error'),
+                    "last_file": st.session_state.app_state.get('last_uploaded_file'),
+                    "has_uploaded_file": uploaded_image is not None,
+                    "has_camera_image": camera_image is not None
+                })
         
         if st.button("🔄 Start Over", use_container_width=True):
             reset_state()