Update app.py

app.py

@@ -7,8 +7,6 @@ import time
 import os
 import tempfile
 import random
-import threading
-import queue
 
 # === OPTIMIERTE EINSTELLUNGEN ===
 device = "cuda" if torch.cuda.is_available() else "cpu"
@@ -17,22 +15,6 @@ IMG_SIZE = 512
 
 print(f"Running on: {device}")
 
-# === GLOBALE FLAGS FÜR INTERRUPT ===
-current_txt2img_task_id = None
-current_img2img_task_id = None
-cancel_txt2img = False
-cancel_img2img = False
-interrupt_queue = queue.Queue()
-
-def interrupt_monitor(task_id, is_txt2img):
-    """Überwacht Cancel-Flags in einem separaten Thread und löst Interrupt aus"""
-    global cancel_txt2img, cancel_img2img
-    while True:
-        if (is_txt2img and cancel_txt2img) or (not is_txt2img and cancel_img2img):
-            print(f"🛑 Interrupt ausgelöst für Task ID: {task_id}")
-            interrupt_queue.put(("interrupt", task_id))
-            break
-        time.sleep(0.1)  # Polling-Intervall
 
 # === GESICHTSMASKEN-FUNKTIONEN ===
 def create_face_mask(image, bbox_coords):
@@ -125,28 +107,13 @@ def load_img2img():
 
 # === FUNKTIONEN ===
 def text_to_image(prompt, steps, guidance_scale):
-    global current_txt2img_task_id, cancel_txt2img
-    task_id = random.randint(0, 2**32 - 1)  # Eindeutige Task-ID
     try:
         if not prompt or not prompt.strip():
             return None
-        
-        # Cancel vorherigen Task, falls vorhanden
-        if current_txt2img_task_id is not None:
-            print(f"🛑 Cancel vorheriger Text-to-Image Task (ID: {current_txt2img_task_id})")
-            cancel_txt2img = True
-            time.sleep(1.0)  # Wartezeit für CPU
-
-        current_txt2img_task_id = task_id
-        cancel_txt2img = False
-        print(f"Starting generation for: {prompt} (Task ID: {task_id})")
+            
+        print(f"Starting generation for: {prompt}")
         start_time = time.time()
         
-        # Starte Interrupt-Monitor in einem separaten Thread
-        monitor_thread = threading.Thread(target=interrupt_monitor, args=(task_id, True))
-        monitor_thread.daemon = True
-        monitor_thread.start()
-        
         pipe = load_txt2img()
         
         # ZUFÄLLIGER SEED für Variation
@@ -154,14 +121,6 @@ def text_to_image(prompt, steps, guidance_scale):
         generator = torch.Generator(device=device).manual_seed(seed)
         print(f"🎲 Using seed: {seed}")
         
-        # Prüfe Interrupt-Queue während der Generierung
-        for step in range(steps):
-            if not interrupt_queue.empty():
-                action, interrupted_task_id = interrupt_queue.get()
-                if action == "interrupt" and interrupted_task_id == task_id:
-                    raise RuntimeError("Task interrupted by user")
-            time.sleep(0.01)  # Kurze Pause für Queue-Prüfung
-        
         image = pipe(
             prompt=prompt,
             height=IMG_SIZE,
@@ -173,52 +132,25 @@ def text_to_image(prompt, steps, guidance_scale):
         
         end_time = time.time()
         print(f"✅ Bild generiert in {end_time - start_time:.2f} Sekunden")
-        current_txt2img_task_id = None
         
         return image
         
-    except RuntimeError as e:
-        if "interrupt" in str(e).lower():
-            print(f"🛑 Generierung unterbrochen (Task ID: {task_id})")
-            current_txt2img_task_id = None
-            return None
-        print(f"❌ Fehler: {e}")
-        import traceback
-        traceback.print_exc()
-        current_txt2img_task_id = None
-        return None
     except Exception as e:
         print(f"❌ Fehler: {e}")
         import traceback
         traceback.print_exc()
-        current_txt2img_task_id = None
         return None
 
 def img_to_image(image, prompt, neg_prompt, strength, steps, guidance_scale, face_preserve, bbox_x1, bbox_y1, bbox_x2, bbox_y2):
-    global current_img2img_task_id, cancel_img2img
-    task_id = random.randint(0, 2**32 - 1)  # Eindeutige Task-ID
     try:
         if image is None:
             return None
 
-        # Cancel vorherigen Task, falls vorhanden
-        if current_img2img_task_id is not None:
-            print(f"🛑 Cancel vorheriger Image-to-Image Task (ID: {current_img2img_task_id})")
-            cancel_img2img = True
-            time.sleep(1.0)  # Wartezeit für CPU
-
-        current_img2img_task_id = task_id
-        cancel_img2img = False
-        print(f"🧩 Img2Img Start → Strength: {strength}, Steps: {steps}, Guidance: {guidance_scale} (Task ID: {task_id})")
+        print(f"🧩 Img2Img Start → Strength: {strength}, Steps: {steps}, Guidance: {guidance_scale}")
         print(f"Prompt: {prompt}")
         print(f"Gesicht beibehalten: {face_preserve}")
         start_time = time.time()
 
-        # Starte Interrupt-Monitor in einem separaten Thread
-        monitor_thread = threading.Thread(target=interrupt_monitor, args=(task_id, False))
-        monitor_thread.daemon = True
-        monitor_thread.start()
-
         pipe = load_img2img()
         img_resized = image.convert("RGB").resize((IMG_SIZE, IMG_SIZE))
 
@@ -260,14 +192,6 @@ def img_to_image(image, prompt, neg_prompt, strength, steps, guidance_scale, fac
             mask = None
 
         # --- PIPELINE-AUFRUF ---
-        # Prüfe Interrupt-Queue während der Generierung
-        for step in range(int(steps)):
-            if not interrupt_queue.empty():
-                action, interrupted_task_id = interrupt_queue.get()
-                if action == "interrupt" and interrupted_task_id == task_id:
-                    raise RuntimeError("Task interrupted by user")
-            time.sleep(0.01)  # Kurze Pause für Queue-Prüfung
-
         result = pipe(
             prompt=prompt,
             negative_prompt=neg_prompt,
@@ -281,7 +205,6 @@ def img_to_image(image, prompt, neg_prompt, strength, steps, guidance_scale, fac
         
         end_time = time.time()
         print(f"✅ Bild transformiert in {end_time - start_time:.2f} Sekunden")
-        current_img2img_task_id = None
         
         generated_image = result.images[0]
 
@@ -298,21 +221,10 @@ def img_to_image(image, prompt, neg_prompt, strength, steps, guidance_scale, fac
         
         return saved_image
         
-    except RuntimeError as e:
-        if "interrupt" in str(e).lower():
-            print(f"🛑 Generierung unterbrochen (Task ID: {task_id})")
-            current_img2img_task_id = None
-            return None
-        print(f"❌ Fehler: {e}")
-        import traceback
-        traceback.print_exc()
-        current_img2img_task_id = None
-        return None
     except Exception as e:
         print(f"❌ Fehler: {e}")
         import traceback
         traceback.print_exc()
-        current_img2img_task_id = None
         return None
 
 def update_bbox_from_image(image):
@@ -455,7 +367,6 @@ with gr.Blocks() as app:
         )
 
 # === APP START ===
-app.queue(max_size=5)
 app.launch(
     share=True,
     server_name="0.0.0.0",