Upload 12 files

src/agentcore/libcal.py

@@ -1,61 +1,106 @@
-"""LibCal client + formatting: live opening hours and events via the Cloudflare Worker proxy."""
+"""LibCal client + formatting for live opening hours and events."""
 import asyncio
-import html
-import json
-import logging
-import os
-import re
-import time
-import uuid
-from datetime import datetime
-from typing import Any, Dict, List, Literal, Optional, Tuple
-from urllib.parse import quote
-
-import httpx
-from pydantic import BaseModel, ConfigDict, Field
-
-from src.config import get_settings, LIBBEE_VERSION
-
-from src.agentcore.constants import LIBRARY_HOURS_URL
-from src.agentcore.utils import _escape
+import json
+import logging
+import re
+import time
+from datetime import datetime
+from typing import Any, Dict, Optional
+from urllib.parse import urlsplit
+
+import httpx
+
+from src.config import get_settings, LIBBEE_VERSION
+
+from src.agentcore.constants import LIBRARY_HOURS_URL
+from src.agentcore.utils import _escape
+from src.services.http_client import make_client
 
 logger = logging.getLogger(__name__)
 
-_libcal_hours_cache: Dict[str, Any] = {}
-
-
-_LIBCAL_HOURS_TTL = 60 * 60
+_libcal_hours_cache: Dict[str, Any] = {}
+_LIBCAL_HOURS_TTL = 60 * 60
+_LIBCAL_BASE = "https://kustar.libcal.com"
+_LIBCAL_LOC_MAIN = 6386
+_LIBCAL_LOC_HABSHAN = 25028
+_LIBCAL_IID = 3495
+_LIBCAL_EVENTS_CAL = 8398
+_libcal_tokens: Dict[str, Dict[str, Any]] = {
+    "hours": {"value": "", "expires_at": 0.0},
+    "events": {"value": "", "expires_at": 0.0},
+}
+_libcal_token_lock = asyncio.Lock()
+
+
+async def _libcal_access_token(client: httpx.AsyncClient, events: bool = False) -> str:
+    """Fetch and briefly cache a LibCal OAuth token without logging secrets."""
+    settings = get_settings()
+    client_id = settings.libcal_events_client_id if events else settings.libcal_client_id
+    client_secret = settings.libcal_events_client_secret if events else settings.libcal_client_secret
+    if events:
+        client_id = client_id or settings.libcal_client_id
+        client_secret = client_secret or settings.libcal_client_secret
+    if not client_id or not client_secret:
+        raise RuntimeError("LibCal credentials are not configured in the HF Space")
+
+    cache_key = "events" if events else "hours"
+    cached = _libcal_tokens[cache_key]
+    now = time.time()
+    if cached["value"] and now < cached["expires_at"]:
+        return str(cached["value"])
+
+    async with _libcal_token_lock:
+        cached = _libcal_tokens[cache_key]
+        now = time.time()
+        if cached["value"] and now < cached["expires_at"]:
+            return str(cached["value"])
+        response = await client.post(
+            f"{_LIBCAL_BASE}/api/1.1/oauth/token",
+            data={"client_id": client_id, "client_secret": client_secret, "grant_type": "client_credentials"},
+            headers={"Content-Type": "application/x-www-form-urlencoded"},
+        )
+        response.raise_for_status()
+        data = response.json()
+        token = str(data.get("access_token") or "")
+        if not token:
+            raise RuntimeError("LibCal authentication returned no access token")
+        cached["value"] = token
+        cached["expires_at"] = now + max(5, int(data.get("expires_in") or 3600) - 60)
+        return token
 
 
-async def _libcal_fetch_hours() -> Optional[dict]:
+async def _libcal_fetch_hours() -> Optional[dict]:
     now = time.time()
     cached_at = _libcal_hours_cache.get("cached_at", 0)
     if _libcal_hours_cache.get("data") and now - cached_at < _LIBCAL_HOURS_TTL:
         return _libcal_hours_cache["data"]
-    settings = get_settings()
-    worker_url = getattr(settings, "cloudflare_worker_url", "").strip()
-    if not worker_url:
-        logger.warning("LibCal: CLOUDFLARE_WORKER_URL not set — cannot fetch hours")
-        return None
-    from datetime import timezone, timedelta
-    uae_now   = datetime.now(timezone(timedelta(hours=4)))
-    date_from = uae_now.strftime("%Y-%m-%d")
-    date_to   = (uae_now + timedelta(days=6)).strftime("%Y-%m-%d")
-    try:
-        async with httpx.AsyncClient(timeout=10) as client:
-            r = await client.get(
-                f"{worker_url.rstrip('/')}/hours",
-                params={"from": date_from, "to": date_to},
-            )
-            r.raise_for_status()
-            data = r.json()
-            if data.get("error"):
-                logger.warning("LibCal worker error: %s", data["error"])
-                return None
-            _libcal_hours_cache["data"]      = data
-            _libcal_hours_cache["cached_at"] = now
-            logger.info("LibCal: hours refreshed via worker")
-            return data
+    from datetime import timezone, timedelta
+    uae_now   = datetime.now(timezone(timedelta(hours=4)))
+    date_from = uae_now.strftime("%Y-%m-%d")
+    date_to   = (uae_now + timedelta(days=6)).strftime("%Y-%m-%d")
+    try:
+        async with make_client(timeout=12) as client:
+            token = await _libcal_access_token(client)
+
+            async def fetch_location(location_id: int) -> dict:
+                response = await client.get(
+                    f"{_LIBCAL_BASE}/api/1.1/hours/{location_id}",
+                    params={"from": date_from, "to": date_to},
+                    headers={"Authorization": f"Bearer {token}"},
+                )
+                response.raise_for_status()
+                value = response.json()
+                return value[0] if isinstance(value, list) and value else value
+
+            main_campus, habshan = await asyncio.gather(
+                fetch_location(_LIBCAL_LOC_MAIN),
+                fetch_location(_LIBCAL_LOC_HABSHAN),
+            )
+            data = {"main_campus": main_campus, "habshan": habshan}
+            _libcal_hours_cache["data"] = data
+            _libcal_hours_cache["cached_at"] = now
+            logger.info("LibCal: hours refreshed directly")
+            return data
     except Exception as exc:
         logger.warning("LibCal hours fetch failed: %s", exc)
         return None
@@ -123,18 +168,19 @@ async def _hours_answer() -> str:
         "main_campus": "Main Campus Library",
         "habshan":     "Habshan Library (SAN Campus)",
     }
-    def _today_line(loc_name: str, loc_data: dict) -> str:
+    def _today_line(loc_name: str, loc_data: dict) -> str:
         dates = loc_data.get("dates", {})
         today_entry = dates.get(today_str, {})
         if not today_entry:
             return f"<em>See <a href='{LIBRARY_HOURS_URL}' target='_blank'>live hours</a> for today</em>"
-        hours_str = _format_libcal_day(today_entry)
-        is_closed = hours_str.lower().startswith("closed")
-        colour = "#dc2626" if is_closed else "#16a34a"
-        return (
-            f"📅 <strong>Today ({today_name}):</strong> "
-            f"<span style='color:{colour};font-weight:700'>{hours_str}</span>"
-        )
+        hours_str = _format_libcal_day(today_entry)
+        is_closed = hours_str.lower().startswith("closed")
+        colour = "#dc2626" if is_closed else "#16a34a"
+        safe_hours = _escape(hours_str)
+        return (
+            f"📅 <strong>Today ({today_name}):</strong> "
+            f"<span style='color:{colour};font-weight:700'>{safe_hours}</span>"
+        )
     def _week_table(loc_data: dict) -> str:
         dates = loc_data.get("dates", {})
         if not dates:
@@ -149,17 +195,18 @@ async def _hours_answer() -> str:
             except ValueError:
                 day_label = date_key
                 is_today  = False
-            hours_str = _format_libcal_day(dates[date_key])
-            is_closed = hours_str.lower().startswith("closed")
-            colour    = "#dc2626" if is_closed else "#16a34a"
-            weight    = "700" if is_today else "400"
-            bg        = "#fffbeb" if is_today else "transparent"
-            rows += (
-                f"<tr style='background:{bg}'>"
-                f"<td style='padding:3px 12px 3px 0;color:#374151;font-weight:{weight}'>{day_label}</td>"
-                f"<td style='padding:3px 0;font-weight:600;color:{colour}'>{hours_str}</td>"
-                f"</tr>"
-            )
+            hours_str = _format_libcal_day(dates[date_key])
+            is_closed = hours_str.lower().startswith("closed")
+            colour    = "#dc2626" if is_closed else "#16a34a"
+            weight    = "700" if is_today else "400"
+            bg        = "#fffbeb" if is_today else "transparent"
+            safe_hours = _escape(hours_str)
+            rows += (
+                f"<tr style='background:{bg}'>"
+                f"<td style='padding:3px 12px 3px 0;color:#374151;font-weight:{weight}'>{day_label}</td>"
+                f"<td style='padding:3px 0;font-weight:600;color:{colour}'>{safe_hours}</td>"
+                f"</tr>"
+            )
         if not rows:
             return ""
         return (
@@ -196,30 +243,32 @@ _libcal_events_cache: Dict[str, Any] = {}
 _LIBCAL_EVENTS_TTL = 30 * 60
 
 
-async def _libcal_fetch_events(days: int = 30, limit: int = 10) -> Optional[list]:
+async def _libcal_fetch_events(days: int = 30, limit: int = 10) -> Optional[list]:
     now = time.time()
     cache_key = f"{days}_{limit}"
     cached = _libcal_events_cache.get(cache_key, {})
     if cached.get("data") and now - cached.get("cached_at", 0) < _LIBCAL_EVENTS_TTL:
         return cached["data"]
-    settings = get_settings()
-    worker_url = getattr(settings, "cloudflare_worker_url", "").strip()
-    if not worker_url:
-        logger.warning("LibCal events: CLOUDFLARE_WORKER_URL not set")
-        return None
-    try:
-        async with httpx.AsyncClient(timeout=10) as client:
-            r = await client.get(
-                f"{worker_url.rstrip('/')}/events",
-                params={"days": days, "limit": limit},
-            )
-            r.raise_for_status()
-            data = r.json()
-            if data.get("error"):
-                logger.warning("LibCal events worker error: %s", data["error"])
-                return None
-            events_raw = data.get("events", [])
-            def _safe_str(val) -> str:
+    try:
+        from datetime import timezone, timedelta
+        uae_now = datetime.now(timezone(timedelta(hours=4)))
+        async with make_client(timeout=12) as client:
+            token = await _libcal_access_token(client, events=True)
+            response = await client.get(
+                f"{_LIBCAL_BASE}/api/1.1/events",
+                params={
+                    "iid": _LIBCAL_IID,
+                    "cal_id": _LIBCAL_EVENTS_CAL,
+                    "date": uae_now.strftime("%Y-%m-%d"),
+                    "days": max(1, min(int(days), 90)),
+                    "limit": max(1, min(int(limit), 50)),
+                },
+                headers={"Authorization": f"Bearer {token}"},
+            )
+            response.raise_for_status()
+            data = response.json()
+            events_raw = data if isinstance(data, list) else data.get("events", [])
+            def _safe_str(val) -> str:
                 if val is None:
                     return ""
                 if isinstance(val, str):
@@ -249,9 +298,9 @@ async def _libcal_fetch_events(days: int = 30, limit: int = 10) -> Optional[list
                     "campus":       _safe_str(e.get("campus") or ""),
                     "category":     cat_str,
                 })
-            _libcal_events_cache[cache_key] = {"data": events, "cached_at": now}
-            logger.info("LibCal: %d events fetched", len(events))
-            return events
+            _libcal_events_cache[cache_key] = {"data": events, "cached_at": now}
+            logger.info("LibCal: %d events fetched directly", len(events))
+            return events
     except Exception as exc:
         logger.warning("LibCal events fetch failed: %s", exc)
         return None
@@ -276,17 +325,17 @@ def _format_event_datetime(start: str, end: str, all_day: bool) -> str:
         return start[:16].replace("T", " ")
 
 
-async def _events_answer(days: int = 30) -> str:
-    EVENTS_URL = "https://kustar.libcal.com/calendar/events"
-    events = await _libcal_fetch_events(days=days, limit=15)
-    if not events:
-        return (
+async def _events_answer(days: int = 30) -> str:
+    EVENTS_URL = "https://kustar.libcal.com/calendar/events"
+    events = await _libcal_fetch_events(days=days, limit=15)
+    if events is None:
+        return (
             "<strong>📅 Khalifa University Library Events</strong><br><br>"
             "Live event data is currently unavailable. Browse all upcoming events here:<br>"
             f'<a href="{EVENTS_URL}" target="_blank" '
             f'style="font-weight:700;color:#003366">{EVENTS_URL}</a>'
         )
-    if not events:
+    if len(events) == 0:
         return (
             "<strong>📅 Khalifa University Library Events</strong><br><br>"
             f"No upcoming events found in the next {days} days.<br><br>"
@@ -296,12 +345,19 @@ async def _events_answer(days: int = 30) -> str:
     answer = f"<strong>📅 Upcoming Library Events, Workshops & Training</strong> (next {days} days)<br><br>"
     for ev in events[:10]:
         title    = _escape(str(ev.get("title") or "Untitled Event"))
-        when     = _format_event_datetime(
-            str(ev.get("start") or ""), str(ev.get("end") or ""), bool(ev.get("allDay"))
-        )
-        location = _escape(str(ev.get("location") or ""))
-        desc     = _escape(str(ev.get("description") or ""))
-        url      = str(ev.get("url") or EVENTS_URL)
+        when     = _escape(_format_event_datetime(
+            str(ev.get("start") or ""), str(ev.get("end") or ""), bool(ev.get("allDay"))
+        ))
+        location = _escape(str(ev.get("location") or ""))
+        desc     = _escape(str(ev.get("description") or ""))
+        candidate_url = str(ev.get("url") or EVENTS_URL)
+        try:
+            parsed_url = urlsplit(candidate_url)
+            if parsed_url.scheme != "https" or not parsed_url.netloc:
+                candidate_url = EVENTS_URL
+        except ValueError:
+            candidate_url = EVENTS_URL
+        url      = _escape(candidate_url)
         reg      = bool(ev.get("registration"))
         answer += (
             f'<div style="margin-bottom:12px;padding:10px 12px;border-left:3px solid #003366;'