Update app.py

app.py

@@ -5,6 +5,7 @@ import requests
 import io
 import gc
 import json
+import time
 from typing import Tuple, Optional, Dict, Any
 import logging
 from dotenv import load_dotenv
@@ -17,75 +18,14 @@ logger = logging.getLogger(__name__)
 load_dotenv()
 
 # Constantes
-MAX_STEPS = 40
-MAX_GUIDANCE_SCALE = 10.0
+MAX_RETRIES = 3
+TIMEOUT = 60
 DEFAULT_WIDTH = 768
 DEFAULT_HEIGHT = 768
 
-# Styles artistiques étendus
-ART_STYLES = {
-    "Art Moderne": {
-        "prompt_prefix": "modern art style poster, professional design",
-        "negative_prompt": "traditional, photorealistic, cluttered, busy design"
-    },
-    "Neo Vintage": {
-        "prompt_prefix": "vintage style advertising poster, retro design",
-        "negative_prompt": "modern, digital, contemporary style"
-    },
-    "Pop Art": {
-        "prompt_prefix": "pop art style poster, bold design",
-        "negative_prompt": "subtle, realistic, traditional art"
-    },
-    "Minimaliste": {
-        "prompt_prefix": "minimalist design poster, clean composition",
-        "negative_prompt": "complex, detailed, ornate, busy"
-    },
-    "Cyberpunk": {
-        "prompt_prefix": "cyberpunk style poster, neon lights, futuristic design",
-        "negative_prompt": "vintage, natural, rustic, traditional"
-    },
-    "Aquarelle": {
-        "prompt_prefix": "watercolor art style poster, fluid artistic design",
-        "negative_prompt": "digital, sharp, photorealistic"
-    },
-    "Art Déco": {
-        "prompt_prefix": "art deco style poster, geometric patterns, luxury design",
-        "negative_prompt": "modern, minimalist, casual"
-    },
-    "Japonais": {
-        "prompt_prefix": "japanese art style poster, ukiyo-e inspired design",
-        "negative_prompt": "western, modern, photographic"
-    },
-    "Ultra Réaliste": {
-        "prompt_prefix": "hyper-realistic poster, photographic quality, extremely detailed",
-        "negative_prompt": "cartoon, illustration, stylized, abstract"
-    }
-}
-
-# Paramètres de composition
-COMPOSITION_PARAMS = {
-    "Layouts": {
-        "Centré": "centered composition, balanced layout",
-        "Asymétrique": "dynamic asymmetrical composition",
-        "Grille": "grid-based layout, structured composition",
-        "Diagonal": "diagonal dynamic composition",
-        "Minimaliste": "minimal composition, lots of whitespace"
-    },
-    "Ambiances": {
-        "Dramatique": "dramatic lighting, high contrast",
-        "Doux": "soft lighting, gentle atmosphere",
-        "Vibrant": "vibrant colors, energetic mood",
-        "Mystérieux": "mysterious atmosphere, moody lighting",
-        "Serein": "peaceful atmosphere, calm mood"
-    },
-    "Palette": {
-        "Monochrome": "monochromatic color scheme",
-        "Contrasté": "high contrast color palette",
-        "Pastel": "soft pastel color palette",
-        "Terre": "earthy color palette",
-        "Néon": "neon color palette"
-    }
-}
+# Styles artistiques et paramètres de composition (inchangés)
+ART_STYLES = {...}  # Gardez la définition existante
+COMPOSITION_PARAMS = {...}  # Gardez la définition existante
 
 class ImageGenerator:
     def __init__(self):
@@ -99,11 +39,11 @@ class ImageGenerator:
     def _build_prompt(self, params: Dict[str, Any]) -> str:
         style_info = ART_STYLES.get(params["style"], ART_STYLES["Neo Vintage"])
         prompt = f"{style_info['prompt_prefix']}, {params['subject']}"
-        
+
         for param_type in ['layout', 'ambiance', 'palette']:
             if params.get(param_type):
                 prompt += f", {COMPOSITION_PARAMS[param_type.capitalize() + 's'][params[param_type]]}"
-        
+
         for param, description in [
             ("detail_level", "highly detailed" if params.get("detail_level", 0) > 7 else "moderately detailed"),
             ("contrast", "high contrast" if params.get("contrast", 0) > 7 else "balanced contrast"),
@@ -111,47 +51,52 @@ class ImageGenerator:
         ]:
             if params.get(param):
                 prompt += f", {description}"
-        
+
         if params.get("title"):
             prompt += f", with text saying '{params['title']}'"
-        
+
         logger.debug(f"Prompt final: {prompt}")
         return prompt
 
     def generate(self, params: Dict[str, Any]) -> Tuple[Optional[Image.Image], str]:
-        try:
-            logger.info(f"Début de génération avec paramètres: {json.dumps(params, indent=2)}")
-            if 'Bearer None' in self.headers['Authorization']:
-                return None, "⚠️ Erreur: Token Hugging Face non configuré"
-            
-            prompt = self._build_prompt(params)
-            payload = {
-                "inputs": prompt,
-                "parameters": {
-                    "negative_prompt": ART_STYLES[params["style"]]["negative_prompt"],
-                    "num_inference_steps": min(int(35 * (params["quality"]/100)), MAX_STEPS),
-                    "guidance_scale": min(7.5 * (params["creativity"]/10), MAX_GUIDANCE_SCALE),
-                    "width": DEFAULT_WIDTH,
-                    "height": DEFAULT_HEIGHT if params["orientation"] == "Portrait" else DEFAULT_WIDTH
+        for attempt in range(MAX_RETRIES):
+            try:
+                logger.info(f"Tentative de génération {attempt + 1}/{MAX_RETRIES}")
+                if 'Bearer None' in self.headers['Authorization']:
+                    return None, "⚠️ Erreur: Token Hugging Face non configuré"
+
+                prompt = self._build_prompt(params)
+                payload = {
+                    "inputs": prompt,
+                    "parameters": {
+                        "negative_prompt": ART_STYLES[params["style"]]["negative_prompt"],
+                        "num_inference_steps": min(int(35 * (params["quality"]/100)), 50),
+                        "guidance_scale": min(7.5 * (params["creativity"]/10), 15.0),
+                        "width": DEFAULT_WIDTH,
+                        "height": DEFAULT_HEIGHT if params["orientation"] == "Portrait" else DEFAULT_WIDTH
+                    }
                 }
-            }
-            
-            logger.debug(f"Payload: {json.dumps(payload, indent=2)}")
-            response = requests.post(self.API_URL, headers=self.headers, json=payload, timeout=30)
-            
-            if response.status_code == 200:
+
+                logger.debug(f"Payload: {json.dumps(payload, indent=2)}")
+                response = requests.post(self.API_URL, headers=self.headers, json=payload, timeout=TIMEOUT)
+                response.raise_for_status()
+
                 image = Image.open(io.BytesIO(response.content))
                 return image, "✨ Création réussie!"
-            else:
-                error_msg = f"⚠️ Erreur API {response.status_code}: {response.text}"
-                logger.error(error_msg)
-                return None, error_msg
-        except Exception as e:
-            error_msg = f"⚠️ Erreur: {str(e)}"
-            logger.exception("Erreur pendant la génération:")
-            return None, error_msg
-        finally:
-            gc.collect()
+
+            except requests.exceptions.RequestException as e:
+                logger.warning(f"Erreur de requête à la tentative {attempt + 1}: {str(e)}")
+                if attempt < MAX_RETRIES - 1:
+                    time.sleep(2 ** attempt)  # Attente exponentielle
+                else:
+                    return None, f"⚠️ Erreur de connexion après {MAX_RETRIES} tentatives: {str(e)}"
+
+            except Exception as e:
+                logger.exception("Erreur inattendue pendant la génération:")
+                return None, f"⚠️ Erreur inattendue: {str(e)}"
+
+            finally:
+                gc.collect()
 
 def create_interface():
     logger.info("Création de l'interface Gradio")
@@ -160,9 +105,6 @@ def create_interface():
     .welcome { text-align: center; margin: 20px 0; padding: 20px; background: #1e293b; border-radius: 10px; color: white; }
     .controls-group { background: #2d3748; padding: 15px; border-radius: 5px; margin: 10px 0; color: white; }
     .advanced-controls { background: #374151; padding: 12px; border-radius: 5px; margin: 8px 0; }
-    .gradio-slider input[type="range"] { accent-color: #4a5568; }
-    .gradio-button { transition: all 0.3s ease; }
-    .gradio-button:hover { transform: translateY(-2px); box-shadow: 0 4px 6px rgba(50, 50, 93, 0.11), 0 1px 3px rgba(0, 0, 0, 0.08); }
     """
 
     generator = ImageGenerator()
@@ -176,37 +118,8 @@ def create_interface():
         """)
 
         with gr.Column(elem_classes="container"):
-            with gr.Group(elem_classes="controls-group"):
-                gr.Markdown("### 📐 Format et Orientation")
-                with gr.Row():
-                    format_size = gr.Dropdown(choices=["A4", "A3", "A2", "A1", "A0"], value="A4", label="Format")
-                    orientation = gr.Radio(choices=["Portrait", "Paysage"], value="Portrait", label="Orientation")
-
-            with gr.Group(elem_classes="controls-group"):
-                gr.Markdown("### 🎨 Style et Composition")
-                with gr.Row():
-                    style = gr.Dropdown(choices=list(ART_STYLES.keys()), value="Neo Vintage", label="Style artistique")
-                    layout = gr.Dropdown(choices=list(COMPOSITION_PARAMS["Layouts"].keys()), value="Centré", label="Composition")
-                with gr.Row():
-                    ambiance = gr.Dropdown(choices=list(COMPOSITION_PARAMS["Ambiances"].keys()), value="Dramatique", label="Ambiance")
-                    palette = gr.Dropdown(choices=list(COMPOSITION_PARAMS["Palette"].keys()), value="Contrasté", label="Palette")
-
-            with gr.Group(elem_classes="controls-group"):
-                gr.Markdown("### 📝 Contenu")
-                subject = gr.Textbox(label="Description", placeholder="Décrivez votre vision...")
-                title = gr.Textbox(label="Titre", placeholder="Titre de l'affiche...")
-
-            with gr.Group(elem_classes="advanced-controls"):
-                gr.Markdown("### 🎯 Ajustements Fins")
-                with gr.Row():
-                    detail_level = gr.Slider(minimum=1, maximum=10, value=7, step=1, label="Niveau de Détail")
-                    contrast = gr.Slider(minimum=1, maximum=10, value=5, step=1, label="Contraste")
-                    saturation = gr.Slider(minimum=1, maximum=10, value=5, step=1, label="Saturation")
-
-            with gr.Group(elem_classes="controls-group"):
-                with gr.Row():
-                    quality = gr.Slider(minimum=30, maximum=50, value=35, label="Qualité")
-                    creativity = gr.Slider(minimum=5, maximum=15, value=7.5, label="Créativité")
+            # Ajoutez ici les éléments d'interface comme dans votre code original
+            # (format_size, orientation, style, layout, ambiance, palette, subject, title, etc.)
 
             with gr.Row():
                 generate_btn = gr.Button("✨ Générer", variant="primary")