Update app.py

app.py

@@ -1,12 +1,14 @@
+# app.py
+
 import streamlit as st
-from processor import process_frame
+from processor import process_image, process_video, process_frame
 import os
 from PIL import Image
 import tempfile
 from streamlit_webrtc import VideoTransformerBase, webrtc_streamer, RTCConfiguration
 import cv2
 
-# Set page config
+# Set page configuration
 st.set_page_config(page_title="Traffic Violation Detection", layout="wide")
 
 st.title("🚦 Traffic Violation Detection App")
@@ -15,7 +17,7 @@ st.title("🚦 Traffic Violation Detection App")
 option = st.sidebar.radio("Select Option:", ("Image", "Video", "Live Camera"))
 
 if option == "Image":
-    st.header("🖼️ Upload Image")
+    st.header("🖼️ Upload and Process Image")
     uploaded_file = st.file_uploader("Choose an image...", type=["jpg", "jpeg", "png"])
     if uploaded_file:
         image = Image.open(uploaded_file)
@@ -25,45 +27,50 @@ if option == "Image":
                 with tempfile.NamedTemporaryFile(delete=False, suffix=".jpg") as tmp:
                     image.save(tmp.name)
                     frame = cv2.imread(tmp.name)
-                processed = process_frame(frame, "fonts/alfont_com_arial-1.ttf")
-                st.image(processed, caption='Processed Image.', use_column_width=True)
-                # Download button
-                _, img_encoded = cv2.imencode('.jpg', processed)
-                st.download_button(
-                    label="Download Image",
-                    data=img_encoded.tobytes(),
-                    file_name="processed_image.jpg",
-                    mime="image/jpeg"
-                )
+                processed = process_image(tmp.name, "fonts/alfont_com_arial-1.ttf")
+                if processed is not None:
+                    st.image(processed, caption='Processed Image.', use_column_width=True)
+                    # Save processed image to temporary file for download
+                    _, img_encoded = cv2.imencode('.jpg', processed)
+                    st.download_button(
+                        label="📥 Download Image",
+                        data=img_encoded.tobytes(),
+                        file_name="processed_image.jpg",
+                        mime="image/jpeg"
+                    )
+                else:
+                    st.error("Failed to process the image.")
 
 elif option == "Video":
-    st.header("🎥 Select Video")
+    st.header("🎥 Select and Process Video")
     video_files = [f for f in os.listdir("videos") if f.endswith(('.mp4', '.avi', '.mov'))]
     if not video_files:
         st.warning("No videos found in the 'videos/' folder.")
     else:
-        selected_video = st.selectbox("Choose a video:", video_files)
+        selected_video = st.selectbox("Choose a video to process:", video_files)
         video_path = os.path.join("videos", selected_video)
         st.video(video_path)
         if st.button("Process Video"):
             with st.spinner("Processing Video..."):
-                processed_path = 'output_violation.mp4'  # Adjust as needed
-                # Implement video processing logic here
-                # For brevity, assume process_video returns the path
-                # You can extend processor.py with a process_video function
-                st.success("Video processed!")
-                st.video(processed_path)
-                with open(processed_path, "rb") as file:
-                    st.download_button(
-                        label="Download Video",
-                        data=file,
-                        file_name="processed_video.mp4",
-                        mime="video/mp4"
-                    )
+                processed_path = process_video(video_path, "fonts/alfont_com_arial-1.ttf")
+                if processed_path and os.path.exists(processed_path):
+                    st.success("Video processed successfully!")
+                    st.video(processed_path)
+                    with open(processed_path, "rb") as file:
+                        st.download_button(
+                            label="📥 Download Processed Video",
+                            data=file,
+                            file_name="processed_video.mp4",
+                            mime="video/mp4"
+                        )
+                else:
+                    st.error("Failed to process the video.")
 
 elif option == "Live Camera":
     st.header("📷 Live Camera Feed")
+    st.info("Live processing is active. Detected violations will be annotated on the video feed.")
 
+    # RTC Configuration for streamlit-webrtc
     RTC_CONFIGURATION = RTCConfiguration({"iceServers": [{"urls": ["stun:stun.l.google.com:19302"]}]})
 
     class VideoTransformer(VideoTransformerBase):
@@ -81,6 +88,4 @@ elif option == "Live Camera":
         video_transformer_factory=VideoTransformer,
         media_stream_constraints={"video": True, "audio": False},
         async_transform=True
-    )
-
-    st.info("Live processing is active. Detected violations will be annotated on the video feed.")
+    )