Merge branch 'main' of github.com:MyElectricalData/myelectricaldata_new

Author: Clément VALENTIN

apps/api/src/services/price_scrapers/__init__.py

@@ -9,6 +9,7 @@
 from .ekwateur_scraper import EkwateurScraper
 from .octopus_scraper import OctopusScraper
 from .vattenfall_scraper import VattenfallScraper
+from .ufc_scraper import UFCQueChoisirScraper
 
 __all__ = [
     "BasePriceScraper",
@@ -22,4 +23,5 @@
     "EkwateurScraper",
     "OctopusScraper",
     "VattenfallScraper",
+    "UFCQueChoisirScraper",
 ]

apps/api/src/services/price_update_service.py

@@ -7,7 +7,7 @@
 import logging
 
 from ..models import EnergyProvider, EnergyOffer
-from .price_scrapers import EDFPriceScraper, EnercoopPriceScraper, TotalEnergiesPriceScraper, PrimeoEnergiePriceScraper, EngieScraper, AlpiqScraper, AlternaScraper, EkwateurScraper, OctopusScraper, VattenfallScraper
+from .price_scrapers import EDFPriceScraper, EnercoopPriceScraper, TotalEnergiesPriceScraper, PrimeoEnergiePriceScraper, EngieScraper, AlpiqScraper, AlternaScraper, EkwateurScraper, OctopusScraper, VattenfallScraper, UFCQueChoisirScraper
 from .price_scrapers.base import OfferData
 
 logger = logging.getLogger(__name__)
@@ -28,6 +28,7 @@ class PriceUpdateService:
         "Ekwateur": EkwateurScraper,
         "Octopus": OctopusScraper,
         "Vattenfall": VattenfallScraper,
+        "UFC Que Choisir": UFCQueChoisirScraper,
     }
 
     # Default provider info (website URLs)
@@ -42,6 +43,7 @@ class PriceUpdateService:
         "Ekwateur": {"website": "https://ekwateur.fr"},
         "Octopus": {"website": "https://octopusenergy.fr"},
         "Vattenfall": {"website": "https://www.vattenfall.fr"},
+        "UFC Que Choisir": {"website": "https://www.quechoisir.org"},
     }
 
     def __init__(self, db: AsyncSession):

watch-backend.sh

@@ -48,28 +48,41 @@ echo $$ > "$PID_FILE"
 rm -f "$LOCK_FILE"
 
 echo "🔄 Watch-backend started with PID $$"
-echo "🔄 Watching for changes in apps/api/src/*.py"
+echo "🔄 Watching for changes in apps/api/src/**/*.py (recursive)"
 echo "Press Ctrl+C to stop"
 
-# Utilise fswatch sur macOS pour détecter les changements
-if command -v fswatch &> /dev/null; then
-    echo "✅ Using fswatch for file monitoring"
-    fswatch -o apps/api/src/*.py | while read num ; do
+# Debounce: évite les redémarrages multiples pour des changements rapides
+DEBOUNCE_SECONDS=2
+LAST_RESTART=0
+
+restart_backend() {
+    CURRENT_TIME=$(date +%s)
+    if [ $((CURRENT_TIME - LAST_RESTART)) -ge $DEBOUNCE_SECONDS ]; then
         echo "[$(date '+%Y-%m-%d %H:%M:%S')] 📝 Change detected, restarting backend..."
         docker compose restart backend
         echo "[$(date '+%Y-%m-%d %H:%M:%S')] ✅ Backend restarted"
+        LAST_RESTART=$CURRENT_TIME
+    else
+        echo "[$(date '+%Y-%m-%d %H:%M:%S')] ⏳ Debouncing, skipping restart"
+    fi
+}
+
+# Utilise fswatch sur macOS pour détecter les changements (récursif)
+if command -v fswatch &> /dev/null; then
+    echo "✅ Using fswatch for file monitoring (recursive)"
+    # -r: récursif, -e: exclure, --include: inclure seulement .py
+    fswatch -r -o --include '\.py$' --exclude '.*' apps/api/src | while read num ; do
+        restart_backend
     done
 else
     echo "⚠️  fswatch not found, using polling mode (less efficient)"
     echo "💡 Install fswatch with: brew install fswatch"
-    # Alternative: utilise find avec polling
+    # Alternative: utilise find avec polling (récursif)
     while true; do
-        CURRENT_HASH=$(find apps/api/src -name "*.py" -type f -exec md5 {} \; | md5)
+        CURRENT_HASH=$(find apps/api/src -name "*.py" -type f -exec md5 {} \; 2>/dev/null | md5)
         if [ "$LAST_HASH" != "$CURRENT_HASH" ]; then
-            if [ ! -z "$LAST_HASH" ]; then
-                echo "[$(date '+%Y-%m-%d %H:%M:%S')] 📝 Change detected, restarting backend..."
-                docker compose restart backend
-                echo "[$(date '+%Y-%m-%d %H:%M:%S')] ✅ Backend restarted"
+            if [ -n "$LAST_HASH" ]; then
+                restart_backend
             fi
             LAST_HASH=$CURRENT_HASH
         fi