Update app.py

app.py

@@ -48,22 +48,20 @@ def get_address_from_coords(lat, lon):
         data = response.json()
         return data.get('display_name', f"Lat: {lat}, Lon: {lon}")
     except Exception as e:
-        print(f"Geocoding Error: {e}")
         return f"Lat: {lat}, Lon: {lon}"
 
 # ----------------------------------------------------
-# 🌐 SERPAPI GOOGLE SEARCH ENGINE (Location Aware)
+# 🌐 SERPAPI GOOGLE SEARCH ENGINE
 # ----------------------------------------------------
 def web_search_scraper(query, num_results=5, user_address=None):
     results = []
     serpapi_key = os.environ.get("SERPAPI_KEY") 
     if not serpapi_key:
-        print("ALERT: SERPAPI_KEY missing in secrets.")
         return results
 
     search_query = query
     if user_address:
-        local_keywords = ["near", "nearby", "आसपास", "रेस्टोरेंट", "दुकान", "distance", "time", "where"]
+        local_keywords = ["near", "nearby", "distance", "time", "where"]
         if any(kw in query.lower() for kw in local_keywords):
             search_query = f"{query} near {user_address}"
 
@@ -79,25 +77,22 @@ def web_search_scraper(query, num_results=5, user_address=None):
                 snippet = item.get("snippet", "")
                 if title and snippet:
                     results.append({"title": title, "link": link, "snippet": snippet})
-    except Exception as e:
-        print(f"SerpApi Error: {e}")
-
+    except Exception:
+        pass
     return results
 
 # ----------------------------------------------------
-# 📰 RSS TECH NEWS SCRAPER (Pure Tech Filter)
+# 📰 RSS TECH NEWS SCRAPER
 # ----------------------------------------------------
 def get_live_web_data(query):
-    print(f"[Live Feed] Fetching news for topic: '{query}'...")
-    url = f"https://news.google.com/rss/search?q={query}&hl=hi&gl=IN&ceid=IN:hi"
+    url = f"https://news.google.com/rss/search?q={query}&hl=en&gl=IN&ceid=IN:en"
     headers = {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"}
     
     tech_keywords = [
-        "ai", "artificial intelligence", "एआई", "इंटेलिजेंस", "स्मार्टफोन", 
-        "smartphone", "mobile", "मोबाइल", "फीचर", "feature", "whatsapp", 
-        "google", "tech", "तकनीक", "टेक्नोलॉजी", "गैजेट", "gadget", "apple", "nasa"
+        "ai", "artificial intelligence", "smartphone", "mobile", 
+        "feature", "whatsapp", "google", "tech", "technology", "gadget", "apple", "nasa"
     ]
-    block_keywords = ["share news", "stock", "शेयर", "म्यूचुअल फंड"]
+    block_keywords = ["share news", "stock"]
     scraped_results = []
     
     try:
@@ -117,14 +112,13 @@ def get_live_web_data(query):
                     source = item.source.text if item.source else "Google News"
                     scraped_results.append({
                         "title": title,
-                        "snippet": f"प्रकाशित तिथि: {pub_date} | स्रोत: {source}",
+                        "snippet": f"Published: {pub_date} | Source: {source}",
                         "link": link
                     })
                 if len(scraped_results) >= 5:
                     break
-    except Exception as e:
-        print(f"[Live Feed Error] Failed to fetch: {e}")
-        
+    except Exception:
+        pass
     return scraped_results
 
 # ----------------------------------------------------
@@ -143,13 +137,11 @@ def home():
 # ----------------------------------------------------
 @app.route('/api/chat', methods=['POST'])
 def chat():
-    # SECRETS MAPPED EXACTLY TO USER'S HUGGINGFACE SPACE ENVIRONMENT
     API_KEY = os.environ.get("NVIDIA_API_KEY")
     INVOKE_URL = os.environ.get("BASE_URL")
     MODEL_ID = os.environ.get("MODEL_ID")
 
     if not API_KEY or not INVOKE_URL or not MODEL_ID:
-        print("Missing Environment Variables. API_KEY:", bool(API_KEY), "INVOKE_URL:", bool(INVOKE_URL), "MODEL_ID:", bool(MODEL_ID))
         return Response("Server Error: Critical configuration secrets missing.", status=500)
 
     data = request.get_json() or {}
@@ -184,7 +176,7 @@ def chat():
 [CRITICAL INSTRUCTION: THINKING MODE ENABLED]
 Effort Level: {thinking_effort.upper()} - {effort_text}
 You MUST format your reasoning exactly inside <think> and </think> HTML tags. 
-Do NOT use special system tokens like <|channel|>thought or <|im_start|>. Use standard <think> tags.
+Do NOT use special system tokens.
 """
 
     location_instruction = ""
@@ -232,18 +224,25 @@ STRICT DIRECTIVES:
 
     messages = [{"role": "system", "content": system_prompt}]
 
-    clean_history = []
     for msg in history:
         if msg == history[-1] and msg.get("role") == "user":
             continue
+            
         role = msg.get("role", "user")
+        if role not in ["system", "user", "assistant"]:
+            role = "user"
+            
         content = msg.get("content", "")
+        
+        if isinstance(content, list):
+            text_parts = [item["text"] for item in content if item.get("type") == "text"]
+            content = " ".join(text_parts)
+            
         if "Gemma" in content or "DeepMind" in content or "Google" in content or "Alibaba" in content or "Tongyi" in content:
             continue
-        if content:
-            clean_history.append({"role": role, "content": content})
             
-    messages.extend(clean_history)
+        if content:
+            messages.append({"role": role, "content": str(content)})
 
     if attachments:
         content_payload = [{"type": "text", "text": user_message}]
@@ -278,8 +277,8 @@ STRICT DIRECTIVES:
         response = requests.post(INVOKE_URL, headers=headers, json=payload, stream=True, timeout=60)
         
         if response.status_code != 200:
-            print(f"API Error: {response.status_code} - {response.text}")
-            return Response(f"Upstream API Error: {response.status_code}", status=500)
+            err_msg = json.dumps({"error": f"NVIDIA API Error {response.status_code}: {response.text[:200]}"})
+            return Response(f"data: {err_msg}\n\n", mimetype='text/event-stream')
 
         def generate():
             for line in response.iter_lines():
@@ -303,12 +302,12 @@ STRICT DIRECTIVES:
                         
         return Response(stream_with_context(generate()), mimetype='text/event-stream')
     except Exception as e:
-        print(f"Request Exception: {str(e)}")
-        return Response(f"Internal Error: {str(e)}", status=500)
+        err_msg = json.dumps({"error": str(e)})
+        return Response(f"data: {err_msg}\n\n", mimetype='text/event-stream')
 
 
 # ----------------------------------------------------
-# 🎙️ TTS DIRECT API ENDPOINT (OPTIMIZED)
+# 🎙️ TTS DIRECT API ENDPOINT
 # ----------------------------------------------------
 @app.route('/api/tts', methods=['POST'])
 def generate_tts():
@@ -361,7 +360,6 @@ def generate_tts():
         return Response(mp3_buffer.read(), mimetype="audio/mpeg")
         
     except Exception as e:
-        print(f"TTS Error: {str(e)}")
         return Response(json.dumps({"error": str(e)}), status=500, mimetype='application/json')