Update main.py

main.py

@@ -1,4 +1,4 @@
-# main.py (Revised: Starlette Lifespan + ptb_app._running fix + HTTPX Config + Updated Prompts)
+# main.py (Revised: Correct HTTPXRequest init + Starlette Lifespan + Updated Prompts)
 import os
 import re
 import logging
@@ -28,7 +28,7 @@ from telegram.error import NetworkError, RetryAfter # Import RetryAfter
 from telegram.request import HTTPXRequest # Import the request class
 
 # --- Other Libraries ---
-import httpx # Import httpx directly
+# import httpx # No longer needed for direct import
 from youtube_transcript_api import YouTubeTranscriptApi
 import requests
 from bs4 import BeautifulSoup
@@ -43,14 +43,14 @@ logging.basicConfig(
     format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
     level=logging.DEBUG
 )
-logging.getLogger("httpx").setLevel(logging.WARNING) # Keep httpx logs quieter unless debugging it
+logging.getLogger("httpx").setLevel(logging.WARNING)
 if ApifyClient: logging.getLogger("apify_client").setLevel(logging.WARNING)
 logging.getLogger("telegram.ext").setLevel(logging.INFO)
 logging.getLogger('telegram.bot').setLevel(logging.INFO)
 logging.getLogger("urllib3").setLevel(logging.INFO)
 logging.getLogger('gunicorn.error').setLevel(logging.INFO)
-logging.getLogger('uvicorn').setLevel(logging.INFO) # Uvicorn logs (incl. access)
-logging.getLogger('starlette').setLevel(logging.INFO) # Starlette logs
+logging.getLogger('uvicorn').setLevel(logging.INFO)
+logging.getLogger('starlette').setLevel(logging.INFO)
 logger = logging.getLogger(__name__)
 logger.info("Logging configured.")
 
@@ -75,6 +75,11 @@ logger.info("Secret loading attempt finished.")
 
 
 # --- Bot Logic Functions ---
+# (Keep ALL your functions: is_youtube_url, extract_youtube_id,
+#  get_transcript_via_supadata, get_transcript_via_apify,
+#  get_youtube_transcript, get_website_content_via_requests,
+#  get_website_content_via_urltotext_api, generate_summary)
+# Ensure the generate_summary has the updated prompts from previous response
 
 # Helper Functions
 def is_youtube_url(url):
@@ -517,18 +522,37 @@ async def setup_bot_config() -> Application:
         logger.critical("CRITICAL: TELEGRAM_TOKEN environment variable not found.")
         raise ValueError("TELEGRAM_TOKEN environment variable not set.")
 
-    httpx_settings = {
-        "timeout": httpx.Timeout(timeout=10.0, read=10.0, connect=5.0, pool=10.0),
-        "limits": httpx.Limits(max_keepalive_connections=10, max_connections=100, keepalive_expiry=15.0) # Increased expiry
-    }
-    logger.info(f"Creating PTB HTTPXRequest with settings: {httpx_settings}")
-    custom_request = HTTPXRequest(connection_pool_size=10, connect_timeout=5.0, read_timeout=10.0, http_version="1.1", httpx_settings=httpx_settings)
-
+    # --- Configure HTTPX client settings via individual parameters ---
+    # Increased read/pool timeouts slightly, connect timeout standard.
+    # No direct way to set keepalive_expiry via HTTPXRequest in PTB v20.
+    connect_timeout = 5.0
+    read_timeout = 15.0  # Slightly increased
+    write_timeout = 15.0 # Matching read timeout
+    pool_timeout = 15.0  # Slightly increased pool timeout
+
+    logger.info(f"Creating PTB HTTPXRequest with timeouts: "
+                f"connect={connect_timeout}, read={read_timeout}, "
+                f"write={write_timeout}, pool={pool_timeout}")
+
+    # Create a custom request object with these settings
+    # connection_pool_size default is 10, which is usually fine.
+    custom_request = HTTPXRequest(
+        connect_timeout=connect_timeout,
+        read_timeout=read_timeout,
+        write_timeout=write_timeout, # Added write_timeout
+        pool_timeout=pool_timeout,
+        http_version="1.1"
+    )
+
+    # Use Application.builder() and pass the custom request object
     application_builder = Application.builder().token(TELEGRAM_TOKEN)
     application_builder.request(custom_request)
-    application_builder.get_updates_request(custom_request)
+    application_builder.get_updates_request(custom_request) # Apply same settings for getUpdates if used
+
+    # Build the application instance
     application = application_builder.build()
 
+    # --- Register Handlers (same as before) ---
     application.add_handler(CommandHandler("start", start))
     application.add_handler(CommandHandler("help", help_command))
     application.add_handler(MessageHandler(filters.TEXT & ~filters.COMMAND, handle_potential_url))