Update app.py

app.py

@@ -356,7 +356,7 @@ class HRCollectorVideoProcessor:
 
     def stop_and_dump_to_file(self) -> Optional[str]:
         self.recording = False
-        if len(self.frames) < 30:  # ~1s
+               if len(self.frames) < 30:  # ~1s
             return None
         h, w = self.frames[0].shape[:2]
         fourcc = cv2.VideoWriter_fourcc(*"mp4v")
@@ -382,6 +382,9 @@ if "captured_image_bgr" not in st.session_state:
     st.session_state.captured_image_bgr = None
 if "captured_video_path" not in st.session_state:
     st.session_state.captured_video_path = None
+# NEW: buffer raw camera bytes in case user forgets to click "Save Image"
+if "img_bytes_buffer" not in st.session_state:
+    st.session_state.img_bytes_buffer = None
 
 mode = st.radio("Choose Input Mode", ["Image", "Video"], horizontal=True)
 
@@ -396,9 +399,10 @@ with col_left:
             img_source = st.radio("Source", ["Camera", "Upload"], horizontal=True, key="img_source")
             uploaded_img = None
             if img_source == "Camera":
-                cam_img = st.camera_input("Capture image")
+                # KEY ADDED + auto-buffer captured bytes
+                cam_img = st.camera_input("Capture image", key="camera_img")
                 if cam_img is not None:
-                    uploaded_img = cam_img.getvalue()
+                    st.session_state.img_bytes_buffer = cam_img.getvalue()
             else:
                 file_up = st.file_uploader("Upload JPG/PNG", type=["jpg", "jpeg", "png"])
                 if file_up is not None:
@@ -406,11 +410,16 @@ with col_left:
 
             submitted_img = st.form_submit_button("Save Image")
             if submitted_img:
-                if uploaded_img:
-                    arr = np.frombuffer(uploaded_img, dtype=np.uint8)
+                # Prefer explicit upload; else fall back to auto-buffered camera bytes
+                raw_bytes = uploaded_img if uploaded_img else st.session_state.img_bytes_buffer
+                if raw_bytes:
+                    arr = np.frombuffer(raw_bytes, dtype=np.uint8)
                     img_bgr = cv2.imdecode(arr, cv2.IMREAD_COLOR)
-                    st.session_state.captured_image_bgr = img_bgr
-                    st.success("Image saved. Now click **Analyze Image** below.")
+                    if img_bgr is not None:
+                        st.session_state.captured_image_bgr = img_bgr
+                        st.success("Image saved. Now click **Analyze Image** below.")
+                    else:
+                        st.warning("Could not decode the image. Please recapture/upload.")
                 else:
                     st.warning("No image provided.")
 
@@ -484,6 +493,13 @@ report_placeholder = st.empty()
 
 # Run analysis only when the explicit Analyze buttons are pressed
 if mode == "Image" and 'analyze_image' in locals() and analyze_image:
+    # If user forgot "Save Image", try auto-buffer
+    if st.session_state.captured_image_bgr is None and st.session_state.img_bytes_buffer is not None:
+        arr = np.frombuffer(st.session_state.img_bytes_buffer, dtype=np.uint8)
+        img_bgr = cv2.imdecode(arr, cv2.IMREAD_COLOR)
+        if img_bgr is not None:
+            st.session_state.captured_image_bgr = img_bgr
+
     html, frame_rgb_blurred = analyze_face(st.session_state.captured_image_bgr)
     if frame_rgb_blurred is not None:
         preview_placeholder.image(frame_rgb_blurred, caption="Blurred Image", use_container_width=True)