Update app.py

app.py

@@ -22,11 +22,11 @@ cancel_txt2img = False
 cancel_img2img = False
 
 def interrupt_callback(pipe, step, timestep, callback_kwargs):
-    """Callback für Diffusers: Prüft Flag und unterbricht bei Cancel"""
+    """Callback für Diffusers: Prüft Flag und löst Exception für Interrupt aus"""
     global cancel_txt2img, cancel_img2img
     if (pipe == pipe_txt2img and cancel_txt2img) or (pipe == pipe_img2img and cancel_img2img):
-        pipe._interrupt = True  # Stoppt die Pipeline
         print(f"🛑 Interrupt ausgelöst für Pipeline (Step: {step})")
+        raise RuntimeError("Task interrupted by user")
     return callback_kwargs
 
 # === GESICHTSMASKEN-FUNKTIONEN ===
@@ -130,7 +130,7 @@ def text_to_image(prompt, steps, guidance_scale):
         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(0.5)  # Längere Pause für CPU
+            time.sleep(1.0)  # Längere Pause für CPU
 
         current_txt2img_task_id = task_id
         cancel_txt2img = False
@@ -160,7 +160,7 @@ def text_to_image(prompt, steps, guidance_scale):
         
         return image
         
-    except Exception as e:
+    except RuntimeError as e:
         if "interrupt" in str(e).lower():
             print(f"🛑 Generierung unterbrochen (Task ID: {task_id})")
             current_txt2img_task_id = None
@@ -170,6 +170,12 @@ def text_to_image(prompt, steps, guidance_scale):
         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
@@ -182,7 +188,7 @@ def img_to_image(image, prompt, neg_prompt, strength, steps, guidance_scale, fac
         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(0.5)  # Längere Pause für CPU
+            time.sleep(1.0)  # Längere Pause für CPU
 
         current_img2img_task_id = task_id
         cancel_img2img = False
@@ -263,7 +269,7 @@ def img_to_image(image, prompt, neg_prompt, strength, steps, guidance_scale, fac
         
         return saved_image
         
-    except Exception as e:
+    except RuntimeError as e:
         if "interrupt" in str(e).lower():
             print(f"🛑 Generierung unterbrochen (Task ID: {task_id})")
             current_img2img_task_id = None
@@ -273,6 +279,12 @@ def img_to_image(image, prompt, neg_prompt, strength, steps, guidance_scale, fac
         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):
     """Aktualisiert die Bounding-Box-Koordinaten wenn ein Bild hochgeladen wird"""