Update main.py

main.py

@@ -99,34 +99,16 @@ APIFY_API_TOKEN = get_secret('APIFY_API_TOKEN')
 RAPIDAPI_KEY = get_secret('RAPIDAPI_KEY')
 WEBHOOK_SECRET = get_secret('WEBHOOK_SECRET')
 
-# --- Model Configurations (Specific April 2025 UPDATE) ---
-# Model Priority (first → last):
-# 1. Gemini 2.5 Flash Preview
-# 2. Gemini 2.5 Pro Exp
-# 3. Gemini 2.0 Flash
-# 4. OpenRouter DeepSeek V3 Free
-# 5. Groq Llama 4 Scout
-GEMINI_FLASH_PREVIEW_MODEL = os.environ.get(
-    "GEMINI_FLASH_PREVIEW_MODEL",
-    "gemini-2.5-flash-preview"
-)
-GEMINI_PRO_EXP_MODEL = os.environ.get(
-    "GEMINI_PRO_EXP_MODEL",
-    "gemini-2.5-pro-exp-03-25"
-)
-GEMINI_FLASH_MODEL = os.environ.get(
-    "GEMINI_FLASH_MODEL",
-    "gemini-2.0-flash-001"
-)
-OPENROUTER_DEEPSEEK_MODEL = os.environ.get(
-    "OPENROUTER_DEEPSEEK_MODEL",
-    "deepseek/deepseek-chat-v3-0324:free"
-)
-GROQ_LLAMA4_MODEL = os.environ.get(
-    "GROQ_LLAMA4_MODEL",
-    "meta-llama/llama-4-scout-17b-16e-instruct"
-)
-
+# --- Model Configurations (Specific April 2025) ---
+# Model Priority:
+# 1. Groq Llama 4 Scout
+# 2. Gemini 2.5 Pro Exp
+# 3. Gemini 2.0 Flash
+# 4. OpenRouter DeepSeek V3 Free
+GROQ_LLAMA4_MODEL = os.environ.get("GROQ_LLAMA4_MODEL", "meta-llama/llama-4-scout-17b-16e-instruct") # Specific Llama 4 model
+GEMINI_PRO_EXP_MODEL = os.environ.get("GEMINI_PRO_EXP_MODEL", "gemini-2.5-pro-exp-03-25")
+GEMINI_FLASH_MODEL = os.environ.get("GEMINI_FLASH_MODEL", "gemini-2.0-flash-001")
+OPENROUTER_DEEPSEEK_MODEL = os.environ.get("OPENROUTER_DEEPSEEK_MODEL", "deepseek/deepseek-chat-v3-0324:free") # Specific DeepSeek model
 
 APIFY_ACTOR_ID = os.environ.get("APIFY_ACTOR_ID", "1s7eXiaukVuOr4Ueg") # YT Default
 APIFY_STRUCTURED_YT_ACTOR_ID = "gpjTCWkGZS1lHc9pR" # YT Fallback 1 (New Structured Extractor)
@@ -162,27 +144,10 @@ if not SUPADATA_API_KEY: logger.warning("Optional secret 'SUPADATA_API_KEY' not
 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"Summariser 1 (Gemini Flash Preview): "
-    f"{GEMINI_FLASH_PREVIEW_MODEL if _gemini_api_enabled else 'DISABLED'}"
-)
-logger.info(
-    f"Summariser 2 (Gemini Pro Exp): "
-    f"{GEMINI_PRO_EXP_MODEL if _gemini_api_enabled else 'DISABLED'}"
-)
-logger.info(
-    f"Summariser 3 (Gemini Flash 2.0): "
-    f"{GEMINI_FLASH_MODEL if _gemini_api_enabled else 'DISABLED'}"
-)
-logger.info(
-    f"Summariser 4 (OpenRouter DeepSeek V3): "
-    f"{OPENROUTER_DEEPSEEK_MODEL if _openrouter_fallback_enabled else 'DISABLED'}"
-)
-logger.info(
-    f"Summariser 5 (Groq Llama 4 Scout): "
-    f"{GROQ_LLAMA4_MODEL if _groq_enabled else 'DISABLED'}"
-)
-
+logger.info(f"Summarizer 1 (Groq): {GROQ_LLAMA4_MODEL if _groq_enabled else 'DISABLED'}")
+logger.info(f"Summarizer 2 (Gemini Pro Exp): {GEMINI_PRO_EXP_MODEL if _gemini_api_enabled else 'DISABLED'}")
+logger.info(f"Summarizer 3 (Gemini Flash): {GEMINI_FLASH_MODEL if _gemini_api_enabled else 'DISABLED'}")
+logger.info(f"Summarizer 4 (OpenRouter): {OPENROUTER_DEEPSEEK_MODEL if _openrouter_fallback_enabled else 'DISABLED'}")
 # --- Updated Logging ---
 logger.info(f"Using Apify Actor (YT Fallback 1 - Structured): {APIFY_STRUCTURED_YT_ACTOR_ID}")
 logger.info(f"Using Apify Actor (YT Fallback 3 - Default): {APIFY_ACTOR_ID}") # Now fallback 3
@@ -887,27 +852,19 @@ async def _call_gemini(text: str, summary_type: str, model_name: str) -> Tuple[O
     # FIX: Define safety_settings explicitly with the 5 categories from the error log
     # Removed the problematic loop that dynamically added potentially unsupported categories.
     try:
-        # safety settings – list‑of‑dict form (docs compliant)
-        safety_settings = [
-            {"category": "HARM_CATEGORY_HARASSMENT",        "threshold": "BLOCK_NONE"},
-            {"category": "HARM_CATEGORY_HATE_SPEECH",       "threshold": "BLOCK_NONE"},
-            {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "BLOCK_NONE"},
-            {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "BLOCK_NONE"},
-            {"category": "HARM_CATEGORY_CIVIC_INTEGRITY",   "threshold": "BLOCK_NONE"},
-        ]
-
-        list_descr = ", ".join(f"{s['category']}:{s['threshold']}"
-                               for s in safety_settings)
-        logger.debug(f"[Gemini {model_name}] Using safety settings → {list_descr}")
-
+        safety_settings = {
+            HarmCategory.HARM_CATEGORY_HARASSMENT: HarmBlockThreshold.BLOCK_NONE,
+            HarmCategory.HARM_CATEGORY_HATE_SPEECH: HarmBlockThreshold.BLOCK_NONE,
+            HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: HarmBlockThreshold.BLOCK_NONE,
+            HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: HarmBlockThreshold.BLOCK_NONE,
+            HarmCategory.HARM_CATEGORY_CIVIC_INTEGRITY: HarmBlockThreshold.BLOCK_NONE, # Added based on error msg
+        }
+        logger.debug(f"[Gemini {model_name}] Using safety settings: { {k.name: v.name for k, v in safety_settings.items()} }")
     except AttributeError:
-        logger.error(f"[Gemini {model_name}] Failed to define safety settings "
-                     "(HarmCategory/HarmBlockThreshold missing?)")
-        return None, (
-            f"Sorry, an internal error occurred configuring the AI service "
-            f"({model_name})."
-        )
-
+        # Handle case where HarmCategory or HarmBlockThreshold might not be loaded correctly
+        # This shouldn't happen if _gemini_sdk_available is True, but defensive coding
+        logger.error(f"[Gemini {model_name}] Failed to define safety settings. HarmCategory/HarmBlockThreshold missing?")
+        return None, f"Sorry, an internal error occurred configuring the AI service ({model_name})."
 
     try:
         logger.debug(f"[Gemini {model_name}] Initializing model {model_name}")
@@ -1019,91 +976,82 @@ async def _call_openrouter(text: str, summary_type: str) -> Tuple[Optional[str],
 
 async def generate_summary(text: str, summary_type: str) -> str:
     """
-    Generates a summary using the April 2025 hierarchy:
-    1. Gemini 2.5 Flash Preview
-    2. Gemini 2.5 Pro Exp
-    3. Gemini 2.0 Flash
-    4. OpenRouter DeepSeek V3 Free
-    5. Groq Llama 4 Scout
+    Generates summary using the specific model hierarchy (April 2025):
+    1. Groq (Llama 4 Scout)
+    2. Gemini (2.5 Pro Exp)
+    3. Gemini (2.0 Flash)
+    4. OpenRouter (DeepSeek V3 Free)
+    Returns the summary text or a comprehensive error message.
     """
-    logger.info("[Summary Generation] Starting with updated model hierarchy.")
+    global _groq_enabled, _gemini_api_enabled, _openrouter_fallback_enabled
+    global GROQ_LLAMA4_MODEL, GEMINI_PRO_EXP_MODEL, GEMINI_FLASH_MODEL, OPENROUTER_DEEPSEEK_MODEL
+
+    logger.info("[Summary Generation] Starting process with specific April 2025 model hierarchy.")
     summary: Optional[str] = None
     errors: Dict[str, Optional[str]] = {
-        "GeminiFlashPreview": None,
+        "Llama4Scout": None,
         "GeminiProExp": None,
         "GeminiFlash": None,
         "DeepSeekV3": None,
-        "Llama4Scout": None,
     }
 
-    # Attempt 1: Gemini 2.5 Flash Preview
-    if _gemini_api_enabled:
-        summary, errors["GeminiFlashPreview"] = await _call_gemini(
-            text, summary_type, GEMINI_FLASH_PREVIEW_MODEL
-        )
+    # --- Attempt 1: Groq (Llama 4 Scout) ---
+    if _groq_enabled:
+        logger.info(f"[Summary Generation] Attempting 1: Groq ({GROQ_LLAMA4_MODEL})")
+        summary, errors["Llama4Scout"] = await _call_groq(text, summary_type)
         if summary:
+            logger.info(f"[Summary Generation] Success with Groq ({GROQ_LLAMA4_MODEL}).")
             return summary
-        logger.warning(
-            f"[Summary Generation] Gemini Flash Preview failed: "
-            f"{errors['GeminiFlashPreview']}; trying Gemini Pro Exp."
-        )
+        else:
+            logger.warning(f"[Summary Generation] Groq Llama 4 Scout failed. Error: {errors['Llama4Scout']}. Proceeding to Gemini 2.5 Pro Exp.")
     else:
-        errors["GeminiFlashPreview"] = "Service disabled/unavailable."
+        logger.warning("[Summary Generation] Groq (Llama 4 Scout) is disabled or unavailable. Skipping.")
+        errors["Llama4Scout"] = "Service disabled/unavailable."
 
-    # Attempt 2: Gemini 2.5 Pro Exp
+    # --- Attempt 2: Gemini 2.5 Pro Exp ---
     if _gemini_api_enabled:
-        summary, errors["GeminiProExp"] = await _call_gemini(
-            text, summary_type, GEMINI_PRO_EXP_MODEL
-        )
+        logger.info(f"[Summary Generation] Attempting 2: Gemini ({GEMINI_PRO_EXP_MODEL})")
+        summary, errors["GeminiProExp"] = await _call_gemini(text, summary_type, GEMINI_PRO_EXP_MODEL)
         if summary:
+            logger.info(f"[Summary Generation] Success with Gemini ({GEMINI_PRO_EXP_MODEL}).")
             return summary
-        logger.warning(
-            f"[Summary Generation] Gemini Pro Exp failed: "
-            f"{errors['GeminiProExp']}; trying Gemini Flash 2.0."
-        )
-
-    # Attempt 3: Gemini 2.0 Flash
-    if _gemini_api_enabled:
-        summary, errors["GeminiFlash"] = await _call_gemini(
-            text, summary_type, GEMINI_FLASH_MODEL
-        )
+        else:
+            logger.warning(f"[Summary Generation] Gemini 2.5 Pro Exp failed. Error: {errors['GeminiProExp']}. Proceeding to Gemini 2.0 Flash.")
+    else:
+        logger.warning("[Summary Generation] Gemini API is disabled or unavailable. Skipping Gemini 2.5 Pro Exp & 2.0 Flash.")
+        errors["GeminiProExp"] = "Service disabled/unavailable."
+        errors["GeminiFlash"] = "Service disabled/unavailable."
+
+    # --- Attempt 3: Gemini 2.0 Flash ---
+    if _gemini_api_enabled and errors["GeminiFlash"] is None: # Check if Gemini API is enabled AND wasn't already marked as failed/skipped
+        logger.info(f"[Summary Generation] Attempting 3: Gemini ({GEMINI_FLASH_MODEL})")
+        summary, errors["GeminiFlash"] = await _call_gemini(text, summary_type, GEMINI_FLASH_MODEL)
         if summary:
+            logger.info(f"[Summary Generation] Success with Gemini ({GEMINI_FLASH_MODEL}).")
             return summary
-        logger.warning(
-            f"[Summary Generation] Gemini Flash 2.0 failed: "
-            f"{errors['GeminiFlash']}; trying DeepSeek V3."
-        )
+        else:
+            logger.warning(f"[Summary Generation] Gemini 2.0 Flash failed. Error: {errors['GeminiFlash']}. Proceeding to OpenRouter DeepSeek V3.")
+    elif errors["GeminiFlash"] is None: # Only log skip message if it wasn't already marked as disabled
+         logger.warning("[Summary Generation] Skipping Gemini 2.0 Flash (API was disabled).")
+         errors["GeminiFlash"] = "Service disabled/unavailable."
 
-    # Attempt 4: OpenRouter DeepSeek V3
+    # --- Attempt 4: OpenRouter (DeepSeek V3 Free - Final Fallback) ---
     if _openrouter_fallback_enabled:
+        logger.info(f"[Summary Generation] Attempting 4: OpenRouter ({OPENROUTER_DEEPSEEK_MODEL})")
         summary, errors["DeepSeekV3"] = await _call_openrouter(text, summary_type)
         if summary:
+            logger.info(f"[Summary Generation] Success with OpenRouter ({OPENROUTER_DEEPSEEK_MODEL}).")
             return summary
-        logger.warning(
-            f"[Summary Generation] DeepSeek V3 failed: "
-            f"{errors['DeepSeekV3']}; trying Llama 4 Scout."
-        )
+        else:
+            logger.error(f"[Summary Generation] OpenRouter DeepSeek V3 (Final Fallback) also failed. Error: {errors['DeepSeekV3']}")
     else:
+        logger.error("[Summary Generation] OpenRouter fallback (DeepSeek V3) is disabled or unavailable. Cannot proceed.")
         errors["DeepSeekV3"] = "Service disabled/unavailable."
 
-    # Attempt 5: Groq Llama 4 Scout
-    if _groq_enabled:
-        summary, errors["Llama4Scout"] = await _call_groq(text, summary_type)
-        if summary:
-            return summary
-        logger.error(
-            f"[Summary Generation] Llama 4 Scout failed: {errors['Llama4Scout']}."
-        )
-    else:
-        errors["Llama4Scout"] = "Service disabled/unavailable."
-
-    # All failed
-    error_details = "\n".join(f"- {k}: {v}" for k, v in errors.items() if v)
-    return (
-        "Sorry, I could not generate a summary after trying all available AI models.\n"
-        f"Details:\n{error_details}"
-    )
-
+    # --- All Attempts Failed ---
+    logger.error("[Summary Generation] All summarization models failed.")
+    error_details = "\n".join([f"- {model}: {err}" for model, err in errors.items() if err])
+    return f"Sorry, I couldn't generate a summary after trying all available AI models.\nDetails:\n{error_details}"
 
 
 # --- Main Processing Logic ---
@@ -1268,7 +1216,7 @@ async def help_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
                   "2. I'll ask how you want it summarised (paragraph or points).\n"
                   "3. Click the button for your choice.\n"
                   "4. Wait while I fetch the content and generate the summary!\n\n"
-                  "⚙️ I try multiple methods to get content, especially for tricky websites or YouTube videos without standard transcripts. I use a five‑step fallback: Gemini 2.5 Flash Preview → Gemini 2.5 Pro Exp → Gemini 2.0 Flash → DeepSeek V3 → Llama 4 Scout.\n\n" # Updated help text
+                  "⚙️ I try multiple methods to get content, especially for tricky websites or YouTube videos without standard transcripts. I then use a sequence of AI models (Llama 4 Scout, Gemini 2.5 Pro, Gemini 2.0 Flash, DeepSeek V3) to summarise.\n\n" # Updated help text
                   "**Commands:**\n"
                   "`/start` - Display the welcome message\n"
                   "`/help` - Show this help message" )
@@ -1432,7 +1380,7 @@ async def lifespan(app: Starlette):
 
 async def health_check(request: Request) -> PlainTextResponse:
     """Simple health check endpoint."""
-    global GROQ_LLAMA4_MODEL, GEMINI_PRO_EXP_MODEL, GEMINI_FLASH_MODEL, GEMINI_FLASH_PREVIEW_MODEL, OPENROUTER_DEEPSEEK_MODEL
+    global GROQ_LLAMA4_MODEL, GEMINI_PRO_EXP_MODEL, GEMINI_FLASH_MODEL, OPENROUTER_DEEPSEEK_MODEL
     global APIFY_ACTOR_ID, APIFY_STRUCTURED_YT_ACTOR_ID # Add new ID here
     global _groq_enabled, _gemini_api_enabled, _openrouter_fallback_enabled
     global _apify_token_exists, _urltotext_key_exists, _rapidapi_key_exists, SUPADATA_API_KEY
@@ -1457,18 +1405,11 @@ async def health_check(request: Request) -> PlainTextResponse:
     return PlainTextResponse(
         f"TG Bot Summariser - Status: {bot_status} ({bot_username})\n"
         f"---\n"
-        f"Summariser Priority (April 2025):\n"
-        f"1. Gemini Flash Preview: "
-        f"{GEMINI_FLASH_PREVIEW_MODEL if _gemini_api_enabled else 'DISABLED'}\n"
-        f"2. Gemini Pro Exp: "
-        f"{GEMINI_PRO_EXP_MODEL if _gemini_api_enabled else 'DISABLED'}\n"
-        f"3. Gemini Flash 2.0: "
-        f"{GEMINI_FLASH_MODEL if _gemini_api_enabled else 'DISABLED'}\n"
-        f"4. OpenRouter DeepSeek V3: "
-        f"{OPENROUTER_DEEPSEEK_MODEL if _openrouter_fallback_enabled else 'DISABLED'}\n"
-        f"5. Groq Llama 4 Scout: "
-        f"{GROQ_LLAMA4_MODEL if _groq_enabled else 'DISABLED'}\n"
-
+        f"Summarizer Priority (April 2025 - Specific):\n"
+        f"1. Groq API: {GROQ_LLAMA4_MODEL if _groq_enabled else 'DISABLED'}\n"
+        f"2. Gemini API: {GEMINI_PRO_EXP_MODEL if _gemini_api_enabled else 'DISABLED'}\n"
+        f"3. Gemini API: {GEMINI_FLASH_MODEL if _gemini_api_enabled else 'DISABLED'}\n"
+        f"4. OpenRouter API: {OPENROUTER_DEEPSEEK_MODEL if _openrouter_fallback_enabled else 'DISABLED'}\n"
         f"---\n"
         f"Content Fetching Status:\n"
         # --- Updated YT Fallback List ---