Update app.py

app.py

@@ -41,34 +41,31 @@ class PesticideDataFetcher:
         try:
             response = self.session.get(url, timeout=10)
             response.raise_for_status()
-            return response.json()
+            data = response.json()
+            logger.info(f"Réponse API pour {url}: {data[:200]}")
+            return data
         except requests.RequestException as e:
             logger.error(f"Échec de la requête {url}: {e}")
             return {"error": str(e)}
 
     def preload_substance_names(self):
         url = f"{self.BASE_URL}/active_substances?format=json&api-version=v2.0"
-        with ThreadPoolExecutor(max_workers=5) as executor:
-            while url:
-                data = self.fetch_data(url)
-                if "error" in data:
-                    logger.error(f"Erreur lors du préchargement: {data.get('error', 'Aucune info')}")
-                    break
-                tasks = []
-                for item in data.get("value", []):
-                    tasks.append(executor.submit(self._cache_substance, item))
-                url = data.get("nextLink")
-        logger.info(f"Cache prérempli avec {len(self._substance_cache)} substances")
-
-    def _cache_substance(self, item: Dict[str, Any]):
-        substance_id = item.get("substanceId")
-        if substance_id:
-            self._substance_cache[substance_id] = SubstanceDetails(
-                name=item.get("substanceName", "Nom non trouvé"),
-                status=item.get("substanceStatus"),
-                approval_date=item.get("approvalDate"),
-                expiry_date=item.get("expiryDate")
-            )
+        while url:
+            data = self.fetch_data(url)
+            if "error" in data:
+                logger.error(f"Erreur préchargement substances: {data.get('error')}")
+                break
+            for item in data.get("value", []):
+                substance_id = item.get("substanceId")  # Utilisation de substanceId (camelCase)
+                if substance_id:
+                    self._substance_cache[substance_id] = SubstanceDetails(
+                        name=item.get("substanceName", "Nom non trouvé"),
+                        status=item.get("substanceStatus"),
+                        approval_date=item.get("approvalDate"),
+                        expiry_date=item.get("expiryDate")
+                    )
+            url = data.get("nextLink")
+        logger.info(f"Cache substances prérempli avec {len(self._substance_cache)} entrées")
 
     def get_product_list(self) -> List[Dict[str, Any]]:
         if self._product_cache:
@@ -77,10 +74,10 @@ class PesticideDataFetcher:
         while url:
             data = self.fetch_data(url)
             if "error" in data:
-                logger.error(f"Erreur produits: {data.get('error', 'Aucune info')}")
+                logger.error(f"Erreur récupération produits: {data.get('error')}")
                 break
             for product in data.get("value", []):
-                product_id = product.get("productId")
+                product_id = product.get("productId")  # Utilisation de productId (camelCase)
                 if product_id:
                     self._product_cache[product_id] = product
             url = data.get("nextLink")
@@ -91,23 +88,20 @@ class PesticideDataFetcher:
         url = f"{self.BASE_URL}/pesticide_residues_mrls?format=json&product_id={product_id}&api-version=v2.0"
         response = self.fetch_data(url)
         if "error" in response:
-            logger.error(f"Erreur MRLs pour le produit {product_id}: {response.get('error', 'Aucune info')}")
+            logger.error(f"Erreur MRLs pour {product_id}: {response.get('error')}")
             return []
         return response.get("value", [])
 
-    def get_substance_name(self, substance_id: int) -> str:
-        substance = self._substance_cache.get(substance_id)
-        return substance.name if substance else f"Substance {substance_id}"
-
 class PesticideApp:
     def __init__(self):
         self.fetcher = PesticideDataFetcher()
         self.product_list = {
-            p.get('productName', 'Aucun nom'): p.get('productId', 0)
+            p.get('productName', 'Aucun nom'): p.get('productId', 0)  # Utilisation de productName (camelCase)
             for p in self.fetcher.get_product_list()
         }
+        # Correction : Accès au cache via self.fetcher
         self.substances = [
-            sd.name for sd in self._substance_cache.values()
+            sd.name for sd in self.fetcher._substance_cache.values()
         ]
 
     def format_date(self, date_str: str) -> str:
@@ -118,7 +112,7 @@ class PesticideApp:
                 return datetime.strptime(date_str, fmt).strftime("%d/%m/%Y")
             except ValueError:
                 continue
-        return "Format de date inconnu"
+        return "Format inconnu"
 
     def get_product_details(self, product_name: str) -> pd.DataFrame:
         product_id = self.product_list.get(product_name)
@@ -126,20 +120,16 @@ class PesticideApp:
             return pd.DataFrame([{"Erreur": "Produit non trouvé"}])
         
         mrls = self.fetcher.get_mrls(product_id)
-        if not mrls:
-            return pd.DataFrame([{"Erreur": "Aucune donnée MRL trouvée"}])
-        
         data = []
         for mrl in mrls:
-            substance_id = mrl.get("pesticideResidueId", 0)
-            substance_name = self.fetcher.get_substance_name(substance_id)
-            substance = self.fetcher._substance_cache.get(substance_id)
+            substance_id = mrl.get("pesticideResidueId", 0)  # Utilisation de pesticideResidueId (camelCase)
+            substance_name = self.fetcher._substance_cache.get(substance_id, {}).get("name", "Substance inconnue")
             
             data.append({
                 "Substance": substance_name,
                 "Valeur LMR": mrl.get("mrlValue", "N/C"),
-                "Date d'effet": self.format_date(mrl.get("entryIntoForceDate")),
-                "Statut": getattr(substance, "status", "N/C")
+                "Date d'effet": self.format_date(mrl.get("entryIntoForceDate")),  # entryIntoForceDate (camelCase)
+                "Statut": self.fetcher._substance_cache.get(substance_id, {}).get("status", "N/C")
             })
         return pd.DataFrame(data)
 
@@ -148,10 +138,10 @@ class PesticideApp:
         return pd.DataFrame(matches, columns=["Substance"]) if matches else pd.DataFrame([{"Message": "Aucun résultat"}])
 
     def create_ui(self) -> gr.Blocks:
-        with gr.Blocks(theme=gr.themes.Default()) as ui:
+        with gr.Blocks() as ui:
             gr.HTML("""
                 <div style="text-align: center; padding: 20px; background: #006633; color: white;">
-                    <h1>Base de Données des Pesticides UE</h1>
+                    <h1>Base de Données Pesticides UE</h1>
                 </div>
             """)
             
@@ -164,7 +154,6 @@ class PesticideApp:
                 output = gr.Dataframe(
                     headers=["Substance", "Valeur LMR", "Date d'effet", "Statut"],
                     max_height=500,
-                    overflow_scroll=True,
                     interactive=False
                 )
                 product.change(
@@ -176,12 +165,9 @@ class PesticideApp:
             with gr.Tab("Recherche par Substance"):
                 substance_search = gr.Textbox(
                     label="Rechercher une substance",
-                    placeholder="Entrez un nom de substance..."
-                )
-                substance_results = gr.Dataframe(
-                    max_height=300,
-                    interactive=False
+                    placeholder="Entrez un nom..."
                 )
+                substance_results = gr.Dataframe(max_height=300)
                 substance_search.submit(
                     fn=self.search_substances,
                     inputs=[substance_search],