Update app/app.py

app/app.py

@@ -1,11 +1,12 @@
 """
-Sentinel TradeFlow Protocol — High-performance FastAPI application.
-This version includes a live price ticker and robust, structured analysis.
+Sentinel TradeFlow Protocol — v3.0 FINAL
+
+This is the definitive, robust version of the application, designed for
+guaranteed functionality and a superior user experience.
 """
 import asyncio
 import os
 from contextlib import asynccontextmanager
-from typing import Optional, Union
 from datetime import datetime, timezone
 
 import httpx
@@ -25,10 +26,10 @@ async def lifespan(app: FastAPI):
         app.state.news_api = NewsApiClient(api_key=os.getenv("NEWS_API_KEY"))
         app.state.signal_queue: asyncio.Queue = asyncio.Queue()
 
-        price_task = asyncio.create_task(run_periodic_updates(app.state.price_fetcher, 60))
+        price_task = asyncio.create_task(run_periodic_updates(app.state.price_fetcher, 30))
         news_task = asyncio.create_task(run_periodic_news_analysis(app, 300))
         
-        print("🚀 Sentinel TradeFlow Protocol started successfully.")
+        print("🚀 Sentinel TradeFlow Protocol v3.0 FINAL started successfully.")
         yield
         
         print("⏳ Shutting down background tasks...")
@@ -37,8 +38,7 @@ async def lifespan(app: FastAPI):
         try:
             await asyncio.gather(price_task, news_task)
         except asyncio.CancelledError:
-            print("Background tasks cancelled successfully.")
-        print("✅ Shutdown complete.")
+            print("Background tasks cancelled.")
 
 async def run_periodic_updates(fetcher: PriceFetcher, interval_seconds: int):
     while True:
@@ -48,7 +48,7 @@ async def run_periodic_updates(fetcher: PriceFetcher, interval_seconds: int):
 async def run_periodic_news_analysis(app: FastAPI, interval_seconds: int):
     processed_urls = set()
     while True:
-        print(f"📰 Fetching news... (have processed {len(processed_urls)} articles so far)")
+        print("📰 Fetching news...")
         try:
             top_headlines = app.state.news_api.get_everything(
                 q='(crypto OR bitcoin OR ethereum) AND (regulation OR partnership OR hack OR update OR adoption)',
@@ -58,20 +58,20 @@ async def run_periodic_news_analysis(app: FastAPI, interval_seconds: int):
             print(f"📰 Found {len(articles)} articles.")
             
             analyzer: GeminiAnalyzer = app.state.gemini_analyzer
-            for article in reversed(articles): # Process oldest first
+            for article in reversed(articles):
                 title = article.get('title')
                 url = article.get('url')
                 if title and "[Removed]" not in title and url not in processed_urls:
-                    print(f"✨ New article found: '{title}'. Analyzing...")
+                    print(f"✨ Analyzing: '{title}'")
                     analysis = await analyzer.analyze_text(title)
                     if not analysis.get("error"):
                         analysis['url'] = url
                         analysis['timestamp'] = datetime.now(timezone.utc).isoformat()
                         await app.state.signal_queue.put(analysis)
-                        processed_urls.add(url) # Mark as processed
-                        print(f"✅ Signal generated and queued for: '{title}'")
+                        processed_urls.add(url)
+                        print(f"✅ Queued: '{title}'")
         except Exception as e:
-            print(f"❌ CRITICAL ERROR in news analysis loop: {e}")
+            print(f"❌ CRITICAL ERROR in news loop: {e}")
         
         await asyncio.sleep(interval_seconds)
 
@@ -82,32 +82,18 @@ def render_signal_card(payload: dict) -> str:
     s = payload
     url = s.get('url', '#')
     summary = s.get('summary', 'N/A')
-    timestamp_str = s.get('timestamp')
-    if timestamp_str:
-        dt_obj = datetime.fromisoformat(timestamp_str)
-        time_ago = f"{dt_obj.strftime('%H:%M:%S UTC')}"
-    else:
-        time_ago = "Just now"
-
-    text_to_show = f'<a href="{url}" target="_blank" rel="noopener noreferrer">{summary}</a>'
-    impact_class = f"impact-{s.get('impact', 'low').lower()}"
-    sentiment_class = f"sentiment-{s.get('sentiment', 'neutral').lower()}"
+    time_str = datetime.fromisoformat(s['timestamp']).strftime('%H:%M:%S UTC')
     
-    # Use Out-of-Band swaps to update the timestamp without re-rendering the whole stream
-    oob_swap = f'<span id="last-signal-time" hx-swap-oob="true">{time_ago}</span>'
-
+    # This entire block will be sent as a single data payload
     return f"""
-    {oob_swap}
-    <div class="card {impact_class}">
-        <blockquote>{text_to_show}</blockquote>
-        <div class="grid">
-            <div><strong>Sentiment:</strong> <span class="{sentiment_class}">{s.get('sentiment')} ({s.get('sentiment_score', 0):.2f})</span></div>
-            <div><strong>Impact:</strong> {s.get('impact')}</div>
-        </div>
-        <div class="grid">
-            <div><strong>Topic:</strong> {s.get('topic')}</div>
-            <div><strong>Entities:</strong> {', '.join(s.get('entities', []))}</div>
-        </div>
+    <div id="last-signal-time" hx-swap-oob="true">{time_str}</div>
+    <div class="card impact-{s.get('impact', 'low').lower()}" hx-swap-oob="afterbegin:#signal-container">
+        <header class="card-header">
+            <span>{s.get('topic', 'General News')}</span>
+            <span>{', '.join(s.get('entities', []))}</span>
+        </header>
+        <blockquote><a href="{url}" target="_blank" rel="noopener noreferrer">{summary}</a></blockquote>
+        <footer><strong>Sentiment:</strong> <span class="sentiment-{s.get('sentiment', 'neutral').lower()}">{s.get('sentiment')} ({s.get('sentiment_score', 0):.2f})</span> • <strong>Impact:</strong> {s.get('impact')}</footer>
     </div>
     """
 
@@ -115,26 +101,27 @@ def render_signal_card(payload: dict) -> str:
 async def serve_dashboard(request: Request):
     return templates.TemplateResponse("index.html", {"request": request})
 
-# NEW ENDPOINT FOR LIVE PRICES
 @app.get("/api/prices", response_class=HTMLResponse)
 async def get_prices_fragment(request: Request):
-    price_fetcher: PriceFetcher = request.app.state.price_fetcher
-    prices = price_fetcher.get_current_prices()
-    html_fragment = "".join(
-        f"<span>{coin.capitalize()}: <strong>${price:,.2f}</strong></span>" if isinstance(price, (int, float))
-        else f"<span>{coin.capitalize()}: <strong>{price}</strong></span>"
-        for coin, price in prices.items()
-    )
-    return HTMLResponse(content=html_fragment)
+    prices = request.app.state.price_fetcher.get_current_prices()
+    return HTMLResponse("".join(
+        f"<span>{c.capitalize()}: <strong>${p:,.2f}</strong></span>" if isinstance(p, (int, float))
+        else f"<span>{c.capitalize()}: <strong>{p}</strong></span>"
+        for c, p in prices.items()
+    ))
 
 @app.get("/api/signals/stream")
 async def signal_stream(request: Request):
     queue: asyncio.Queue = request.app.state.signal_queue
     async def event_generator():
+        # --- THE GUARANTEED "HELLO" MESSAGE ---
+        welcome_html = "<div id='signal-container' hx-swap-oob='innerHTML'></div>"
+        yield f"event: message\ndata: {welcome_html}\n\n"
+        
         while True:
             payload = await queue.get()
-            html = render_signal_card(payload)
-            data_payload = html.replace('\n', '')
-            sse_message = f"event: message\ndata: {data_payload}\n\n"
-            yield sse_message
+            html_card = render_signal_card(payload)
+            data_payload = html_card.replace('\n', ' ').strip()
+            yield f"event: message\ndata: {data_payload}\n\n"
+            
     return StreamingResponse(event_generator(), media_type="text/event-stream")