Fix: 增加用户提示以正确指引用户进行更新操作 (#197)

Author: NCBM

.basedpyright/baseline.json

@@ -159,6 +159,8 @@ async def install(
         name, extras = name.split("[", 1)
         extras = extras.rstrip("]")
 
+    _all_adapters = await list_adapters(include_unpublished=include_unpublished)
+
     try:
         _installed_adapters = await list_installed_adapters()
         is_installed = False
@@ -180,11 +182,10 @@ async def install(
                 name,
                 [
                     a
-                    for a in await list_adapters(
-                        include_unpublished=include_unpublished
-                    )
+                    for a in _all_adapters
                     if (a.project_link, a.module_name) not in _installed
                 ],
+                echo=False,
             )
 
         assert adapter is not None  # confirmed by above logic
@@ -193,6 +194,23 @@ async def install(
     except NoSelectablePackageError:
         click.echo(_("No available adapter found to install."))
         return
+    except RuntimeError:
+        _adapter = await find_exact_package(
+            _("Adapter name to install:"), name, _all_adapters
+        )
+        click.secho(
+            _("ERROR: Adapter {name} is already installed.").format(
+                name=_adapter.project_link
+            ),
+            fg="red",
+        )
+        click.secho(
+            _("To upgrade the adapter, run `nb adapter update {name}` instead.").format(
+                name=_adapter.project_link
+            ),
+            fg="red",
+        )
+        return
 
     if include_unpublished:
         click.secho(

nb_cli/cli/commands/adapter.py

@@ -159,6 +159,8 @@ async def install(
         name, extras = name.split("[", 1)
         extras = extras.rstrip("]")
 
+    _all_plugins = await list_plugins(include_unpublished=include_unpublished)
+
     try:
         _installed_plugins = await list_installed_plugins()
         is_installed = False
@@ -180,9 +182,10 @@ async def install(
                 name,
                 [
                     p
-                    for p in await list_plugins(include_unpublished=include_unpublished)
+                    for p in _all_plugins
                     if (p.project_link, p.module_name) not in _installed
                 ],
+                echo=False,
             )
 
         assert plugin is not None  # confirmed by above logic
@@ -191,6 +194,23 @@ async def install(
     except NoSelectablePackageError:
         click.echo(_("No available plugin found to install."))
         return
+    except RuntimeError:
+        _plugin = await find_exact_package(
+            _("Plugin name to install:"), name, _all_plugins
+        )
+        click.secho(
+            _("ERROR: Plugin {name} is already installed.").format(
+                name=_plugin.project_link
+            ),
+            fg="red",
+        )
+        click.secho(
+            _("To upgrade the plugin, run `nb plugin update {name}` instead.").format(
+                name=_plugin.project_link
+            ),
+            fg="red",
+        )
+        return
 
     if include_unpublished:
         click.secho(

nb_cli/cli/commands/plugin.py

@@ -63,7 +63,12 @@ def __call__(self, x: Adapter | Plugin | Driver, *, value: str) -> bool: ...
 
 
 async def find_exact_package(
-    question: str, name: str | None, packages: list[T], *, no_extras: bool = False
+    question: str,
+    name: str | None,
+    packages: list[T],
+    *,
+    no_extras: bool = False,
+    echo: bool = True,
 ) -> T:
     if name is None:
         if not packages:
@@ -99,9 +104,9 @@ async def find_exact_package(
     ]
     if len(packages) == 1:
         return packages[0]
-    elif len(packages) > 1:
+    elif echo and len(packages) > 1:
         click.echo(format_package_results(packages))
-    else:
+    elif echo:
         click.echo(_("Package {name} not found.").format(name=name))
         click.echo(
             _("*** You may check with `--include-unpublished` option if supported.")