Update main.py

main.py

@@ -1,4 +1,4 @@
-from __future__ import annotations
+from __future__ import annotations
 
 import json
 import os
@@ -92,13 +92,16 @@ def clamp_page(value: Any) -> int:
     return page if page > 0 else 1
 
 
-def build_list_query(status: str, q: str, page: int) -> str:
-    params = {
-        "status": status,
-        "page": page,
-    }
+def build_list_query(status: str, q: str, page: int, sort: str = "newest", min_words: int = 0, max_words: int = 0) -> str:
+    params: dict = {"status": status, "page": page}
     if q:
         params["q"] = q
+    if sort and sort != "newest":
+        params["sort"] = sort
+    if min_words > 0:
+        params["min_words"] = min_words
+    if max_words > 0:
+        params["max_words"] = max_words
     return urlencode(params)
 
 
@@ -303,40 +306,61 @@ def conversation_summary(conversation: dict[str, Any]) -> dict[str, Any]:
     }
 
 
+VALID_SORTS = {"newest", "oldest", "most_votes", "most_answers", "longest_answer", "shortest_answer"}
+
+
 def sort_conversations_for_queue(
     conversations: list[dict[str, Any]],
     status: str,
     query: str,
+    sort: str = "newest",
 ) -> list[dict[str, Any]]:
-    status = clean_text(status).lower() or "unanswered"
-    query = clean_text(query)
+    sort = clean_text(sort).lower()
+    if sort not in VALID_SORTS:
+        sort = "newest"
 
-    if status == "unanswered" and not query:
-        return sorted(
-            conversations,
-            key=lambda c: to_dt(c.get("created_at") or c.get("updated_at")),
-            reverse=True,
-        )
+    if sort == "oldest":
+        return sorted(conversations, key=lambda c: to_dt(c.get("created_at") or c.get("updated_at")))
 
-    def key(conversation: dict[str, Any]):
-        has_answers = bool(conversation.get("answers"))
-        best_length = answer_text_length(conversation) if has_answers else 0
-        updated = to_dt(conversation.get("updated_at") or conversation.get("created_at"))
-        return (
-            0 if not has_answers else 1,
-            0 if not has_answers else best_length,
-            -updated.timestamp(),
-        )
+    if sort == "most_votes":
+        def vote_key(c: dict[str, Any]) -> int:
+            best = best_answer_payload(c)
+            return int(best.get("votes", 0)) if best else 0
+        return sorted(conversations, key=vote_key, reverse=True)
+
+    if sort == "most_answers":
+        return sorted(conversations, key=lambda c: len(c.get("answers", [])), reverse=True)
+
+    if sort == "longest_answer":
+        return sorted(conversations, key=answer_text_length, reverse=True)
 
-    return sorted(conversations, key=key)
+    if sort == "shortest_answer":
+        def short_key(c: dict[str, Any]) -> tuple:
+            length = answer_text_length(c)
+            return (0 if length == 0 else 1, length)
+        return sorted(conversations, key=short_key)
 
+    # newest (default)
+    return sorted(conversations, key=lambda c: to_dt(c.get("created_at") or c.get("updated_at")), reverse=True)
 
-def list_questions(status: str = "unanswered", q: str = "", page: int = 1) -> dict[str, Any]:
+
+def list_questions(status: str = "unanswered", q: str = "", page: int = 1, sort: str = "newest", min_words: int = 0, max_words: int = 0) -> dict[str, Any]:
     status = clean_text(status).lower() or "unanswered"
     if status not in {"unanswered", "answered", "all"}:
         status = "unanswered"
     q = clean_text(q)
     page = clamp_page(page)
+    sort = clean_text(sort).lower()
+    if sort not in VALID_SORTS:
+        sort = "newest"
+    try:
+        min_words = max(0, int(min_words))
+    except Exception:
+        min_words = 0
+    try:
+        max_words = max(0, int(max_words))
+    except Exception:
+        max_words = 0
 
     conversations = [normalize_conversation(c) for c in load_conversations()]
 
@@ -348,7 +372,12 @@ def list_questions(status: str = "unanswered", q: str = "", page: int = 1) -> di
     if q:
         conversations = [c for c in conversations if matches_query(c, q)]
 
-    conversations = sort_conversations_for_queue(conversations, status=status, query=q)
+    if min_words > 0:
+        conversations = [c for c in conversations if len(clean_text(c.get("question")).split()) >= min_words]
+    if max_words > 0:
+        conversations = [c for c in conversations if len(clean_text(c.get("question")).split()) <= max_words]
+
+    conversations = sort_conversations_for_queue(conversations, status=status, query=q, sort=sort)
     total = len(conversations)
     start = (page - 1) * PAGE_SIZE
     end = start + PAGE_SIZE
@@ -363,6 +392,9 @@ def list_questions(status: str = "unanswered", q: str = "", page: int = 1) -> di
         "has_next": end < total,
         "status": status,
         "q": q,
+        "sort": sort,
+        "min_words": min_words,
+        "max_words": max_words,
     }
 
 
@@ -535,8 +567,17 @@ def home(request: Request):
     q = clean_text(request.query_params.get("q"))
     page = clamp_page(request.query_params.get("page", 1))
     conversation_id = clean_text(request.query_params.get("conversation_id"))
+    sort = clean_text(request.query_params.get("sort")) or "newest"
+    try:
+        min_words = max(0, int(request.query_params.get("min_words", 0)))
+    except Exception:
+        min_words = 0
+    try:
+        max_words = max(0, int(request.query_params.get("max_words", 0)))
+    except Exception:
+        max_words = 0
 
-    list_state = list_questions(status=status, q=q, page=page)
+    list_state = list_questions(status=status, q=q, page=page, sort=sort, min_words=min_words, max_words=max_words)
     detail = load_conversation(conversation_id) if conversation_id else None
 
     init = {
@@ -548,11 +589,14 @@ def home(request: Request):
             "q": list_state["q"],
             "page": list_state["page"],
             "page_size": list_state["page_size"],
+            "sort": list_state["sort"],
+            "min_words": list_state["min_words"],
+            "max_words": list_state["max_words"],
         },
         "list": list_state,
         "detail": detail,
         "conversation_id": conversation_id,
-        "back_query": build_list_query(list_state["status"], list_state["q"], list_state["page"]),
+        "back_query": build_list_query(list_state["status"], list_state["q"], list_state["page"], list_state["sort"], list_state["min_words"], list_state["max_words"]),
     }
     return templates.TemplateResponse(
         request,
@@ -593,11 +637,14 @@ async def api(request: Request):
         q = clean_text(payload.get("q"))
         page = clamp_page(payload.get("page", 1))
         conversation_id = clean_text(payload.get("conversation_id"))
+        sort = clean_text(payload.get("sort")) or "newest"
+        min_words = int(payload.get("min_words", 0) or 0)
+        max_words = int(payload.get("max_words", 0) or 0)
         return JSONResponse(
             {
                 "ok": True,
                 "client_id": client_id,
-                "list": list_questions(status=status, q=q, page=page),
+                "list": list_questions(status=status, q=q, page=page, sort=sort, min_words=min_words, max_words=max_words),
                 "detail": load_conversation(conversation_id) if conversation_id else None,
             }
         )
@@ -606,7 +653,10 @@ async def api(request: Request):
         status = clean_text(payload.get("status")).lower() or "unanswered"
         q = clean_text(payload.get("q"))
         page = clamp_page(payload.get("page", 1))
-        return JSONResponse({"ok": True, **list_questions(status=status, q=q, page=page)})
+        sort = clean_text(payload.get("sort")) or "newest"
+        min_words = int(payload.get("min_words", 0) or 0)
+        max_words = int(payload.get("max_words", 0) or 0)
+        return JSONResponse({"ok": True, **list_questions(status=status, q=q, page=page, sort=sort, min_words=min_words, max_words=max_words)})
 
     if action in {"get_question_detail", "get_conversation"}:
         conversation_id = clean_text(payload.get("conversation_id"))
@@ -670,4 +720,4 @@ async def api(request: Request):
 if __name__ == "__main__":
     import uvicorn
 
-    uvicorn.run("main:app", host="0.0.0.0", port=7860, reload=False)
+    uvicorn.run("main:app", host="0.0.0.0", port=7860, reload=False)