✨ Support min_id for WishPaginator

pyproject.toml

@@ -33,4 +33,4 @@ log_cli_date_format = "%Y-%m-%d %H:%M:%S"
 [tool.black]
 include = '\.pyi?$'
 line-length = 120
-target-version = ['py39', 'py310', 'py311', 'py312', 'py313']
+target-version = ['py39', 'py310', 'py311', 'py312']

simnet/client/components/self_help/starrail.py

@@ -15,6 +15,7 @@ async def get_starrail_action_log(
         authkey: str,
         limit: Optional[int] = None,
         end_id: int = 0,
+        min_id: int = 0,
         *,
         lang: Optional[str] = None,
     ) -> List[StarRailSelfHelpActionLog]:
@@ -25,13 +26,15 @@ async def get_starrail_action_log(
             authkey: The authkey for the user.
             limit: The number of logs to get.
             end_id: The end ID for the logs.
+            min_id: The minimum ID for the logs.
             lang: The language to get the logs in.
 
         Returns:
             List[StarRailSelfHelpActionLog]: The action logs.
         """
         paginator = WishPaginator(
             end_id,
+            min_id,
             partial(
                 self.request_self_help,
                 endpoint="UserInfo/GetActionLog",

simnet/client/components/self_help/zzz.py

@@ -15,6 +15,7 @@ async def get_zzz_action_log(
         authkey: str,
         limit: Optional[int] = None,
         end_id: int = 0,
+        min_id: int = 0,
         *,
         lang: Optional[str] = None,
     ) -> List[ZZZSelfHelpActionLog]:
@@ -25,13 +26,15 @@ async def get_zzz_action_log(
             authkey: The authkey for the user.
             limit: The number of logs to get.
             end_id: The end ID for the logs.
+            min_id: The minimum ID for the logs.
             lang: The language to get the logs in.
 
         Returns:
             List[ZZZSelfHelpActionLog]: The action logs.
         """
         paginator = WishPaginator(
             end_id,
+            min_id,
             partial(
                 self.request_self_help,
                 endpoint="LoginRecord/GetList",

simnet/client/components/wish/genshin.py

@@ -19,6 +19,7 @@ async def wish_history(
         lang: Optional[str] = None,
         authkey: Optional[str] = None,
         end_id: int = 0,
+        min_id: int = 0,
         banner_default_name: Optional[str] = "",
     ) -> List[Wish]:
         """Get the wish history for a list of banner types.
@@ -31,6 +32,7 @@ async def wish_history(
                 If not provided, the class default will be used.
             authkey (Optional[str], optional): The authorization key for making the request.
             end_id  (int, optional): The ending ID of the last wish to retrieve.
+            min_id (int, optional): The minimum ID of the first wish to retrieve.
             banner_default_name (Optional[str], optional): The default name of the banner to use.
 
         Returns:
@@ -44,6 +46,7 @@ async def wish_history(
         for banner_type in banner_types:
             paginator = WishPaginator(
                 end_id,
+                min_id,
                 partial(
                     self.get_wish_page,
                     banner_type=banner_type,

simnet/client/components/wish/starrail.py

@@ -19,6 +19,7 @@ async def wish_history(
         lang: Optional[str] = None,
         authkey: Optional[str] = None,
         end_id: int = 0,
+        min_id: int = 0,
     ) -> List[StarRailWish]:
         """
         Get the wish history for a list of banner types.
@@ -31,6 +32,7 @@ async def wish_history(
                 If not provided, the class default will be used.
             authkey (Optional[str], optional): The authorization key for making the request.
             end_id  (int, optional): The ending ID of the last wish to retrieve.
+            min_id (int, optional): The minimum ID of the first wish to retrieve
 
         Returns:
             List[StarRailWish]: A list of StarRailWish objects representing the retrieved wishes.
@@ -42,6 +44,7 @@ async def wish_history(
         for banner_type in banner_types:
             paginator = WishPaginator(
                 end_id,
+                min_id,
                 partial(
                     self.get_wish_page,
                     banner_type=banner_type,

simnet/client/components/wish/zzz.py

@@ -19,6 +19,7 @@ async def wish_history(
         lang: Optional[str] = None,
         authkey: Optional[str] = None,
         end_id: int = 0,
+        min_id: int = 0,
     ) -> List[ZZZWish]:
         """
         Get the wish history for a list of banner types.
@@ -31,6 +32,7 @@ async def wish_history(
                 If not provided, the class default will be used.
             authkey (Optional[str], optional): The authorization key for making the request.
             end_id  (int, optional): The ending ID of the last wish to retrieve.
+            min_id (int, optional): The minimum ID of the first wish to retrieve
 
         Returns:
             List[ZZZWish]: A list of ZZZWish objects representing the retrieved wishes.
@@ -42,6 +44,7 @@ async def wish_history(
         for banner_type in banner_types:
             paginator = WishPaginator(
                 end_id,
+                min_id,
                 partial(
                     self.get_wish_page,
                     banner_type=banner_type,

simnet/utils/paginator.py

@@ -1,4 +1,5 @@
 import asyncio
+import contextlib
 from typing import List, Dict, Callable, Any, Awaitable
 
 
@@ -14,9 +15,11 @@ class WishPaginator:
     def __init__(
         self,
         end_id: int,
+        min_id: int,
         fetch_data: Callable[..., Awaitable[Dict[str, Any]]],
     ):
         self.end_id = end_id
+        self.min_id = min_id
         self.fetch_data = fetch_data
 
     async def get(self, limit: int) -> List[Dict]:
@@ -40,13 +43,21 @@ async def get(self, limit: int) -> List[Dict]:
 
             current_end_id = items[-1]["id"]
 
-            filtered_items = [item for item in items if item["id"] != self.end_id]
-            if len(filtered_items) < len(items):
-                all_items.extend(filtered_items)
-                break
-
+            filtered_items, need_break = [], False
+            for item in items:
+                if item["id"] == self.end_id:
+                    need_break = True
+                    continue
+                if self.min_id:
+                    with contextlib.suppress(ValueError):
+                        if int(item["id"]) <= self.min_id:
+                            need_break = True
+                            continue
+                filtered_items.append(item)
             all_items.extend(filtered_items)
 
+            if need_break:
+                break
             if limit and len(all_items) >= limit:
                 break