up

Author: lgc2333

README.md

@@ -119,6 +119,13 @@ Telegram：[@lgc2333](https://t.me/lgc2333)
 
 ## 📝 更新日志
 
+### 0.4.0
+
+- 创建虚拟环境时可选使用哪一个 Python
+- 不创建虚拟环境时也会提示是否安装依赖了
+- `nb shell` 当已处在虚拟环境内时会输出提示，并不会再开一层 Shell 了
+- 微调项目模板
+
 ### 0.3.1
 
 - 修复无法配置 WebUI

nb_cli_plugin_bootstrap/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.1"
+__version__ = "0.4.0"

nb_cli_plugin_bootstrap/handlers/bootstrap.py

@@ -1,8 +1,11 @@
+import asyncio
 import json
+import os
 import shlex
 import subprocess
 import sys
 import traceback
+from dataclasses import dataclass
 from pathlib import Path
 from typing import List
 
@@ -19,7 +22,7 @@
 from nb_cli.handlers.plugin import list_builtin_plugins
 from nb_cli.handlers.process import create_process
 from nb_cli.handlers.venv import create_virtualenv
-from noneprompt import CheckboxPrompt, Choice, ConfirmPrompt, InputPrompt
+from noneprompt import CheckboxPrompt, Choice, ConfirmPrompt, InputPrompt, ListPrompt
 
 from ..const import INPUT_QUESTION
 from ..utils import call_pip_update_simp, validate_ip_v_any_addr, wait
@@ -29,10 +32,64 @@
 BOOTSTRAP_TEMPLATE_DIR = TEMPLATES_DIR / "bootstrap"
 
 
+@dataclass
+class PythonInfo:
+    path: Path
+    version: str
+
+
 def format_project_folder_name(project_name: str) -> str:
     return project_name.replace(" ", "-").lower()
 
 
+async def get_python_version(python_path: Path) -> str:
+    proc = await create_process(
+        python_path,
+        "-c",
+        (
+            "import platform;"
+            "print(f'{platform.python_implementation()} {platform.python_version()}')"
+        ),
+        stdin=asyncio.subprocess.DEVNULL,
+        stdout=asyncio.subprocess.PIPE,
+        stderr=asyncio.subprocess.PIPE,
+    )
+    code, stdout, stderr = await wait(proc)
+    if code == 0 and stdout:
+        return stdout
+    raise RuntimeError(
+        f"Failed to get python version: [{code}] {stderr}, path: {python_path}",
+    )
+
+
+async def find_python() -> List[PythonInfo]:
+    env_path = os.environ["PATH"].split(";" if WINDOWS else ":")
+    python_filenames = ("python.exe",) if WINDOWS else ("python", "python3")
+
+    founded: List[Path] = []
+    for path_str in env_path:
+        path = Path(path_str)
+        for filename in python_filenames:
+            if (p := (path / filename)).exists():
+                founded.append(p)
+                break
+
+    # founded = list(set(founded))
+    if WINDOWS:
+        founded = [x for x in founded if "WindowsApps" not in x.parts]
+    # founded.sort()
+
+    python_versions = await asyncio.gather(
+        *(get_python_version(x) for x in founded),
+        return_exceptions=True,
+    )
+    return [
+        PythonInfo(path, ver)
+        for path, ver in zip(founded, python_versions)
+        if isinstance(ver, str)
+    ]
+
+
 async def prompt_input_list(prompt: str, **kwargs) -> List[str]:
     click.secho(f"{prompt}（留空回车结束输入）", bold=True)
 
@@ -258,13 +315,43 @@ async def post_project_render(
         "是否新建虚拟环境？",
         default_choice=True,
     ).prompt_async(style=CLI_DEFAULT_STYLE)
+
+    python_infos = await find_python()
+    selected_python = (
+        (
+            python_infos[0].path
+            if len(python_infos) == 1
+            else (
+                await ListPrompt(
+                    question="请选择你想要用来创建虚拟环境的 Python 解释器",
+                    choices=[
+                        Choice(f"{info.version} ({info.path})", info)
+                        for info in python_infos
+                    ],
+                ).prompt_async()
+            ).data.path
+        )
+        if python_infos
+        else None
+    )
+
     project_dir_name = context.variables["project_name"].replace(" ", "-").lower()
     project_dir = Path.cwd() / project_dir_name
     if use_venv:
         venv_dir = project_dir / ".venv"
-        click.secho(f"正在 {venv_dir} 中创建虚拟环境", fg="yellow")
+        click.secho(
+            (
+                f"正在 {venv_dir} 中"
+                f"{f'使用 Python {selected_python} ' if selected_python else ''}创建虚拟环境"
+            ),
+            fg="yellow",
+        )
         try:
-            await create_virtualenv(venv_dir, prompt=project_dir_name)
+            await create_virtualenv(
+                venv_dir,
+                prompt=project_dir_name,
+                python_path=str(selected_python),
+            )
         except Exception:
             click.secho(
                 f"创建虚拟环境失败\n{traceback.format_exc()}",
@@ -286,14 +373,12 @@ async def post_project_render(
         await pip_index_handler(verbose=verbose)
 
     manually_install_tip = "项目依赖已写入项目 pyproject.toml 中，请自行手动安装，或使用 pdm 等包管理器安装"
-    if (not use_venv) or (
-        not (
-            yes
-            or await ConfirmPrompt(
-                "是否立即安装项目依赖？",
-                default_choice=True,
-            ).prompt_async(style=CLI_DEFAULT_STYLE)
-        )
+    if not (
+        yes
+        or await ConfirmPrompt(
+            f"是否立即安装项目依赖？{'' if use_venv else '（注意：将会安装到默认全局环境中！）'}",
+            default_choice=True,
+        ).prompt_async(style=CLI_DEFAULT_STYLE)
     ):
         click.secho(manually_install_tip, fg="green")
         return True

nb_cli_plugin_bootstrap/handlers/pip_index.py

@@ -56,5 +56,5 @@ async def pip_index_handler(verbose: bool = False):
     elif code == 0:
         click.secho("PyPI 源配置成功", fg="green", bold=True)
     else:
-        err = stderr if stderr else ""
+        err = stderr or ""
         click.secho(f"PyPI 源配置失败！\n{err}", fg="red", bold=True, err=True)

nb_cli_plugin_bootstrap/handlers/shell.py

@@ -1,8 +1,11 @@
+from contextlib import suppress
 from pathlib import Path
 from typing import Optional
 
 import click
+from nb_cli.config import ConfigManager
 from nb_cli.handlers import requires_project_root
+from nb_cli.handlers.meta import _get_env_python
 from poetry.utils.env import VirtualEnv
 from poetry.utils.shell import Shell
 
@@ -13,17 +16,33 @@
 #     )
 
 
-def get_venv_dir(cwd: Path) -> Path:
-    path = cwd / ".venv"
-    if path.is_dir() and (path / "pyvenv.cfg").is_file():
-        return path
+def find_venv_root(child_path: Path) -> Path:
+    while True:
+        if (child_path / "pyvenv.cfg").exists():
+            return child_path
+        child_path = child_path.parent
+        if len(child_path.parts) <= 1:
+            break
+    raise FileNotFoundError("No virtual environment found")
+
+
+def get_venv_dir(cwd: Optional[Path]) -> Path:
+    config = ConfigManager(working_dir=cwd, use_venv=True)
+    if config.python_path:
+        return find_venv_root(Path(config.python_path).parent)
     raise FileNotFoundError("No virtual environment found")
 
 
 @requires_project_root
 async def shell_handler(cwd: Optional[Path] = None):
-    shell = Shell.get()
-    venv_path = get_venv_dir(cwd or Path.cwd())
-    venv = VirtualEnv(venv_path)
+    venv_path = get_venv_dir(cwd)
+    with suppress(FileNotFoundError):
+        now_venv_path = find_venv_root(Path(await _get_env_python()).parent)
+        if now_venv_path == venv_path:
+            click.secho("您当前已在虚拟环境内", fg="yellow")
+            return
+
     click.secho(f"进入虚拟环境：{venv_path}", fg="green")
+    venv = VirtualEnv(venv_path)
+    shell = Shell.get()
     shell.activate(venv)

nb_cli_plugin_bootstrap/templates/bootstrap/{{cookiecutter.nonebot.folder_name}}/.env.prod

@@ -13,10 +13,14 @@ LOCALSTORE_DATA_DIR=data/nonebot/data
 {%- endif %}
 {%- if cookiecutter.nonebot.use_logpile %}
 
-# LogPile 配置项
-# LOGPILE_PATH=./log    # 日志文件保存路径
-# LOGPILE_LEVEL=INFO    # 日志输出等级，可以为列表
-# LOGPILE_RETENTION=14  # 日志保留天数
+# LogPile 日志文件保存路径
+# LOGPILE_PATH=./log
+
+# LogPile 日志输出等级，可以为列表
+LOGPILE_LEVEL=INFO
+
+# LogPile 日志保留天数
+# LOGPILE_RETENTION=14
 {%- endif %}
 
 ### NoneBot 配置项 ###