Update src/streamlit_app.py

src/streamlit_app.py

@@ -101,40 +101,46 @@ def main():
     
     with col1:
         st.header("カメラビュー (Camera View)")
-        run = st.checkbox("カメラを起動 (Enable camera)", value=True)
-        FRAME_WINDOW = st.image([])
+        
+        if st.button("カメラアクセスを許可 (Allow camera access)"):
+            st.session_state.camera_allowed = True
+            
+        if not st.session_state.get('camera_allowed', False):
+            st.warning("⚠️ カメラを使用するには許可が必要です (Camera access requires permission)")
+            st.image("demo_pose.jpg")  # Заглушка
+            run = False
+        else:
+            run = st.checkbox("カメラを起動 (Enable camera)", value=True)
+            FRAME_WINDOW = st.image([])
     
     with col2:
         st.header("姿勢分析 (Posture Analysis)")
         status_placeholder = st.empty()
-    
-    # Инициализация камеры с проверкой
-    camera = cv2.VideoCapture(0)
-    if not camera.isOpened():
-        demo_image = np.zeros((480, 640, 3), dtype=np.uint8)
-        FRAME_WINDOW.image(demo_image)
-        status_placeholder.error("エラー: カメラデバイスに接続できません (Error: Camera device not accessible)")
-        return
-    
-    while run:
-        ret, frame = camera.read()
-        if not ret or frame is None:
-            st.warning("フレームを取得できません (Failed to capture frame)")
-            break
-            
-        try:
-            # Конвертация цветов
-            frame_rgb = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
-            analyzed_frame, posture_status = analyze_posture(frame)
-            FRAME_WINDOW.image(analyzed_frame)
-            status_placeholder.markdown(posture_status)
-        except Exception as e:
-            st.error(f"処理エラー: {str(e)} (Processing error)")
-            break
         
-        time.sleep(0.1)
-    
-    camera.release()
+        uploaded_file = st.file_uploader("または画像をアップロード (Or upload image)", 
+                                      type=["jpg", "png", "jpeg"])
+    
+    if run and st.session_state.camera_allowed:
+        camera = cv2.VideoCapture(0)
+        if not camera.isOpened():
+            st.error("カメラエラー: デバイスに接続できません (Camera error: Device not accessible)")
+            run = False
+            
+        while run:
+            ret, frame = camera.read()
+            if ret:
+                analyzed_frame, posture_status = analyze_posture(frame)
+                FRAME_WINDOW.image(analyzed_frame)
+                status_placeholder.markdown(posture_status)
+            time.sleep(0.1)
+        camera.release()
+    
+    elif uploaded_file:
+        file_bytes = np.frombuffer(uploaded_file.read(), np.uint8)
+        frame = cv2.imdecode(file_bytes, cv2.IMREAD_COLOR)
+        analyzed_frame, posture_status = analyze_posture(frame)
+        col1.image(analyzed_frame)
+        status_placeholder.markdown(posture_status)
 
 if __name__ == "__main__":
     main()