Upload agent.py

src/api/agent.py

@@ -777,11 +777,15 @@ async def _events_answer(days: int = 30) -> str:
     """
     Return upcoming library events from LibCal.
     Falls back to library events calendar link if unavailable.
+    _libcal_fetch_events returns:
+      None  — API/network failure
+      []    — API succeeded but no events in the window
+      [...]  — events found
     """
     EVENTS_URL = "https://kustar.libcal.com/calendar/events"
     events = await _libcal_fetch_events(days=days, limit=15)
 
-    if not events:
+    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>"
@@ -789,7 +793,7 @@ async def _events_answer(days: int = 30) -> str:
             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>"
@@ -3526,10 +3530,8 @@ def _log_agent_query(question: str, response: AgentResponse, start_time: float)
                 except Exception:
                     pass
             try:
-                loop = _al.get_event_loop()
-                if loop.is_running():
-                    loop.create_task(_post_to_worker())
-            except Exception:
+                _al.get_running_loop().create_task(_post_to_worker())
+            except RuntimeError:
                 pass
     except Exception:
         pass
@@ -3701,77 +3703,6 @@ async def _agent_query_inner(
 
     is_follow_up, follow_up_action, base_context = _detect_follow_up(question, client_state)
 
-    # ── Catalogue availability: "books available in the KU library on X" ─────────
-    # Catches questions asking what the library *holds*, not topic searches.
-    # Must fire BEFORE the LLM classifier which would route these to search_academic.
-    _CATALOGUE_RE = re.compile(
-        r"\b("
-        r"available in (the )?(ku|khalifa) library"
-        r"|in (the )?(ku|khalifa) library"
-        r"|does (the )?(ku|khalifa) library have"
-        r"|does (the )?library (have|carry|stock|hold)"
-        r"|(ku|khalifa) library (has|have|carry|holds?|stocks?)"
-        r"|ku library (books?|copies|titles?)"
-        r")\b",
-        re.IGNORECASE,
-    )
-    _BOOK_RE = re.compile(r"\b(book|books|ebook|ebooks|textbook|textbooks|copy|copies|title|titles)\b", re.IGNORECASE)
-
-    if _CATALOGUE_RE.search(question) and _BOOK_RE.search(question):
-        # Route as library_info → RAG will handle or fall back to Ask a Librarian
-        # Also build a PRIMO books URL so the user can search directly
-        from urllib.parse import quote as _quote
-        _topic_raw = re.sub(
-            r"\b(can you (help me )?find|find|search|look for|show me|help me find"
-            r"|books? (available|in|on)|available in.{0,30}library|in the ku library"
-            r"|on|about|regarding|related to|ku library|khalifa university library"
-            r"|machine learning|please|thanks)\b",
-            " ", question, flags=re.IGNORECASE,
-        )
-        _topic = _normalize_whitespace(_topic_raw).strip(" ,.")
-        _primo_books_url = (
-            "https://khalifa.primo.exlibrisgroup.com/discovery/search"
-            f"?query=any,contains,{_quote(_topic or question)},AND"
-            "&tab=Everything&search_scope=MyInst_and_CI"
-            "&vid=971KUOSTAR_INST:KU&lang=en&mode=advanced"
-            "&qInclude=facet_rtype,exact,books"
-        )
-        follow_up_question, follow_up_suggestions = _library_follow_up(question)
-
-        # Try RAG first for any policy/service context
-        rag_results = []
-        try:
-            from app import get_rag_service
-            rag_results = await get_rag_service().hybrid_search(question, top_k=3)
-        except Exception:
-            pass
-
-        if rag_results:
-            rag_answer = await _rag_answer(question, rag_results, [], model)
-        else:
-            rag_answer = ""
-
-        catalogue_answer = (
-            f"To find books available in the KU Library on <strong>{_escape(_topic or 'this topic')}</strong>, "
-            f"search the KU Library catalogue directly:<br><br>"
-            f'<a href="{_primo_books_url}" target="_blank" style="display:inline-block;padding:9px 16px;'
-            f'background:#003366;color:#fff;border-radius:8px;font-weight:700;text-decoration:none;font-size:.88rem">'
-            f"📚 Search KU Library catalogue for books →</a><br><br>"
-            f"The catalogue shows real-time availability — whether a copy is on the shelf, checked out, or available as an e-book."
-        )
-        if rag_answer:
-            catalogue_answer += f"<br><br>{rag_answer}"
-
-        return AgentResponse(
-            answer=_thought_block("library_info", "catalogue_books", question) + catalogue_answer + _source_badge("primo", _primo_books_url),
-            intent="library_info",
-            tools_used=["catalogue_books_redirect"],
-            model_used=model,
-            response_time=time.time() - start_time,
-            follow_up_question=follow_up_question,
-            follow_up_suggestions=follow_up_suggestions,
-        )
-
     if is_follow_up and base_context:
         _safe_metrics_increment("follow_up_hits")
         context = _apply_follow_up_action(base_context, follow_up_action)
@@ -4150,7 +4081,6 @@ async def _agent_query_inner(
                 _prepare_queries(question, _ctx_books, model, False),
             )
             # No API — just build PRIMO links for articles and books
-            _ctx_articles = await _prepare_queries(question, _ctx_articles, model, False)
             _src_url_a = _primo_clean_url(_ctx_articles)
             _src_url_b = _primo_clean_url(_ctx_books)