Update app.py

app.py

@@ -7,8 +7,9 @@ import time
 from dataclasses import dataclass
 import zipfile
 import logging
-from streamlit.components.v1 import html
 from PIL import Image
+import numpy as np
+import cv2
 
 # Logging setup
 logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")
@@ -188,157 +189,20 @@ def zip_files(files, zip_name):
             zipf.write(file, os.path.basename(file))
     return zip_name
 
-# JavaScript/HTML Dual Camera Component
-dual_camera_html = """
-<div style="width: 100%;">
-  <h3>Dual Camera Capture</h3>
-  <div>
-    <label>Camera 0 Video: </label>
-    <select id="videoSource0"></select>
-    <label>Audio: </label>
-    <select id="audioSource0"></select>
-    <video id="video0" autoplay playsinline style="width: 45%; margin: 5px;"></video>
-  </div>
-  <div>
-    <label>Camera 1 Video: </label>
-    <select id="videoSource1"></select>
-    <label>Audio: </label>
-    <select id="audioSource1"></select>
-    <video id="video1" autoplay playsinline style="width: 45%; margin: 5px;"></video>
-  </div>
-  <button onclick="startStreams()">Start Streams</button>
-  <button onclick="captureFrame(0)">Capture Frame 📸 Cam 0</button>
-  <button onclick="captureFrame(1)">Capture Frame 📸 Cam 1</button>
-  <button onclick="captureVideo(0)">Capture Video 🎥 Cam 0</button>
-  <button onclick="captureVideo(1)">Capture Video 🎥 Cam 1</button>
-  <canvas id="canvas" style="display: none;"></canvas>
-</div>
-<script>
-  const videoSource0 = document.getElementById('videoSource0');
-  const audioSource0 = document.getElementById('audioSource0');
-  const videoSource1 = document.getElementById('videoSource1');
-  const audioSource1 = document.getElementById('audioSource1');
-  const video0 = document.getElementById('video0');
-  const video1 = document.getElementById('video1');
-  const canvas = document.getElementById('canvas');
-  let streams = [null, null];
-  let recorders = [null, null];
-
-  navigator.mediaDevices.enumerateDevices().then(devices => {
-    let videoCount = 0;
-    devices.forEach(device => {
-      const option = document.createElement('option');
-      option.value = device.deviceId;
-      option.text = device.label || `${device.kind} ${device.deviceId}`;
-      if (device.kind === 'videoinput') {
-        videoSource0.appendChild(option.cloneNode(true));
-        videoSource1.appendChild(option.cloneNode(true));
-        videoCount++;
-      } else if (device.kind === 'audioinput') {
-        audioSource0.appendChild(option.cloneNode(true));
-        audioSource1.appendChild(option.cloneNode(true));
-      }
-    });
-    if (videoCount > 1) {
-      videoSource1.selectedIndex = 1; // Default to second camera
-    }
-  }).catch(err => console.error('Error enumerating devices:', err));
-
-  function startStreams() {
-    [0, 1].forEach(i => {
-      if (streams[i]) {
-        streams[i].getTracks().forEach(track => track.stop());
-      }
-      const constraints = {
-        video: { deviceId: document.getElementById(`videoSource${i}`).value ? { exact: document.getElementById(`videoSource${i}`).value } : undefined },
-        audio: { deviceId: document.getElementById(`audioSource${i}`).value ? { exact: document.getElementById(`audioSource${i}`).value } : undefined }
-      };
-      navigator.mediaDevices.getUserMedia(constraints)
-        .then(mediaStream => {
-          streams[i] = mediaStream;
-          document.getElementById(`video${i}`).srcObject = streams[i];
-          recorders[i] = new MediaRecorder(streams[i]);
-          const chunks = [];
-          recorders[i].ondataavailable = e => chunks.push(e.data);
-          recorders[i].onstop = () => {
-            const blob = new Blob(chunks, { type: 'video/mp4' });
-            saveFile(blob, `${i}${new Date().toISOString().replace(/[^0-9]/g, '')}.mp4`);
-            sliceVideo(blob, i);
-          };
-          console.log(`Camera ${i} stream started`);
-        })
-        .catch(err => console.error(`Error starting Camera ${i}:`, err));
-    });
-  }
-
-  function captureFrame(id) {
-    const video = document.getElementById(`video${id}`);
-    canvas.width = video.videoWidth;
-    canvas.height = video.videoHeight;
-    const ctx = canvas.getContext('2d');
-    ctx.drawImage(video, 0, 0, canvas.width, canvas.height);
-    const dataUrl = canvas.toDataURL('image/png');
-    saveFile(dataUrl, `${id}${new Date().toISOString().replace(/[^0-9]/g, '')}.png`);
-    console.log(`Captured frame from Camera ${id}`);
-  }
-
-  function captureVideo(id) {
-    recorders[id].start();
-    setTimeout(() => recorders[id].stop(), 10000); // 10 seconds
-    console.log(`Recording started for Camera ${id}`);
-  }
-
-  function saveFile(data, filename) {
-    const link = document.createElement('a');
-    link.href = data instanceof Blob ? URL.createObjectURL(data) : data;
-    link.download = filename;
-    link.click();
-  }
-
-  function sliceVideo(blob, id) {
-    const video = document.createElement('video');
-    video.src = URL.createObjectURL(blob);
-    video.onloadedmetadata = () => {
-      const ctx = canvas.getContext('2d');
-      canvas.width = video.videoWidth;
-      canvas.height = video.videoHeight;
-      let frameCount = 0;
-      const interval = video.duration / 10;
-      video.currentTime = 0;
-      const captureFrame = () => {
-        if (frameCount < 10) {
-          ctx.drawImage(video, 0, 0, canvas.width, canvas.height);
-          const dataUrl = canvas.toDataURL('image/png');
-          saveFile(dataUrl, `${id}${new Date().toISOString().replace(/[^0-9]/g, '')}_${frameCount}.png`);
-          console.log(`Captured frame ${frameCount} from Camera ${id}`);
-          frameCount++;
-          video.currentTime += interval;
-          setTimeout(captureFrame, 100);
-        }
-      };
-      video.play().then(captureFrame);
-    };
-  }
-</script>
-"""
-
 # Main App
-st.title("SFT Tiny Titans 🚀 (Web Cam Action!)")
+st.title("SFT Tiny Titans 🚀 (Camera Input Action!)")
 
 # Sidebar Galleries
 st.sidebar.header("Captured Media 🎨")
 gallery_container = st.sidebar.empty()
 def update_gallery():
-    media_files = get_gallery_files(["png", "mp4"])
+    media_files = get_gallery_files(["png"])
     with gallery_container:
         if media_files:
             cols = st.columns(2)
             for idx, file in enumerate(media_files[:4]):
                 with cols[idx % 2]:
-                    if file.endswith(".png"):
-                        st.image(Image.open(file), caption=file.split('/')[-1], use_container_width=True)
-                    elif file.endswith(".mp4"):
-                        st.video(file)
+                    st.image(Image.open(file), caption=file.split('/')[-1], use_container_width=True)
 
 # Sidebar Model Management
 st.sidebar.subheader("Model Hub 🗂️")
@@ -380,21 +244,73 @@ with tab1:
                 st.error(f"Download failed: {str(e)}")
 
 with tab2:
-    st.header("Camera Snap 📷 (Dual Live Feed!)")
-    html(dual_camera_html, height=600)
-    st.subheader("Upload Captured Files")
-    uploaded_files = st.file_uploader("Upload PNGs/MP4s from Downloads", type=["png", "mp4"], accept_multiple_files=True)
-    if uploaded_files:
-        for file in uploaded_files:
-            filename = file.name
+    st.header("Camera Snap 📷 (Dual Capture!)")
+    cols = st.columns(2)
+    with cols[0]:
+        st.subheader("Camera 0")
+        cam0_img = st.camera_input("Take a picture - Cam 0", key="cam0")
+        if cam0_img:
+            filename = generate_filename(0)
             with open(filename, "wb") as f:
-                f.write(file.read())
-            logger.info(f"Saved uploaded file: {filename}")
-            if filename.endswith(".png"):
-                st.image(Image.open(filename), caption=filename, use_container_width=True)
-            elif filename.endswith(".mp4"):
-                st.video(filename)
-        update_gallery()
+                f.write(cam0_img.getvalue())
+            st.image(Image.open(filename), caption=filename, use_container_width=True)
+            logger.info(f"Saved snapshot from Camera 0: {filename}")
+            if 'captured_images' not in st.session_state:
+                st.session_state['captured_images'] = []
+            st.session_state['captured_images'].append(filename)
+            update_gallery()
+    with cols[1]:
+        st.subheader("Camera 1")
+        cam1_img = st.camera_input("Take a picture - Cam 1", key="cam1")
+        if cam1_img:
+            filename = generate_filename(1)
+            with open(filename, "wb") as f:
+                f.write(cam1_img.getvalue())
+            st.image(Image.open(filename), caption=filename, use_container_width=True)
+            logger.info(f"Saved snapshot from Camera 1: {filename}")
+            if 'captured_images' not in st.session_state:
+                st.session_state['captured_images'] = []
+            st.session_state['captured_images'].append(filename)
+            update_gallery()
+
+    st.subheader("Capture 10 Frames (Video Simulation)")
+    cols = st.columns(2)
+    with cols[0]:
+        if st.button("Capture 10 Frames - Cam 0 📸"):
+            st.session_state['cam0_frames'] = []
+            for i in range(10):
+                img = st.camera_input(f"Frame {i} - Cam 0", key=f"cam0_frame_{i}")
+                if img:
+                    filename = generate_filename(f"0_{i}")
+                    with open(filename, "wb") as f:
+                        f.write(img.getvalue())
+                    st.session_state['cam0_frames'].append(filename)
+                    logger.info(f"Saved frame {i} from Camera 0: {filename}")
+                    time.sleep(0.5)  # Simulate video frame rate
+            if 'captured_images' not in st.session_state:
+                st.session_state['captured_images'] = []
+            st.session_state['captured_images'].extend(st.session_state['cam0_frames'])
+            update_gallery()
+            for frame in st.session_state['cam0_frames']:
+                st.image(Image.open(frame), caption=frame, use_container_width=True)
+    with cols[1]:
+        if st.button("Capture 10 Frames - Cam 1 📸"):
+            st.session_state['cam1_frames'] = []
+            for i in range(10):
+                img = st.camera_input(f"Frame {i} - Cam 1", key=f"cam1_frame_{i}")
+                if img:
+                    filename = generate_filename(f"1_{i}")
+                    with open(filename, "wb") as f:
+                        f.write(img.getvalue())
+                    st.session_state['cam1_frames'].append(filename)
+                    logger.info(f"Saved frame {i} from Camera 1: {filename}")
+                    time.sleep(0.5)  # Simulate video frame rate
+            if 'captured_images' not in st.session_state:
+                st.session_state['captured_images'] = []
+            st.session_state['captured_images'].extend(st.session_state['cam1_frames'])
+            update_gallery()
+            for frame in st.session_state['cam1_frames']:
+                st.image(Image.open(frame), caption=frame, use_container_width=True)
 
 with tab3:
     st.header("Fine-Tune & Test 🔧🧪")
@@ -436,7 +352,7 @@ with tab3:
                     except Exception as e:
                         st.error(f"CV fine-tune failed: {str(e)}")
             else:
-                st.warning("Upload at least 2 PNGs in Camera Snap first! ⚠️")
+                st.warning("Capture at least 2 images in Camera Snap first! ⚠️")
             st.subheader("CV Test 🎨 (Image Set Demo)")
             if len(captured_images) >= 2:
                 if st.button("Run CV Demo ▶️"):
@@ -465,7 +381,7 @@ with tab3:
                         st.error(f"CV demo failed: {str(e)}")
                         logger.error(f"Error in CV demo: {str(e)}")
             else:
-                st.warning("Upload at least 2 PNGs in Camera Snap first! ⚠️")
+                st.warning("Capture at least 2 images in Camera Snap first! ⚠️")
 
 # Display Logs
 st.sidebar.subheader("Action Logs 📜")