Update main.py

main.py

@@ -307,9 +307,11 @@ def get_type_filter(search_type: str) -> str:
 
 
 def search_repos(
-    conn, query: str, search_type: str = "all", limit: int = 50
-) -> List[Dict[str, Any]]:
-    """Search repositories by query string."""
+    conn, query: str, search_type: str = "all", per_page: int = 15, page: int = 1
+) -> Dict[str, Any]:
+    """Search repositories by query string with pagination."""
+    actual_per_page = min(max(per_page, 1), 15)
+    requested_page = max(page, 1)
     search_term_like = f"%{query}%"
     fts_query = " ".join(
         '"' + word.replace('"', '""') + '"*' for word in query.split() if word
@@ -317,6 +319,34 @@ def search_repos(
 
     type_filter = get_type_filter(search_type)
 
+    count_sql = f"""
+    WITH matched_ids AS (
+        SELECT repo_id FROM repo_search WHERE keywords MATCH ?1
+        UNION
+        SELECT id FROM repos
+        WHERE id LIKE ?2 OR owner LIKE ?2 OR description LIKE ?2 OR primary_language LIKE ?2
+    ),
+    filtered_repos AS (
+        SELECT DISTINCT r.id
+        FROM repos r
+        JOIN matched_ids mi ON r.id = mi.repo_id
+        LEFT JOIN packages pkg ON r.id = pkg.repo_id
+        LEFT JOIN programs prog ON r.id = prog.repo_id
+        WHERE
+            r.is_disabled = 0
+            {type_filter}
+    )
+    SELECT COUNT(*) FROM filtered_repos
+    """
+
+    total_count = conn.execute(count_sql, (fts_query, search_term_like)).fetchone()[0] or 0
+
+    total_pages = (
+        (total_count + actual_per_page - 1) // actual_per_page if total_count > 0 else 0
+    )
+    current_page = min(requested_page, total_pages) if total_pages > 0 else 1
+    offset = (current_page - 1) * actual_per_page
+
     sql = f"""
     WITH matched_ids AS (
         SELECT repo_id FROM repo_search WHERE keywords MATCH ?1
@@ -324,17 +354,22 @@ def search_repos(
         SELECT id FROM repos
         WHERE id LIKE ?2 OR owner LIKE ?2 OR description LIKE ?2 OR primary_language LIKE ?2
     ),
-    repo_data AS (
-        SELECT
-            {_REPO_COLUMNS}
+    filtered_repos AS (
+        SELECT DISTINCT r.id
         FROM repos r
-        {_REPO_JOIN_USERS}
         JOIN matched_ids mi ON r.id = mi.repo_id
         LEFT JOIN packages pkg ON r.id = pkg.repo_id
         LEFT JOIN programs prog ON r.id = prog.repo_id
         WHERE
             r.is_disabled = 0
             {type_filter}
+    ),
+    repo_data AS (
+        SELECT
+            {_REPO_COLUMNS}
+        FROM repos r
+        {_REPO_JOIN_USERS}
+        JOIN filtered_repos fr ON r.id = fr.id
     )
     SELECT
         rd.*,
@@ -347,14 +382,25 @@ def search_repos(
             ELSE 3
         END,
         rd.stargazer_count DESC
-    LIMIT ?5
+    LIMIT ?5 OFFSET ?6
     """
 
     starts_with = f"{query}%"
-    cursor = conn.execute(sql, (fts_query, search_term_like, query, starts_with, limit))
+    cursor = conn.execute(
+        sql, (fts_query, search_term_like, query, starts_with, actual_per_page, offset)
+    )
     rows = cursor.fetchall()
+    items = [row_to_repo_dict(row) for row in rows]
 
-    return [row_to_repo_dict(row) for row in rows]
+    return {
+        "items": items,
+        "total": total_count,
+        "page": current_page,
+        "per_page": actual_per_page,
+        "total_pages": total_pages,
+        "has_previous_page": current_page > 1,
+        "has_next_page": current_page < total_pages,
+    }
 
 
 def get_latest_repos(
@@ -684,21 +730,23 @@ def check_db_connection():
 @app.get("/search/packages", tags=["Search"])
 async def search_packages_endpoint(
     q: str = Query(..., min_length=1, description="Search query"),
-    limit: int = Query(50, ge=1, le=100, description="Maximum results"),
+    per_page: int = Query(15, ge=1, le=15, description="Items per page"),
+    page: int = Query(1, ge=1, description="Page number"),
 ):
-    """Search for Zig packages."""
+    """Search for Zig packages with pagination."""
     check_db_connection()
-    return search_repos(db_conn, q, search_type="package", limit=limit)
+    return search_repos(db_conn, q, search_type="package", per_page=per_page, page=page)
 
 
 @app.get("/search/programs", tags=["Search"])
 async def search_programs_endpoint(
     q: str = Query(..., min_length=1, description="Search query"),
-    limit: int = Query(50, ge=1, le=100, description="Maximum results"),
+    per_page: int = Query(15, ge=1, le=15, description="Items per page"),
+    page: int = Query(1, ge=1, description="Page number"),
 ):
-    """Search for Zig programs."""
+    """Search for Zig programs with pagination."""
     check_db_connection()
-    return search_repos(db_conn, q, search_type="program", limit=limit)
+    return search_repos(db_conn, q, search_type="program", per_page=per_page, page=page)
 
 
 @app.get("/packageIndexDetails", tags=["Packages"])
@@ -816,4 +864,4 @@ async def health_check():
 if __name__ == "__main__":
     import uvicorn
 
-    uvicorn.run(app, host="0.0.0.0", port=7860)
+    uvicorn.run(app, host="0.0.0.0", port=7860)