Update bot.py

bot.py

@@ -41,15 +41,14 @@ if not WEBHOOK_DOMAIN:
 # Define a unique webhook path using the bot token
 # WEBHOOK_PATH = f"/{TOKEN}"
 # Construct the full webhook URL (must be HTTPS as required by Telegram)
-WEBHOOK_URL = f"https://{WEBHOOK_DOMAIN}"  # {WEBHOOK_PATH}"
-TELEGRAM_WEBHOOK = f"https://api.telegram.org/bot{TOKEN}/setwebhook?url=https://{WEBHOOK_URL}"
-
+WEBHOOK_URL = f"https://{WEBHOOK_DOMAIN}"
 
 # -------------------------
 # API URL of the FastAPI server (running on Hugging Face)
 # -------------------------
 API_URL = "https://demaking-decision-helper-bot.hf.space/generate_response"
 
+bot = Bot(token=TOKEN)
 
 # -------------------------
 # Function to fetch response from FastAPI (unchanged)
@@ -102,30 +101,58 @@ async def handle_message(update: Update, context: CallbackContext):
 #     return "!", 200
 
 
+# # -------------------------
+# # Set Telegram webhook
+# # -------------------------
+# async def set_webhook():
+#     #bot = Bot(token=TOKEN)
+#     #bot.delete_webhook()
+#     # This call will set the webhook to the given URL.
+#     PATH = WEBHOOK_URL + TOKEN
+#     try:
+#         await bot.set_webhook(url=PATH)
+#         logger.info(f"Webhook set successfully to: {WEBHOOK_URL}")
+#         print("bot webhook success")
+#     except Exception as e:
+#         logger.error(f"Failed to set webhook manually. Error: {e}")
+#         print(f"error setting bot webhook. Error: {e}")
+
+
+
+# -------------------------
+# Delete Telegram webhook
+# -------------------------
+async def delete_webhook():
+    try:
+        await bot.delete_webhook(drop_pending_updates=True)
+        logger.info("Webhook deleted successfully")
+        print("deleted webhook successfully")
+    except Exception as e:
+        logger.error(f"Failed to delete webhook manually. Error: {e}")
+        print(f"error deleting bot webhook. Error: {e}")
+
+
 # -------------------------
-# Optional: Manually set webhook using bot.set_webhook()
+# Set Telegram webhook
 # -------------------------
 async def set_webhook():
-    bot = Bot(token=TOKEN)
-    #bot.delete_webhook()
-    # This call will set the webhook to the given URL.
-    PATH = WEBHOOK_URL + TOKEN
+    # bot = Bot(token=TOKEN)
     try:
-        await bot.set_webhook(url=PATH)
+        await bot.set_webhook(url=WEBHOOK_URL)  # This call will set the webhook to the given URL.
         logger.info(f"Webhook set successfully to: {WEBHOOK_URL}")
-        print("bot webhook success")
+        print("webhook set succesfully")
     except Exception as e:
-        logger.error(f"Failed to set webhook manually. Error: {e}")
-        print(f"error setting bot webhook. Error: {e}")
-     
+        logger.error(f"Failed to set webhook. Error: {e}")
+        print(f"error in setting bot webhook. Error: {e}")
 
  
-
 # -------------------------
 # Main function to run the bot using Webhook mode
 # -------------------------
 async def main():
+    await delete_webhook()
     await set_webhook()
+    
     # Build the Application with the Telegram Bot Token
     application = Application.builder().token(TOKEN).build()
 
@@ -135,17 +162,16 @@ async def main():
 
     # Log: starting the bot in webhook mode.
     logger.info("Starting bot in webhook mode...")
-
+    print("Starting bot in webhook mode...")
    
 
     # Run the application using webhook mode.
-    # The bot will listen on all interfaces (0.0.0.0) at the specified port (5000 in this example).
-    # Make sure that the port you choose is allowed by your hosting environment.
+    # The bot will listen on all interfaces (0.0.0.0) at the specified port.
     await application.run_webhook(
-        listen="0.0.0.0",         # Listen on all available interfaces
-        port=443,                # Port to listen on
+        listen="0.0.0.0",  # Listen on all available interfaces
+        port=443,  # Port to listen on
        # url_path=TELEGRAM_WEBHOOK,    # The webhook path; here, we use the bot token
-        #webhook_url=WEBHOOK_URL   # The full webhook URL that Telegram will use to send updates
+        webhook_url=WEBHOOK_URL  # The webhook URL that Telegram will use to send updates
     )
 
 
@@ -160,4 +186,12 @@ if __name__ == "__main__":
     # Instead of asyncio.run(), which may try to close an already running loop,
     # get the current loop and run main() until complete.
     loop = asyncio.get_event_loop()
-    loop.run_until_complete(main())
+    # loop.run_until_complete(main())
+
+    try:
+        loop.run_until_complete(main())
+    except Exception as e:
+        logger.error(f"Error in main loop: {e}")
+        print(f"Error in main loop: {e}")
+    # finally:
+    #     await bot.shutdown()