chore: 更新 issue template 里的参数 (#400)

Co-authored-by: uy/sun <[email protected]>

Author: BigOrangeQWQ

src/plugins/github/plugins/config/utils.py

@@ -5,6 +5,7 @@
 from src.plugins.github.handlers import GitHandler, IssueHandler
 from src.plugins.github.plugins.publish.constants import (
     PLUGIN_CONFIG_PATTERN,
+    PLUGIN_MODULE_IMPORT_PATTERN,
     PLUGIN_MODULE_NAME_PATTERN,
     PROJECT_LINK_PATTERN,
 )
@@ -26,7 +27,7 @@ async def validate_info_from_issue(handler: IssueHandler) -> ValidationDict:
     # 从议题里提取插件所需信息
     raw_data: dict[str, Any] = extract_issue_info_from_issue(
         {
-            "module_name": PLUGIN_MODULE_NAME_PATTERN,
+            "module_name": [PLUGIN_MODULE_NAME_PATTERN, PLUGIN_MODULE_IMPORT_PATTERN],
             "project_link": PROJECT_LINK_PATTERN,
             "test_config": PLUGIN_CONFIG_PATTERN,
         },

src/plugins/github/plugins/publish/constants.py

@@ -14,8 +14,10 @@
 BOT_DESC_PATTERN = re.compile(ISSUE_PATTERN.format("机器人描述"))
 BOT_HOMEPAGE_PATTERN = re.compile(ISSUE_PATTERN.format("机器人项目仓库/主页链接"))
 # 插件
-PLUGIN_MODULE_NAME_PATTERN = re.compile(ISSUE_PATTERN.format("插件 import 包名"))
+PLUGIN_MODULE_NAME_PATTERN = re.compile(ISSUE_PATTERN.format("插件模块名"))
+PLUGIN_MODULE_IMPORT_PATTERN = re.compile(ISSUE_PATTERN.format("插件 import 包名"))
 PLUGIN_NAME_STRING = "插件名称"
+
 PLUGIN_NAME_PATTERN = re.compile(ISSUE_PATTERN.format(PLUGIN_NAME_STRING))
 PLUGIN_DESC_STRING = "插件描述"
 PLUGIN_DESC_PATTERN = re.compile(ISSUE_PATTERN.format(PLUGIN_DESC_STRING))

src/plugins/github/plugins/publish/validation.py

@@ -23,6 +23,7 @@
     PLUGIN_CONFIG_PATTERN,
     PLUGIN_DESC_PATTERN,
     PLUGIN_HOMEPAGE_PATTERN,
+    PLUGIN_MODULE_IMPORT_PATTERN,
     PLUGIN_MODULE_NAME_PATTERN,
     PLUGIN_NAME_PATTERN,
     PLUGIN_SUPPORTED_ADAPTERS_PATTERN,
@@ -58,7 +59,7 @@ async def validate_plugin_info_from_issue(
     # 从议题里提取插件所需信息
     raw_data: dict[str, Any] = extract_issue_info_from_issue(
         {
-            "module_name": PLUGIN_MODULE_NAME_PATTERN,
+            "module_name": [PLUGIN_MODULE_NAME_PATTERN, PLUGIN_MODULE_IMPORT_PATTERN],
             "project_link": PROJECT_LINK_PATTERN,
             "test_config": PLUGIN_CONFIG_PATTERN,
             "tags": TAGS_PATTERN,

src/plugins/github/plugins/remove/constants.py

@@ -9,7 +9,9 @@
 REMOVE_BOT_NAME_PATTERN = re.compile(ISSUE_PATTERN.format("机器人名称"))
 # Plugin
 REMOVE_PLUGIN_PROJECT_LINK_PATTERN = re.compile(ISSUE_PATTERN.format("PyPI 项目名"))
-REMOVE_PLUGIN_MODULE_NAME_PATTERN = re.compile(ISSUE_PATTERN.format("import 包名"))
+REMOVE_PLUGIN_IMPORT_NAME_PATTERN = re.compile(ISSUE_PATTERN.format("import 包名"))
+REMOVE_PLUGIN_MODULE_NAME_PATTERN = re.compile(ISSUE_PATTERN.format("插件模块名"))
+
 # Driver / Adapter
 REMOVE_HOMEPAGE_PATTERN = re.compile(ISSUE_PATTERN.format("项目主页"))
 

src/plugins/github/plugins/remove/validation.py

@@ -12,6 +12,7 @@
 from .constants import (
     REMOVE_BOT_HOMEPAGE_PATTERN,
     REMOVE_BOT_NAME_PATTERN,
+    REMOVE_PLUGIN_IMPORT_NAME_PATTERN,
     REMOVE_PLUGIN_MODULE_NAME_PATTERN,
     REMOVE_PLUGIN_PROJECT_LINK_PATTERN,
 )
@@ -70,7 +71,10 @@ async def validate_author_info(issue: Issue, publish_type: PublishType) -> Remov
         case PublishType.PLUGIN | PublishType.ADAPTER:
             raw_data = extract_issue_info_from_issue(
                 {
-                    "module_name": REMOVE_PLUGIN_MODULE_NAME_PATTERN,
+                    "module_name": [
+                        REMOVE_PLUGIN_MODULE_NAME_PATTERN,
+                        REMOVE_PLUGIN_IMPORT_NAME_PATTERN,
+                    ],
                     "project_link": REMOVE_PLUGIN_PROJECT_LINK_PATTERN,
                 },
                 body,

src/plugins/github/utils.py

@@ -27,12 +27,20 @@ def commit_message(prefix: str, message: str, issue_number: int):
 
 
 def extract_issue_info_from_issue(
-    patterns: dict[str, Pattern[str]], body: str
+    patterns: dict[str, Pattern[str] | list[Pattern[str]]], body: str
 ) -> dict[str, str | None]:
     """
     根据提供的正则表达式和议题内容来提取所需的信息
     """
-    matchers = {key: pattern.search(body) for key, pattern in patterns.items()}
+    matchers = {}
+    for key, pattern in patterns.items():
+        if isinstance(pattern, list):
+            matchers[key] = next(
+                (p.search(body) for p in pattern if p.search(body)), None
+            )
+        else:
+            matchers[key] = pattern.search(body)
+
     # 如果未匹配到数据，则不添加进字典中
     # 这样可以让 Pydantic 在校验时报错 missing
     data = {key: match.group(1).strip() for key, match in matchers.items() if match}

tests/plugins/github/config/process/test_config_check.py

@@ -134,7 +134,7 @@ async def test_process_config_check(
 
 nonebot-plugin-treehelp
 
-### 插件 import 包名
+### 插件模块名
 
 nonebot_plugin_treehelp
 
@@ -223,7 +223,7 @@ async def test_process_config_check(
 
 nonebot-plugin-treehelp
 
-### 插件 import 包名
+### 插件模块名
 
 nonebot_plugin_treehelp
 

tests/plugins/github/config/utils.py

@@ -3,4 +3,4 @@ def generate_issue_body(
     project_link: str = "project_link",
     config: str = "log_level=DEBUG",
 ):
-    return f"""### PyPI 项目名\n\n{project_link}\n\n### 插件 import 包名\n\n{module_name}\n\n### 插件配置项\n\n```dotenv\n{config}\n```"""
+    return f"""### PyPI 项目名\n\n{project_link}\n\n### 插件模块名\n\n{module_name}\n\n### 插件配置项\n\n```dotenv\n{config}\n```"""

tests/plugins/github/publish/process/test_publish_check_plugin.py

@@ -134,7 +134,7 @@ async def test_plugin_process_publish_check(
 
 project_link
 
-### 插件 import 包名
+### 插件模块名
 
 module_name
 
@@ -163,7 +163,7 @@ async def test_plugin_process_publish_check(
 
 project_link
 
-### 插件 import 包名
+### 插件模块名
 
 module_name
 
@@ -400,7 +400,7 @@ async def test_plugin_process_publish_check_re_run(
 
 project_link
 
-### 插件 import 包名
+### 插件模块名
 
 module_name
 
@@ -429,7 +429,7 @@ async def test_plugin_process_publish_check_re_run(
 
 project_link
 
-### 插件 import 包名
+### 插件模块名
 
 module_name
 
@@ -650,7 +650,7 @@ async def test_plugin_process_publish_check_missing_metadata(
 
 project_link
 
-### 插件 import 包名
+### 插件模块名
 
 module_name
 
@@ -679,7 +679,7 @@ async def test_plugin_process_publish_check_missing_metadata(
 
 project_link
 
-### 插件 import 包名
+### 插件模块名
 
 module_name
 
@@ -861,7 +861,7 @@ async def test_skip_plugin_check(
 
 project_link
 
-### 插件 import 包名
+### 插件模块名
 
 module_name
 
@@ -900,7 +900,7 @@ async def test_skip_plugin_check(
 
 project_link
 
-### 插件 import 包名
+### 插件模块名
 
 module_name
 
@@ -938,7 +938,7 @@ async def test_skip_plugin_check(
 
 project_link
 
-### 插件 import 包名
+### 插件模块名
 
 module_name
 

tests/plugins/github/publish/utils/test_ensure_issue_plugin_test_button.py

@@ -33,7 +33,7 @@ async def test_ensure_issue_plugin_test_button(app: App, mocker: MockerFixture):
 
 project_link
 
-### 插件 import 包名
+### 插件模块名
 
 module_name
 
@@ -93,7 +93,7 @@ async def test_ensure_issue_plugin_test_button_checked(app: App, mocker: MockerF
 
 project_link
 
-### 插件 import 包名
+### 插件模块名
 
 module_name
 
@@ -182,7 +182,7 @@ async def test_ensure_issue_plugin_test_button_in_progress(
 
 project_link
 
-### 插件 import 包名
+### 插件模块名
 
 module_name