Fix _count_user_annotations: query task_completion DB directly, fix superuser token lookup

ls_proxy_hf.py

@@ -692,11 +692,31 @@ def proxy_me():
 
 
 def _count_user_annotations(uid, proj):
-    """Count distinct tasks annotated by uid in proj using admin token."""
+    """Count distinct tasks annotated by uid in proj — DB-first, LS API fallback."""
+    # Primary: query task_completion table directly (no network call needed)
     try:
         conn = sqlite3.connect(DB_PATH)
-        # Get admin token (user_id=1)
-        row = conn.execute("SELECT key FROM authtoken_token WHERE user_id=1").fetchone()
+        done = conn.execute(
+            "SELECT COUNT(DISTINCT tc.task_id) FROM task_completion tc "
+            "JOIN task t ON tc.task_id=t.id "
+            "WHERE tc.completed_by_id=? AND t.project_id=? AND tc.was_cancelled=0",
+            (uid, int(proj))
+        ).fetchone()[0]
+        conn.close()
+        if done > 0:
+            return done
+    except Exception:
+        pass
+
+    # Fallback: use superuser token from DB to call LS API
+    try:
+        conn = sqlite3.connect(DB_PATH)
+        # Get token for any superuser
+        row = conn.execute(
+            "SELECT at.key FROM authtoken_token at "
+            "JOIN htx_user u ON at.user_id = u.id "
+            "WHERE u.is_superuser=1 ORDER BY u.id LIMIT 1"
+        ).fetchone()
         conn.close()
         admin_token = row[0] if row else None
     except Exception:
@@ -726,19 +746,7 @@ def _count_user_annotations(uid, proj):
         except Exception:
             pass
 
-    # Fallback: DB query
-    try:
-        conn = sqlite3.connect(DB_PATH)
-        done = conn.execute(
-            "SELECT COUNT(DISTINCT tc.task_id) FROM task_completion tc "
-            "JOIN task t ON tc.task_id=t.id "
-            "WHERE tc.completed_by_id=? AND t.project_id=? AND tc.was_cancelled=0",
-            (uid, int(proj))
-        ).fetchone()[0]
-        conn.close()
-        return done
-    except Exception:
-        return 0
+    return 0
 
 
 @app.route("/proxy/init")
@@ -798,9 +806,22 @@ def proxy_count_debug():
             ls_status = str(e)
     else:
         done = -3
+    # Also check task_completion directly
+    try:
+        conn2 = sqlite3.connect(DB_PATH)
+        db_done = conn2.execute(
+            "SELECT COUNT(DISTINCT tc.task_id) FROM task_completion tc "
+            "JOIN task t ON tc.task_id=t.id "
+            "WHERE tc.completed_by_id=? AND t.project_id=? AND tc.was_cancelled=0",
+            (uid, int(proj))
+        ).fetchone()[0]
+        conn2.close()
+    except Exception as e:
+        db_done = str(e)
     result = {"uid": uid, "proj": proj, "admin_token_found": admin_token is not None,
               "ls_status": ls_status, "ls_tasks": ls_tasks, "done": done,
-              "ls_url": LS_URL, "_count_result": _count_user_annotations(uid, proj)}
+              "db_done": db_done, "ls_url": LS_URL,
+              "_count_result": _count_user_annotations(uid, proj)}
     return Response(json.dumps(result, indent=2), content_type="application/json; charset=utf-8")