Update prompt information

Author: wu-clan

backend/app/admin/api/v1/sys/plugin.py

@@ -43,9 +43,11 @@ async def install_plugin(
     file: Annotated[UploadFile | None, File()] = None,
     repo_url: Annotated[str | None, Query(description='插件 git 仓库地址')] = None,
 ) -> ResponseModel:
-    await plugin_service.install(type=type, file=file, repo_url=repo_url)
+    plugin_name = await plugin_service.install(type=type, file=file, repo_url=repo_url)
     return response_base.success(
-        res=CustomResponse(code=200, msg='插件安装成功，请根据插件说明（README.md）进行相关配置并重启服务')
+        res=CustomResponse(
+            code=200, msg=f'插件 {plugin_name} 安装成功，请根据插件说明（README.md）进行相关配置并重启服务'
+        )
     )
 
 
@@ -61,7 +63,7 @@ async def install_plugin(
 async def uninstall_plugin(plugin: Annotated[str, Path(description='插件名称')]) -> ResponseModel:
     await plugin_service.uninstall(plugin=plugin)
     return response_base.success(
-        res=CustomResponse(code=200, msg='插件卸载成功，请根据插件说明（README.md）移除相关配置并重启服务')
+        res=CustomResponse(code=200, msg=f'插件 {plugin} 卸载成功，请根据插件说明（README.md）移除相关配置并重启服务')
     )
 
 

backend/app/admin/service/plugin_service.py

@@ -43,7 +43,7 @@ async def changed() -> str | None:
         return await redis_client.get(f'{settings.PLUGIN_REDIS_PREFIX}:changed')
 
     @staticmethod
-    async def install(*, type: PluginType, file: UploadFile | None = None, repo_url: str | None = None):
+    async def install(*, type: PluginType, file: UploadFile | None = None, repo_url: str | None = None) -> str:
         """
         安装插件
 
@@ -55,11 +55,11 @@ async def install(*, type: PluginType, file: UploadFile | None = None, repo_url:
         if type == PluginType.zip:
             if not file:
                 raise errors.RequestError(msg='ZIP 压缩包不能为空')
-            await install_zip_plugin(file)
+            return await install_zip_plugin(file)
         elif type == PluginType.git:
             if not repo_url:
                 raise errors.RequestError(msg='Git 仓库地址不能为空')
-            await install_git_plugin(repo_url)
+            return await install_git_plugin(repo_url)
 
     @staticmethod
     async def uninstall(*, plugin: str):

backend/cli.py

@@ -59,6 +59,26 @@ def run(host: str, port: int, reload: bool, workers: int | None) -> None:
     uvicorn.run(app='backend.main:app', host=host, port=port, reload=not reload, workers=workers)
 
 
+def install_plugin(path: str, repo_url: str) -> None:
+    if not path and not repo_url:
+        raise cappa.Exit('path 或 repo_url 必须指定其中一项', code=1)
+    if path and repo_url:
+        raise cappa.Exit('path 和 repo_url 不能同时指定', code=1)
+
+    plugin_name = None
+    console.print(Text('开始安装插件...', style='bold cyan'))
+
+    try:
+        if path:
+            plugin_name = run_await(install_zip_plugin)(file=path)
+        if repo_url:
+            plugin_name = run_await(install_git_plugin)(repo_url=repo_url)
+    except Exception as e:
+        raise cappa.Exit(e.msg if isinstance(e, BaseExceptionMixin) else str(e), code=1)
+
+    console.print(Text(f'插件 {plugin_name} 安装成功', style='bold cyan'))
+
+
 @cappa.command(help='运行服务')
 @dataclass
 class Run:
@@ -91,21 +111,17 @@ def __call__(self):
 @cappa.command(help='新增插件')
 @dataclass
 class Add:
-    path: Annotated[str | None, cappa.Arg(long=True, help='ZIP 插件的本地完整路径')]
-    repo_url: Annotated[str | None, cappa.Arg(long=True, help='Git 插件的仓库地址')]
+    path: Annotated[
+        str | None,
+        cappa.Arg(long=True, help='ZIP 插件的本地完整路径'),
+    ]
+    repo_url: Annotated[
+        str | None,
+        cappa.Arg(long=True, help='Git 插件的仓库地址'),
+    ]
 
     def __call__(self):
-        if not self.path and not self.repo_url:
-            raise cappa.Exit('path 或 repo_url 必须指定其中一项', code=1)
-        if self.path and self.repo_url:
-            raise cappa.Exit('path 和 repo_url 不能同时指定', code=1)
-        try:
-            if self.path:
-                run_await(install_zip_plugin)(file=self.path)
-            if self.repo_url:
-                run_await(install_git_plugin)(repo_url=self.repo_url)
-        except Exception as e:
-            raise cappa.Exit(e.msg if isinstance(e, BaseExceptionMixin) else str(e), code=1)
+        install_plugin(path=self.path, repo_url=self.repo_url)
 
 
 @dataclass

backend/utils/file_ops.py

@@ -81,7 +81,7 @@ async def upload_file(file: UploadFile) -> str:
     return filename
 
 
-async def install_zip_plugin(file: UploadFile | str):
+async def install_zip_plugin(file: UploadFile | str) -> str:
     """
     安装 ZIP 插件
 
@@ -135,8 +135,10 @@ async def install_zip_plugin(file: UploadFile | str):
     await install_requirements_async(plugin_dir_name)
     await redis_client.set(f'{settings.PLUGIN_REDIS_PREFIX}:changed', 'ture')
 
+    return plugin_name
 
-async def install_git_plugin(repo_url: str):
+
+async def install_git_plugin(repo_url: str) -> str:
     """
     安装 Git 插件
 
@@ -157,3 +159,5 @@ async def install_git_plugin(repo_url: str):
 
     await install_requirements_async(repo_name)
     await redis_client.set(f'{settings.PLUGIN_REDIS_PREFIX}:changed', 'ture')
+
+    return repo_name