Update app.py

app.py

@@ -8,8 +8,6 @@ import requests
 from dataclasses import dataclass
 from tenacity import retry, stop_after_attempt, wait_fixed
 import plotly.express as px
-import redis
-import os
 
 # Configuration du logging
 logging.basicConfig(
@@ -18,11 +16,6 @@ logging.basicConfig(
 )
 logger = logging.getLogger(__name__)
 
-# Configuration du cache Redis
-REDIS_HOST = os.getenv('REDIS_HOST', 'localhost')
-REDIS_PORT = int(os.getenv('REDIS_PORT', 6379))
-redis_client = redis.StrictRedis(host=REDIS_HOST, port=REDIS_PORT, db=0)
-
 @dataclass
 class PesticideRecord:
     """Structure de données pour les enregistrements de pesticides."""
@@ -98,11 +91,11 @@ class PesticideDataFetcher:
             if not response or "value" not in response:
                 break
             all_products.extend(response["value"])
-            url = response.get("@odata.nextLink")
-            if url and url.startswith("/"):
-                url = f"{self.BASE_URL}{url}"
-            elif url and not url.startswith("http"):
-                url = f"{self.BASE_URL}/{url}"
+            next_link = response.get("@odata.nextLink")
+            if next_link:
+                url = next_link
+            else:
+                break
         self._product_cache = all_products
         logger.info(f"Récupéré {len(all_products)} produits au total")
         return all_products
@@ -152,11 +145,32 @@ class PesticideDataFetcher:
         return f"Substance {substance_id}"
 
     def get_all_substances(self) -> List[str]:
-        """Récupère la liste complète des substances actives."""
-        url = f"{self.BASE_URL}/active_substances?format=json&api-version=v2.0"
-        response = self.fetch_data(url)
-        substances = [item.get("substance_name") for item in response.get("value", [])]
-        return substances
+        """Récupère la liste complète des substances actives avec pagination."""
+        if self._substance_cache:
+            return list(self._substance_cache.keys())
+        all_substances = set()
+        base_url = f"{self.BASE_URL}/active_substances?format=json&api-version=v2.0"
+        url = base_url
+        while url:
+            response = self.fetch_data(url)
+            if not response or "value" not in response:
+                break
+            for item in response.get("value", []):
+                substance_name = item.get("substance_name")
+                if substance_name:
+                    all_substances.add(substance_name)
+                    self._substance_cache[substance_name] = {
+                        "status": item.get("substance_status"),
+                        "approval_date": item.get("approval_date"),
+                        "expiry_date": item.get("expiry_date")
+                    }
+            next_link = response.get("@odata.nextLink")
+            if next_link:
+                url = next_link
+            else:
+                break
+        logger.info(f"Récupéré {len(all_substances)} substances au total")
+        return sorted(all_substances)
 
 class PesticideInterface:
     """Classe pour gérer l'interface utilisateur Gradio."""
@@ -401,5 +415,4 @@ def main():
     )
 
 if __name__ == "__main__":
-    main()
-    
+    main()