Update app.py

app.py

@@ -124,15 +124,62 @@ class ImageGenerator:
         logger.info("ImageGenerator initialisé")
 
     def _build_prompt(self, params: Dict[str, Any]) -> str:
-        """Construction de prompt améliorée avec le PromptEnhancer"""
         try:
-            # Initialisation du PromptEnhancer
             enhancer = PromptEnhancer()
-            
-            # Récupération du style
             style_info = ART_STYLES.get(params["style"], ART_STYLES["Art Moderne"])
             
-            # Construction du contexte de style
+            # Détection du type de contenu
+            content_type = self._detect_content_type(params["subject"])
+            
+            # Adaptation du style selon le contenu
+            style_adjustments = {
+                "anime_manga": {
+                    "prompt_prefix": "high quality anime artwork, detailed anime illustration, studio anime quality, professional anime art",
+                    "negative_prompt": "low quality, simple, poorly drawn, blurry"
+                },
+                "art_digital": {
+                    "prompt_prefix": "professional digital artwork, detailed digital illustration, modern digital art",
+                    "negative_prompt": "traditional art, poor quality, amateur"
+                },
+                "art_traditionnel": {
+                    "prompt_prefix": "traditional art masterpiece, fine art painting, artistic technique, professional artwork",
+                    "negative_prompt": "digital art, 3d render, poor quality"
+                },
+                "photo_realiste": {
+                    "prompt_prefix": "ultra realistic photograph, professional photography, high end photo, studio quality",
+                    "negative_prompt": "drawing, painting, artificial, digital art"
+                },
+                "graphisme": {
+                    "prompt_prefix": "professional graphic design, clean modern design, commercial quality artwork",
+                    "negative_prompt": "amateur, messy, unrefined"
+                },
+                "fantastique": {
+                    "prompt_prefix": "fantasy art masterpiece, mythical artwork, magical atmosphere, epic fantasy illustration",
+                    "negative_prompt": "realistic, mundane, ordinary"
+                },
+                "sci_fi": {
+                    "prompt_prefix": "futuristic sci-fi artwork, high tech aesthetic, advanced technology, science fiction art",
+                    "negative_prompt": "vintage, retro, traditional"
+                },
+                "art_abstrait": {
+                    "prompt_prefix": "abstract art composition, non-representational artwork, artistic expression",
+                    "negative_prompt": "realistic, figurative, literal"
+                },
+                "art_pop": {
+                    "prompt_prefix": "pop art style, bold colors, graphic art, contemporary pop culture",
+                    "negative_prompt": "classical, traditional, subtle"
+                },
+                "art_conceptuel": {
+                    "prompt_prefix": "concept art, professional design, detailed visualization, production quality",
+                    "negative_prompt": "amateur, unrefined, sketch"
+                }
+            }
+
+            # Ajustement du style en fonction du contenu détecté
+            if content_type in style_adjustments:
+                style_info = style_adjustments[content_type]
+            
+            # Construction du contexte
             style_context = {
                 "prompt_prefix": style_info['prompt_prefix'],
                 "layout": COMPOSITION_PARAMS['Layouts'][params['layout']],
@@ -140,68 +187,44 @@ class ImageGenerator:
                 "palette": COMPOSITION_PARAMS['Palette'][params['palette']]
             }
             
-            # Préparation du prompt initial
             base_prompt = f"{params['subject']}"
             if params.get('title'):
                 base_prompt += f", with text '{params['title']}'"
-            
-            # Amélioration du prompt
+
             enhanced_prompt = enhancer.enhance_prompt(base_prompt, style_context)
-            
-            # Analyse de l'efficacité du prompt
-            prompt_analysis = enhancer.analyze_prompt_effectiveness(enhanced_prompt)
-            logger.debug(f"Analyse du prompt: {json.dumps(prompt_analysis, indent=2)}")
-            
             return enhanced_prompt
 
         except Exception as e:
             logger.error(f"Erreur dans la construction du prompt: {str(e)}")
-            # Fallback sur le prompt basique en cas d'erreur
             return f"{style_info['prompt_prefix']}, {params['subject']}"
 
-    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é"
+    def _detect_content_type(self, subject: str) -> str:
+        """Détecte le type de contenu demandé pour adapter le style"""
+        content_types = {
+            "anime_manga": ["manga", "anime", "dragon ball", "naruto", "one piece", "pokemon"],
+            "art_digital": ["pixel art", "digital", "vectoriel", "3d", "game art"],
+            "art_traditionnel": ["peinture", "aquarelle", "huile", "acrylique", "dessin"],
+            "photo_realiste": ["photo", "portrait", "paysage", "architecture", "produit"],
+            "graphisme": ["logo", "affiche", "flyer", "branding", "typographie"],
+            "fantastique": ["fantasy", "dragon", "magie", "heroic fantasy", "mythologie"],
+            "sci_fi": ["science fiction", "futuriste", "cyberpunk", "space", "robot"],
+            "art_abstrait": ["abstrait", "géométrique", "non-figuratif", "minimaliste"],
+            "art_pop": ["pop art", "comics", "bande dessinée", "cartoon", "graffiti"],
+            "art_conceptuel": ["concept art", "character design", "environment design", "matte painting"]
+        }
 
-            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)), 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=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 Exception as e:
-            error_msg = f"⚠️ Erreur: {str(e)}"
-            logger.exception("Erreur pendant la génération:")
-            return None, error_msg
-        finally:
-            gc.collect()
+        subject_lower = subject.lower()
+        detected_types = []
+        
+        for content_type, keywords in content_types.items():
+            if any(keyword in subject_lower for keyword in keywords):
+                detected_types.append(content_type)
+        
+        if len(detected_types) > 1:
+            if "photo_realiste" in detected_types and any(t in detected_types for t in ["art_digital", "anime_manga"]):
+                return "photo_realiste"
+        
+        return detected_types[0] if detected_types else "general"
 
 def create_interface():
     logger.info("Création de l'interface Gradio")