Update app.py

app.py

@@ -1,10 +1,10 @@
 import os
 import subprocess
 import uuid
-import httpx
 import asyncio
 import shutil
-from fastapi import FastAPI, BackgroundTasks, UploadFile, File, Form, Header, HTTPException
+from fastapi import FastAPI, UploadFile, File, Form, Header, HTTPException
+from fastapi.responses import FileResponse, JSONResponse
 from telegram import Bot
 from telegram.request import HTTPXRequest
 
@@ -13,67 +13,62 @@ app = FastAPI()
 SECRET_KEY = "MySecretWatermarkKey123"
 BOT_TOKEN = os.environ.get("BOT_TOKEN")
 
-async def process_video_task(input_path: str, watermark: str, chat_id: int):
-    if not BOT_TOKEN: return
-    
-    # আপলোড টাইমআউট ফিক্স (১০ মিনিট সময় দেওয়া হয়েছে)
-    t_request = HTTPXRequest(connect_timeout=600, read_timeout=600, write_timeout=600)
-    bot = Bot(token=BOT_TOKEN, request=t_request)
+# গ্লোবাল বট কানেকশন
+t_request = HTTPXRequest(connect_timeout=30, read_timeout=60, write_timeout=600)
+bot_instance = Bot(token=BOT_TOKEN, request=t_request) if BOT_TOKEN else None
+
+@app.post("/watermark")
+async def add_watermark(
+    file: UploadFile = File(...),
+    watermark_text: str = Form(...),
+    chat_id: int = Form(...),
+    api_key: str = Header(None)
+):
+    if api_key != SECRET_KEY:
+        raise HTTPException(status_code=403, detail="Unauthorized")
     
-    output_path = f"out_{uuid.uuid4()}.mp4"
+    unique_id = uuid.uuid4()
+    input_path = f"in_{unique_id}.mp4"
+    output_path = f"out_{unique_id}.mp4"
     
     try:
-        # FFmpeg কমান্ড
+        # ১. ফাইলটি ডিস্কে সেভ করা
+        with open(input_path, "wb") as buffer:
+            shutil.copyfileobj(file.file, buffer)
+        
+        # ২. FFmpeg দিয়ে প্রসেস করা
         cmd = [
             "ffmpeg", "-i", input_path,
-            "-vf", f"drawtext=text='{watermark}':x=w-tw-20:y=h-th-20:fontsize=30:fontcolor=white@0.6",
+            "-vf", f"drawtext=text='{watermark_text}':x=w-tw-20:y=h-th-20:fontsize=30:fontcolor=white@0.6",
             "-c:v", "libx264", "-profile:v", "main", "-pix_fmt", "yuv420p", 
             "-preset", "ultrafast", "-crf", "23", "-c:a", "copy", 
             "-movflags", "+faststart+frag_keyframe+empty_moov",
             output_path
         ]
-        
-        # প্রসেসিং রান করা
         process = await asyncio.create_subprocess_exec(*cmd)
         await process.wait()
 
-        # সরাসরি ফাইল থেকে স্ট্রিম করে টেলিগ্রামে আপলোড
+        # ৩. Hugging Face থেকে আপলোড করার চেষ্টা
         if os.path.exists(output_path):
-            with open(output_path, "rb") as v:
-                await bot.send_video(
-                    chat_id=chat_id, 
-                    video=v, 
-                    caption=f"✅ {watermark}",
-                    supports_streaming=True
-                )
+            try:
+                with open(output_path, "rb") as v:
+                    await bot_instance.send_video(
+                        chat_id=chat_id, video=v, 
+                        caption=f"✅ {watermark_text}", 
+                        supports_streaming=True
+                    )
+                return JSONResponse({"status": "success", "message": "Uploaded by HF"})
+            except Exception as e:
+                print(f"HF Upload Failed, sending back to Main Bot: {e}")
+                # আপলোড ফেইল হলে ভিডিওটি মেইন বটকে রিটার্ন করবে
+                return FileResponse(output_path, media_type="video/mp4", filename="watermarked.mp4")
+        
     except Exception as e:
-        print(f"Detailed Error: {e}")
+        return JSONResponse({"status": "error", "message": str(e)}, status_code=500)
     finally:
-        # সব ফাইল পরিষ্কার করা
         if os.path.exists(input_path): os.remove(input_path)
-        if os.path.exists(output_path): os.remove(output_path)
-
-@app.post("/watermark")
-async def trigger_watermark(
-    background_tasks: BackgroundTasks,
-    file: UploadFile = File(...),
-    watermark_text: str = Form(...),
-    chat_id: int = Form(...),
-    api_key: str = Header(None)
-):
-    if api_key != SECRET_KEY:
-        raise HTTPException(status_code=403, detail="Unauthorized")
-    
-    unique_id = uuid.uuid4()
-    input_path = f"in_{unique_id}.mp4"
-    
-    # মেমরি বাঁচাতে ফাইলটি সরাসরি ডিস্কে রাইট করা
-    with open(input_path, "wb") as buffer:
-        shutil.copyfileobj(file.file, buffer)
-    
-    background_tasks.add_task(process_video_task, input_path, watermark_text, chat_id)
-    return {"status": "Processing queued"}
+        # output_path রিমুভ করা হবে না যদি FileResponse দেওয়া হয় (FastAPI নিজে হ���যান্ডেল করবে)
 
 if __name__ == "__main__":
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=int(os.environ.get("PORT", 7860)))
+    uvicorn.run(app, host="0.0.0.0", port=7860)