again

components/gateways/headlines_to_wa.py

@@ -2,8 +2,8 @@ import os
 import json
 import redis
 import requests
-from fastapi import FastAPI # This import is not strictly needed in this file if it's just a module
-from fastapi.responses import JSONResponse # This import is not strictly needed in this file if it's just a module
+from fastapi import FastAPI
+from fastapi.responses import JSONResponse
 import logging
 
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -13,21 +13,22 @@ logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(
 REDIS_URL = os.environ.get("UPSTASH_REDIS_URL", "redis://localhost:6379")
 WHATSAPP_API_URL = os.environ.get("WHATSAPP_API_URL", "https://api.gupshup.io/wa/api/v1/msg") 
 WHATSAPP_TOKEN = os.environ.get("WHATSAPP_TOKEN")
-WHATSAPP_TO_NUMBER = os.environ.get("WHATSAPP_TO_NUMBER", "353899495777")  # e.g., "91xxxxxxxxxx"
-GUPSHUP_SOURCE_NUMBER = os.environ.get("GUPSHUP_SOURCE_NUMBER")  # e.g., your WABA number
-GUPSHUP_APP_NAME = os.environ.get("GUPSHUP_APP_NAME")  # e.g., your Gupshup app name
+WHATSAPP_TO_NUMBER = os.environ.get("WHATSAPP_TO_NUMBER", "353899495777")  # Default can be changed
+GUPSHUP_SOURCE_NUMBER = os.environ.get("GUPSHUP_SOURCE_NUMBER")  
+GUPSHUP_APP_NAME = os.environ.get("GUPSHUP_APP_NAME")  
 
-# ✅ Redis connection
+# ✅ Redis connection (assuming it's connected successfully elsewhere in the full file)
 try:
     redis_client = redis.Redis.from_url(REDIS_URL, decode_responses=True)
-    redis_client.ping() # Test connection
+    redis_client.ping() 
     logging.info("Redis client connected successfully.")
 except Exception as e:
     logging.error(f"❌ Failed to connect to Redis: {e}")
     raise
 
-# 🧾 Fetch and format headlines
+# 🧾 Fetch and format headlines (assuming this function is defined as before)
 def fetch_cached_headlines() -> str:
+    # ... (content of your fetch_cached_headlines function) ...
     try:
         raw = redis_client.get("detailed_news_feed_cache") 
         if not raw:
@@ -45,7 +46,7 @@ def fetch_cached_headlines() -> str:
     for topic_key in sorted_topics:
         stories = data[topic_key]
         title = topic_key.replace("_", " ").title() 
-        message_parts.append(f"\n🏷️ *{title}*") # Added newline before topic title
+        message_parts.append(f"\n🏷️ *{title}*") 
         
         sorted_story_ids = sorted(stories.keys(), key=int) 
 
@@ -60,43 +61,50 @@ def fetch_cached_headlines() -> str:
     return "\n".join(message_parts)
 
 # 📤 Send via Gupshup WhatsApp API
-def send_to_whatsapp(message_text: str, destination_number: str) -> dict: # Function expects the full message text
+def send_to_whatsapp(message_text: str, destination_number: str) -> dict: # destination_number is required
     # Validate critical environment variables for sending a message
     if not WHATSAPP_TOKEN or \
-       not WHATSAPP_TO_NUMBER or \
        not GUPSHUP_SOURCE_NUMBER or \
-       not GUPSHUP_APP_NAME:
-        error_msg = "❌ Missing one or more critical WhatsApp API environment variables (WHATSAPP_TOKEN, WHATSAPP_TO_NUMBER, GUPSHUP_SOURCE_NUMBER, GUPSHUP_APP_NAME)."
+       not GUPSHUP_APP_NAME: # WHATSAPP_TO_NUMBER is no longer critically validated here, as it's passed as an argument
+        error_msg = "❌ Missing one or more critical WhatsApp API environment variables (WHATSAPP_TOKEN, GUPSHUP_SOURCE_NUMBER, GUPSHUP_APP_NAME)."
         logging.error(error_msg)
         return {"status": "failed", "error": error_msg, "code": 500}
+    
+    # It's good practice to ensure the destination number itself isn't empty
+    if not destination_number:
+        error_msg = "❌ Destination number cannot be empty."
+        logging.error(error_msg)
+        return {"status": "failed", "error": error_msg, "code": 400}
+
 
     headers = {
         "Content-Type": "application/x-www-form-urlencoded",
-        "apikey": WHATSAPP_TOKEN, # API key in 'apikey' header
-        "Cache-Control": "no-cache" # Add Cache-Control header
+        "apikey": WHATSAPP_TOKEN, 
+        "Cache-Control": "no-cache" 
     }
 
     whatsapp_message_content = {
         "type": "text",
-        "text": message_text # This is the full formatted text
+        "text": message_text 
     }
     
     payload = {
         "channel": "whatsapp",
         "source": GUPSHUP_SOURCE_NUMBER,
-        "destination": destination_number,
+        "destination": destination_number, # Use the passed destination_number
         "src.name": GUPSHUP_APP_NAME,
-        "message": json.dumps(whatsapp_message_content) # 'message' parameter with JSON string for text type
+        "message": json.dumps(whatsapp_message_content) 
     }
 
     try:
-        logging.info(f"Attempting to send standard text WhatsApp message to {WHATSAPP_TO_NUMBER} via Gupshup. API URL: {WHATSAPP_API_URL}")
+        # FIX: Log the actual destination_number being used
+        logging.info(f"Attempting to send standard text WhatsApp message to {destination_number} via Gupshup. API URL: {WHATSAPP_API_URL}")
         response = requests.post(
             WHATSAPP_API_URL, 
             headers=headers,
             data=payload, 
         )
-        response.raise_for_status() # Raise HTTPError for bad responses (4xx or 5xx)
+        response.raise_for_status() 
 
         return {"status": "success", "details": response.json()}
     except requests.exceptions.RequestException as e:
@@ -106,9 +114,64 @@ def send_to_whatsapp(message_text: str, destination_number: str) -> dict: # Func
         logging.error(f"❌ An unexpected error occurred during WhatsApp send: {e}")
         return {"status": "failed", "error": str(e), "code": 500}
 
-# Removed the FastAPI app instance and endpoint from here,
-# as it will be defined in routes/api/wa_headlines.py
-# and then included in app.py.
+# 🚀 FastAPI App
+app = FastAPI()
+
+@app.get("/send-daily-whatsapp")
+def send_daily_whatsapp_digest():
+    logging.info("API Call: /send-daily-whatsapp initiated.")
+    
+    full_message_text = fetch_cached_headlines()
+
+    if full_message_text.startswith("❌") or full_message_text.startswith("⚠️"):
+        logging.warning(f"Returning error due to issue fetching headlines: {full_message_text}")
+        return JSONResponse(status_code=404, content={"error": full_message_text})
+
+    # Call send_to_whatsapp with the default destination from environment variable
+    # This now requires WHATSAPP_TO_NUMBER to be set and passed
+    result = send_to_whatsapp(full_message_text, destination_number=WHATSAPP_TO_NUMBER) 
+    
+    if result.get("status") == "success":
+        logging.info("✅ WhatsApp message sent successfully.")
+        return JSONResponse(status_code=200, content=result)
+    else:
+        logging.error(f"❌ Failed to send WhatsApp message: {result.get('error')}")
+        return JSONResponse(status_code=result.get("code", 500), content=result)
+
+# 🧪 For local testing
+if __name__ == "__main__":
+    # For local testing, ensure these environment variables are set in your shell or .env file.
+    # Example .env content:
+    # UPSTASH_REDIS_URL="redis://your_redis_url"
+    # WHATSAPP_API_URL="https://api.gupshup.io/wa/api/v1/msg"
+    # WHATSAPP_TOKEN="YOUR_GUPSHUP_API_KEY"
+    # WHATSAPP_TO_NUMBER="919999999999"  # Ensure this is set for direct use by send_daily_whatsapp_digest
+    # GUPSHUP_SOURCE_NUMBER="15557926439"
+    # GUPSHUP_APP_NAME="NuseAI"
+
+    # Simulate a cached detailed feed for testing
+    dummy_cached_detailed_feed = {
+        "india": {
+            "1": {"title": "India's Economy Surges", "description": "Rapid growth in manufacturing and services sectors signals a strong economic recovery, boosting investor confidence and job creation.", "sources": ["Times of India"]},
+            "2": {"title": "New Tech Policy Unveiled", "description": "Government introduces new regulations to foster innovation while addressing data privacy concerns, aiming to balance growth with user protection.", "sources": ["Indian Express"]}
+        },
+        "world": {
+            "3": {"title": "Global Climate Talks Advance", "description": "Nations agree on ambitious new targets for emissions reduction, marking a significant step towards combating climate change despite earlier disagreements.", "sources": ["BBC News"]},
+            "4": {"title": "Space Mission Explores Mars", "description": "A new rover successfully lands on Mars, sending back groundbreaking data that could revolutionize our understanding of planetary geology and potential for life.", "sources": ["CNN World"]}
+        }
+    }
+    # Store dummy data in Redis for testing fetch_cached_headlines
+    redis_client.set("detailed_news_feed_cache", json.dumps(dummy_cached_detailed_feed))
 
-# Removed the if __name__ == "__main__": block from here,
-# as it will be in routes/api/wa_headlines.py for local testing.
+
+    logging.info("\n--- WhatsApp Message Preview ---\n")
+    msg_preview = fetch_cached_headlines()
+    print(msg_preview)
+    
+    logging.info("\n--- Sending WhatsApp Message (Test) ---\n")
+    # When testing locally, you might pass a specific number here
+    # test_result = send_to_whatsapp(msg_preview, destination_number="919999999999") 
+    
+    # If running the app via uvicorn and hitting the /send-daily-whatsapp endpoint,
+    # it will use WHATSAPP_TO_NUMBER from os.environ.get
+    print("Run `uvicorn your_app_file:app --reload` and visit /send-daily-whatsapp in browser or curl.")