mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-10-05 03:39:59 +08:00
添加uv支持 (#2119)
* bugfix:修复内存泄露和信号量饥饿问题 * 修复图片渲染按高度截断问题 * 优化图片渲染速度 * 权限检查去掉无效引用代码 * 添加uv支持 * 🚨 auto fix by pre-commit hooks * bugfix:修改gitignore换行 * bugfix:修复测试没有新生成uv.lock * 修复导入错误 * bugfix:移除重复调用 * 🚨 auto fix by pre-commit hooks * 清理残余poetry引用 * 更新uv安装方式 * 修复阿里云获取问题 * 增加资源下载提示 * 🚨 auto fix by pre-commit hooks * 修改资源下载为流式 * 🚨 auto fix by pre-commit hooks * 提高启动速度 * 移除bot.py支持 * 🚨 auto fix by pre-commit hooks * 优化win脚本逻辑 * 🚨 auto fix by pre-commit hooks * 清理残余无效逻辑 * 代码改进 * 🚨 auto fix by pre-commit hooks * 增加数据库迁移存在性检查 * 🚨 auto fix by pre-commit hooks * chore(test): 添加pytest超时控制和优雅关闭机制 - 在GitHub Actions工作流中添加作业级和步骤级超时限制，防止测试无限期挂起 - 添加pytest-timeout依赖并配置全局超时为120秒 - 在send_queue服务添加关闭钩子，确保worker任务正确取消 - 在priority_manager添加on_shutdown钩子，支持优先级生命周期的关闭阶段 * chore(lint): 禁用超长行的lint警告 * Modify restart logic for Windows platform * 🚨 auto fix by pre-commit hooks * bugfix:修复sys导入问题 * 清理无效结构 * bugfix:修复路径问题 * bugfix:修复shell语法传递给git导致资源获取失败问题 * 优化关闭显示 * bugfix:修复路径问题 * bugfix:增加路径安全 * bugfix:修复orm绕过问题 * 放宽numpy版本限制 * 修改重启方案 * bugfix:修复循环导入 * 优化逻辑 * Enhance disconnect function with error handling Added error handling for disconnect function and imported ConfigurationError. * Implement emergency restart mechanism Added emergency restart mechanism using atexit to ensure process restart even on severe exceptions during shutdown. * 🚨 auto fix by pre-commit hooks * 重启行为归一化 * 修复测试检测问题 * bugfix:修复测试侧类型报错问题 * 引入launcher机制 * 移除重启测试 * 收紧缓存调用路径 * 类型注解收敛 * 优化浏览器回收行为 * 优化浏览器渲染 * bugfix:解决重复关闭浏览器问题 --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: ManyManyTomato <93612024+ATTomatoo@users.noreply.github.com> Co-authored-by: AkashiCoin <l1040186796@gmail.com>
This commit is contained in:
Copaan
co-authored by
pre-commit-ci[bot]
ManyManyTomato
AkashiCoin
pre-commit-ci[bot]
ManyManyTomato
AkashiCoin
parent
74bf912d04
commit
8b16126e40
@@ -153,7 +153,7 @@ class BaseRepoManager(ABC):
|
||||
return ""
|
||||
|
||||
try:
|
||||
async with aiofiles.open(version_file) as f:
|
||||
async with aiofiles.open(version_file, encoding="utf-8") as f:
|
||||
return (await f.read()).strip()
|
||||
except Exception as e:
|
||||
logger.error(f"读取版本文件失败: {e}")
|
||||
@@ -174,10 +174,10 @@ class BaseRepoManager(ABC):
|
||||
|
||||
try:
|
||||
version_bb = "vNone"
|
||||
async with aiofiles.open(version_file) as rf:
|
||||
async with aiofiles.open(version_file, encoding="utf-8") as rf:
|
||||
if text := await rf.read():
|
||||
version_bb = text.strip().split("-")[0]
|
||||
async with aiofiles.open(version_file, "w") as f:
|
||||
async with aiofiles.open(version_file, "w", encoding="utf-8") as f:
|
||||
await f.write(f"{version_bb}-{version[:6]}")
|
||||
return True
|
||||
except Exception as e:
|
||||
@@ -261,9 +261,9 @@ class BaseRepoManager(ABC):
|
||||
# 检查本地目录是否存在
|
||||
if not await AsyncPath(local_path).exists():
|
||||
# 如果不存在，则克隆仓库
|
||||
logger.info(f"克隆仓库 {repo_url} 到 {local_path}", LOG_COMMAND)
|
||||
logger.info(f"正在克隆仓库 {repo_url}，请耐心等待...", LOG_COMMAND)
|
||||
success, _stdout, stderr = await run_git_command(
|
||||
f"clone -b {branch} {repo_url} {local_path}"
|
||||
f"clone --progress -b {branch} {repo_url} {local_path}"
|
||||
)
|
||||
if not success:
|
||||
return RepoUpdateResult(
|
||||
@@ -375,11 +375,28 @@ class BaseRepoManager(ABC):
|
||||
|
||||
# 拉取最新代码
|
||||
logger.info(f"拉取最新代码: {repo_url}", LOG_COMMAND)
|
||||
pull_cmd = f"pull origin {branch}"
|
||||
if force:
|
||||
pull_cmd = f"fetch --all && git reset --hard origin/{branch}"
|
||||
logger.info("使用强制拉取模式", LOG_COMMAND)
|
||||
success, _, stderr = await run_git_command(pull_cmd, cwd=local_path)
|
||||
# 强制模式需要两步：先 fetch，再 reset，不能用 shell && 链式写法
|
||||
success, _, stderr = await run_git_command(
|
||||
"fetch --all", cwd=local_path
|
||||
)
|
||||
if not success:
|
||||
return RepoUpdateResult(
|
||||
repo_type=repo_type or RepoType.GITHUB,
|
||||
repo_name=repo_name,
|
||||
owner=owner or "",
|
||||
old_version=old_version.strip(),
|
||||
new_version="",
|
||||
error_message=f"拉取最新代码失败: {stderr}",
|
||||
)
|
||||
success, _, stderr = await run_git_command(
|
||||
f"reset --hard origin/{branch}", cwd=local_path
|
||||
)
|
||||
else:
|
||||
success, _, stderr = await run_git_command(
|
||||
f"pull origin {branch}", cwd=local_path
|
||||
)
|
||||
if not success:
|
||||
return RepoUpdateResult(
|
||||
repo_type=repo_type or RepoType.GITHUB,
|
||||
|
||||
@@ -23,8 +23,9 @@ async def check_git() -> bool:
|
||||
bool: 是否存在git命令
|
||||
"""
|
||||
try:
|
||||
process = await asyncio.create_subprocess_shell(
|
||||
"git --version",
|
||||
process = await asyncio.create_subprocess_exec(
|
||||
"git",
|
||||
"--version",
|
||||
stdout=asyncio.subprocess.PIPE,
|
||||
stderr=asyncio.subprocess.PIPE,
|
||||
)
|
||||
@@ -50,7 +51,7 @@ async def run_git_command(
|
||||
command: str, cwd: Path | None = None
|
||||
) -> tuple[bool, str, str]:
|
||||
"""
|
||||
运行git命令
|
||||
运行git命令，实时输出 stderr 进度信息（如 git clone --progress）。
|
||||
|
||||
参数:
|
||||
command: 命令
|
||||
@@ -60,19 +61,54 @@ async def run_git_command(
|
||||
tuple[bool, str, str]: (是否成功, 标准输出, 标准错误)
|
||||
"""
|
||||
try:
|
||||
full_command = f"git {command}"
|
||||
# 将Path对象转换为字符串
|
||||
cwd_str = str(cwd) if cwd else None
|
||||
process = await asyncio.create_subprocess_shell(
|
||||
full_command,
|
||||
args = command.split()
|
||||
process = await asyncio.create_subprocess_exec(
|
||||
"git",
|
||||
*args,
|
||||
stdout=asyncio.subprocess.PIPE,
|
||||
stderr=asyncio.subprocess.PIPE,
|
||||
cwd=cwd_str,
|
||||
cwd=cwd,
|
||||
)
|
||||
stdout_bytes, stderr_bytes = await process.communicate()
|
||||
|
||||
stdout = stdout_bytes.decode("utf-8").strip()
|
||||
stderr = stderr_bytes.decode("utf-8").strip()
|
||||
stderr_lines: list[str] = []
|
||||
|
||||
async def _read_stderr():
|
||||
assert process.stderr is not None
|
||||
buf = b""
|
||||
while True:
|
||||
chunk = await process.stderr.read(256)
|
||||
if not chunk:
|
||||
if buf:
|
||||
text = buf.decode("utf-8", errors="replace").strip()
|
||||
if text:
|
||||
stderr_lines.append(text)
|
||||
logger.debug(text, LOG_COMMAND)
|
||||
break
|
||||
buf += chunk
|
||||
while b"\n" in buf or b"\r" in buf:
|
||||
idx_r = buf.find(b"\r")
|
||||
idx_n = buf.find(b"\n")
|
||||
if idx_r == -1:
|
||||
idx = idx_n
|
||||
elif idx_n == -1:
|
||||
idx = idx_r
|
||||
else:
|
||||
idx = min(idx_r, idx_n)
|
||||
line_bytes = buf[:idx]
|
||||
if buf[idx : idx + 2] == b"\r\n":
|
||||
buf = buf[idx + 2 :]
|
||||
else:
|
||||
buf = buf[idx + 1 :]
|
||||
text = line_bytes.decode("utf-8", errors="replace").strip()
|
||||
if text:
|
||||
stderr_lines.append(text)
|
||||
logger.debug(text, LOG_COMMAND)
|
||||
|
||||
stdout_bytes, _ = await asyncio.gather(_collect_stdout(process), _read_stderr())
|
||||
|
||||
await process.wait()
|
||||
stdout = (stdout_bytes or b"").decode("utf-8").strip()
|
||||
stderr = "\n".join(stderr_lines)
|
||||
|
||||
return process.returncode == 0, stdout, stderr
|
||||
except Exception as e:
|
||||
@@ -80,6 +116,18 @@ async def run_git_command(
|
||||
return False, "", str(e)
|
||||
|
||||
|
||||
async def _collect_stdout(process: asyncio.subprocess.Process) -> bytes:
|
||||
"""收集子进程的全部 stdout 输出。"""
|
||||
assert process.stdout is not None
|
||||
chunks: list[bytes] = []
|
||||
while True:
|
||||
chunk = await process.stdout.read(4096)
|
||||
if not chunk:
|
||||
break
|
||||
chunks.append(chunk)
|
||||
return b"".join(chunks)
|
||||
|
||||
|
||||
def glob_to_regex(pattern: str) -> str:
|
||||
"""
|
||||
将glob模式转换为正则表达式
|
||||
|
||||
Reference in New Issue
Block a user