Update app.py

app.py

@@ -1,6 +1,5 @@
 import os
 import gradio as gr
-import requests
 import json
 import time
 import traceback
@@ -8,14 +7,6 @@ import io
 import base64
 from PIL import Image, ImageEnhance, ImageFilter
 
-# Conditional imports
-try:
-    import google.generativeai as genai
-    GENAI_AVAILABLE = True
-except ImportError:
-    GENAI_AVAILABLE = False
-    print("Warning: google-generativeai not installed, will attempt on-demand import")
-
 # --- Environment Configuration ---
 GEMINI_KEY = os.environ.get("GEMINI_KEY", "")
 DEFAULT_PORT = int(os.environ.get("PORT", 7860))
@@ -44,49 +35,6 @@ FLUX_SPECS = {
     "dpi_options": [72, 150, 300, 600]
 }
 
-# --- Quality Control System ---
-class QualityValidator:
-    VALIDATION_TEMPLATE = """Analyze this Flux prompt:
-1. Score style adherence (1-5)
-2. List technical issues
-3. Suggest improvements
-Respond ONLY as JSON: {"score": x/10, "issues": [], "suggestions": []}"""
-
-    @classmethod
-    def validate(cls, prompt, model):
-        try:
-            with gr.utils.TempFiles() as temp:
-                response = model.generate_content([cls.VALIDATION_TEMPLATE, prompt])
-                return json.loads(response.text)
-        except Exception as e:
-            print(f"Validation error: {str(e)}")
-            return {"score": 0, "issues": ["Validation failed"], "suggestions": []}
-
-# --- Lazy API Initialization ---
-def init_genai_api(api_key):
-    """Initialize Gemini API with error handling"""
-    if not GENAI_AVAILABLE:
-        try:
-            # Attempt dynamic import
-            global genai
-            import google.generativeai as genai
-        except ImportError:
-            raise ValueError("Failed to import google.generativeai. Install with: pip install google-generativeai")
-    
-    try:
-        genai.configure(api_key=api_key)
-        # Test connection with minimal request
-        model = genai.GenerativeModel("gemini-1.5-pro")
-        model.generate_content("test", request_options={"timeout": 5})
-        return model
-    except Exception as e:
-        if "authentication" in str(e).lower():
-            raise ValueError("Invalid API key or authentication error")
-        elif "timeout" in str(e).lower():
-            raise ValueError("API connection timeout - check your internet connection")
-        else:
-            raise ValueError(f"API initialization error: {str(e)}")
-
 # --- Image Processing Pipeline ---
 def preprocess_image(img):
     """Convert and enhance uploaded images"""
@@ -111,11 +59,18 @@ def generate_prompt(image, api_key, style, creativity, neg_prompt, aspect, color
         if not api_key:
             return {"error": "API key required - set in env (GEMINI_KEY) or input field"}
 
-        # Initialize model with proper error handling
+        # Import and configure Gemini only when needed
         try:
-            model = init_genai_api(api_key)
-        except ValueError as e:
-            return {"error": str(e)}
+            import google.generativeai as genai
+            genai.configure(api_key=api_key)
+            model = genai.GenerativeModel("gemini-1.5-pro")
+        except ImportError:
+            return {"error": "Failed to import google.generativeai. Install with: pip install google-generativeai"}
+        except Exception as e:
+            if "authentication" in str(e).lower():
+                return {"error": "Invalid API key or authentication error"}
+            else:
+                return {"error": f"API initialization error: {str(e)}"}
 
         # Process image with timeout protection
         start_time = time.time()
@@ -132,30 +87,15 @@ def generate_prompt(image, api_key, style, creativity, neg_prompt, aspect, color
         try:
             response = model.generate_content(
                 contents=[instruction, {"mime_type": "image/png", "data": img_b64}],
-                generation_config={"temperature": creativity},
-                request_options={"timeout": API_TIMEOUT}
+                generation_config={"temperature": creativity}
             )
             raw_prompt = response.text
-        except requests.exceptions.Timeout:
-            return {"error": "API request timed out (>30s). Try a smaller image or check your connection."}
         except Exception as e:
             return {"error": f"Generation failed: {str(e)}"}
 
-        # Quality validation (skip if taking too long)
+        # Simple quality validation
         validation = {"score": 8, "issues": [], "suggestions": []}
-        if time.time() - start_time < 20:  # Only validate if we have time
-            try:
-                validation = QualityValidator.validate(raw_prompt, model)
-                if validation.get("score", 0) < 7:
-                    response = model.generate_content(
-                        f"Improve this prompt: {raw_prompt}\nIssues: {validation['issues']}",
-                        request_options={"timeout": 10}
-                    )
-                    raw_prompt = response.text
-            except:
-                # Continue even if validation fails
-                pass
-
+        
         # Token tracking
         input_tokens = len(img_b64) // 4  # Approximate base64 token count
         output_tokens = len(raw_prompt.split())
@@ -170,18 +110,6 @@ def generate_prompt(image, api_key, style, creativity, neg_prompt, aspect, color
         traceback.print_exc()
         return {"error": str(e)}
 
-# --- UI Components ---
-def create_advanced_controls():
-    with gr.Accordion("⚙️ Advanced Settings", open=False):
-        with gr.Row():
-            creativity = gr.Slider(0.0, 1.0, 0.7, label="Creativity Level")
-            neg_prompt = gr.Textbox(label="🚫 Negative Prompts", placeholder="What to avoid")
-        with gr.Row():
-            aspect = gr.Dropdown(FLUX_SPECS["aspect_ratios"], value="1:1", label="Aspect Ratio")
-            color_mode = gr.Dropdown(FLUX_SPECS["color_modes"], value="RGB", label="Color Mode")
-            dpi = gr.Dropdown([str(d) for d in FLUX_SPECS["dpi_options"]], value="300", label="Output DPI")
-    return [creativity, neg_prompt, aspect, color_mode, dpi]
-
 # --- UI Response Formatting ---
 def format_generation_response(result):
     """Format the response from generate_prompt for the UI"""
@@ -190,9 +118,13 @@ def format_generation_response(result):
     else:
         return result.get("prompt", ""), result.get("validation", {}), result.get("stats", {})
 
+# Modern copy function using Gradio's JavaScript API
+def copy_text(text):
+    return gr.update(value=text), f"✓ Copied: '{text[:20]}...'", gr.Button.update(variant="secondary")
+
 # --- Main Interface ---
 def build_interface():
-    with gr.Blocks(title="Flux Pro Generator", theme=gr.themes.Soft()) as app:
+    with gr.Blocks(title="Flux Pro Generator", theme="soft") as app:
         # Header
         gr.Markdown("# 🎨 Flux Pro Prompt Generator")
         gr.Markdown("Generate optimized design prompts from images using Google's Gemini")
@@ -206,7 +138,7 @@ def build_interface():
         )
 
         # Main Workflow
-        with gr.Row(variant="panel"):
+        with gr.Row():
             with gr.Column(scale=1):
                 img_input = gr.Image(
                     label="🖼️ Upload Design",
@@ -219,18 +151,28 @@ def build_interface():
                     value="General",
                     label="🎨 Target Style"
                 )
-                adv_controls = create_advanced_controls()
+                
+                # Advanced Settings
+                with gr.Accordion("⚙️ Advanced Settings", open=False):
+                    creativity = gr.Slider(0.0, 1.0, 0.7, label="Creativity Level")
+                    neg_prompt = gr.Textbox(label="🚫 Negative Prompts", placeholder="What to avoid")
+                    aspect = gr.Dropdown(FLUX_SPECS["aspect_ratios"], value="1:1", label="Aspect Ratio")
+                    color_mode = gr.Dropdown(FLUX_SPECS["color_modes"], value="RGB", label="Color Mode")
+                    dpi = gr.Dropdown([str(d) for d in FLUX_SPECS["dpi_options"]], value="300", label="Output DPI")
+                
                 gen_btn = gr.Button("✨ Generate Prompt", variant="primary")
-                status_msg = gr.Textbox(label="Status", visible=True)
 
             with gr.Column(scale=2):
                 prompt_output = gr.Textbox(
                     label="📝 Optimized Prompt",
                     lines=8,
-                    interactive=False
+                    interactive=True,
+                    show_copy_button=True  # Modern Gradio has built-in copy button
                 )
+                status_msg = gr.Textbox(label="Status", visible=True)
                 with gr.Row():
-                    copy_btn = gr.Button("📋 Copy")
+                    copy_btn = gr.Button("📋 Copy to Clipboard", variant="secondary")
+                
                 quality_report = gr.JSON(
                     label="🔍 Quality Report",
                     visible=True
@@ -239,69 +181,27 @@ def build_interface():
                     label="🧮 Token Usage",
                     visible=True
                 )
-
+        
         # Event Handling
         gen_btn.click(
-            lambda *args: format_generation_response(generate_prompt(*args)),
-            inputs=[img_input, api_key, style] + adv_controls,
+            fn=generate_prompt,
+            inputs=[
+                img_input, api_key, style, creativity, 
+                neg_prompt, aspect, color_mode, dpi
+            ],
             outputs=[prompt_output, quality_report, token_stats],
             api_name="generate"
+        ).then(
+            fn=lambda: gr.update(value="Generation complete!"),
+            outputs=status_msg
         )
         
-        # Add a JavaScript function for clipboard functionality
-        app.load(None, None, None, _js="""
-        function setupCopyButton() {
-            // Find the copy button by its text
-            const copyButtons = Array.from(document.querySelectorAll('button')).filter(
-                button => button.textContent.includes('Copy')
-            );
-            
-            if (copyButtons.length > 0) {
-                const copyBtn = copyButtons[0];
-                copyBtn.addEventListener('click', function() {
-                    // Find the prompt output textarea
-                    const textareas = document.querySelectorAll('textarea');
-                    let promptTextarea = null;
-                    
-                    for (let textarea of textareas) {
-                        if (textarea.closest('div').querySelector('label')?.textContent.includes('Optimized Prompt')) {
-                            promptTextarea = textarea;
-                            break;
-                        }
-                    }
-                    
-                    if (promptTextarea && promptTextarea.value) {
-                        navigator.clipboard.writeText(promptTextarea.value)
-                            .then(() => {
-                                const originalText = copyBtn.textContent;
-                                copyBtn.textContent = "✓ Copied!";
-                                setTimeout(() => {
-                                    copyBtn.textContent = originalText;
-                                }, 2000);
-                            })
-                            .catch(err => {
-                                console.error('Failed to copy: ', err);
-                                alert('Copy failed. Please select and copy manually.');
-                            });
-                    }
-                });
-            }
-        }
-        
-        // Run our setup once the DOM is fully loaded
-        if (document.readyState === 'loading') {
-            document.addEventListener('DOMContentLoaded', setupCopyButton);
-        } else {
-            // DOM already loaded, run setup
-            setTimeout(setupCopyButton, 1000);
-        }
-        """)
-        
-        # Add a simple no-op function for the copy button
+        # Modern copy implementation
         copy_btn.click(
-            lambda x: x,
+            fn=copy_text,
             inputs=prompt_output,
-            outputs=prompt_output
+            outputs=[prompt_output, status_msg, copy_btn],
+            js="(text) => { if(text) { navigator.clipboard.writeText(text); } return [text]; }"
         )
 
     return app
@@ -309,4 +209,4 @@ def build_interface():
 # --- Production Launch ---
 if __name__ == "__main__":
     app = build_interface()
-    app.launch(server_name="0.0.0.0", server_port=DEFAULT_PORT, share=False)
+    app.launch(server_name="0.0.0.0", server_port=DEFAULT_PORT)