From ff78f9da548be01fffda60929b93144aadb1c156 Mon Sep 17 00:00:00 2001 From: ewandor Date: Mon, 17 Mar 2025 17:46:04 +0100 Subject: [PATCH] Migrating to fastapi-pagination --- back/Dockerfile | 2 +- back/app/core/routes.py | 7 +++---- back/requirements.txt | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/back/Dockerfile b/back/Dockerfile index 42f73cf5..faf603a0 100644 --- a/back/Dockerfile +++ b/back/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10 +FROM python:3.13 RUN apt update && apt install -y xfonts-base xfonts-75dpi python3-pip python3-cffi python3-brotli libpango-1.0-0 libpangoft2-1.0-0 \ && rm -rf /var/lib/apt/lists/* diff --git a/back/app/core/routes.py b/back/app/core/routes.py index 7e863584..0c45938a 100644 --- a/back/app/core/routes.py +++ b/back/app/core/routes.py @@ -3,8 +3,8 @@ from beanie.odm.operators.find.comparison import In from beanie.operators import And, RegEx, Eq from fastapi import APIRouter, HTTPException, Depends -from fastapi_paginate import Page, Params, add_pagination -from fastapi_paginate.ext.motor import paginate +from fastapi_pagination import Page, Params, add_pagination +from fastapi_pagination.ext.beanie import paginate from ..user.manager import get_current_user, get_current_superuser @@ -79,8 +79,7 @@ def get_crud_router(model, model_create, model_read, model_update): sort = parse_sort(sort_by) query = parse_query(query, model_read) - collection = model.get_motor_collection() - items = paginate(collection, query, Params(**{'size': size, 'page': page}), sort=sort) + items = paginate(model.find(query), Params(**{'size': size, 'page': page})) return await items @router.put("/{id}", response_description="{} record updated".format(model.__name__)) diff --git a/back/requirements.txt b/back/requirements.txt index f02c774a..3289ac34 100644 --- a/back/requirements.txt +++ b/back/requirements.txt @@ -1,8 +1,7 @@ fastapi fastapi_users fastapi_users_db_beanie -motor -fastapi-paginate +fastapi-pagination uvicorn jinja2 weasyprint