Skip to content

Commit 61ba391

Browse files
pcrespovpcrespov
committed
@sanderegg review: drop default
1 parent bbd6d8b commit 61ba391

File tree

7 files changed

+48
-18
lines changed

7 files changed

+48
-18
lines changed

‎packages/common-library/src/common_library/pagination_tools.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def total_number_of_pages(self) -> NonNegativeInt:
3131
def iter_pagination_params(
3232
*,
3333
limit: PositiveInt,
34-
offset: NonNegativeInt = 0,
34+
offset: NonNegativeInt,
3535
total_number_of_items: NonNegativeInt | None = None,
3636
) -> Iterable[PageParams]:
3737
"""Iterates through pages of a collection by yielding PageParams for each page.

‎packages/common-library/tests/test_pagination_tools.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def test_fails_if_total_number_of_items_not_set():
7676
RuntimeError,
7777
match="page_args.total_number_of_items = total_count",
7878
):
79-
for _ in iter_pagination_params(limit=2):
79+
for _ in iter_pagination_params(offset=0, limit=2):
8080
pass
8181

8282

@@ -85,6 +85,8 @@ def test_fails_if_total_number_of_items_changes():
8585
RuntimeError,
8686
match="total_number_of_items cannot change on every iteration",
8787
):
88-
for page_params in iter_pagination_params(limit=2, total_number_of_items=4):
88+
for page_params in iter_pagination_params(
89+
offset=0, limit=2, total_number_of_items=4
90+
):
8991
assert page_params.total_number_of_items == 4
9092
page_params.total_number_of_items += 1

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ async def list_solvers_releases(
136136
):
137137

138138
latest_solvers: list[Solver] = []
139-
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
139+
for page_params in iter_pagination_params(
140+
offset=0, limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
141+
):
140142
solvers, page_meta = await solver_service.latest_solvers(
141143
pagination_offset=page_params.offset,
142144
pagination_limit=page_params.limit,
@@ -147,7 +149,7 @@ async def list_solvers_releases(
147149
all_solvers = []
148150
for solver in latest_solvers:
149151
for page_params in iter_pagination_params(
150-
limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
152+
offset=0, limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
151153
):
152154
solvers, page_meta = await solver_service.solver_release_history(
153155
solver_key=solver.id,
@@ -219,7 +221,9 @@ async def list_solver_releases(
219221
url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
220222
):
221223
all_releases: list[Solver] = []
222-
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
224+
for page_params in iter_pagination_params(
225+
offset=0, limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
226+
):
223227
solvers, page_meta = await solver_service.solver_release_history(
224228
solver_key=solver_key,
225229
pagination_offset=page_params.offset,

‎services/web/server/src/simcore_service_webserver/folders/_trash_service.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,9 @@ async def list_explicitly_trashed_folders(
225225
) -> list[FolderID]:
226226
trashed_folder_ids: list[FolderID] = []
227227

228-
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
228+
for page_params in iter_pagination_params(
229+
offset=0, limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
230+
):
229231
(
230232
folders,
231233
page_params.total_number_of_items,
@@ -301,7 +303,9 @@ async def batch_delete_trashed_folders_as_admin(
301303
"""
302304
errors: list[tuple[FolderID, Exception]] = []
303305

304-
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
306+
for page_params in iter_pagination_params(
307+
offset=0, limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
308+
):
305309
(
306310
page_params.total_number_of_items,
307311
expired_trashed_folders,
@@ -349,7 +353,9 @@ async def batch_delete_folders_with_content_in_root_workspace_as_admin(
349353
deleted_folder_ids: list[FolderID] = []
350354
errors: list[tuple[FolderID, Exception]] = []
351355

352-
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
356+
for page_params in iter_pagination_params(
357+
offset=0, limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
358+
):
353359
(
354360
page_params.total_number_of_items,
355361
folders_for_deletion,

‎services/web/server/src/simcore_service_webserver/projects/_trash_service.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ async def list_explicitly_trashed_projects(
161161
"""
162162
trashed_projects: list[ProjectID] = []
163163

164-
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
164+
for page_params in iter_pagination_params(
165+
offset=0, limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
166+
):
165167
(
166168
projects,
167169
page_params.total_number_of_items,
@@ -238,7 +240,9 @@ async def batch_delete_trashed_projects_as_admin(
238240
deleted_project_ids: list[ProjectID] = []
239241
errors: list[tuple[ProjectID, Exception]] = []
240242

241-
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
243+
for page_params in iter_pagination_params(
244+
offset=0, limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
245+
):
242246
(
243247
page_params.total_number_of_items,
244248
expired_trashed_projects,
@@ -291,7 +295,9 @@ async def batch_delete_projects_in_root_workspace_as_admin(
291295
deleted_project_ids: list[ProjectID] = []
292296
errors: list[tuple[ProjectID, Exception]] = []
293297

294-
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
298+
for page_params in iter_pagination_params(
299+
offset=0, limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
300+
):
295301
(
296302
page_params.total_number_of_items,
297303
projects_for_deletion,

‎services/web/server/src/simcore_service_webserver/workspaces/_trash_service.py‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ async def _list_root_child_folders(
6363
) -> list[FolderID]:
6464

6565
child_folders: list[FolderID] = []
66-
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
66+
for page_params in iter_pagination_params(
67+
offset=0, limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
68+
):
6769
(
6870
folders,
6971
page_params.total_number_of_items,
@@ -93,7 +95,9 @@ async def _list_root_child_projects(
9395
) -> list[ProjectID]:
9496

9597
child_projects: list[ProjectID] = []
96-
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
98+
for page_params in iter_pagination_params(
99+
offset=0, limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
100+
):
97101
(
98102
projects,
99103
page_params.total_number_of_items,
@@ -285,7 +289,9 @@ async def list_trashed_workspaces(
285289
) -> list[WorkspaceID]:
286290
trashed_workspace_ids: list[WorkspaceID] = []
287291

288-
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
292+
for page_params in iter_pagination_params(
293+
offset=0, limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
294+
):
289295
(
290296
page_params.total_number_of_items,
291297
workspaces,
@@ -326,7 +332,9 @@ async def batch_delete_trashed_workspaces_as_admin(
326332
deleted_workspace_ids: list[WorkspaceID] = []
327333
errors: list[tuple[WorkspaceID, Exception]] = []
328334

329-
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
335+
for page_params in iter_pagination_params(
336+
offset=0, limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
337+
):
330338
(
331339
page_params.total_number_of_items,
332340
expired_trashed_workspaces,

‎services/web/server/src/simcore_service_webserver/workspaces/_workspaces_service.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ async def delete_workspace_with_all_content(
9999
)
100100

101101
# Get all root projects
102-
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
102+
for page_params in iter_pagination_params(
103+
offset=0, limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
104+
):
103105
(
104106
projects,
105107
page_params.total_number_of_items,
@@ -131,7 +133,9 @@ async def delete_workspace_with_all_content(
131133
)
132134

133135
# Get all root folders
134-
for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
136+
for page_params in iter_pagination_params(
137+
offset=0, limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
138+
):
135139
(
136140
folders,
137141
page_params.total_number_of_items,

0 commit comments

Comments
 (0)