Update main.py

main.py

@@ -1,4 +1,4 @@
-# main.py (Fixing get_secret for optional secrets)
+# main.py (Increasing timeout and adding logging in generate_summary)
 import os
 import re
 import logging
@@ -41,10 +41,7 @@ except ImportError:
     DEFAULT_PARSER = 'html.parser'
 
 # --- Logging Setup ---
-logging.basicConfig(
-    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
-    level=logging.INFO
-)
+logging.basicConfig( format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', level=logging.INFO )
 logging.getLogger("httpx").setLevel(logging.WARNING)
 logging.getLogger("telegram.ext").setLevel(logging.INFO)
 logging.getLogger('telegram.bot').setLevel(logging.INFO)
@@ -61,17 +58,9 @@ ptb_app: Optional[Application] = None
 # --- Environment Variable Loading & Configuration ---
 logger.info("Attempting to load secrets and configuration...")
 def get_secret(secret_name):
-    """Gets a secret from environment variables and logs status safely."""
     value = os.environ.get(secret_name)
-    if value:
-        status = "Found"
-        # Safely log the beginning of the value
-        log_length = min(len(value), 8)
-        value_start = value[:log_length]
-        logger.info(f"Secret '{secret_name}': {status} (Value starts with: {value_start}...)")
-    else:
-        status = "Not Found"
-        logger.warning(f"Secret '{secret_name}': {status}") # Changed to warning for not found
+    if value: status = "Found"; log_length = min(len(value), 8); value_start = value[:log_length]; logger.info(f"Secret '{secret_name}': {status} (Value starts with: {value_start}...)")
+    else: status = "Not Found"; logger.warning(f"Secret '{secret_name}': {status}")
     return value
 
 TELEGRAM_TOKEN = get_secret('TELEGRAM_TOKEN')
@@ -79,20 +68,18 @@ OPENROUTER_API_KEY = get_secret('OPENROUTER_API_KEY')
 URLTOTEXT_API_KEY = get_secret('URLTOTEXT_API_KEY')
 SUPADATA_API_KEY = get_secret('SUPADATA_API_KEY')
 APIFY_API_TOKEN = get_secret('APIFY_API_TOKEN')
-WEBHOOK_SECRET = get_secret('WEBHOOK_SECRET') # This will now correctly return None if not set, without erroring
+WEBHOOK_SECRET = get_secret('WEBHOOK_SECRET')
 
 OPENROUTER_MODEL = os.environ.get("OPENROUTER_MODEL", "deepseek/deepseek-chat-v3-0324:free")
 APIFY_ACTOR_ID = os.environ.get("APIFY_ACTOR_ID", "karamelo/youtube-transcripts")
 
-# Critical checks remain the same
 if not TELEGRAM_TOKEN: logger.critical("❌ FATAL: TELEGRAM_TOKEN not found."); raise RuntimeError("Exiting: Telegram token missing.")
 if not OPENROUTER_API_KEY: logger.error("❌ ERROR: OPENROUTER_API_KEY not found. Summarization will fail.")
 
-# Optional checks remain the same (logging handled by get_secret)
-if not URLTOTEXT_API_KEY: pass # Logged as warning by get_secret
-if not SUPADATA_API_KEY: pass  # Logged as warning by get_secret
-if not APIFY_API_TOKEN: pass   # Logged as warning by get_secret
-if not WEBHOOK_SECRET: logger.info("Optional secret 'WEBHOOK_SECRET' not found. Webhook security disabled.") # Explicit info log
+if not URLTOTEXT_API_KEY: pass
+if not SUPADATA_API_KEY: pass
+if not APIFY_API_TOKEN: pass
+if not WEBHOOK_SECRET: logger.info("Optional secret 'WEBHOOK_SECRET' not found. Webhook security disabled.")
 
 logger.info("Secret loading and configuration check finished.")
 logger.info(f"Using OpenRouter Model: {OPENROUTER_MODEL}")
@@ -101,9 +88,7 @@ logger.info(f"Using Apify Actor (via REST): {APIFY_ACTOR_ID}")
 _apify_token_exists = bool(APIFY_API_TOKEN)
 
 # --- Retry Decorator ---
-@retry( stop=stop_after_attempt(4), wait=wait_exponential(multiplier=1, min=2, max=15),
-        retry=retry_if_exception_type((NetworkError, RetryAfter, TimedOut, BadRequest)),
-        before_sleep=before_sleep_log(logger, logging.WARNING), reraise=True )
+@retry( stop=stop_after_attempt(4), wait=wait_exponential(multiplier=1, min=2, max=15), retry=retry_if_exception_type((NetworkError, RetryAfter, TimedOut, BadRequest)), before_sleep=before_sleep_log(logger, logging.WARNING), reraise=True )
 async def retry_bot_operation(func, *args, **kwargs):
     try: return await func(*args, **kwargs)
     except BadRequest as e:
@@ -295,12 +280,29 @@ async def generate_summary(text: str, summary_type: str) -> str:
     if len(text) > MAX_INPUT_LENGTH: logger.warning(f"Input length ({len(text)}) exceeds limit ({MAX_INPUT_LENGTH}). Truncating."); text = text[:MAX_INPUT_LENGTH] + "... (Content truncated)"
     full_prompt = f"{prompt}\n\n{text}"
     headers = { "Authorization": f"Bearer {OPENROUTER_API_KEY}", "Content-Type": "application/json" }; payload = { "model": OPENROUTER_MODEL, "messages": [{"role": "user", "content": full_prompt}] }; openrouter_api_endpoint = "https://openrouter.ai/api/v1/chat/completions"
+
+    # *** FIX: Increase timeout and add logging ***
+    # Set a longer timeout (e.g., 180 seconds = 3 minutes)
+    api_timeout = 180.0
+    response = None # Initialize response variable
+
     try:
-        async with httpx.AsyncClient(timeout=60.0) as client:
-            logger.debug(f"Sending request to OpenRouter ({OPENROUTER_MODEL})..."); response = await client.post(openrouter_api_endpoint, headers=headers, json=payload); logger.debug(f"Received status {response.status_code} from OpenRouter.")
+        async with httpx.AsyncClient(timeout=api_timeout) as client:
+            logger.info(f"Sending request to OpenRouter ({OPENROUTER_MODEL}) with timeout {api_timeout}s...")
+            response = await client.post(openrouter_api_endpoint, headers=headers, json=payload)
+            # Check response immediately after await returns
+            if response:
+                 logger.info(f"Received response from OpenRouter. Status code: {response.status_code}")
+            else:
+                 # This case should technically not happen if await returns, but good for debugging
+                 logger.error("No response received from OpenRouter after await completed (unexpected).")
+                 return "Sorry, communication with the AI service failed unexpectedly."
+
+            # Process the response (status code check and JSON parsing)
             if response.status_code == 200:
                 try:
                     data = response.json()
+                    # ... (rest of the success processing logic remains the same)
                     if data.get("choices") and isinstance(data["choices"], list) and len(data["choices"]) > 0:
                         message = data["choices"][0].get("message")
                         if message and isinstance(message, dict):
@@ -311,14 +313,25 @@ async def generate_summary(text: str, summary_type: str) -> str:
                     else: logger.error(f"Unexpected choices structure in OpenRouter resp: {data.get('choices')}. Full: {data}"); return "Sorry, could not parse AI response (choices)."
                 except json.JSONDecodeError: logger.error(f"Failed JSON decode OpenRouter. Status:{response.status_code}. Resp:{response.text[:500]}"); return "Sorry, failed to understand AI response."
                 except Exception as e: logger.error(f"Error processing OpenRouter success response: {e}", exc_info=True); return "Sorry, error processing AI response."
+            # ... (rest of the error status code handling remains the same)
             elif response.status_code == 401: logger.error("OpenRouter API key invalid (401)."); return "Error: AI model configuration key is invalid."
             elif response.status_code == 402: logger.error("OpenRouter Payment Required (402)."); return "Sorry, AI service limits/payment issue."
             elif response.status_code == 429: logger.warning("OpenRouter Rate Limit Exceeded (429)."); return "Sorry, AI model is busy. Try again."
             elif response.status_code == 500: logger.error(f"OpenRouter Internal Server Error (500). Resp:{response.text[:500]}"); return "Sorry, AI service internal error."
             else: logger.error(f"Unexpected status {response.status_code} from OpenRouter. Resp:{response.text[:500]}"); return f"Sorry, AI service returned unexpected status ({response.status_code})."
-    except httpx.TimeoutException: logger.error("Timeout connecting to OpenRouter API."); return "Sorry, request to AI model timed out."
-    except httpx.RequestError as e: logger.error(f"Request error connecting to OpenRouter API: {e}"); return "Sorry, error connecting to AI service."
-    except Exception as e: logger.error(f"Unexpected error in generate_summary (OpenRouter): {e}", exc_info=True); return "Sorry, unexpected error generating summary."
+
+    except httpx.TimeoutException:
+        logger.error(f"Timeout error ({api_timeout}s) connecting to OpenRouter API.")
+        return f"Sorry, the request to the AI model timed out after {api_timeout} seconds. The content might be too long or the service busy. Please try again later or with shorter content."
+    except httpx.RequestError as e:
+        logger.error(f"Request error connecting to OpenRouter API: {e}")
+        return "Sorry, there was an error connecting to the AI model service."
+    except Exception as e:
+        # Catch any other unexpected errors during the request/response cycle
+        logger.error(f"Unexpected error in generate_summary (OpenRouter request phase): {e}", exc_info=True)
+        # Log response status if available
+        if response: logger.error(f"--> Last response status before error: {response.status_code}")
+        return "Sorry, an unexpected error occurred while trying to generate the summary."
 
 # --- Background Task Processing ---
 async def process_summary_task(
@@ -482,7 +495,7 @@ async def lifespan(app: Starlette):
             except Exception as e: logger.warning(f"Could not delete webhook: {e}"); await asyncio.sleep(1)
         space_host = os.environ.get("SPACE_HOST"); webhook_path = "/webhook"; full_webhook_url = None
         if space_host:
-            protocol = "https://"; host = space_host.split('://')[-1]; full_webhook_url = f"{protocol}{host.rstrip('/')}{webhook_path}"
+            protocol = "https"; host = space_host.split('://')[-1]; full_webhook_url = f"{protocol}://{host.rstrip('/')}{webhook_path}" # Corrected URL construction
             if full_webhook_url:
                 logger.info(f"Setting webhook: {full_webhook_url}"); set_webhook_args = { "url": full_webhook_url, "allowed_updates": Update.ALL_TYPES, "drop_pending_updates": True }
                 if WEBHOOK_SECRET: set_webhook_args["secret_token"] = WEBHOOK_SECRET; logger.info("Using webhook secret.")