Upload 2 files

Reverted changes manually by re-uploading working files

planmate/attractions.py

@@ -2,52 +2,78 @@
 
 import requests
 from typing import List, Dict
-from .config import OPENTRIPMAP_API_KEY  # Geoapify key stored under this name
+from .config import OPENTRIPMAP_BASE, get_opentripmap_key
 
-GEOAPIFY_BASE = "https://api.geoapify.com/v2/places"
-
-def _get(params: Dict):
+def _get(path: str, params: Dict):
+    url = f"{OPENTRIPMAP_BASE}{path}"
     params = dict(params or {})
-    params["apiKey"] = OPENTRIPMAP_API_KEY  # keep the same name
-    r = requests.get(GEOAPIFY_BASE, params=params, timeout=30)
+    params["apikey"] = get_opentripmap_key()
+    r = requests.get(url, params=params, timeout=30)
     try:
         r.raise_for_status()
     except requests.HTTPError as e:
+        # make API errors easier to debug in Streamlit
         snippet = (r.text or "")[:300]
-        raise RuntimeError(f"Geoapify error {r.status_code}: {snippet}") from e
+        raise RuntimeError(f"OpenTripMap error {r.status_code}: {snippet}") from e
     return r.json()
 
-def get_poi_radius(lat: float, lon: float, radius=7000, categories="tourism.sights", limit=50) -> List[Dict]:
+def get_poi_radius(lat: float, lon: float, radius=7000, kinds="interesting_places", limit=50) -> List[Dict]:
     return _get(
+        "/places/radius",
         {
-            "categories": categories,
-            "filter": f"circle:{lon},{lat},{radius}",
-            "limit": limit
-        }
-    ).get("features", [])
+            "lat": lat,
+            "lon": lon,
+            "radius": radius,
+            "kinds": kinds,
+            "format": "json",
+            "limit": limit,
+            "rate": 2,
+        },
+    )
 
-def enrich_pois(pois: List[Dict]) -> List[Dict]:
+def get_details(xid: str) -> Dict:
+    return _get(f"/places/xid/{xid}", {})
+
+def enrich_pois(pois: List[Dict], fetch_details=False) -> List[Dict]:
     out = []
     for p in pois:
-        props = p.get("properties", {})
         item = {
-            "name": props.get("name") or "(Unnamed)",
-            "dist": props.get("distance"),
-            "kinds": props.get("categories", ""),
-            "point": {"lat": props.get("lat"), "lon": props.get("lon")},
-            "address": props.get("formatted")
+            "name": p.get("name") or "(Unnamed)",
+            "dist": p.get("dist"),
+            "rate": p.get("rate"),
+            "kinds": p.get("kinds", ""),
+            "xid": p.get("xid"),
+            "point": p.get("point", {}),
         }
+        if fetch_details and item["xid"]:
+            try:
+                det = get_details(item["xid"])
+                item["wikipedia"] = det.get("wikipedia")
+                item["url"] = det.get("url")
+                item["address"] = det.get("address", {})
+                item["otm"] = det.get("otm")
+            except Exception:
+                pass
         out.append(item)
     return out
 
 def get_attractions_and_stays(lat: float, lon: float, radius=7000, limit=40):
-    attractions_categories = "tourism.sights,tourism.museum,historic"
-    stays_categories = "accommodation.hotel,accommodation.hostel,accommodation.guest_house,accommodation.apartment"
+    # Attractions remain unchanged
+    attractions_kinds = "interesting_places,cultural,historic,museums,architecture"
+
+    # IMPORTANT: Use taxonomy accepted by OpenTripMap.
+    # "accomodations" (sic) is the umbrella category; for hotels use "other_hotels", not "hotels".
+    # See OTM catalog: Accomodations (accomodations), Hotels (other_hotels), Hostels (hostels).
+    # https://dev.opentripmap.org/catalog
+    stays_kinds = (
+        "accomodations,other_hotels,hostels,apartments,guest_houses,"
+        "resorts,motels,villas_and_chalet,alpine_hut"
+    )
 
-    attractions = get_poi_radius(lat, lon, radius, attractions_categories, limit)
-    stays = get_poi_radius(lat, lon, radius, stays_categories, limit=30)
+    attractions = get_poi_radius(lat, lon, radius, attractions_kinds, limit)
+    stays = get_poi_radius(lat, lon, radius, stays_kinds, limit=30)
 
     return {
-        "attractions": enrich_pois(attractions),
-        "stays": enrich_pois(stays),
-    }
+        "attractions": enrich_pois(attractions, fetch_details=False),
+        "stays": enrich_pois(stays, fetch_details=False),
+    }

planmate/config.py

@@ -1,27 +1,8 @@
 import os
-import time
-import requests
-from itertools import cycle
+from dotenv import load_dotenv
 
-# Try to load .env (local dev only, ignored in production)
-try:
-    from dotenv import load_dotenv
-    load_dotenv()
-except ImportError:
-    pass
-
-# Streamlit-safe logging
-def log_message(msg, level="info"):
-    try:
-        import streamlit as st
-        if level == "error":
-            st.error(msg)
-        elif level == "warning":
-            st.warning(msg)
-        else:
-            st.info(msg)
-    except ImportError:
-        print(f"[{level.upper()}] {msg}")
+# Load .env if present (local dev convenience)
+load_dotenv()
 
 APP_TITLE = "PlanMate"
 APP_TAGLINE = "AI Powered smart trip planner"
@@ -45,17 +26,18 @@ OPENTRIPMAP_BASE = "https://api.opentripmap.com/0.1/en"
 # ---------- Hugging Face Secrets Configuration ----------
 def get_secret(key, default=None):
     """
-    Get secret from environment first (production),
-    fallback to .env for local dev.
+    Get secret from Hugging Face Spaces environment or fallback to local .env
     """
+    # Try to get from environment first (Hugging Face Spaces)
     value = os.getenv(key)
-
+    
     if value is None and default is not None:
         return default
     elif value is None:
-        log_message(f"Missing required secret: {key}", level="error")
-        raise RuntimeError(f"Missing required secret: {key}")
-
+        st.error(f"Missing required secret: {key}")
+        st.info("Please add this secret in your Hugging Face Space settings.")
+        st.stop()
+    
     return value
 
 def get_env(key: str) -> str:
@@ -64,67 +46,9 @@ def get_env(key: str) -> str:
         raise RuntimeError(f"Missing required environment variable: {key}")
     return val
 
-# ---------- Gemini Key Rotation ----------
-gemini_keys = os.getenv("GEMINI_API_KEY", "").split(",")
-gemini_keys = [k.strip() for k in gemini_keys if k.strip()]
-
-if not gemini_keys:
-    raise RuntimeError("No GEMINI_API_KEY found in environment!")
-
-gemini_cycle = cycle(gemini_keys)
-_current_gemini_key = next(gemini_cycle)
-
 def get_gemini_key():
-    """Get the current Gemini API key"""
-    return _current_gemini_key
-
-def rotate_gemini_key():
-    """Rotate to the next Gemini API key (when quota exceeded)"""
-    global _current_gemini_key
-    _current_gemini_key = next(gemini_cycle)
-    log_message(f"Rotated to new Gemini API key: {_current_gemini_key}", level="warning")
-    return _current_gemini_key
-
-# ---------- Gemini Helper Function ----------
-def make_gemini_request(prompt, model="gemini-2.0-flash-lite", max_retries=3):
-    """
-    Make a Gemini API request with automatic key rotation on quota errors.
-    """
-    import google.generativeai as genai
-
-    for attempt in range(max_retries):
-        try:
-            # Configure SDK with current key
-            genai.configure(api_key=get_gemini_key())
-
-            # Create the model
-            model_instance = genai.GenerativeModel(model)
-
-            # Generate response
-            response = model_instance.generate_content(prompt)
-            return response.text  # or response.candidates, depending on usage
-
-        except Exception as e:
-            error_message = str(e)
-
-            # Case 1: Quota exceeded (429)
-            if "429" in error_message or "quota" in error_message.lower():
-                rotate_gemini_key()
-                time.sleep(2)  # short delay before retry
-                continue
-
-            # Case 2: Network/HTTP error
-            elif isinstance(e, requests.exceptions.RequestException):
-                log_message(f"Network issue: {e}. Retrying...", level="warning")
-                time.sleep(2)
-                continue
-
-            # Any other error → stop immediately
-            raise e
-
-    raise RuntimeError("Gemini request failed after rotating all keys")
+    return get_secret("GEMINI_API_KEY")
 
-# ---------- Other API Keys ----------
 def get_amadeus_credentials():
     return get_secret("AMADEUS_CLIENT_ID"), get_secret("AMADEUS_CLIENT_SECRET")