Update bot.py

bot.py

@@ -13,47 +13,51 @@ from telegram.ext import (
     CallbackContext
 )
 
+
 # -------------------------
 # Configure logging
 # -------------------------
-logging.basicConfig(
-    format="%(asctime)s - %(levelname)s - %(message)s", level=logging.INFO
-)
+logging.basicConfig(format="%(asctime)s - %(levelname)s - %(message)s", level=logging.INFO)
 logger = logging.getLogger(__name__)
 
+
 # -------------------------
 # Environment variables
 # -------------------------
-# Get the Telegram Bot Token
+# Get Telegram bot token from environment variables
 TOKEN = os.getenv("TELEGRAM_BOT_TOKEN")
 if not TOKEN:
     raise ValueError("Missing Telegram Bot Token. Please set TELEGRAM_BOT_TOKEN environment variable.")
 
-# Get the domain for webhook (publicly accessible, e.g., your-space.hf.space)
-WEBHOOK_DOMAIN = os.getenv("WEBHOOK_DOMAIN")
-if not WEBHOOK_DOMAIN:
-    raise ValueError("Missing Webhook Domain. Please set WEBHOOK_DOMAIN environment variable.")
+# # Get the domain for webhook (publicly accessible, e.g., your-space.hf.space)
+# WEBHOOK_DOMAIN = os.getenv("WEBHOOK_DOMAIN")
+# if not WEBHOOK_DOMAIN:
+#     raise ValueError("Missing Webhook Domain. Please set WEBHOOK_DOMAIN environment variable.")
 
 
-# -------------------------
-# Webhook configuration
-# -------------------------
-# 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 configuration
+# # -------------------------
+# # 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}"
+
 
 # -------------------------
 # 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)
+# bot = Bot(token=TOKEN)
 
 # -------------------------
 # Function to fetch response from FastAPI (unchanged)
 # -------------------------
 async def fetch_response(user_text: str):
+    """
+    Sends a POST request to the FastAPI API with the user's text and returns the JSON response.
+    """
     async with httpx.AsyncClient(timeout=45.0) as client:
         try:
             response = await client.post(API_URL, json={"text": user_text})
@@ -74,6 +78,9 @@ async def fetch_response(user_text: str):
 # Command handler for /start
 # -------------------------
 async def start(update: Update, context: CallbackContext):
+    """"
+    Handler for the /start command.
+    """
     # Respond to the /start command.
     await update.message.reply_text("Hello! Tell me your decision-making issue, and I'll try to help.")
     logger.info("Start command received.")
@@ -83,6 +90,10 @@ async def start(update: Update, context: CallbackContext):
 # Message handler for incoming text messages
 # -------------------------
 async def handle_message(update: Update, context: CallbackContext):
+    """
+    Handler for incoming messages.
+    Sends the user's message to the API and replies with the response.
+    """
     user_text = update.message.text
     logger.info(f"User message: {user_text}")
     
@@ -122,36 +133,39 @@ async def handle_message(update: Update, context: CallbackContext):
 # -------------------------
 # 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}")
+# 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}")
 
 
 # -------------------------
 # Set Telegram webhook
 # -------------------------
-async def set_webhook():
-    # bot = Bot(token=TOKEN)
-    try:
-        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("webhook set succesfully")
-    except Exception as e:
-        logger.error(f"Failed to set webhook. Error: {e}")
-        print(f"error in setting bot webhook. Error: {e}")
+# async def set_webhook():
+#     # bot = Bot(token=TOKEN)
+#     try:
+#         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("webhook set succesfully")
+#     except Exception as 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()
+    """
+    Main function to run the Telegram Bot in polling mode.
+    """
+    # await delete_webhook()
+    # await set_webhook()
     
     # Build the Application with the Telegram Bot Token
     application = Application.builder().token(TOKEN).build()
@@ -160,19 +174,22 @@ async def main():
     application.add_handler(CommandHandler("start", start))
     application.add_handler(MessageHandler(filters.TEXT & ~filters.COMMAND, handle_message))
 
-    # Log: starting the bot in webhook mode.
-    logger.info("Starting bot in webhook mode...")
-    print("Starting bot in webhook mode...")
+    # # Log: starting the bot in webhook mode.
+    # logger.info("Starting bot in webhook mode...")
+    logger.info("Starting bot in polling mode...")
+    print("Starting bot in polling mode...")
+    await application.run_polling()
+    
    
 
     # Run the application using webhook mode.
     # 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=7860,  # Port to listen on
-       # url_path=TELEGRAM_WEBHOOK,    # The webhook path; here, we use the bot token
-        webhook_url=WEBHOOK_URL  # The webhook URL that Telegram will use to send updates
-    )
+    # await application.run_webhook(
+    #     listen="0.0.0.0",  # Listen on all available interfaces
+    #     port=7860,  # Port to listen on
+    #    # url_path=TELEGRAM_WEBHOOK,    # The webhook path; here, we use the bot token
+    #     webhook_url=WEBHOOK_URL  # The webhook URL that Telegram will use to send updates
+    # )
 
 
 # -------------------------
@@ -181,17 +198,22 @@ async def main():
 if __name__ == "__main__":
     # Apply nest_asyncio to support nested event loops if required.
     nest_asyncio.apply()
-#    asyncio.run(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())
-
     try:
-        loop.run_until_complete(main())
+        asyncio.run(main())
     except Exception as e:
         logger.error(f"Error in main loop: {e}")
         print(f"Error in main loop: {e}")
+        
+
+    # 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())
+
+    # 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()