fix 110

components/gateways/headlines_to_wa.py

@@ -4,17 +4,18 @@ import redis
 import requests
 from fastapi import FastAPI
 from fastapi.responses import JSONResponse
-import logging # Import logging for better output
+import logging
 
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 
 # 🌐 Redis config
 REDIS_URL = os.environ.get("UPSTASH_REDIS_URL", "redis://localhost:6379")
-WHATSAPP_API_URL = os.environ.get("WHATSAPP_API_URL", "https://api.gupshup.io/sm/api/v1/msg")
-WHATSAPP_TOKEN = os.environ.get("WHATSAPP_TOKEN", "sk_e73f674b797549ed80c85105ded5a0d1")
-WHATSAPP_TO_NUMBER = os.environ.get("WHATSAPP_TO_NUMBER", "35389945777")  # e.g., "91xxxxxxxxxx"
-GUPSHUP_SOURCE_NUMBER = os.environ.get("GUPSHUP_SOURCE_NUMBER", "15557926439")  # e.g., your WABA number
-GUPSHUP_APP_NAME = os.environ.get("GUPSHUP_APP_NAME", "NuseAI")  # e.g., your Gupshup app name
+# <<< CHANGE 1: Update the API URL to match the curl template >>>
+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")  # 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
 
 # ✅ Redis connection
 try:
@@ -23,14 +24,11 @@ try:
     logging.info("Redis client connected successfully.")
 except Exception as e:
     logging.error(f"❌ Failed to connect to Redis: {e}")
-    # Depending on your application's needs, you might want to exit or fail gracefully here.
     raise
 
 # 🧾 Fetch and format headlines
 def fetch_cached_headlines() -> str:
     try:
-        # Assuming 'detailed_news_feed_cache' is the key for the final detailed headlines
-        # This key should match what's used in components/generators/detailed_explainer.py
         raw = redis_client.get("detailed_news_feed_cache") 
         if not raw:
             logging.warning("⚠️ No detailed news headlines found in cache.")
@@ -42,28 +40,20 @@ def fetch_cached_headlines() -> str:
 
     message_parts = ["🗞️ *Your Daily Digest* 🟡\n"]
     
-    # Iterate through topics in the order defined by TOPIC_KEYS (if available, otherwise iterate data.items())
-    # Assuming TOPIC_KEYS is available globally or passed here if needed for consistent order
-    # For now, just iterate through the data items as they are in the cached JSON
-    
-    # Sort topics alphabetically for consistent output if no external order is provided
     sorted_topics = sorted(data.keys())
 
     for topic_key in sorted_topics:
         stories = data[topic_key]
-        # Format topic title nicely (e.g., "india" -> "India", "world" -> "World")
         title = topic_key.replace("_", " ").title() 
         message_parts.append(f"🏷️ *{title}*")
         
-        # Sort stories by their sequential ID for consistent order
-        sorted_story_ids = sorted(stories.keys(), key=int) # Ensure keys are treated as integers for sorting
+        sorted_story_ids = sorted(stories.keys(), key=int) 
 
         for ref_id in sorted_story_ids:
             item = stories[ref_id]
-            summary = item.get("title", "") # Use 'title' key for the summary/headline
-            description = item.get("description", "") # Use 'description' key for the explanation
+            summary = item.get("title", "") 
+            description = item.get("description", "") 
             
-            # Ensure ref_id is a string for the message
             message_parts.append(f"{ref_id}. {summary}\n_Why this matters_: {description}")
         message_parts.append("")  # spacing between sections
 
@@ -77,16 +67,16 @@ def send_to_whatsapp(message_text: str) -> dict:
         logging.error(error_msg)
         return {"status": "failed", "error": error_msg, "code": 500}
 
-    # Gupshup requires the API key in the 'apikey' header
     headers = {
         "Content-Type": "application/x-www-form-urlencoded",
-        "apikey": WHATSAPP_TOKEN # <<< FIX: API key in 'apikey' header
+        "apikey": WHATSAPP_TOKEN, # API key in 'apikey' header
+        "Cache-Control": "no-cache" # <<< CHANGE 2: Add Cache-Control header
     }
 
     payload = {
         "channel": "whatsapp",
         "source": GUPSHUP_SOURCE_NUMBER,
-        "destination": WHATSAPP_TO_NUMBER,
+        "destination": WHATSAPP_TO_NUMBER, # Ensure this holds the full number, not just '91'
         "message": json.dumps({
             "type": "text",
             "text": message_text
@@ -95,12 +85,11 @@ def send_to_whatsapp(message_text: str) -> dict:
     }
 
     try:
-        logging.info(f"Attempting to send WhatsApp message to {WHATSAPP_TO_NUMBER} via Gupshup.")
+        logging.info(f"Attempting to send WhatsApp message to {WHATSAPP_TO_NUMBER} via Gupshup. API URL: {WHATSAPP_API_URL}")
         response = requests.post(
-            WHATSAPP_API_URL,
+            WHATSAPP_API_URL, # Uses the updated URL
             headers=headers,
-            data=payload,
-            # auth=(WHATSAPP_TOKEN, '') # <<< REMOVED: This sends Basic Auth, which Gupshup doesn't support for API key
+            data=payload, # requests will correctly url-encode this dict
         )
         response.raise_for_status() # Raise HTTPError for bad responses (4xx or 5xx)
 
@@ -130,19 +119,12 @@ def send_daily_whatsapp_digest():
         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')}")
+        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__":
-    # Set dummy environment variables for local testing if not already set
-    os.environ.setdefault("WHATSAPP_API_URL", "https://api.gupshup.io/sm/api/v1/msg")
-    os.environ.setdefault("WHATSAPP_TOKEN", "sk_e73f674b797549ed80c85105ded5a0d1") # Replace with a real dummy or your actual key
-    os.environ.setdefault("WHATSAPP_TO_NUMBER", "35389945777") # Replace with a test number
-    os.environ.setdefault("GUPSHUP_SOURCE_NUMBER", "15557926439") # Replace with your WABA number
-    os.environ.setdefault("GUPSHUP_APP_NAME", "NuseAI") # Replace with your app name
-
-    # 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"]},
@@ -162,6 +144,5 @@ if __name__ == "__main__":
     print(msg_preview)
     
     logging.info("\n--- Sending WhatsApp Message (Test) ---\n")
-    # This will attempt to send a real message if your env vars are valid
     test_result = send_to_whatsapp(msg_preview)
     print(test_result)