once again

components/gateways/headlines_to_wa.py

@@ -2,14 +2,11 @@ import os
 import json
 import redis
 import requests
-from fastapi import FastAPI 
-from fastapi.responses import JSONResponse 
 import logging
-import datetime # Import datetime for dynamic date
 
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 
-# 🌐 Configuration from Environment Variables
+# 🌐 Configuration from Environment Variables (rest of the file's global section)
 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")
@@ -17,7 +14,7 @@ WHATSAPP_TO_NUMBER = os.environ.get("WHATSAPP_TO_NUMBER", "353899495777")
 GUPSHUP_SOURCE_NUMBER = os.environ.get("GUPSHUP_SOURCE_NUMBER")  
 GUPSHUP_APP_NAME = os.environ.get("GUPSHUP_APP_NAME")  
 
-# ✅ Redis connection
+# ✅ Redis connection (rest of the file's redis connection)
 try:
     redis_client = redis.Redis.from_url(REDIS_URL, decode_responses=True)
     redis_client.ping() 
@@ -26,19 +23,9 @@ except Exception as e:
     logging.error(f"❌ Failed to connect to Redis: {e}")
     raise
 
-# --- New: Topic mapping for display names and emojis ---
-TOPIC_DISPLAY_MAP = {
-    "india": {"name": "India", "emoji": "🇮🇳"},
-    "world": {"name": "World", "emoji": "🌍"},
-    "tech": {"name": "Technology", "emoji": "🧠"}, # Used brain emoji from your curl
-    "finance": {"name": "Business & Markets", "emoji": "💰"}, # Used money bag emoji from your curl
-    "sports": {"name": "Sports", "emoji": "🏆"}, # Used trophy emoji from your curl
-}
-
-
-# 🧾 Fetch and format headlines
-# UPDATED: To match the exact "NUSE DAILY" format
+# 🧾 Fetch and format headlines (rest of the file's fetch_cached_headlines)
 def fetch_cached_headlines() -> str:
+    # ... (rest of your fetch_cached_headlines function) ...
     try:
         raw = redis_client.get("detailed_news_feed_cache") 
         if not raw:
@@ -57,17 +44,23 @@ def fetch_cached_headlines() -> str:
     message_parts = []
 
     # Header section
-    message_parts.append("🗞️ *NUSE DAILY* 🟡")
-    message_parts.append(f"{formatted_date} — Morning Edition")
-    message_parts.append("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━") # Unicode Box Drawings Light Horizontal
-    message_parts.append("") # Empty line for spacing
+    message_parts.append(f"Nuse Daily - {formatted_date}")
+    message_parts.append("") 
+
+    # --- New: Topic mapping for display names and emojis ---
+    TOPIC_DISPLAY_MAP = {
+        "india": {"name": "India", "emoji": "🇮🇳"},
+        "world": {"name": "World", "emoji": "🌍"},
+        "tech": {"name": "Technology", "emoji": "🧠"}, # Used brain emoji from your curl
+        "finance": {"name": "Business & Markets", "emoji": "💰"}, # Used money bag emoji from your curl
+        "sports": {"name": "Sports", "emoji": "🏆"}, # Used trophy emoji from your curl
+    }
 
     # Iterate through topics in a defined order for consistent output
-    # Using the keys from TOPIC_DISPLAY_MAP to ensure order and access details
-    for topic_key, display_info in TOPIC_DISPLAY_MAP.items():
-        stories_for_topic = data.get(topic_key) # Get stories for this topic key
+    for topic_key, display_info in TOPIC_DISPLAY_MAP.items(): # TOPIC_DISPLAY_MAP needs to be defined
+        stories_for_topic = data.get(topic_key) 
         
-        if stories_for_topic: # Only add topic section if there are stories
+        if stories_for_topic: 
             message_parts.append(f"{display_info['emoji']} *{display_info['name']}*")
             
             sorted_story_ids = sorted(stories_for_topic.keys(), key=int) 
@@ -77,9 +70,8 @@ def fetch_cached_headlines() -> str:
                 summary = item.get("title", "") 
                 description = item.get("description", "") 
                 
-                # Using U+2007 (Figure Space) for alignment as seen in your example
                 message_parts.append(f"\u2007{ref_id}. \u2007{summary}\n_Why this matters_: {description}")
-            message_parts.append("") # Empty line for spacing between topics
+            message_parts.append("") 
 
     # Footer section
     message_parts.append("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━")
@@ -87,6 +79,7 @@ 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: 
     # Validate critical environment variables
@@ -106,7 +99,8 @@ def send_to_whatsapp(message_text: str, destination_number: str) -> dict:
     headers = {
         "Content-Type": "application/x-www-form-urlencoded",
         "apikey": WHATSAPP_TOKEN, 
-        "Cache-Control": "no-cache" 
+        "Cache-Control": "no-cache",
+        "accept": "application/json" # <<< ADDED: Accept header
     }
 
     whatsapp_message_content = {
@@ -119,7 +113,9 @@ def send_to_whatsapp(message_text: str, destination_number: str) -> dict:
         "source": GUPSHUP_SOURCE_NUMBER,
         "destination": destination_number,
         "src.name": GUPSHUP_APP_NAME,
-        "message": json.dumps(whatsapp_message_content) 
+        "message": json.dumps(whatsapp_message_content),
+        "disablePreview": False, # <<< ADDED: disablePreview parameter
+        "encode": False          # <<< ADDED: encode parameter
     }
 
     try:
@@ -137,77 +133,4 @@ def send_to_whatsapp(message_text: str, destination_number: str) -> dict:
         return {"status": "failed", "error": str(e), "code": e.response.status_code if e.response else 500}
     except Exception as e:
         logging.error(f"❌ An unexpected error occurred during WhatsApp send: {e}")
-        return {"status": "failed", "error": str(e), "code": 500}
-
-# 🚀 FastAPI App (This part should ideally be in routes/api/wa_headlines.py, not here)
-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 its os.environ.get)
-    result = send_to_whatsapp(full_message_text, destination_number=os.environ.get("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.
-    os.environ.setdefault("UPSTASH_REDIS_URL", "redis://localhost:6379")
-    os.environ.setdefault("WHATSAPP_API_URL", "https://api.gupshup.io/wa/api/v1/msg")
-    os.environ.setdefault("WHATSAPP_TOKEN", "YOUR_GUPSHUP_API_KEY") 
-    os.environ.setdefault("WHATSAPP_TO_NUMBER", "353899495777") # Use a valid test number
-    os.environ.setdefault("GUPSHUP_SOURCE_NUMBER", "15557926439") 
-    os.environ.setdefault("GUPSHUP_APP_NAME", "NuseAI") 
-
-    # Simulate a cached detailed feed for testing
-    dummy_cached_detailed_feed = {
-        "india": {
-            "1": {"title": "RBI Holds Rates at 6.5% as Inflation Cools to 5.1%, Boosting Confidence Ahead of Festive Demand", "description": "The central bank's decision signals stability and aims to encourage consumer spending during the upcoming festive season, crucial for economic momentum. Lower inflation provides relief to households and supports growth prospects. The cautious approach balances economic recovery with price control.", "sources": ["Times of India"]},
-            "2": {"title": "Modi Inaugurates Global Summit Venue in Gandhinagar to Cement India’s Role as East–West Diplomatic Bridge", "description": "This new venue positions India as a key player in international diplomacy, fostering dialogue and collaboration between Asian and Western nations. It highlights the country's growing influence on global affairs and capacity for large-scale international events, boosting its soft power.", "sources": ["Indian Express"]},
-            "3": {"title": "Adani Pursues $50B Gulf Green Hydrogen Deal to Accelerate India’s Clean Energy Ambitions", "description": "This massive investment underscores India's commitment to renewable energy and its transition away from fossil fuels. Partnering with Gulf nations secures critical resources and technology, advancing India's position as a leader in green hydrogen production and reducing its carbon footprint.", "sources": ["The Economic Times"]}
-        },
-        "world": {
-            "4": {"title": "Biden Signs $95B Indo-Pacific Aid Bill, Reinforcing U.S. Strategy Against Chinese Expansion", "description": "The bill provides significant financial assistance to allies in the Indo-Pacific, strengthening regional security and economic ties. This move aims to counter China's growing influence and maintain stability in a strategically vital area, signaling continued U.S. commitment to its partners.", "sources": ["Reuters"]},
-            "5": {"title": "Hurricane Felix Strengthens Into Category 4, Florida Declares Statewide Emergency", "description": "The rapid intensification of Hurricane Felix poses a severe threat to coastal communities in Florida, prompting urgent evacuation orders and extensive preparedness measures. Residents are urged to secure their homes and follow safety guidelines as the storm approaches, emphasizing climate change impacts.", "sources": ["CNN World"]},
-            "6": {"title": "Iran’s Hardliner President Takes Office Amid Nuclear Tensions and Diplomatic Uncertainty", "description": "The new leadership in Iran signals a potential shift in foreign policy, raising concerns among international observers about the future of nuclear negotiations. Diplomatic tensions could escalate, impacting regional stability and global energy markets as nations reassess their strategies.", "sources": ["BBC News"]}
-        },
-        "finance": {
-            "7": {"title": "Nasdaq Surges as Nvidia and AI Stocks Power New Record Highs", "description": "The technology-heavy Nasdaq's rise reflects robust investor confidence in the artificial intelligence sector, with Nvidia leading the charge. This surge indicates strong market enthusiasm for innovation and potential future growth in tech, driving overall market performance.", "sources": ["CNBC"]},
-            "8": {"title": "Eurozone Inflation Falls Below 2.5%, Raising Hopes for ECB Rate Cuts in Q4", "description": "Declining inflation figures in the Eurozone signal easing price pressures, increasing the likelihood of interest rate reductions by the European Central Bank. Such cuts could stimulate economic activity and provide relief to consumers and businesses, supporting recovery efforts.", "sources": ["Financial Times"]},
-            "9": {"title": "Infosys Beats Earnings Expectations, Announces $1.5B Buyback", "description": "Infosys' strong financial performance demonstrates resilience in the IT services sector despite global economic uncertainties. The share buyback initiative signals confidence in the company's future prospects and aims to return value to shareholders, potentially boosting stock performance.", "sources": ["Economic Times"]}
-        },
-        "tech": {
-            "10": {"title": "Meta’s Llama 3.5 Rivals GPT-4 in Benchmarks, Marking Breakthrough for Open-Source AI", "description": "Meta's latest large language model, Llama 3.5, demonstrates impressive performance, challenging proprietary models like GPT-4. This development significantly advances open-source AI capabilities, promoting wider accessibility and innovation in artificial intelligence research and application development globally.", "sources": ["Wired"]},
-            "11": {"title": "Apple Unveils Foldable iPhone 17 with AI-Native OS, Signaling Shift Toward Software Innovation", "description": "Apple's new foldable smartphone, featuring a deeply integrated AI operating system, marks a significant technological leap. This move emphasizes a strategic shift towards software-driven experiences and design innovation, potentially reshaping the smartphone market and user interaction paradigms.", "sources": ["The Verge"]},
-            "12": {"title": "Google Partners With Indian Startups to Expand Regional AI Tools", "description": "Google's collaboration with Indian startups aims to foster localized AI solutions, addressing unique market needs and promoting technological advancement in the region. This initiative supports the growth of India's tech ecosystem and expands Google's reach into emerging markets, boosting digital transformation.", "sources": ["TechCrunch"]}
-        },
-        "sports": {
-            "13": {"title": "India Clinches T20 Series vs West Indies With Last-Over Thriller in Port of Spain", "description": "India's dramatic series victory showcases their resilience and strategic prowess in high-pressure cricket matches. This win boosts team morale and demonstrates strong form ahead of upcoming international tournaments, solidifying their position in global T20 rankings.", "sources": ["ESPN Cricinfo"]},
-            "14": {"title": "Messi Breaks MLS Scoring Record With Hat-Trick for Inter Miami", "description": "Lionel Messi continues to redefine Major League Soccer, setting a new scoring record with his exceptional performance for Inter Miami. His consistent brilliance elevates the league's global profile and inspires a new generation of football fans across North America.", "sources": ["MLS Soccer"]},
-            "15": {"title": "Olympic Torch Relay Kicks Off in Paris With 100 Days Until Opening", "description": "The ceremonial start of the Olympic Torch Relay in Paris ignites excitement and anticipation for the upcoming Summer Games. This milestone event symbolizes unity and athletic spirit, bringing the global community together in the countdown to the prestigious sporting spectacle.", "sources": ["Olympic.org"]}
-        }
-    }
-    # Store dummy data in Redis for testing fetch_cached_headlines
-    redis_client.set("detailed_news_feed_cache", json.dumps(dummy_cached_detailed_feed))
-
-
-    logging.info("\n--- WhatsApp Message Preview ---\n")
-    msg_preview = fetch_cached_headlines()
-    print(msg_preview)
-    
-    logging.info("\n--- Sending WhatsApp Message (Test) ---\n")
-    test_result = send_to_whatsapp(msg_preview, destination_number=os.environ.get("WHATSAPP_TO_NUMBER"))
-    print(test_result)
+        return {"status": "failed", "error": str(e), "code": 500}