Update app.py

app.py

@@ -8,21 +8,17 @@ import json
 from typing import Tuple, Optional, Dict, Any
 import logging
 from dotenv import load_dotenv
-import time
 
 # Configuration du logging
-logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s')
+logging.basicConfig(
+    level=logging.DEBUG,
+    format='%(asctime)s - %(levelname)s - %(message)s'
+)
 logger = logging.getLogger(__name__)
 
 # Chargement des variables d'environnement
 load_dotenv()
 
-# Constantes
-MAX_RETRIES = 3
-TIMEOUT = 60
-DEFAULT_WIDTH = 768
-DEFAULT_HEIGHT = 768
-
 # Styles artistiques étendus
 ART_STYLES = {
     "Art Moderne": {
@@ -56,10 +52,6 @@ ART_STYLES = {
     "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"
     }
 }
 
@@ -98,77 +90,85 @@ class ImageGenerator:
         logger.info("ImageGenerator initialisé")
 
     def _build_prompt(self, params: Dict[str, Any]) -> str:
+        """Construction de prompt améliorée"""
         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()][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"),
-            ("saturation", "vibrant colors" if params.get("saturation", 0) > 7 else "subtle colors")
-        ]:
-            if params.get(param):
-                prompt += f", {description}"
-        
+
+        # Ajout des paramètres de composition
+        if params.get("layout"):
+            prompt += f", {COMPOSITION_PARAMS['Layouts'][params['layout']]}"
+        if params.get("ambiance"):
+            prompt += f", {COMPOSITION_PARAMS['Ambiances'][params['ambiance']]}"
+        if params.get("palette"):
+            prompt += f", {COMPOSITION_PARAMS['Palette'][params['palette']]}"
+
+        # Ajout des ajustements fins
+        if params.get("detail_level"):
+            detail_strength = params["detail_level"]
+            prompt += f", {'highly detailed' if detail_strength > 7 else 'moderately detailed'}"
+        if params.get("contrast"):
+            contrast_strength = params["contrast"]
+            prompt += f", {'high contrast' if contrast_strength > 7 else 'balanced contrast'}"
+        if params.get("saturation"):
+            saturation_strength = params["saturation"]
+            prompt += f", {'vibrant colors' if saturation_strength > 7 else 'subtle colors'}"
+
         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]:
-        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
-                    }
+        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)
+
+            # Configuration de base
+            payload = {
+                "inputs": prompt,
+                "parameters": {
+                    "negative_prompt": ART_STYLES[params["style"]]["negative_prompt"],
+                    "num_inference_steps": min(int(35 * (params["quality"]/100)), 40),
+                    "guidance_scale": min(7.5 * (params["creativity"]/10), 10.0),
+                    "width": 768,
+                    "height": 768 if params["orientation"] == "Portrait" else 512
                 }
+            }
 
-                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()
+            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:
                 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 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()
+        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()
 
 def create_interface():
     logger.info("Création de l'interface Gradio")
     css = """
     .container { max-width: 1200px; margin: auto; }
-    .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; }
+    .welcome { text-align: center; margin: 20px 0; padding: 20px; background: #1e293b; border-radius: 10px; }
+    .controls-group { background: #2d3748; padding: 15px; border-radius: 5px; margin: 10px 0; }
     .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,58 +176,118 @@ def create_interface():
     with gr.Blocks(css=css) as app:
         gr.HTML("""
         <div class="welcome">
-            <h1>🎨 Equity Artisan 4.0</h1>
-            <p>Assistant de création d'affiches professionnelles avancé</p>
+            <h1>🎨 Equity Artisan 3.0</h1>
+            <p>Assistant de création d'affiches professionnelles</p>
         </div>
         """)
 
         with gr.Column(elem_classes="container"):
+            # Format et Orientation
             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")
+                    format_size = gr.Dropdown(
+                        choices=["A4", "A3", "A2", "A1", "A0"],
+                        value="A4",
+                        label="Format"
+                    )
+                    orientation = gr.Radio(
+                        choices=["Portrait", "Paysage"],
+                        value="Portrait",
+                        label="Orientation"
+                    )
 
+            # Style et Composition
             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")
+                    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")
+                    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"
+                    )
 
+            # Contenu
             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...")
+                subject = gr.Textbox(
+                    label="Description",
+                    placeholder="Décrivez votre vision..."
+                )
+                title = gr.Textbox(
+                    label="Titre",
+                    placeholder="Titre de l'affiche..."
+                )
 
+            # Ajustements fins
             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")
+                    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"
+                    )
 
+            # Paramètres de génération
             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é")
+                    quality = gr.Slider(
+                        minimum=30, maximum=50, value=35,
+                        label="Qualité"
+                    )
+                    creativity = gr.Slider(
+                        minimum=5, maximum=15, value=7.5,
+                        label="Créativité"
+                    )
 
+            # Boutons
             with gr.Row():
                 generate_btn = gr.Button("✨ Générer", variant="primary")
                 clear_btn = gr.Button("🗑️ Effacer", variant="secondary")
 
+            # Sortie
             image_output = gr.Image(label="Aperçu")
             status = gr.Textbox(label="Statut", interactive=False)
 
         def generate(*args):
             logger.info("Démarrage d'une nouvelle génération")
             params = {
-                "format_size": args[0], "orientation": args[1], "style": args[2],
-                "layout": args[3], "ambiance": args[4], "palette": args[5],
-                "subject": args[6], "title": args[7], "detail_level": args[8],
-                "contrast": args[9], "saturation": args[10], "quality": args[11],
+                "format_size": args[0],
+                "orientation": args[1],
+                "style": args[2],
+                "layout": args[3],
+                "ambiance": args[4],
+                "palette": args[5],
+                "subject": args[6],
+                "title": args[7],
+                "detail_level": args[8],
+                "contrast": args[9],
+                "saturation": args[10],
+                "quality": args[11],
                 "creativity": args[12]
             }
             result = generator.generate(params)
@@ -236,11 +296,17 @@ def create_interface():
 
         generate_btn.click(
             generate,
-            inputs=[format_size, orientation, style, layout, ambiance, palette, subject, title, detail_level, contrast, saturation, quality, creativity],
+            inputs=[
+                format_size, orientation, style, layout, ambiance, palette,
+                subject, title, detail_level, contrast, saturation, quality, creativity
+            ],
             outputs=[image_output, status]
         )
 
-        clear_btn.click(lambda: (None, "🗑️ Image effacée"), outputs=[image_output, status])
+        clear_btn.click(
+            lambda: (None, "🗑️ Image effacée"),
+            outputs=[image_output, status]
+        )
 
     logger.info("Interface créée avec succès")
     return app