Add Waste Sorter, Optimize for Render/Netlify, & Restore Pothole Detection via HF

backend/hf_api_service.py

@@ -91,6 +91,11 @@ async def _detect_clip_generic(image: Union[Image.Image, bytes], labels: List[st
 
 # --- Specific Detectors ---
 
+async def detect_pothole_clip(image: Union[Image.Image, bytes], client: httpx.AsyncClient = None):
+    labels = ["pothole", "damaged road", "road crack", "smooth road", "clean street"]
+    targets = ["pothole", "damaged road", "road crack"]
+    return await _detect_clip_generic(image, labels, targets, client)
+
 async def detect_illegal_parking_clip(image: Union[Image.Image, bytes], client: httpx.AsyncClient = None):
     labels = ["illegal parking", "car blocking driveway", "double parked", "car on sidewalk", "legal parking", "empty street"]
     targets = ["illegal parking", "car blocking driveway", "double parked", "car on sidewalk"]

backend/main.py

@@ -51,7 +51,7 @@
     find_mla_by_constituency
 )
 from backend.init_db import migrate_db
-from backend.pothole_detection import detect_potholes, validate_image_for_processing
+from backend.pothole_detection import detect_potholes, validate_image_for_processing, is_model_available
 from backend.grievance_service import GrievanceService
 from backend.unified_detection_service import (
     detect_vandalism as detect_vandalism_unified,
@@ -82,7 +82,8 @@
     detect_audio_event,
     transcribe_audio,
     detect_waste_clip,
-    detect_civic_eye_clip
+    detect_civic_eye_clip,
+    detect_pothole_clip
 )
 
 # Configure structured logging
@@ -1109,7 +1110,7 @@ def get_recent_issues(db: Session = Depends(get_db)):
     return data
 
 @app.post("/api/detect-pothole", response_model=DetectionResponse)
-async def detect_pothole_endpoint(image: UploadFile = File(...)):
+async def detect_pothole_endpoint(request: Request, image: UploadFile = File(...)):
     # Validate uploaded file
     await validate_uploaded_file(image)
 
@@ -1124,9 +1125,17 @@ async def detect_pothole_endpoint(image: UploadFile = File(...)):
         logger.error(f"Invalid image file for pothole detection: {e}", exc_info=True)
         raise HTTPException(status_code=400, detail="Invalid image file")
 
-    # Run detection (blocking, so run in threadpool)
+    # Run detection
     try:
-        detections = await run_in_threadpool(detect_potholes, pil_image)
+        if is_model_available():
+            # Use local model if available (blocking)
+            detections = await run_in_threadpool(detect_potholes, pil_image)
+        else:
+            # Fallback to Hugging Face API
+            logger.info("Local pothole model unavailable, falling back to HF API")
+            client = request.app.state.http_client
+            detections = await detect_pothole_clip(pil_image, client=client)
+
         return DetectionResponse(detections=detections)
     except Exception as e:
         logger.error(f"Pothole detection error: {e}", exc_info=True)

backend/pothole_detection.py

@@ -14,8 +14,15 @@
 _model_loading_error: Optional[Exception] = None
 _model_initialized: bool = False
 
-_model = None
-_model_lock = threading.Lock()
+def is_model_available():
+    """
+    Checks if the model dependencies are available.
+    """
+    try:
+        import ultralyticsplus
+        return True
+    except ImportError:
+        return False
 
 def load_model():
     """
@@ -44,9 +51,12 @@ def load_model():
 
         logger.info("Model loaded successfully.")
         return model
+    except ImportError:
+        logger.warning("ultralyticsplus not installed. Pothole detection disabled.")
+        return None
     except Exception as e:
         logger.error(f"Failed to load model: {e}")
-        raise ModelLoadException("keremberke/yolov8n-pothole-segmentation", details={"error": str(e)}) from e
+        return None
 
 
 def get_model():
@@ -147,6 +157,8 @@ def detect_potholes(image_source):
     """
     try:
         model = get_model()
+        if model is None:
+            return []
 
         # perform inference
         # stream=False ensures we get all results in memory

backend/requirements.txt

@@ -6,16 +6,10 @@ google-generativeai
 python-multipart
 psycopg2-binary
 async-lru
-ultralyticsplus==0.0.28
-ultralytics
-opencv-python-headless
 huggingface-hub
 httpx
 python-magic
 pywebpush
-# Local ML dependencies (Issue #76)
-torch
-transformers
 Pillow
 firebase-functions
 firebase-admin

frontend/public/_headers

@@ -0,0 +1,5 @@
+/*
+  X-Frame-Options: DENY
+  X-Content-Type-Options: nosniff
+  X-XSS-Protection: 1; mode=block
+  Referrer-Policy: strict-origin-when-cross-origin

frontend/public/_redirects

@@ -0,0 +1 @@
+/*  /index.html  200