button fix

app.py

@@ -23,10 +23,10 @@ import io
 if not os.getcwd() in sys.path:
     sys.path.append(os.getcwd())
 
-# Check if detectron is installed and attempt installation if needed
+# Check if detectron2 is installed and attempt installation if needed
 if importlib.util.find_spec("detectron") is None:
-    print("🔄 D not found. Attempting installation...")
-    print("Installing PyTorch and D...")
+    print("🔄 Detectron2 not found. Attempting installation...")
+    print("Installing PyTorch and Detectron2...")
     os.system("pip install torch torchvision --extra-index-url https://download.pytorch.org/whl/cpu")
     os.system("pip install git+https://github.com/facebookresearch/detectron2.git")
     print("Installation complete!")
@@ -77,72 +77,122 @@ MAILJET_CONFIG = {
     'URL': 'https://api.mailjet.com/v3.1/send'
 }
 
-# JavaScript pour la gestion des cookies
+# JavaScript pour la gestion des cookies - Version corrigée
 COOKIE_JAVASCRIPT = """
 <script>
-// Fonctions de gestion des cookies HEDI
+// Fonctions de gestion des cookies HEDI - Version Debug
 function setCookie(name, value, days = 1) {
-    const expires = new Date();
-    expires.setTime(expires.getTime() + (days * 24 * 60 * 60 * 1000));
-    document.cookie = name + '=' + value + ';expires=' + expires.toUTCString() + ';path=/;SameSite=Lax';
+    try {
+        const expires = new Date();
+        expires.setTime(expires.getTime() + (days * 24 * 60 * 60 * 1000));
+        document.cookie = name + '=' + value + ';expires=' + expires.toUTCString() + ';path=/;SameSite=Lax';
+        console.log('✅ Cookie set:', name, '=', value);
+        return true;
+    } catch (e) {
+        console.error('❌ Error setting cookie:', e);
+        return false;
+    }
 }
 
 function getCookie(name) {
-    const nameEQ = name + '=';
-    const ca = document.cookie.split(';');
-    for(let i = 0; i < ca.length; i++) {
-        let c = ca[i];
-        while (c.charAt(0) == ' ') c = c.substring(1, c.length);
-        if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length);
+    try {
+        const nameEQ = name + '=';
+        const ca = document.cookie.split(';');
+        for(let i = 0; i < ca.length; i++) {
+            let c = ca[i];
+            while (c.charAt(0) == ' ') c = c.substring(1, c.length);
+            if (c.indexOf(nameEQ) == 0) {
+                const value = c.substring(nameEQ.length, c.length);
+                console.log('📖 Cookie read:', name, '=', value);
+                return value;
+            }
+        }
+        console.log('📖 Cookie not found:', name);
+        return null;
+    } catch (e) {
+        console.error('❌ Error reading cookie:', e);
+        return null;
     }
-    return null;
 }
 
 function getHediUsage() {
     try {
+        console.log('🔍 Getting HEDI usage...');
         const today = new Date().toISOString().split('T')[0]; // YYYY-MM-DD
         const lastDate = getCookie('hedi_last_date');
         
         // Reset quotidien automatique
         if (lastDate !== today) {
-            console.log('🔄 Daily reset: ' + lastDate + ' → ' + today);
+            console.log('🔄 Daily reset detected: ' + lastDate + ' → ' + today);
             setCookie('hedi_usage_count', '0', 1);
             setCookie('hedi_last_date', today, 1);
+            console.log('✅ Usage reset to 0');
             return 0;
         }
         
         const usage = parseInt(getCookie('hedi_usage_count') || '0');
-        console.log('🍪 Loaded usage from cookies: ' + usage + '/10');
+        console.log('🍪 Current usage from cookies: ' + usage + '/10');
         return usage;
     } catch (e) {
-        console.error('Error loading usage from cookies:', e);
+        console.error('❌ Error getting usage from cookies:', e);
         return 0;
     }
 }
 
 function saveHediUsage(count) {
     try {
+        console.log('💾 Saving usage to cookies:', count);
         const today = new Date().toISOString().split('T')[0];
-        setCookie('hedi_usage_count', count.toString(), 1);
-        setCookie('hedi_last_date', today, 1);
-        console.log('💾 Saved usage to cookies: ' + count + '/10');
-        return true;
+        const success1 = setCookie('hedi_usage_count', count.toString(), 1);
+        const success2 = setCookie('hedi_last_date', today, 1);
+        
+        if (success1 && success2) {
+            console.log('✅ Usage saved successfully: ' + count + '/10');
+            return true;
+        } else {
+            console.error('❌ Failed to save usage');
+            return false;
+        }
     } catch (e) {
-        console.error('Error saving usage to cookies:', e);
+        console.error('❌ Error saving usage to cookies:', e);
         return false;
     }
 }
 
-// Exposer les fonctions globalement
+// Exposer les fonctions globalement avec fallback
 window.hediCookies = {
-    getUsage: getHediUsage,
-    saveUsage: saveHediUsage
+    getUsage: function() {
+        try {
+            return getHediUsage();
+        } catch (e) {
+            console.error('Fallback: Error in getUsage', e);
+            return 0;
+        }
+    },
+    saveUsage: function(count) {
+        try {
+            return saveHediUsage(count);
+        } catch (e) {
+            console.error('Fallback: Error in saveUsage', e);
+            return false;
+        }
+    }
 };
 
-// Initialiser au chargement
-document.addEventListener('DOMContentLoaded', function() {
-    console.log('🍪 HEDI Cookies initialized');
-});
+// Initialiser immédiatement ET au chargement
+console.log('🍪 HEDI Cookies loading...');
+try {
+    const initialUsage = getHediUsage();
+    console.log('🍪 HEDI Cookies initialized with usage:', initialUsage);
+} catch (e) {
+    console.error('❌ Error during initialization:', e);
+}
+
+// Double initialisation pour être sûr
+setTimeout(function() {
+    console.log('🍪 HEDI Cookies late initialization...');
+    window.hediCookies.getUsage();
+}, 1000);
 </script>
 """
 
@@ -788,7 +838,7 @@ def create_gradio_interface():
                 </div>
                 """)
         
-        # === SECTION 2: Boutons ===
+        # === SECTION 2: Boutons et Debug ===
         gr.HTML("")
         with gr.Row():
             analyze_btn = gr.Button(
@@ -796,13 +846,22 @@ def create_gradio_interface():
                 variant="primary", 
                 size="lg", 
                 elem_classes="hedi-btn-primary", 
-                scale=3
+                scale=2
             )
             clear_btn = gr.Button(
                 "🗑️ Clear", 
                 variant="secondary", 
                 scale=1
             )
+            # Bouton de test JavaScript (temporaire pour debug)
+            test_js_btn = gr.Button(
+                "🍪 Test Cookies", 
+                variant="secondary", 
+                scale=1
+            )
+        
+        # Debug info (temporaire)
+        debug_info = gr.HTML("")
         
         # === SECTION 3: Usage Counter et Real-time Monitoring ===
         with gr.Row(equal_height=True):
@@ -950,14 +1009,37 @@ def create_gradio_interface():
                         <p>• <strong>No registration:</strong> No account needed, just cookies</p>
                     </div>
                 </div>
+                
+                <div style="background: #fff7ed; border: 1px solid #fed7aa; padding: 16px; border-radius: 12px; margin-top: 20px; color: #000000 !important;">
+                    <h3 style="color: #ea580c; display: flex; align-items: center; margin-bottom: 12px;"><span style="margin-right: 12px;">🔧</span>Troubleshooting & Debug</h3>
+                    <div style="color: #c2410c;">
+                        <p>• <strong>Test Cookies button:</strong> Click to verify JavaScript functions are working</p>
+                        <p>• <strong>Browser Console:</strong> Press F12 and check Console tab for cookie debugging info</p>
+                        <p>• <strong>Debug info:</strong> Green area below buttons shows function call status</p>
+                        <p>• <strong>If nothing happens:</strong> Check console for errors, try refreshing page</p>
+                        <p>• <strong>Cookie issues:</strong> Clear browser cookies for this site and try again</p>
+                    </div>
+                </div>
             </div>
             """)
         
         # === FONCTIONS EVENT HANDLERS ===
+        def test_javascript_cookies():
+            """Fonction pour tester les cookies JavaScript"""
+            return """
+            <div style="background: #f0f9ff; padding: 15px; border-radius: 8px; border: 1px solid #bfdbfe; color: #000000 !important;">
+                <h4 style="color: #000000 !important;">🍪 JavaScript Cookie Test</h4>
+                <p>Check browser console (F12) for cookie debugging info.</p>
+                <p>This test verifies that JavaScript functions are working.</p>
+            </div>
+            """
+        
         def update_interface(*args):
             try:
                 image, damage_thresh, deepfake_thresh, device_val, current_usage, email = args
                 
+                print(f"🎯 update_interface called with args: image={image is not None}, usage={current_usage}, email={bool(email)}")
+                
                 if image is None:
                     return [
                         """<div style="background: #fef2f2; padding: 20px; border-radius: 8px; border: 1px solid #fecaca; margin-top: 10px; color: #000000 !important;">
@@ -974,7 +1056,8 @@ def create_gradio_interface():
                         gr.update(visible=False),
                         "",
                         "",
-                        get_usage_display_html(current_usage)
+                        get_usage_display_html(current_usage),
+                        f"<div style='color: green;'>✅ Function called successfully with usage: {current_usage}</div>"
                     ]
                 
                 if not email:
@@ -993,9 +1076,13 @@ def create_gradio_interface():
                         gr.update(visible=False),
                         "",
                         "",
-                        get_usage_display_html(current_usage)
+                        get_usage_display_html(current_usage),
+                        f"<div style='color: orange;'>⚠️ Email missing. Usage: {current_usage}</div>"
                     ]
                 
+                # Pour l'instant, on utilise l'usage passé en paramètre
+                # Plus tard, on pourra intégrer la récupération depuis les cookies
+                
                 # Check usage limit
                 if current_usage >= MAX_TRIES:
                     return [
@@ -1014,27 +1101,19 @@ def create_gradio_interface():
                         gr.update(visible=False),
                         "",
                         "",
-                        get_usage_display_html(current_usage)
+                        get_usage_display_html(current_usage),
+                        f"<div style='color: red;'>❌ Usage limit reached: {current_usage}/{MAX_TRIES}</div>"
                     ]
                 
-                # Show processing status
-                processing_status = """<div style="background: #fef3c7; padding: 20px; border-radius: 8px; border: 1px solid #fcd34d; margin-top: 10px; color: #000000 !important;">
-                    <div style="display: flex; align-items: center; margin-bottom: 12px;">
-                        <span style="font-size: 18px; margin-right: 8px;">🔄</span>
-                        <strong style="color: #000000 !important;">Analysis Status</strong>
-                    </div>
-                    <div style="color: #92400e; text-align: center;">
-                        <div><strong>Processing in progress...</strong></div>
-                        <div style="font-size: 14px; margin-top: 8px;">AI analysis and email delivery</div>
-                        <div style="font-size: 12px; margin-top: 4px; opacity: 0.8;">Please wait 30-60 seconds</div>
-                    </div>
-                </div>"""
+                print(f"🚀 Starting analysis process...")
                 
                 # Call the REAL processing function
                 analysis_text, new_usage_count, status_message, download_path = process_image_sequential(
                     image, damage_thresh, deepfake_thresh, device_val, current_usage, email
                 )
                 
+                print(f"✅ Analysis completed. New usage: {new_usage_count}")
+                
                 # Check if analysis was successful
                 if "✅" in status_message or "sent via Mailjet" in status_message:
                     success_status = """<div style="background: #f0fdf4; padding: 20px; border-radius: 8px; border: 1px solid #bbf7d0; margin-top: 10px; color: #000000 !important;">
@@ -1058,7 +1137,8 @@ def create_gradio_interface():
                         gr.update(value=download_path, visible=bool(download_path)),
                         "",
                         analysis_text,
-                        get_usage_display_html(new_usage_count)
+                        get_usage_display_html(new_usage_count),
+                        f"<div style='color: green;'>✅ Analysis successful! Usage: {new_usage_count}/{MAX_TRIES}</div>"
                     ]
                 else:
                     # Analysis failed
@@ -1079,10 +1159,15 @@ def create_gradio_interface():
                         gr.update(visible=False),
                         "",
                         analysis_text,
-                        get_usage_display_html(new_usage_count)
+                        get_usage_display_html(new_usage_count),
+                        f"<div style='color: red;'>❌ Analysis failed: {status_message}</div>"
                     ]
                 
             except Exception as e:
+                print(f"❌ Error in update_interface: {e}")
+                import traceback
+                traceback.print_exc()
+                
                 error_status = f"""<div style="background: #fef2f2; padding: 20px; border-radius: 8px; border: 1px solid #fecaca; margin-top: 10px; color: #000000 !important;">
                     <div style="display: flex; align-items: center; margin-bottom: 12px;">
                         <span style="font-size: 18px; margin-right: 8px;">❌</span>
@@ -1094,7 +1179,15 @@ def create_gradio_interface():
                     </div>
                 </div>"""
                 
-                return [error_status, current_usage, gr.update(visible=False), "", f"Error: {str(e)}", get_usage_display_html(current_usage)]
+                return [
+                    error_status, 
+                    current_usage, 
+                    gr.update(visible=False), 
+                    "", 
+                    f"Error: {str(e)}", 
+                    get_usage_display_html(current_usage),
+                    f"<div style='color: red;'>❌ Exception: {str(e)}</div>"
+                ]
         
         def clear_interface():
             return [
@@ -1108,46 +1201,59 @@ def create_gradio_interface():
                         <div style="color: #6b7280; font-size: 14px; margin-top: 8px;">Upload an image and click Analyze</div>
                     </div>
                 </div>""",
-                0,  # Reset usage counter display (will be updated by JS)
+                0,  # Reset usage counter display
                 gr.update(visible=False),
                 "",
                 "",
                 get_usage_display_html(0),
+                "<div style='color: blue;'>🔄 Interface cleared</div>",
                 ""
             ]
         
-        # Event handlers avec JavaScript pour synchronisation cookies
+        # Event handlers - Version simplifiée avec debug
+        def handle_analyze_click(image, damage_thresh, deepfake_thresh, device_val, current_usage, email):
+            # Cette fonction sera appelée côté Python
+            print(f"🎯 Analyze button clicked!")
+            print(f"📊 Current inputs: image={image is not None}, usage={current_usage}, email={bool(email)}")
+            return update_interface(image, damage_thresh, deepfake_thresh, device_val, current_usage, email)
+        
         analyze_btn.click(
-            fn=update_interface,
+            fn=handle_analyze_click,
             inputs=[input_image, damage_threshold, deepfake_threshold, device, usage_counter, recipient_email],
-            outputs=[status_display, usage_counter, download_file, download_info, output_text, usage_display],
+            outputs=[status_display, usage_counter, download_file, download_info, output_text, usage_display, debug_info]
+        )
+        
+        test_js_btn.click(
+            fn=test_javascript_cookies,
+            outputs=[debug_info],
             js="""
-            (image, damage_thresh, deepfake_thresh, device_val, current_usage, email) => {
-                // Récupérer l'usage actuel depuis les cookies
-                const actualUsage = window.hediCookies.getUsage();
-                console.log('🍪 Current usage from cookies:', actualUsage);
-                return [image, damage_thresh, deepfake_thresh, device_val, actualUsage, email];
+            () => {
+                console.log('🍪 Testing JavaScript cookies...');
+                try {
+                    const currentUsage = window.hediCookies.getUsage();
+                    console.log('✅ Current usage:', currentUsage);
+                    window.hediCookies.saveUsage(currentUsage + 1);
+                    console.log('✅ Test save completed');
+                    alert('✅ Cookie test completed! Check console (F12) for details. Current usage: ' + currentUsage);
+                    return null;
+                } catch (e) {
+                    console.error('❌ Cookie test failed:', e);
+                    alert('❌ Cookie test failed: ' + e.message);
+                    return null;
+                }
             }
             """
         )
         
         clear_btn.click(
             fn=clear_interface,
-            outputs=[status_display, usage_counter, download_file, download_info, output_text, usage_display, recipient_email]
+            outputs=[status_display, usage_counter, download_file, download_info, output_text, usage_display, debug_info, recipient_email]
         )
         
-        # JavaScript pour mise à jour automatique de l'usage après analyse
+        # Initialisation au chargement de la page
         app.load(
-            fn=lambda: [0, get_usage_display_html(0)],
-            outputs=[usage_counter, usage_display],
-            js="""
-            () => {
-                // Initialiser l'usage depuis les cookies au chargement
-                const usage = window.hediCookies.getUsage();
-                console.log('🍪 Page loaded, usage from cookies:', usage);
-                return [usage, null]; // Le HTML sera mis à jour côté Python
-            }
-            """
+            fn=lambda: [0, get_usage_display_html(0), "<div style='color: blue;'>🔄 Page loaded, cookies will be initialized</div>"],
+            outputs=[usage_counter, usage_display, debug_info]
         )
     
     return app
@@ -1350,16 +1456,23 @@ def validate_email(email):
 def process_image_sequential(input_image, damage_threshold, deepfake_threshold, device_str, usage_count, recipient_email):
     """Main processing function with sequential pipeline: Damage Detection → Deepfake Detection"""
     
+    print(f"🚀 process_image_sequential called!")
+    print(f"📊 Parameters: image={input_image is not None}, threshold_damage={damage_threshold}, threshold_deepfake={deepfake_threshold}")
+    print(f"📧 Email: {recipient_email}, Usage: {usage_count}")
+    
     # Handle usage count
     if usage_count is None:
         usage_count = 0
+        print(f"⚠️ Usage count was None, set to 0")
     
     try:
         usage_count = int(usage_count)
     except (TypeError, ValueError):
+        print(f"⚠️ Could not convert usage_count to int: {usage_count}, defaulting to 0")
         usage_count = 0
         
     usage_count = usage_count + 1
+    print(f"📈 Incremented usage count to: {usage_count}")
     
     progress_info = []
     progress_info.append(f"📊 Individual Usage: {usage_count}/{MAX_TRIES}")
@@ -1732,6 +1845,7 @@ if __name__ == "__main__":
     # Test Mailjet configuration
     if MAILJET_CONFIG['API_KEY'] and MAILJET_CONFIG['SECRET_KEY']:
         print("📧 Mailjet API: ✅ Configured")
+        print(f"📧 From: {MAILJET_CONFIG['FROM_NAME']} <{MAILJET_CONFIG['FROM_EMAIL']}>")
         # Test connection at startup
         if test_mailjet_connection():
             print("📧 Mailjet: ✅ Connection test successful")