Skip to content

Commit c9ec79b

Browse files
committed
🐛 Remove DEFAULT_PAGINATION_LIMIT and use MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE directly in pagination logic
1 parent c4a8def commit c9ec79b

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

services/api-server/src/simcore_service_api_server/_service_solvers.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from models_library.basic_types import VersionStr
55
from models_library.products import ProductName
66
from models_library.rest_pagination import (
7-
MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE,
87
PageMetaInfoLimitOffset,
98
PageOffsetInt,
109
)
@@ -26,8 +25,6 @@
2625
from .models.schemas.solvers import Solver, SolverKeyId
2726
from .services_rpc.catalog import CatalogService
2827

29-
DEFAULT_PAGINATION_LIMIT = MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE - 1
30-
3128

3229
@dataclass(frozen=True, kw_only=True)
3330
class SolverService:

services/api-server/src/simcore_service_api_server/api/routes/solvers.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
create_route_description,
3333
)
3434

35-
DEFAULT_PAGINATION_LIMIT = MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE - 1
36-
37-
3835
_logger = logging.getLogger(__name__)
3936

4037
_SOLVER_STATUS_CODES: dict[int | str, dict[str, Any]] = {
@@ -139,7 +136,7 @@ async def list_solvers_releases(
139136
):
140137

141138
latest_solvers: list[Solver] = []
142-
for page_params in iter_pagination_params(limit=DEFAULT_PAGINATION_LIMIT):
139+
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
143140
solvers, page_meta = await solver_service.latest_solvers(
144141
pagination_offset=page_params.offset,
145142
pagination_limit=page_params.limit,
@@ -149,7 +146,9 @@ async def list_solvers_releases(
149146

150147
all_solvers = []
151148
for solver in latest_solvers:
152-
for page_params in iter_pagination_params(limit=DEFAULT_PAGINATION_LIMIT):
149+
for page_params in iter_pagination_params(
150+
limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
151+
):
153152
solvers, page_meta = await solver_service.solver_release_history(
154153
solver_key=solver.id,
155154
pagination_offset=page_params.offset,
@@ -220,7 +219,7 @@ async def list_solver_releases(
220219
url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
221220
):
222221
all_releases: list[Solver] = []
223-
for page_params in iter_pagination_params(limit=DEFAULT_PAGINATION_LIMIT):
222+
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
224223
solvers, page_meta = await solver_service.solver_release_history(
225224
solver_key=solver_key,
226225
pagination_offset=page_params.offset,

0 commit comments

Comments
 (0)