Update app.py

app.py

@@ -12,69 +12,27 @@ from playwright.async_api import async_playwright
 
 nest_asyncio.apply()
 
-# --- FastAPI Setup (For Hugging Face Health Check) ---
+# --- FastAPI Setup ---
 app = FastAPI()
 @app.get("/")
 def home():
     return {"status": "Bot is Running on Hugging Face"}
 
 def run_fastapi():
-    # Hugging Face डिफ़ॉल्ट रूप से पोर्ट 7860 का उपयोग करता है
     port = int(os.environ.get("PORT", 7860))
     uvicorn.run(app, host="0.0.0.0", port=port)
 
-# --- कॉन्फ़िगरेशन ---
+# --- JNVU Logic ---
 BOT_TOKEN = "7936101320:AAGTHSCteVyYUzPb-snNWXDn9MxQDZUXs1M"
 
-# --- PDF विश्लेषण लॉजिक ---
-def extract_student_info(pdf_path):
-    info = {"name": "Not Found", "father": "Not Found", "mother": "Not Found",
-            "email": "Not Found", "abc_id": "Not Found", "roll": "Not Found",
-            "college": "Not Found", "center": "Not Found"}
-    try:
-        doc = fitz.open(pdf_path)
-        text = "".join([page.get_text() for page in doc])
-        
-        roll_match = re.search(r"Roll no is\s+([\w\d]+)", text)
-        if roll_match: info["roll"] = roll_match.group(1).strip()
-
-        name_match = re.search(r"NAME OF CANDIDATE\s*:\s*(.*)", text)
-        if name_match: info["name"] = name_match.group(1).split('\n')[0].strip()
-
-        father_match = re.search(r"FATHER'S NAME\s*:\s*(.*)", text)
-        if father_match: info["father"] = father_match.group(1).split('\n')[0].strip()
-
-        mother_match = re.search(r"MOTHER'S NAME\s*:\s*(.*)", text)
-        if mother_match: info["mother"] = mother_match.group(1).split('\n')[0].strip()
-
-        email_match = re.search(r"EMAIL ID\s*:\s*(.*)", text)
-        if email_match: info["email"] = email_match.group(1).split('\n')[0].strip()
-
-        abc_match = re.search(r"ABC ID\s*:\s*(\d+)", text)
-        if abc_match: info["abc_id"] = abc_match.group(1).strip()
-            
-        college_match = re.search(r"COLLEGE NAME\s*:\s*(.*)", text)
-        if college_match: info["college"] = college_match.group(1).split('\n')[0].strip()
-
-        center_pattern = r"Exam Centre is\s*(.*?)(?=Print Date|To,|The Centre|NAME OF EXAMINATION)"
-        center_match = re.search(center_pattern, text, re.DOTALL)
-        if center_match: info["center"] = " ".join(center_match.group(1).split())
-
-        doc.close()
-        return info
-    except Exception as e:
-        print(f"Extraction Error: {e}")
-        return info
-
-# --- डाउनलोड लॉजिक ---
 async def download_jnvu_pdf(form_number):
     pdf_path = f"admit_card_{form_number}.pdf"
-    async with async_playwright() as p:
-        browser = await p.chromium.launch(headless=True, args=["--no-sandbox", "--disable-setuid-sandbox"])
-        context = await browser.new_context(accept_downloads=True)
-        page = await context.new_page()
-        url = "https://erp.jnvuiums.in/(S(biolzjtwlrcfmzwwzgs5uj5n))/Exam/Pre_Exam/Exam_ForALL_AdmitCard.aspx#"
-        try:
+    try:
+        async with async_playwright() as p:
+            browser = await p.chromium.launch(headless=True, args=["--no-sandbox", "--disable-setuid-sandbox"])
+            context = await browser.new_context(accept_downloads=True)
+            page = await context.new_page()
+            url = "https://erp.jnvuiums.in/(S(biolzjtwlrcfmzwwzgs5uj5n))/Exam/Pre_Exam/Exam_ForALL_AdmitCard.aspx#"
             await page.goto(url, wait_until="load", timeout=60000)
             await page.fill("#txtchallanNo", str(form_number))
             async with page.expect_download(timeout=30000) as download_info:
@@ -83,68 +41,66 @@ async def download_jnvu_pdf(form_number):
             await download.save_as(pdf_path)
             await browser.close()
             return pdf_path
-        except Exception as e:
-            print(f"Download Error: {e}")
-            await browser.close()
-            return None
+    except Exception as e:
+        print(f"Download Error: {e}")
+        return None
+
+def extract_student_info(pdf_path):
+    info = {"name": "N/A", "college": "N/A", "roll": "N/A", "center": "N/A"}
+    try:
+        doc = fitz.open(pdf_path)
+        text = "".join([page.get_text() for page in doc])
+        name_match = re.search(r"NAME OF CANDIDATE\s*:\s*(.*)", text)
+        if name_match: info["name"] = name_match.group(1).split('\n')[0].strip()
+        doc.close()
+    except: pass
+    return info
 
-# --- टेलीग्राम हैंडलर ---
-# --- टेलीग्राम हैंडलर (इसे वैसा ही रहने दें) ---
 async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE):
     user_input = update.message.text.strip()
-    if not user_input.isdigit():
-        await update.message.reply_text("❌ कृपया केवल Form Number भेजें।")
-        return
-
-    status_msg = await update.message.reply_text("⚡ एडमिट कार्ड लोड हो रहा है...")
-    file_path = await download_jnvu_pdf(user_input)
-
-    if file_path and os.path.exists(file_path):
-        data = extract_student_info(file_path)
-        caption = (f"✅ **Admit Card Found!**\n\n👤 **Name:** `{data['name']}`\n👨‍💼 **Father:** `{data['father']}`\n"
-                   f"🎓 **College:** `{data['college']}`\n🔢 **Roll No:** `{data['roll']}`\n🏫 **Center:**\n`{data['center']}`")
-        try:
-            with open(file_path, 'rb') as doc:
-                await update.message.reply_document(document=doc, caption=caption, parse_mode='Markdown')
+    if user_input.isdigit():
+        status = await update.message.reply_text("⏳ एडमिट कार्ड निकाल रहा हूँ...")
+        file_path = await download_jnvu_pdf(user_input)
+        if file_path and os.path.exists(file_path):
+            data = extract_student_info(file_path)
+            caption = f"✅ एडमिट कार्ड मिल गया!\n👤 नाम: {data['name']}"
+            await update.message.reply_document(document=open(file_path, 'rb'), caption=caption)
             os.remove(file_path)
-            await status_msg.delete()
-        except Exception as e:
-            await status_msg.edit_text(f"❌ फाइल भेजने में त्रुटि: {e}")
-    else:
-        await status_msg.edit_text("❌ एडमिट कार्ड नहीं मिला।")
+            await status.delete()
+        else:
+            await status.edit_text("❌ एडमिट कार्ड नहीं मिला।")
 
-# --- अपडेट किया हुआ मेन बॉट फंक्शन (यहाँ से बदलें) ---
+# --- Main Bot Function with Power-Reset ---
 async def main_bot():
-    # टोकन को सुरक्षित तरीके से प्राप्त करें
-    token = os.getenv("BOT_TOKEN", "7936101320:AAGTHSCteVyYUzPb-snNWXDn9MxQDZUXs1M")
-    bot_app = ApplicationBuilder().token(token).build()
-    
-    bot_app.add_handler(CommandHandler("start", lambda u, c: u.message.reply_text("नमस्ते! अपना Form Number भेजें।")))
-    bot_app.add_handler(MessageHandler(filters.TEXT & (~filters.COMMAND), handle_message))
-    
-    print("✅ बॉट लोड हो रहा है, नेटवर्क का इंतज़ार...")
-    
+    print("⏳ DNS स्टेबल होने का इंतज़ार (10s)...")
+    await asyncio.sleep(10)
+
     while True:
+        bot_app = None
         try:
-            # initialize() को केवल एक बार चलाने के लिए try-except का सही उपयोग
+            print("🚀 टेलीग्राम से नया कनेक्शन बना रहा हूँ...")
+            bot_app = ApplicationBuilder().token(BOT_TOKEN).build()
+            bot_app.add_handler(CommandHandler("start", lambda u,c: u.message.reply_text("नमस्ते! Form No भेजें।")))
+            bot_app.add_handler(MessageHandler(filters.TEXT & (~filters.COMMAND), handle_message))
+
             async with bot_app:
                 await bot_app.initialize()
                 await bot_app.start()
                 await bot_app.updater.start_polling()
-                print("🚀 बॉट अब टेलीग्राम से जुड़ चुका है!")
-                while True: 
-                    await asyncio.sleep(3600) # लूप चालू रखने के लिए
+                print("✅ बॉट अब टेलीग्राम से जुड़ चुका है!")
+                while bot_app.updater.running:
+                    await asyncio.sleep(10)
         except Exception as e:
-            print(f"❌ कनेक्शन एरर: {e} | 10 सेकंड में फिर कोशिश करेंगे...")
-            await asyncio.sleep(10)
+            print(f"❌ कनेक्शन एरर: {e}")
+            if bot_app:
+                try: await bot_app.stop()
+                except: pass
+            print("🔄 15 सेकंड में रीस्टार्ट करेंगे...")
+            await asyncio.sleep(15)
 
 if __name__ == "__main__":
-    # FastAPI को अलग थ्रेड में चलाएं
     threading.Thread(target=run_fastapi, daemon=True).start()
-    
-    # बॉट को मुख्य लूप में चलाएं
     try:
         asyncio.run(main_bot())
-    except Exception as e:
-        print(f"बॉट क्रैश हो गया: {e}")
-
+    except KeyboardInterrupt:
+        pass