Merge pull request #1 from HibiKier/feature/add-search-params

✨  添加search参数

Author: BalconyJH

nonebot_plugin_paper/command.py

@@ -1,8 +1,16 @@
-from aioarxiv.client.arxiv_client import ArxivClient
+from aioarxiv.client.arxiv_client import ArxivClient, SortCriterion, SortOrder
 from arclet.alconna import Alconna, Args, Subcommand
 from nonebot.log import logger
 from nonebot.typing import T_State
-from nonebot_plugin_alconna import Image, UniMessage, UniMsg, on_alconna
+from nonebot_plugin_alconna import (
+    AlconnaQuery,
+    Image,
+    Option,
+    Query,
+    UniMessage,
+    UniMsg,
+    on_alconna,
+)
 from nonebot_plugin_htmlrender import capture_element
 from nonebot_plugin_uninfo import Uninfo
 
@@ -14,6 +22,13 @@
         Subcommand(
             "-s|--search",
             Args["keyword", str],
+            Option("--number", Args["number", int]),
+            Option(
+                "--sort",
+                Args["sort", ["relevance", "lastUpdatedDate", "submittedDate"]],
+            ),
+            Option("--order", Args["order", ["ascending", "descending"]]),
+            Option("--start", Args["start", int]),
         ),
         Subcommand(
             "-id",
@@ -26,12 +41,24 @@
 
 
 @paper_cmd.assign("search")
-async def handle_search(keyword: str, state: T_State, uninfo: Uninfo, unimsg: UniMsg):
+async def handle_search(
+    keyword: str,
+    state: T_State,
+    uninfo: Uninfo,
+    unimsg: UniMsg,
+    number: Query[int] = AlconnaQuery("number", 1),
+    sort: Query[SortCriterion | None] = AlconnaQuery("sort", None),
+    order: Query[SortOrder | None] = AlconnaQuery("order", None),
+    start: Query[int | None] = AlconnaQuery("start", None),
+):
     logger.debug(f"Searching for {keyword} by {uninfo.user.id}")
     async with ArxivClient() as client:
         result = await client.search(
             keyword,
-            max_results=1,
+            max_results=number.result,
+            sort_by=sort.result,
+            sort_order=order.result,
+            start=start.result,
         )
         await paper_cmd.send(
             f"Search result for {keyword} and get {result.total_result} papers"
@@ -41,10 +68,10 @@ async def handle_search(keyword: str, state: T_State, uninfo: Uninfo, unimsg: Un
 
 
 @paper_cmd.assign("id")
-async def handle_id(paper_id: str, state: T_State, uninfo: Uninfo, unimsg: UniMsg):
-    logger.debug(f"Searching for {paper_id} by {uninfo.user.id}")
+async def handle_id(id: str, state: T_State, uninfo: Uninfo, unimsg: UniMsg):
+    logger.debug(f"Searching for {id} by {uninfo.user.id}")
     img = await capture_element(
-        f"https://arxiv.org/abs/{paper_id}",
+        f"https://arxiv.org/abs/{id}",
         element="#abs-outer > div.leftcolumn",
     )
     await UniMessage(Image(raw=img)).finish(reply_to=True)