time analytics added

api/camera.py

@@ -15,7 +15,6 @@ class CameraData(BaseModel):
     user_id: str = Field(..., min_length=1)
     camera_name: str = Field(..., min_length=1)
     camera_loc: Optional[List[float]] = None
-
     @validator("camera_loc")
     def validate_loc(cls, loc):
         if loc is None:
@@ -35,7 +34,6 @@ class EditCameraData(BaseModel):
     old_camera_name: str
     new_camera_name: str
     new_camera_loc: List[float]
-
     @validator("new_camera_loc")
     def validate_loc(cls, loc):
         if len(loc) != 2:
@@ -61,13 +59,11 @@ def home():
         ]
     }
 
-
 # ---------- GET CAMERAS ----------
 @router.get("/get_cameras")
 def get_cameras(user_id: str = Query(...)):
     if not user_exists(user_id):
         raise HTTPException(status_code=404, detail="User not found")
-
     cameras = load_cameras(user_id)
     return {"success": True, "user_id": user_id, "cameras": cameras, "count": len(cameras)}
 
@@ -76,30 +72,23 @@ def get_cameras(user_id: str = Query(...)):
 @router.post("/add_camera")
 def add_camera(data: CameraData):
     cameras = load_cameras(data.user_id)
-
     if len(cameras) >= 2:
         raise HTTPException(status_code=400, detail="Only 2 cameras allowed")
-
     for cam in cameras:
         if cam["camera_name"].lower() == data.camera_name.lower():
             raise HTTPException(status_code=400, detail="Camera already exists")
-
     cameras.append({"camera_name": data.camera_name, "camera_loc": data.camera_loc})
     save_cameras(data.user_id, cameras)
-
     return {"success": True, "camera": data.camera_name}
 
 @router.put("/edit_camera")
 def edit_camera(data: EditCameraData):
     if not user_exists(data.user_id):
         raise HTTPException(status_code=404, detail="User not found")
-
     cameras = load_cameras(data.user_id)
-
     # Check if new camera name already exists (case-insensitive)
     if any(cam["camera_name"].lower() == data.new_camera_name.lower() for cam in cameras):
         raise HTTPException(status_code=400, detail=f"Camera name '{data.new_camera_name}' already exists")
-
     camera_found = False
     for cam in cameras:
         if cam["camera_name"].lower() == data.old_camera_name.lower():
@@ -107,7 +96,6 @@ def edit_camera(data: EditCameraData):
             cam["camera_name"] = data.new_camera_name
             cam["camera_loc"] = data.new_camera_loc
             camera_found = True
-
             # Rename camera folder
             old_folder = os.path.join(UPLOAD_DIR, data.user_id, old_name)
             new_folder = os.path.join(UPLOAD_DIR, data.user_id, data.new_camera_name)
@@ -116,7 +104,6 @@ def edit_camera(data: EditCameraData):
                     os.rename(old_folder, new_folder)
                 except Exception as e:
                     raise HTTPException(status_code=500, detail=f"Failed to rename camera folder: {str(e)}")
-
                 # Rename detection JSON
                 for f in os.listdir(new_folder):
                     if f.endswith("_detections.json") and f.lower().startswith(old_name.lower()):
@@ -128,10 +115,8 @@ def edit_camera(data: EditCameraData):
                         except Exception as e:
                             raise HTTPException(status_code=500, detail=f"Failed to rename detection JSON: {str(e)}")
                         break  # Only one detection JSON per camera
-
             save_cameras(data.user_id, cameras)
             return {"success": True, "updated": cam}
-
     if not camera_found:
         raise HTTPException(status_code=404, detail="Camera not found")
 

api/config.py

@@ -1,5 +1,6 @@
 import os
 import logging
+from zipfile import Path
 from dotenv import load_dotenv
 from ultralytics import YOLO
 from google.cloud import storage

api/utils.py

@@ -189,7 +189,6 @@ def save_cameras(user_id: str, cameras: list):
         json.dump(cameras, f, indent=2)
 
 
-
 #>>>>>>>>dashboard>>>>>>>>>>>>
 def get_user_dashboard(user_id: str, camera_name: str = None) -> dict:
     """Return analytics for a user or a specific camera"""
@@ -197,31 +196,47 @@ def get_user_dashboard(user_id: str, camera_name: str = None) -> dict:
     cameras_file = user_folder / "cameras.json"
     if not cameras_file.exists():
         raise HTTPException(404, f"User {user_id} not found")
+    
     try:
         with open(cameras_file, "r") as f:
             cameras = json.load(f)
     except json.JSONDecodeError:
         cameras = []
+    
     total_cameras = len(cameras)
     total_images = 0
     total_detections = 0
     buck_type_distribution = {}
     buck_doe_distribution = {"Buck": 0, "Doe": 0}
+
+    # New dashboard analytics
+    from collections import defaultdict, Counter
+    from datetime import datetime
+
+    heatmap = defaultdict(lambda: [0]*24)  # day -> 24 hours
+    deer_per_day = Counter()
+    bucks_per_day = Counter()
+    does_per_day = Counter()
+    hour_activity = [0]*24  # 0-23 hours
+
     for cam in cameras:
         cam_name = cam["camera_name"]
-        # Skip cameras if a specific one is selected
         if camera_name and cam_name != camera_name:
             continue
+        
         raw_folder = user_folder / cam_name / "raw"
         detections_file = user_folder / cam_name / f"{cam_name}_detections.json"
+        
         # Count images
         if raw_folder.exists():
             total_images += len(list(raw_folder.glob("*.*")))
+        
         # Count detections and distributions
         if detections_file.exists():
             try:
                 dets = json.load(open(detections_file, "r"))
                 for rec in dets:
+                    # --- Existing Buck/Doe counts ---
                     for d in rec.get("detections", []):
                         total_detections += 1
                         label = d.get("label", "")
@@ -232,8 +247,38 @@ def get_user_dashboard(user_id: str, camera_name: str = None) -> dict:
                                 buck_type_distribution[parts[2]] = buck_type_distribution.get(parts[2], 0) + 1
                             else:  # Doe
                                 buck_doe_distribution["Doe"] += 1
+                    
+                    # --- New analytics using datetime_original ---
+                    dt_str = rec.get("metadata", {}).get("exif", {}).get("datetime_original")
+                    if dt_str:
+                        dt = datetime.strptime(dt_str, "%Y:%m:%d %H:%M:%S")
+                        day = dt.date()
+                        hour = dt.hour
+                        
+                        # Heatmap count
+                        heatmap[day][hour] += len(rec.get("detections", []))
+                        
+                        # Count deer, bucks, does per day
+                        for d in rec.get("detections", []):
+                            label = d.get("label", "")
+                            if "Deer" in label:
+                                deer_per_day[day] += 1
+                            if "Buck" in label:
+                                bucks_per_day[day] += 1
+                            if "Doe" in label:
+                                does_per_day[day] += 1
+                        
+                        # Hourly aggregated activity
+                        hour_activity[hour] += len(rec.get("detections", []))
             except json.JSONDecodeError:
                 continue
+
+    # Average activity by hour (morning/night)
+    morning_hours = range(6, 18)
+    night_hours = list(range(0,6)) + list(range(18,24))
+    morning_activity = sum(hour_activity[h] for h in morning_hours) / len(morning_hours)
+    night_activity = sum(hour_activity[h] for h in night_hours) / len(night_hours)
+
     return {
         "user_id": user_id,
         "selected_camera": camera_name,
@@ -241,5 +286,15 @@ def get_user_dashboard(user_id: str, camera_name: str = None) -> dict:
         "images_uploaded": total_images,
         "total_detections": total_detections,
         "buck_type_distribution": buck_type_distribution,
-        "buck_doe_distribution": buck_doe_distribution
+        "buck_doe_distribution": buck_doe_distribution,
+        # --- New analytics ---
+        "activity_heatmap": dict(heatmap),
+        "deer_per_day": dict(deer_per_day),
+        "bucks_per_day": dict(bucks_per_day),
+        "does_per_day": dict(does_per_day),
+        "average_activity": {
+            "morning": round(morning_activity,2),
+            "night": round(night_activity,2)
+        }
     }
+