Update app.py

app.py

@@ -9,7 +9,7 @@ from typing import Tuple, Optional, Dict, Any
 import logging
 from dotenv import load_dotenv
 
-# Configuration du logging détaillé
+# Configuration du logging
 logging.basicConfig(
     level=logging.DEBUG,
     format='%(asctime)s - %(levelname)s - %(message)s'
@@ -19,7 +19,7 @@ logger = logging.getLogger(__name__)
 # Chargement des variables d'environnement
 load_dotenv()
 
-# Styles pour la génération
+# Styles artistiques étendus
 ART_STYLES = {
     "Art Moderne": {
         "prompt_prefix": "modern art style poster, professional design",
@@ -36,6 +36,47 @@ ART_STYLES = {
     "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"
+    }
+}
+
+# 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"
     }
 }
 
@@ -44,39 +85,56 @@ class ImageGenerator:
         self.API_URL = "https://api-inference.huggingface.co/models/stabilityai/stable-diffusion-xl-base-1.0"
         token = os.getenv('HUGGINGFACE_TOKEN')
         if not token:
-            logger.error("HUGGINGFACE_TOKEN non trouvé dans les variables d'environnement!")
+            logger.error("HUGGINGFACE_TOKEN non trouvé!")
         self.headers = {"Authorization": f"Bearer {token}"}
         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']}"
+
+        # 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 construit: {prompt}")
-        return prompt
 
-    def _get_negative_prompt(self, style: str) -> str:
-        return ART_STYLES.get(style, ART_STYLES["Neo Vintage"])["negative_prompt"]
+        logger.debug(f"Prompt final: {prompt}")
+        return prompt
 
     def generate(self, params: Dict[str, Any]) -> Tuple[Optional[Image.Image], str]:
         try:
-            # Log des paramètres
             logger.info(f"Début de génération avec paramètres: {json.dumps(params, indent=2)}")
             
-            # Vérification du token
             if 'Bearer None' in self.headers['Authorization']:
                 return None, "⚠️ Erreur: Token Hugging Face non configuré"
 
-            # Construction du prompt
             prompt = self._build_prompt(params)
-            logger.debug(f"Prompt final: {prompt}")
-
-            # Configuration de la requête
+            
+            # Configuration de base
             payload = {
                 "inputs": prompt,
                 "parameters": {
-                    "negative_prompt": self._get_negative_prompt(params["style"]),
+                    "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,
@@ -84,10 +142,8 @@ class ImageGenerator:
                 }
             }
             
-            logger.debug(f"Payload de la requête: {json.dumps(payload, indent=2)}")
+            logger.debug(f"Payload: {json.dumps(payload, indent=2)}")
 
-            # Requête API
-            logger.info("Envoi de la requête à l'API...")
             response = requests.post(
                 self.API_URL,
                 headers=self.headers,
@@ -95,12 +151,8 @@ class ImageGenerator:
                 timeout=30
             )
             
-            logger.debug(f"Statut de la réponse: {response.status_code}")
-            logger.debug(f"Contenu de la réponse: {response.text[:200]}...")  # Premiers 200 caractères
-
             if response.status_code == 200:
                 image = Image.open(io.BytesIO(response.content))
-                logger.info("Image générée avec succès")
                 return image, "✨ Création réussie!"
             else:
                 error_msg = f"⚠️ Erreur API {response.status_code}: {response.text}"
@@ -111,15 +163,17 @@ class ImageGenerator:
             error_msg = f"⚠️ Erreur: {str(e)}"
             logger.exception("Erreur pendant la génération:")
             return None, error_msg
+        finally:
+            gc.collect()
 
 def create_interface():
-    """Crée l'interface utilisateur Gradio avec logging"""
     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; }
     .controls-group { background: #2d3748; padding: 15px; border-radius: 5px; margin: 10px 0; }
+    .advanced-controls { background: #374151; padding: 12px; border-radius: 5px; margin: 8px 0; }
     """
     
     generator = ImageGenerator()
@@ -133,7 +187,9 @@ def create_interface():
         """)
         
         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"],
@@ -146,14 +202,36 @@ def create_interface():
                         label="Orientation"
                     )
             
+            # Style et Composition
             with gr.Group(elem_classes="controls-group"):
-                style = gr.Dropdown(
-                    choices=list(ART_STYLES.keys()),
-                    value="Neo Vintage",
-                    label="Style artistique"
-                )
+                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"
+                    )
             
+            # Contenu
             with gr.Group(elem_classes="controls-group"):
+                gr.Markdown("### 📝 Contenu")
                 subject = gr.Textbox(
                     label="Description",
                     placeholder="Décrivez votre vision..."
@@ -163,6 +241,33 @@ def create_interface():
                     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"
+                    )
+            
+            # Paramètres de génération
             with gr.Group(elem_classes="controls-group"):
                 with gr.Row():
                     quality = gr.Slider(
@@ -178,10 +283,12 @@ def create_interface():
                         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)
         
@@ -191,10 +298,16 @@ def create_interface():
                 "format_size": args[0],
                 "orientation": args[1],
                 "style": args[2],
-                "subject": args[3],
-                "title": args[4],
-                "quality": args[5],
-                "creativity": args[6]
+                "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)
             logger.info(f"Génération terminée avec statut: {result[1]}")
@@ -206,8 +319,14 @@ def create_interface():
                 format_size,
                 orientation,
                 style,
+                layout,
+                ambiance,
+                palette,
                 subject,
                 title,
+                detail_level,
+                contrast,
+                saturation,
                 quality,
                 creativity
             ],