Update app.py

app.py

@@ -1380,33 +1380,131 @@ def img_to_image(image, prompt, neg_prompt, strength, steps, guidance_scale,
                 print(f"   Conditioning Scale: [{conditioning_scale[0]:.3f}, {conditioning_scale[1]:.3f}]")
         
                                
-        else:  # face_only_change 
+        else:  # face_only_change
             # Optimale UI-Werte (entscheidend)
 		    # Strength: 0.60 – 0.65 → ideal: 0.62
 		    # Guidance (CFG): 7.0 – 8.0 → ideal: 7.5
 		    # Steps: 30 – 34 → ideal: 32
-            keep_environment = True
             
-            adj_strength = 0.6  #Struktur
+            #alte Werte mit UI-strength 0,85
+            #adj_strength = 0.6  #Struktur
+            #controlnet_strength = 0.4   
+            # HIER FEHLEN DIE RATIOS - Controlnet gesteuertes Inpainting:
+            #depth_ratio = 0.55   # Für Gesicht: Depth stärker
+            #canny_ratio = 0.10  # Canny leichter hält an Kanten fest
+    
+            keep_environment = True
 
-            # Controlnet-zurückhaltend
-            controlnet_strength = 0.4
+            ui_strength = strength  # 0.1-0.9 vom User
+            prompt_lower = prompt.lower()
+
+            #Standard für alle Gesichter
+            adj_strength = 0.15 + (ui_strength * 0.75)  # 0.15-0.9 Bereich
     
-            # HIER FEHLEN DIE RATIOS - Controlnet gesteuertes Inpainting:
-            depth_ratio = 0.55   # Für Gesicht: Depth stärker
-            canny_ratio = 0.10  # Canny leichter hält an Kanten fest
+            # ControlNet-Stärke (nimmt mit UI-Strength ab)
+            controlnet_strength = 0.8 - (ui_strength * 0.6)  # 0.8 → 0.2 linear
     
-            # KRITISCH: conditioning_scale HIER definieren (wie bei environment_change)!
-            conditioning_scale = [
-                controlnet_strength * depth_ratio,
-                controlnet_strength * canny_ratio
-            ]
+            # Depth vs. Canny Basis-Ratio
+            depth_ratio = 0.8 - (ui_strength * 0.4)  # 0.8 → 0.4
+            canny_ratio = 0.2 + (ui_strength * 0.3)  # 0.2 → 0.5
+
+
+            # Anime-Stile
+            anime_keywords = ["anime", "manga", "cartoon", "character", "chibi", "cel-shading", "lineart"]
+
+            # Realistic/Photo-Stile  
+            #realistic_keywords = ["photorealistic", "photography", "photo", "realistic", "portrait", "studio", "cinematic"]
+
+            # Zeichnungen/Illustrationen (kein Anime)
+            drawing_keywords = ["drawing", "illustration", "sketch", "painting", "artwork", "watercolor"]
+
+
+            if any(keyword in prompt_lower for keyword in anime_keywords):
+                # Anime: Mehr Denoising für Stiländerungen
+                adj_strength = 0.2 + (ui_strength * 0.8)  # 0.2-1.0
+        
+                # Anime: Weniger ControlNet insgesamt
+                controlnet_strength = 0.7 - (ui_strength * 0.5)  # 0.7 → 0.2
+        
+                # Anime: Weniger Depth, mehr Canny
+                depth_ratio = 0.6 - (ui_strength * 0.3)  # 0.6 → 0.3
+                canny_ratio = 0.4 + (ui_strength * 0.4)  # 0.4 → 0.8
+
+
+
+                #Clipping
+                adj_strength = max(0.15, min(adj_strength, 0.95))
+                controlnet_strength = max(0.1, min(controlnet_strength, 0.9))
+                depth_ratio = max(0.1, min(base_depth, 0.9))
+                canny_ratio = max(0.1, min(base_canny, 0.9))
+                
+
+               # KRITISCH: conditioning_scale HIER definieren (wie bei environment_change)!
+                conditioning_scale = [
+                    controlnet_strength * depth_ratio,
+                    controlnet_strength * canny_ratio
+                ]
+        
+                print("   🎨 Anime-Modus: Mehr Freiheit für Stiländerungen")
+                print(f"🎯 STANDARD MODUS: Umgebung ändern")
+                print(f"   Strength: {adj_strength}, ControlNet: {controlnet_strength}")
+                print(f"   Depth: {depth_ratio*100}%, Canny: {canny_ratio*100}%")
+                print(f"   Conditioning Scale: [{conditioning_scale[0]:.3f}, {conditioning_scale[1]:.3f}]")
+
+
+
+             
+            elif any(keyword in prompt_lower for keyword in drawing_keywords):       
+                # Weniger Denoising für anatomische Korrektheit
+                adj_strength = max(0.3, adj_strength * 0.9)  # Konservativer
+        
+                # Mehr ControlNet für Strukturerhalt
+                controlnet_strength = min(0.9, controlnet_strength * 1.2)  # Mehr Kontrolle
+        
+                # Mehr Depth, weniger Canny
+                depth_ratio = min(0.9, base_depth_ratio * 1.2)  # Mehr Depth
+                canny_ratio = max(0.1, base_canny_ratio * 0.8)  # Weniger Canny
+
+                #Clipping
+                adj_strength = max(0.15, min(adj_strength, 0.95))
+                    controlnet_strength = max(0.1, min(controlnet_strength, 0.9))
+                    base_depth = max(0.1, min(base_depth, 0.9))
+                    base_canny = max(0.1, min(base_canny, 0.9))
+                
+
+                conditioning_scale = [
+                    controlnet_strength * depth_ratio,
+                    controlnet_strength * canny_ratio
+                ]
+        
+                print("   📸 Drawing-Modus: Mehr Strukturerhalt")
+                print(f"🎯 STANDARD MODUS: Umgebung ändern")
+                print(f"   Strength: {adj_strength}, ControlNet: {controlnet_strength}")
+                print(f"   Depth: {depth_ratio*100}%, Canny: {canny_ratio*100}%")
+                print(f"   Conditioning Scale: [{conditioning_scale[0]:.3f}, {conditioning_scale[1]:.3f}]")
     
-            print(f"👤 Gesichtsmodus: Depth {depth_ratio*100}%, Canny {canny_ratio*100}%")
-            print(f"   Strength: {adj_strength:.2f}")
-            print(f"   ControlNet: {controlnet_strength:.3f}")
-            print(f"   Depth: {depth_ratio*100}%, Canny: {canny_ratio*100}%")
+            else: #Standard
+                #Clipping
+                adj_strength = max(0.15, min(adj_strength, 0.95))
+                    controlnet_strength = max(0.1, min(controlnet_strength, 0.9))
+                    depth_ratio = max(0.1, min(base_depth, 0.9))
+                    canny_ratio = max(0.1, min(base_canny, 0.9))
 
+
+                # KRITISCH: conditioning_scale HIER definieren (wie bei environment_change)!
+                conditioning_scale = [
+                    controlnet_strength * depth_ratio,
+                    controlnet_strength * canny_ratio
+                ]
+    
+                print("   📸 Standard-Modus: Mehr Strukturerhalt")
+                print(f"   Strength: {adj_strength}, ControlNet: {controlnet_strength}")
+                print(f"   Depth: {depth_ratio*100}%, Canny: {canny_ratio*100}%")
+                print(f"   Conditioning Scale: [{conditioning_scale[0]:.3f}, {conditioning_scale[1]:.3f}]")
+                          
+
+        #################################################################################################
+        # Controlnet-Einstellungen ENDE
         #################################################################################################