let's see

components/gateways/headlines_to_wa.py

@@ -4,18 +4,22 @@ 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
+# 🌐 Configuration from Environment Variables
+# These variables MUST be set in your environment (e.g., .env file, shell exports, deployment configs)
 REDIS_URL = os.environ.get("UPSTASH_REDIS_URL", "redis://localhost:6379")
+# Reverting API URL to generic WhatsApp message endpoint
 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"
+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
 
+# Removed: WHATSAPP_CATALOG_ID, WHATSAPP_PRODUCT_RETAILER_ID, WHATSAPP_FOOTER_TEXT, WHATSAPP_TEMPLATE_ID
+
 # ✅ Redis connection
 try:
     redis_client = redis.Redis.from_url(REDIS_URL, decode_responses=True)
@@ -26,10 +30,9 @@ except Exception as e:
     raise
 
 # 🧾 Fetch and format headlines
+# Reverting this function to generate the full text message content
 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.")
@@ -46,9 +49,9 @@ def fetch_cached_headlines() -> str:
     for topic_key in sorted_topics:
         stories = data[topic_key]
         title = topic_key.replace("_", " ").title() 
-        message_parts.append(f"🏷️ *{title}*")
+        message_parts.append(f"\n🏷️ *{title}*") # Added newline before topic title
         
-        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]
@@ -56,42 +59,48 @@ def fetch_cached_headlines() -> str:
             description = item.get("description", "") 
             
             message_parts.append(f"{ref_id}. {summary}\n_Why this matters_: {description}")
-        message_parts.append("")  # spacing between sections
+        # No extra empty line needed here if we add newline to topic title
 
     return "\n".join(message_parts)
 
 # 📤 Send via Gupshup WhatsApp API
-def send_to_whatsapp(message_text: str) -> dict:
-    # Validate environment variables
-    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 WhatsApp API environment variables (WHATSAPP_TOKEN, WHATSAPP_TO_NUMBER, GUPSHUP_SOURCE_NUMBER, GUPSHUP_APP_NAME)."
+# Reverting to send a standard text message
+def send_to_whatsapp(message_text: str) -> dict: # Function expects the full message text
+    # 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)."
         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, # API key in 'apikey' header
         "Cache-Control": "no-cache" # Add Cache-Control header
     }
 
+    # <<< REVERTED MESSAGE PAYLOAD FOR STANDARD TEXT MESSAGE >>>
+    whatsapp_message_content = {
+        "type": "text",
+        "text": message_text # This is the full formatted text
+    }
+    
     payload = {
         "channel": "whatsapp",
         "source": GUPSHUP_SOURCE_NUMBER,
-        "destination": WHATSAPP_TO_NUMBER, # Ensure this holds the full number
-        "message": json.dumps({
-            "type": "text",
-            "text": message_text
-        }),
+        "destination": WHATSAPP_TO_NUMBER,
         "src.name": GUPSHUP_APP_NAME,
+        "message": json.dumps(whatsapp_message_content) # 'message' parameter with JSON string for text type
     }
 
     try:
-        logging.info(f"Attempting to send WhatsApp message to {WHATSAPP_TO_NUMBER} via Gupshup. API URL: {WHATSAPP_API_URL}")
+        logging.info(f"Attempting to send standard text WhatsApp message to {WHATSAPP_TO_NUMBER} via Gupshup. API URL: {WHATSAPP_API_URL}")
         response = requests.post(
             WHATSAPP_API_URL, 
             headers=headers,
-            data=payload, # requests will correctly url-encode this dict
+            data=payload, 
         )
         response.raise_for_status() # Raise HTTPError for bad responses (4xx or 5xx)
 
@@ -109,13 +118,16 @@ app = FastAPI()
 @app.get("/send-daily-whatsapp")
 def send_daily_whatsapp_digest():
     logging.info("API Call: /send-daily-whatsapp initiated.")
-    message = fetch_cached_headlines()
+    
+    # fetch_cached_headlines now returns the full message text
+    full_message_text = fetch_cached_headlines()
 
-    if message.startswith("❌") or message.startswith("⚠️"):
-        logging.warning(f"Returning error due to issue fetching headlines: {message}")
-        return JSONResponse(status_code=404, content={"error": message})
+    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})
 
-    result = send_to_whatsapp(message)
+    # Call send_to_whatsapp with the full formatted text
+    result = send_to_whatsapp(full_message_text) 
     
     if result.get("status") == "success":
         logging.info("✅ WhatsApp message sent successfully.")
@@ -126,15 +138,14 @@ def send_daily_whatsapp_digest():
 
 # 🧪 For local testing
 if __name__ == "__main__":
-    # --- IMPORTANT: For local testing, ensure these environment variables are set
-    #               in your shell, via a .env file, or your IDE's configuration.
-    #               Example:
-    #               export WHATSAPP_API_URL="https://api.gupshup.io/wa/api/v1/msg"
-    #               export WHATSAPP_TOKEN="YOUR_GUPSHUP_API_KEY"
-    #               export WHATSAPP_TO_NUMBER="919999999999"
-    #               export GUPSHUP_SOURCE_NUMBER="15557926439"
-    #               export GUPSHUP_APP_NAME="NuseAI"
-    # -----------------------------------------------------------------------------
+    # 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"
+    # GUPSHUP_SOURCE_NUMBER="15557926439"
+    # GUPSHUP_APP_NAME="NuseAI"
 
     # Simulate a cached detailed feed for testing
     dummy_cached_detailed_feed = {