Update main.py

main.py

@@ -933,17 +933,24 @@ logger.info(f"Bot setup finished. Application instance: {'OK' if ptb_app else 'F
 
 
 # --- Flask App Setup (for Webhook) ---
-app = Flask(__name__)
-logger.info("Flask app created.")
+# Import the WSGI-to-ASGI bridge
+from asgiref.wsgi import WsgiToAsgi
 
-@app.route('/')
+logger.info("Flask app setup initiating...")
+
+# Create the core Flask app instance (give it a distinct name)
+flask_app = Flask(__name__)
+logger.info("Core Flask app instance created.")
+
+# --- Define Flask Routes on flask_app ---
+@flask_app.route('/')
 def index():
     """Basic health check endpoint."""
     logger.debug("Health check '/' accessed.")
     bot_status = "Initialized" if ptb_app and ptb_app.bot else "Initialization FAILED"
     return f"Telegram Bot Webhook Listener ({bot_status}) is running."
 
-@app.route('/webhook', methods=['POST'])
+@flask_app.route('/webhook', methods=['POST'])
 async def webhook() -> Response:
     """Webhook endpoint for Telegram updates."""
     if not ptb_app:
@@ -956,13 +963,8 @@ async def webhook() -> Response:
             update_data = request.get_json()
             update = Update.de_json(update_data, ptb_app.bot)
             logger.debug(f"Processing update ID: {update.update_id} via webhook")
-
-            # Crucial: Queue the update for processing by PTB's internal mechanisms
-            # This ensures proper handling within PTB's async context
-            # Use await ptb_app.process_update(update) directly as Flask is run by Uvicorn
             await ptb_app.process_update(update)
             logger.debug(f"Finished processing update ID: {update.update_id}")
-
             return Response('ok', status=200) # Acknowledge receipt to Telegram
 
         except json.JSONDecodeError:
@@ -970,24 +972,26 @@ async def webhook() -> Response:
             return Response('Bad Request: Invalid JSON', status=400)
         except Exception as e:
             logger.error(f"Error processing update in webhook: {e}", exc_info=True)
-            # Avoid sending detailed errors back in the response
             return Response('Internal Server Error processing update.', status=500)
     else:
         logger.warning("Received non-JSON request to webhook endpoint.")
         return Response('Bad Request: Expected JSON', status=400)
 
+# --- Wrap the Flask WSGI app into an ASGI app ---
+# Gunicorn/Uvicorn will look for this 'app' object by default (main:app)
+app = WsgiToAsgi(flask_app)
+logger.info("Flask WSGI app wrapped with WsgiToAsgi for ASGI compatibility.")
+
+
 # --- Main Execution Block (for local testing ONLY) ---
 if __name__ == '__main__':
-    # This block is NOT used when running with Gunicorn/Uvicorn in production
+    # This block remains the same, but note it runs the core flask_app
+    # using Flask's development server, NOT the wrapped ASGI app.
     logger.warning("Running Flask development server directly (for local testing only).")
     if not ptb_app:
         logger.critical("Aborting local Flask start: Telegram App (ptb_app) failed initialization.")
     else:
-        # For local testing, you might need to set a webhook manually or use polling.
-        # Flask's dev server can work with asyncio now.
-        # Running with debug=True enables auto-reloading and more detailed errors.
-        local_port = int(os.environ.get('PORT', 8080)) # Use a different port locally?
+        local_port = int(os.environ.get('PORT', 8080))
         logger.info(f"Flask dev server starting on http://0.0.0.0:{local_port}")
-        # Note: Flask's built-in server is NOT recommended for production.
-        # Use Gunicorn + Uvicorn worker as configured in gunicorn.conf.py for deployment.
-        app.run(host='0.0.0.0', port=local_port, debug=True)
+        # Run the original Flask app for local dev server
+        flask_app.run(host='0.0.0.0', port=local_port, debug=True)