Update app.py

app.py

@@ -214,7 +214,9 @@ def _get_mouse_pos() -> tuple[int, int]:
 
 def capture_screen_raw() -> tuple[object, int, int]:
     """
-    يلتقط الشاشة بـ 5 طرق متسلسلة — تضمن نجاح واحدة:
+    يلتقط الشاشة بـ 5 طرق متسلسلة — تضمن نجاح واحدة.
+    كل الملفات المؤقتة (ناجحة أو فاشلة) تُحذف دائماً لمنع تراكمها في /tmp
+    وامتلاء القرص/الذاكرة بعد عدة لقطات شاشة متتالية.
     1. scrot  (الأسرع)
     2. import (ImageMagick)
     3. xwd + convert
@@ -224,9 +226,10 @@ def capture_screen_raw() -> tuple[object, int, int]:
     from PIL import Image
     env = {**os.environ, "DISPLAY": DISPLAY}
     tmp = f"/tmp/zs_{int(time.time()*1000)}"
+    _tmp_files_to_clean = []  # كل الملفات المؤقتة التي أُنشئت في هذه المحاولة
 
     def _load(path) -> tuple:
-        """تحميل الصورة إذا وُجدت وحجمها > 0"""
+        """تحميل الصورة إذا وُجدت وحجمها > 0 — لا يحذف الملف هنا، الحذف مركزي في النهاية"""
         if not path or not os.path.exists(path):
             return None, 0, 0
         size = os.path.getsize(path)
@@ -237,123 +240,139 @@ def capture_screen_raw() -> tuple[object, int, int]:
             w, h = img.size
             if w < 10 or h < 10:
                 return None, 0, 0
-            try: os.unlink(path)
-            except: pass
             return img, w, h
         except Exception as ex:
             print(f"[_load] {ex}")
             return None, 0, 0
 
-    # ── طريقة 1: scrot ──────────────────────────────────
-    try:
-        p = tmp + "_1.png"
-        r = subprocess.run(
-            ["scrot", "-q", "95", p],
-            env=env, timeout=8, capture_output=True
-        )
-        img, w, h = _load(p)
-        if img:
-            print("[capture] ✅ scrot")
-            return img, w, h
-        print(f"[capture] scrot failed rc={r.returncode} err={r.stderr[:80]}")
-    except Exception as e:
-        print(f"[capture] scrot ex: {e}")
+    def _cleanup():
+        """يحذف كل الملفات المؤقتة المتبقية من كل المحاولات (ناجحة أو فاشلة)"""
+        for p in _tmp_files_to_clean:
+            try:
+                if p and os.path.exists(p):
+                    os.unlink(p)
+            except Exception:
+                pass
 
-    # ── طريقة 2: ImageMagick import ─────────────────────
     try:
-        p = tmp + "_2.png"
-        r = subprocess.run(
-            ["import", "-window", "root", "-silent", p],
-            env=env, timeout=10, capture_output=True
-        )
-        img, w, h = _load(p)
-        if img:
-            print("[capture] ✅ import (ImageMagick)")
-            return img, w, h
-        print(f"[capture] import failed rc={r.returncode}")
-    except Exception as e:
-        print(f"[capture] import ex: {e}")
+        # ── طريقة 1: scrot ──────────────────────────────────
+        try:
+            p = tmp + "_1.png"
+            _tmp_files_to_clean.append(p)
+            r = subprocess.run(
+                ["scrot", "-q", "95", p],
+                env=env, timeout=8, capture_output=True
+            )
+            img, w, h = _load(p)
+            if img:
+                print("[capture] ✅ scrot")
+                return img, w, h
+            print(f"[capture] scrot failed rc={r.returncode} err={r.stderr[:80]}")
+        except Exception as e:
+            print(f"[capture] scrot ex: {e}")
 
-    # ── طريقة 3: xwd + convert ──────────────────────────
-    try:
-        xwd_p = tmp + "_3.xwd"
-        png_p = tmp + "_3.png"
-        r1 = subprocess.run(
-            ["xwd", "-root", "-silent", "-out", xwd_p],
-            env=env, timeout=10, capture_output=True
-        )
-        r2 = subprocess.run(
-            ["convert", xwd_p, png_p],
-            timeout=10, capture_output=True
-        )
-        try: os.unlink(xwd_p)
-        except: pass
-        img, w, h = _load(png_p)
-        if img:
-            print("[capture] ✅ xwd+convert")
-            return img, w, h
-        print(f"[capture] xwd rc={r1.returncode} convert rc={r2.returncode}")
-    except Exception as e:
-        print(f"[capture] xwd ex: {e}")
+        # ── طريقة 2: ImageMagick import ─────────────────────
+        try:
+            p = tmp + "_2.png"
+            _tmp_files_to_clean.append(p)
+            r = subprocess.run(
+                ["import", "-window", "root", "-silent", p],
+                env=env, timeout=10, capture_output=True
+            )
+            img, w, h = _load(p)
+            if img:
+                print("[capture] ✅ import (ImageMagick)")
+                return img, w, h
+            print(f"[capture] import failed rc={r.returncode}")
+        except Exception as e:
+            print(f"[capture] import ex: {e}")
 
-    # ── طريقة 4: ffmpeg x11grab ─────────────────────────
-    try:
-        p = tmp + "_4.png"
-        sw, sh = _get_screen_size()
-        r = subprocess.run([
-            "ffmpeg", "-y",
-            "-f", "x11grab",
-            "-video_size", f"{sw}x{sh}",
-            "-i", DISPLAY,
-            "-vframes", "1",
-            "-q:v", "2",
-            p
-        ], env=env, timeout=12, capture_output=True)
-        img, w, h = _load(p)
-        if img:
-            print("[capture] ✅ ffmpeg x11grab")
-            return img, w, h
-        print(f"[capture] ffmpeg rc={r.returncode} err={r.stderr[-120:]}")
-    except Exception as e:
-        print(f"[capture] ffmpeg ex: {e}")
+        # ── طريقة 3: xwd + convert ──────────────────────────
+        try:
+            xwd_p = tmp + "_3.xwd"
+            png_p = tmp + "_3.png"
+            _tmp_files_to_clean.append(xwd_p)
+            _tmp_files_to_clean.append(png_p)
+            r1 = subprocess.run(
+                ["xwd", "-root", "-silent", "-out", xwd_p],
+                env=env, timeout=10, capture_output=True
+            )
+            r2 = subprocess.run(
+                ["convert", xwd_p, png_p],
+                timeout=10, capture_output=True
+            )
+            img, w, h = _load(png_p)
+            if img:
+                print("[capture] ✅ xwd+convert")
+                return img, w, h
+            print(f"[capture] xwd rc={r1.returncode} convert rc={r2.returncode}")
+        except Exception as e:
+            print(f"[capture] xwd ex: {e}")
 
-    # ── طريقة 5: python-xlib (Xlib مباشرة) ──────────────
-    try:
-        from Xlib import display as Xdisplay
-        from Xlib.ext.xtest import fake_input
-        xdisp = Xdisplay.Display(DISPLAY)
-        root = xdisp.screen().root
-        geom = root.get_geometry()
-        w, h = geom.width, geom.height
-        raw = root.get_image(0, 0, w, h,
-                             Xdisplay.X.ZPixmap,
-                             0xFFFFFFFF)
-        import struct
-        data = raw.data
-        # BGRA → RGB
-        pixels = []
-        for i in range(0, len(data), 4):
-            b, g, r_, a = struct.unpack_from('BBBB', data, i)
-            pixels.extend([r_, g, b])
-        img = Image.frombytes("RGB", (w, h), bytes(pixels))
-        print("[capture] ✅ python-xlib")
-        return img, w, h
-    except Exception as e:
-        print(f"[capture] xlib ex: {e}")
+        # ── طريقة 4: ffmpeg x11grab ─────────────────────────
+        try:
+            p = tmp + "_4.png"
+            _tmp_files_to_clean.append(p)
+            sw, sh = _get_screen_size()
+            r = subprocess.run([
+                "ffmpeg", "-y",
+                "-f", "x11grab",
+                "-video_size", f"{sw}x{sh}",
+                "-i", DISPLAY,
+                "-vframes", "1",
+                "-q:v", "2",
+                p
+            ], env=env, timeout=12, capture_output=True)
+            img, w, h = _load(p)
+            if img:
+                print("[capture] ✅ ffmpeg x11grab")
+                return img, w, h
+            print(f"[capture] ffmpeg rc={r.returncode} err={r.stderr[-120:]}")
+        except Exception as e:
+            print(f"[capture] ffmpeg ex: {e}")
 
-    # ── طريقة 6: صورة placeholder واضحة ────────────────
-    print("[capture] ⚠️ ALL methods failed — returning placeholder")
-    try:
-        from PIL import ImageDraw
-        sw, sh = _get_screen_size()
-        img = Image.new("RGB", (sw or 1280, sh or 720), (20, 20, 30))
-        draw = ImageDraw.Draw(img)
-        draw.rectangle([(0, 0), (sw, 40)], fill=(30, 30, 50))
-        draw.text((10, 10), f"⚠️ Screenshot failed — DISPLAY={DISPLAY}", fill=(255, 100, 100))
-        draw.text((10, 50), "Methods tried: scrot, import, xwd, ffmpeg, xlib", fill=(150, 150, 150))
-        return img, sw or 1280, sh or 720
-    except:
-        return None, 0, 0
+        # ── طريقة 5: python-xlib (Xlib مباشرة) ──────────────
+        try:
+            from Xlib import display as Xdisplay
+            from Xlib.ext.xtest import fake_input
+            xdisp = Xdisplay.Display(DISPLAY)
+            root = xdisp.screen().root
+            geom = root.get_geometry()
+            w, h = geom.width, geom.height
+            raw = root.get_image(0, 0, w, h,
+                                 Xdisplay.X.ZPixmap,
+                                 0xFFFFFFFF)
+            import struct
+            data = raw.data
+            # BGRA → RGB
+            pixels = []
+            for i in range(0, len(data), 4):
+                b, g, r_, a = struct.unpack_from('BBBB', data, i)
+                pixels.extend([r_, g, b])
+            img = Image.frombytes("RGB", (w, h), bytes(pixels))
+            print("[capture] ✅ python-xlib")
+            return img, w, h
+        except Exception as e:
+            print(f"[capture] xlib ex: {e}")
+
+        # ── طريقة 6: صورة placeholder واضحة ────────────────
+        print("[capture] ⚠️ ALL methods failed — returning placeholder")
+        try:
+            from PIL import ImageDraw
+            sw, sh = _get_screen_size()
+            img = Image.new("RGB", (sw or 1280, sh or 720), (20, 20, 30))
+            draw = ImageDraw.Draw(img)
+            draw.rectangle([(0, 0), (sw, 40)], fill=(30, 30, 50))
+            draw.text((10, 10), f"⚠️ Screenshot failed — DISPLAY={DISPLAY}", fill=(255, 100, 100))
+            draw.text((10, 50), "Methods tried: scrot, import, xwd, ffmpeg, xlib", fill=(150, 150, 150))
+            return img, sw or 1280, sh or 720
+        except:
+            return None, 0, 0
+    finally:
+        # ── يحذف كل الملفات المؤقتة دائماً، نجحت المحاولة أو فشلت ──
+        # هذا يمنع تراكم ملفات /tmp التي كانت تمتلئ بعد عدة لقطات وتتسبب
+        # بقتل العمليات (SIGTERM/OOM) على بيئات مثل Hugging Face المجانية.
+        _cleanup()
 
 
 def capture_screen(scale=0.6, quality=70) -> str:
@@ -1136,4 +1155,11 @@ async def quick_search(query: str):
 
 if __name__ == "__main__":
     port = int(os.environ.get("PORT", 7860))
-    uvicorn.run("app:app", host="0.0.0.0", port=port, log_level="info")
+    uvicorn.run("app:app", host="0.0.0.0", port=port, log_level="info")
+
+
+
+
+
+
+