Update app.py

app.py

@@ -77,26 +77,50 @@ def text_to_speech(text: str) -> bytes:
         return b""
 
 # =========================
-# 🌐 SerpAPI with 3 images
+# 🌐 SerpAPI with Global Search + Auto-detect Region
 # =========================
 def serpapi_search(query: str, location=None, num_results=3):
     print(f"\n[SEARCH] 🔍 Starting search for: '{query}'")
+    
+    # Detect Indonesian keywords to determine if search should be ID-focused
+    indonesian_keywords = ["di jakarta", "di bali", "di bekasi", "di surabaya", "di bandung", 
+                          "di indonesia", "di yogyakarta", "di medan", "di semarang",
+                          "termurah", "terbaik di", "dekat", "murah"]
+    is_indonesian_query = any(kw in query.lower() for kw in indonesian_keywords)
+    
+    # Set location and language based on query
+    if is_indonesian_query:
+        country = "id"  # Indonesia
+        lang = "id"
+        search_location = location or "Indonesia"
+        print(f"[SEARCH] 🇮🇩 Indonesian query detected - Using ID region")
+    else:
+        country = "us"  # Global (US default)
+        lang = "en"
+        search_location = location or ""
+        print(f"[SEARCH] 🌍 Global query - Using worldwide search")
+    
     url = "https://serpapi.com/search.json"
     params = {
         "q": query,
-        "location": location or "",
+        "location": search_location,
         "engine": "google",
         "api_key": SERPAPI_KEY,
-        "num": num_results
+        "num": num_results,
+        "gl": country,
+        "hl": lang
     }
+    
+    results = []
+    images = []
+    
     try:
+        # Get text results
+        print("[SEARCH] 📄 Fetching text results...")
         r = requests.get(url, params=params, timeout=10)
         r.raise_for_status()
         data = r.json()
 
-        results = []
-        images = []
-
         if "organic_results" in data:
             print(f"[SEARCH] 📄 Found {len(data['organic_results'])} organic results")
             for item in data["organic_results"][:num_results]:
@@ -105,19 +129,34 @@ def serpapi_search(query: str, location=None, num_results=3):
                     "snippet": item.get("snippet", ""),
                     "link": item.get("link", "")
                 })
-                print(f"[SEARCH]   - {item.get('title', 'No title')}")
+                print(f"[SEARCH]   - {item.get('title', 'No title')[:60]}")
         else:
             print("[SEARCH] ⚠️ No organic results found")
 
-        if "images_results" in data:
-            print(f"[SEARCH] 🖼️ Found {len(data['images_results'])} images")
-            for img in data["images_results"][:3]:
-                img_url = img.get("thumbnail", "")
+        # Get images - separate request for better results
+        img_params = {
+            "q": query,
+            "engine": "google_images",
+            "api_key": SERPAPI_KEY,
+            "num": 3,
+            "gl": country,
+            "hl": lang
+        }
+        
+        print("[SEARCH] 🖼️ Fetching images...")
+        img_r = requests.get(url, params=img_params, timeout=10)
+        img_r.raise_for_status()
+        img_data = img_r.json()
+        
+        if "images_results" in img_data:
+            print(f"[SEARCH] 🖼️ Found {len(img_data['images_results'])} images")
+            for img in img_data["images_results"][:3]:
+                img_url = img.get("original", img.get("thumbnail", ""))
                 if img_url:
                     images.append(img_url)
                     print(f"[SEARCH]   - Image: {img_url[:60]}...")
         else:
-            print("[SEARCH] ⚠️ No images found")
+            print("[SEARCH] ⚠️ No images found in image search")
 
         print(f"[SEARCH] ✅ Total: {len(results)} results, {len(images)} images\n")
         return {"results": results, "images": images}
@@ -191,7 +230,7 @@ def chat():
 
         print(f"[USER] 👤 Transcribed: '{user_text}'")
 
-        keywords = ["hotel", "mall", "resort", "villa", "tempat wisata"]
+        keywords = ["hotel", "mall", "resort", "villa", "tempat wisata", "restaurant", "cafe"]
         has_keyword = any(k in user_text.lower() for k in keywords)
         
         if has_keyword:
@@ -234,7 +273,7 @@ def chat():
     print(f"[USER] 👤 Prompt: '{prompt}'")
     print(f"[HISTORY] 📚 History length: {len(history)} messages")
 
-    keywords = ["hotel", "mall", "resort", "villa", "tempat wisata"]
+    keywords = ["hotel", "mall", "resort", "villa", "tempat wisata", "restaurant", "cafe"]
     has_keyword = any(k in prompt.lower() for k in keywords)
 
     if has_keyword:
@@ -268,7 +307,8 @@ def chat():
 if __name__ == "__main__":
     print("\n" + "="*60)
     print("🚀 Vibow Talk GTE Server Running")
-    print("🔍 Search keywords: hotel, mall, resort, villa, tempat wisata")
+    print("🔍 Search keywords: hotel, mall, resort, villa, tempat wisata, restaurant, cafe")
     print("🖼️ Image extraction: ENABLED")
+    print("🌍 Global search: ENABLED (auto-detect region)")
     print("="*60 + "\n")
     app.run(host="0.0.0.0", port=7860, debug=True, threaded=True)