Skip to content

Commit 26348d0

Browse files
fix type
1 parent 74330ed commit 26348d0

File tree

1 file changed

+12
-22
lines changed

1 file changed

+12
-22
lines changed

packages/models-library/src/models_library/rest_pagination_utils.py

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ def _replace_query(url: _URLType, query: dict[str, Any]) -> str:
3838
new_url = url.update_query(query)
3939
else:
4040
new_url = url.replace_query_params(**query)
41-
return f"{new_url}"
41+
42+
new_url_str = f"{new_url}"
43+
return f"{AnyHttpUrlLegacyAdapter.validate_python(new_url_str)}"
4244

4345

4446
class PageDict(TypedDict):
@@ -71,33 +73,21 @@ def paginate_data(
7173
total=total, count=len(chunk), limit=limit, offset=offset
7274
),
7375
_links=PageLinks(
74-
self=(
75-
AnyHttpUrlLegacyAdapter.validate_python(
76-
_replace_query(request_url, {"offset": offset, "limit": limit}),
77-
)
78-
),
79-
first=AnyHttpUrlLegacyAdapter.validate_python(
80-
_replace_query(request_url, {"offset": 0, "limit": limit})
81-
),
82-
prev=AnyHttpUrlLegacyAdapter.validate_python(
83-
_replace_query(
84-
request_url, {"offset": max(offset - limit, 0), "limit": limit}
85-
),
76+
self=_replace_query(request_url, {"offset": offset, "limit": limit}),
77+
first=_replace_query(request_url, {"offset": 0, "limit": limit}),
78+
prev=_replace_query(
79+
request_url, {"offset": max(offset - limit, 0), "limit": limit}
8680
)
8781
if offset > 0
8882
else None,
89-
next=AnyHttpUrlLegacyAdapter.validate_python(
90-
_replace_query(
91-
request_url,
92-
{"offset": min(offset + limit, last_page * limit), "limit": limit},
93-
),
83+
next=_replace_query(
84+
request_url,
85+
{"offset": min(offset + limit, last_page * limit), "limit": limit},
9486
)
9587
if offset < (last_page * limit)
9688
else None,
97-
last=AnyHttpUrlLegacyAdapter.validate_python(
98-
_replace_query(
99-
request_url, {"offset": last_page * limit, "limit": limit}
100-
),
89+
last=_replace_query(
90+
request_url, {"offset": last_page * limit, "limit": limit}
10191
),
10292
),
10393
data=chunk,

0 commit comments

Comments
 (0)