mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2025-12-14 21:52:56 +08:00
* ✨ feat(env): 支持git更新 * ✨ feat(aliyun): 更新阿里云URL构建逻辑,支持组织名称并优化令牌解码处理 * ✨ feat(config): 修改错误提示信息,更新基础配置文件名称为.env.example * ⚡ 插件商店支持aliyun * ✨ feat(store): 优化插件数据获取逻辑,合并插件列表和额外插件列表 * 🐛 修复非git仓库的初始化更新 * ✨ feat(update): 增强更新提示信息,添加非git源的变更文件说明 * 🎨 代码格式化 * ✨ webui与resources支持git更新 * ✨ feat(update): 更新webui路径处理逻辑 * Fix/test_runwork (#2001) * fix(test): 修复测试工作流 - 修改自动更新模块中的导入路径 - 更新插件商店模块中的插件信息获取逻辑 - 优化插件添加、更新和移除流程 - 统一插件相关错误信息的格式 - 调整测试用例以适应新的插件管理逻辑 * test(builtin_plugins): 重构插件商店相关测试 - 移除 jsd 相关测试用例,只保留 gh(GitHub)的测试 - 删除了 test_plugin_store.py 文件,清理了插件商店的测试 - 更新了 test_search_plugin.py 中的插件版本号 - 调整了 test_update_plugin.py 中的已加载插件版本 - 移除了 StoreManager 类中的 is_external 变量 - 更新了 RepoFileManager 类中的文件获取逻辑,优先使用 GitHub * ✨ feat(submodule): 添加子模块管理功能,支持子模块的初始化、更新和信息获取 * ✨ feat(update): 移除资源管理器,重构更新逻辑,支持通过ZhenxunRepoManager进行资源和Web UI的更新 * test(auto_update): 修改更新检测消息格式 (#2003) - 移除了不必要的版本号后缀(如 "-e6f17c4") - 统一了版本更新消息的格式,删除了冗余信息 * 🐛 修复web zip更新路径问题 * ⚡ 文件获取优化使用ali * Fix/test (#2008) * test: 修复bot测试 - 在 test_check_update.py 中跳过两个测试函数 - 移除 test_check.py 中的 mocked_api 参数和相关调用 - 删除 test_add_plugin.py 中的多个测试函数 - 移除 test_remove_plugin.py 中的 mocked_api 参数和相关调用 - 删除 test_search_plugin.py 中的多个测试函数 - 移除 test_update_all_plugin.py 和 test_update_plugin.py 中的 mocked_api 参数和相关调用 * 🚨 auto fix by pre-commit hooks --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * 修复res zip更新路径问题 * 🐛 修复zhenxun更新zip占用问题 * ✨ feat(update): 优化资源更新逻辑,调整更新路径和消息处理 --------- Co-authored-by: molanp <104612722+molanp@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
187 lines
6.0 KiB
Python
187 lines
6.0 KiB
Python
import asyncio
|
||
from pathlib import Path
|
||
import subprocess
|
||
from subprocess import CalledProcessError
|
||
from typing import ClassVar
|
||
|
||
from zhenxun.configs.config import Config
|
||
from zhenxun.services.log import logger
|
||
|
||
BAT_FILE = Path() / "win启动.bat"
|
||
|
||
LOG_COMMAND = "VirtualEnvPackageManager"
|
||
|
||
Config.add_plugin_config(
|
||
"virtualenv",
|
||
"python_path",
|
||
None,
|
||
help="虚拟环境python路径,为空时使用系统环境的poetry",
|
||
)
|
||
|
||
|
||
class VirtualEnvPackageManager:
|
||
WIN_COMMAND: ClassVar[list[str]] = [
|
||
"./Python310/python.exe",
|
||
"-m",
|
||
"pip",
|
||
]
|
||
|
||
DEFAULT_COMMAND: ClassVar[list[str]] = ["poetry", "run", "pip"]
|
||
|
||
@classmethod
|
||
def __get_command(cls) -> list[str]:
|
||
if path := Config.get_config("virtualenv", "python_path"):
|
||
return [path, "-m", "pip"]
|
||
return (
|
||
cls.WIN_COMMAND.copy() if BAT_FILE.exists() else cls.DEFAULT_COMMAND.copy()
|
||
)
|
||
|
||
@classmethod
|
||
async def install(cls, package: list[str] | str):
|
||
"""安装依赖包
|
||
|
||
参数:
|
||
package: 安装依赖包名称或列表
|
||
"""
|
||
if isinstance(package, str):
|
||
package = [package]
|
||
try:
|
||
command = cls.__get_command()
|
||
command.append("install")
|
||
command.append(" ".join(package))
|
||
logger.info(f"执行虚拟环境安装包指令: {command}", LOG_COMMAND)
|
||
result = await asyncio.to_thread(
|
||
subprocess.run,
|
||
command,
|
||
check=True,
|
||
capture_output=True,
|
||
text=True,
|
||
)
|
||
logger.debug(
|
||
f"安装虚拟环境包指令执行完成: {result.stdout}",
|
||
LOG_COMMAND,
|
||
)
|
||
return result.stdout
|
||
except CalledProcessError as e:
|
||
logger.error(f"安装虚拟环境包指令执行失败: {e.stderr}.", LOG_COMMAND)
|
||
return e.stderr
|
||
|
||
@classmethod
|
||
async def uninstall(cls, package: list[str] | str):
|
||
"""卸载依赖包
|
||
|
||
参数:
|
||
package: 卸载依赖包名称或列表
|
||
"""
|
||
if isinstance(package, str):
|
||
package = [package]
|
||
try:
|
||
command = cls.__get_command()
|
||
command.append("uninstall")
|
||
command.append("-y")
|
||
command.append(" ".join(package))
|
||
logger.info(f"执行虚拟环境卸载包指令: {command}", LOG_COMMAND)
|
||
result = await asyncio.to_thread(
|
||
subprocess.run,
|
||
command,
|
||
check=True,
|
||
capture_output=True,
|
||
text=True,
|
||
)
|
||
logger.debug(
|
||
f"卸载虚拟环境包指令执行完成: {result.stdout}",
|
||
LOG_COMMAND,
|
||
)
|
||
return result.stdout
|
||
except CalledProcessError as e:
|
||
logger.error(f"卸载虚拟环境包指令执行失败: {e.stderr}.", LOG_COMMAND)
|
||
return e.stderr
|
||
|
||
@classmethod
|
||
async def update(cls, package: list[str] | str):
|
||
"""更新依赖包
|
||
|
||
参数:
|
||
package: 更新依赖包名称或列表
|
||
"""
|
||
if isinstance(package, str):
|
||
package = [package]
|
||
try:
|
||
command = cls.__get_command()
|
||
command.append("install")
|
||
command.append("--upgrade")
|
||
command.append(" ".join(package))
|
||
logger.info(f"执行虚拟环境更新包指令: {command}", LOG_COMMAND)
|
||
result = await asyncio.to_thread(
|
||
subprocess.run,
|
||
command,
|
||
check=True,
|
||
capture_output=True,
|
||
text=True,
|
||
)
|
||
logger.debug(f"更新虚拟环境包指令执行完成: {result.stdout}", LOG_COMMAND)
|
||
return result.stdout
|
||
except CalledProcessError as e:
|
||
logger.error(f"更新虚拟环境包指令执行失败: {e.stderr}.", LOG_COMMAND)
|
||
return e.stderr
|
||
|
||
@classmethod
|
||
async def install_requirement(cls, requirement_file: Path):
|
||
"""安装依赖文件
|
||
|
||
参数:
|
||
requirement_file: requirement文件路径
|
||
|
||
异常:
|
||
FileNotFoundError: 文件不存在
|
||
"""
|
||
if not requirement_file.exists():
|
||
raise FileNotFoundError(f"依赖文件 {requirement_file} 不存在", LOG_COMMAND)
|
||
try:
|
||
command = cls.__get_command()
|
||
command.append("install")
|
||
command.append("-r")
|
||
command.append(str(requirement_file.absolute()))
|
||
logger.info(f"执行虚拟环境安装依赖文件指令: {command}", LOG_COMMAND)
|
||
result = await asyncio.to_thread(
|
||
subprocess.run,
|
||
command,
|
||
check=True,
|
||
capture_output=True,
|
||
text=True,
|
||
)
|
||
logger.debug(
|
||
f"安装虚拟环境依赖文件指令执行完成: {result.stdout}",
|
||
LOG_COMMAND,
|
||
)
|
||
return result.stdout
|
||
except CalledProcessError as e:
|
||
logger.error(
|
||
f"安装虚拟环境依赖文件指令执行失败: {e.stderr}.",
|
||
LOG_COMMAND,
|
||
)
|
||
return e.stderr
|
||
|
||
@classmethod
|
||
async def list(cls) -> str:
|
||
"""列出已安装的依赖包"""
|
||
try:
|
||
command = cls.__get_command()
|
||
command.append("list")
|
||
logger.info(f"执行虚拟环境列出包指令: {command}", LOG_COMMAND)
|
||
result = await asyncio.to_thread(
|
||
subprocess.run,
|
||
command,
|
||
check=True,
|
||
capture_output=True,
|
||
text=True,
|
||
)
|
||
logger.debug(
|
||
f"列出虚拟环境包指令执行完成: {result.stdout}",
|
||
LOG_COMMAND,
|
||
)
|
||
return result.stdout
|
||
except CalledProcessError as e:
|
||
logger.error(f"列出虚拟环境包指令执行失败: {e.stderr}.", LOG_COMMAND)
|
||
return ""
|