uv 单环境统一部署与跨平台 CI（消 requirements 族 + 双 venv） - #45
Open
Mieluoxxx wants to merge 2 commits into
Open
Conversation
- 依赖声明收敛到 pyproject.toml + uv.lock 唯一锁：删除 requirements.txt / requirements-dev.txt / requirements-cu124.txt / requirements/locks/ 与旧锁 生成器 tools/generate_python_locks.py - 单一 .venv 逐层 L1→L4：uv sync 前缀递增（voice/vad/local-cu124 extras）； torch 经 [tool.uv.sources] 仅在 Windows + local-cu124 时路由到 PyTorch cu124 index；vad 钉 torch==2.5.1，L3→L4 为同版本 wheel 换源而非版本跳变 - Windows CI 重构为 uv 流，新增 single-venv-ladder job（L1→L4 单环境 + torch +cu124 断言 + 负向第二 venv 检查）；新增 macOS CI（L1+L2 voice： brew portaudio + PyAudio 源码编译 + verify + ruff + 平台安全契约测试 + electron build） - 工具迁移：verify_python_environment 拆门（cpu/ci/voice 跨平台， vad/cu124 Windows-only fail-closed；pip check → uv pip check）； audit_cu124_dependencies 声明侧改读 pyproject 展开； verify_clean_python_install.ps1 改 uv - 测试契约迁移：profile_contract / cu124-audit 改测 pyproject extras、 tool.uv.sources 路由、uv.lock 双 torch 平台条目 - 运行时与文档收敛：Electron venv 探测收敛 [.venv]；删除 run_electron_cu124.bat（run_electron_utf8.bat 唯一入口）；asr/llm 运行时 第二 venv 引用清零；README/CONTRIBUTING/release policy/README_EN 全部 uv 化 本地已验证（macOS M4）：干净 venv L1→L3 逐层 sync+import、uv lock --check、 契约测试 26+50、ruff、electron tsc+build、macOS CI 本地等价复刻全绿； Windows L1→L4 ladder 以 CI job 绿为准。
Mieluoxxx
marked this pull request as ready for review
September 3, 2026 11:22
Member
|
感谢这份实现！我会以本 PR 的提交为基础，在独立 worktree 中追加维护方修正，补齐 CI、CPU/CUDA 依赖分层和环境探测验证，并与现有 cu124 工作环境对照。 PR 先保持开放、暂缓合并；待干净安装、CI 和当前 NVIDIA 语音回归完成后，整理最终修改与验证说明再审阅合入。AMD ROCm 和 RTX 50 系 cu128 会纳入兼容设计，具体接入与实机验证分阶段推进，避免扩大本次迁移范围。 |
Member
|
维护集成草稿已建立：#46，保留了本 PR 的两个原始提交。Windows/macOS 四项 CI 检查现已全绿，干净 cu124 安装和实际 ASR/TTS 样本也已验证；现有工作环境保持不变。后续完成人工语音验收和最终审阅再决定合入，AMD/cu128 等扩展仍分阶段推进。 |
Lucas1479
added a commit
that referenced
this pull request
Sep 6, 2026
) This PR builds on #45 and preserves the original contributor commits. It qualifies one exact uv-managed project environment before changing the maintained installation path. The default capability ladder is L1 core → L2 remote voice → L3 CPU VAD → L4 Windows cu124 local models. Every tier uses the project `.venv`, and CPU, NVIDIA, and ROCm Torch builds are mutually exclusive. CPU VAD and cu124 now use PyTorch/Torchaudio 2.6.0 as the maintained baseline. This is the smallest official cu124 upgrade that fixes critical advisory GHSA-53q9-r3pm-6pq6; the previous 2.5.1 lock was rejected by dependency review. The Windows local-model profile also uses the `pyopenjtalk-plus` CPython 3.12 wheel so a clean install does not depend on compiling pyopenjtalk inside a long checkout path. This branch includes the merged portability, Apple Silicon MPS runtime, native macOS menu, and dependency-review changes from #48, #49, #51, and #52. An opt-in `local-rocm` candidate is also included for Windows. It locks AMD's official ROCm 7.2.1 / Torch 2.9.1 packages as a third build selection in the same `.venv`. Qwen ASR and GPT-SoVITS may run in persistent sidecar processes while using that interpreter; sidecar mode is disabled unless explicitly selected. NVIDIA CUDA Graph, NVIDIA BigVGAN kernels, and unrelated performance tuning are not enabled by this candidate. The latest integration includes public main `f7e57e2` and fixes the offline-loading boundary: inherited online flags, already-imported Hub/Transformers state, and cached/custom Hub sessions are now reset before local voice-model loading. Explicit local-file loading is applied to Qwen ASR, BERT, and BigVGAN. The new regression checks block remote requests while still loading a tiny locally generated BERT model. They ran successfully with the qualified cu124 and ROCm libraries. Current head `f1f6397` has all six remote checks green; the current Windows model-less suite reports 1769 passed / 11 skipped, and the Electron model-less smoke passed. Recorded validation (previous L4 qualification and latest integration checks): - `uv.lock` resolves CPU 2.6.0, cu124 2.6.0, and ROCm 2.9.1/7.2.1 branches; invalid combinations fail closed. - A clean `local-cu124` sync passed the 234-package environment contract and `uv pip check`. - On an RTX 4070 Ti SUPER, PyTorch 2.6.0+cu124 completed real CUDA matrix compute, safely loaded the existing GPT and SoVITS v3 checkpoints, and generated a finite 1.612-second / 24 kHz v3 TTS sample through BERT, CNHubert, GPT, SoVITS LoRA, and BigVGAN. - The full L4 Python suite passed: 1783 passed, 2 skipped. - Exact sync back to L1+dev removed 127 voice/model packages and verified that Torch, Qwen ASR, ONNX Runtime, and pyopenjtalk were absent. - A clean `local-rocm` sync installed the fixed candidate and passed its version/import contract plus `uv pip check`. - Earlier revisions passed the remote Windows model-less, single-venv ladder, macOS voice, ROCm clean-install, and Electron build jobs. The Torch 2.5.1 critical advisory is removed. Dependency review has narrowly documented four temporary exceptions: NLTK GHSA-8mgp-746c-j5xp has no patched release, while qwen-asr 0.0.6 requires Transformers 4.57.6 exactly and therefore cannot consume the fixes for GHSA-29pf-2h5f-8g72, GHSA-fgcw-684q-jj6r, and GHSA-xrqw-3rrv-vx5w. Amadeus does not call the affected NLTK persistence, Transformers LightGlue, or `save_pretrained` paths; ASR resolves a local directory and both ASR and TTS force Transformers/Hugging Face offline. Each exception must be removed when a compatible fix is published. All six remote checks have now passed again for `f1f6397`. - Ruff, workflow YAML validation, lock consistency, focused profile/sidecar tests, and diff checks passed. ROCm evidence remains explicitly experimental. Community history records successful RX 9070 XT ASR/TTS sidecars on another ROCm/PyTorch build. On the maintainer's Radeon 780M, the fixed 7.2.1 build installed and enumerated gfx1103, but its first FP32 tensor operation crashed in `amdhip64_7.dll`; Radeon 780M is absent from AMD's Windows support matrix and is not treated as a supported result. A supported AMD GPU still needs to complete the fixed-combination ASR/TTS, microphone/playback, interruption, lifecycle, and long-running journeys. The PR is ready for maintainer review. ROCm remains experimental until supported AMD hardware completes the remaining real-device acceptance. No model weights, recordings, transcripts, generated audio, credentials, virtual environments, or validation caches are committed. Refs #44 and #45. ### 中文摘要 本 PR 基于 #45，并保留原贡献者提交，用于在切换维护基线前验证由 uv 管理的单一项目环境。 默认能力阶梯是 L1 core → L2 远程语音 → L3 CPU VAD → L4 Windows cu124 本地模型。所有梯级共用项目 `.venv`，CPU、NVIDIA 和 ROCm Torch 构建两两互斥。CPU VAD 与 cu124 现以 PyTorch/Torchaudio 2.6.0 作为正式维护基线；这是仍提供官方 cu124 wheel、同时修复 critical 漏洞 GHSA-53q9-r3pm-6pq6 的最小升级。旧 2.5.1 锁正是 dependency review 失败的原因。Windows 本地模型档也统一采用带 CPython 3.12 wheel 的 `pyopenjtalk-plus`，避免在较长仓库路径中现场编译 pyopenjtalk。 本分支现已合入 #48、#49、#51、#52 的跨平台导入、Apple Silicon MPS runtime、macOS 原生菜单和 dependency review 改动。 Windows `local-rocm` 仍是默认关闭的实验候选。它在同一个 `.venv` 中锁定 AMD 官方 ROCm 7.2.1 / Torch 2.9.1，并与 CPU/cu124 构建互斥。Qwen ASR 与 GPT-SoVITS 可使用同一解释器运行在常驻 sidecar 子进程；sidecar 只表示进程隔离，不额外要求虚拟环境，也不会默认启用 NVIDIA CUDA Graph、NVIDIA BigVGAN kernel 或社区补丁中的其他性能调优。 本轮已接上公开主线 `f7e57e2`，并补齐模型离线加载边界：继承的在线环境变量、已导入的 Hub/Transformers 状态和缓存／自定义 Hub HTTP 会话都会在本地语音模型加载前恢复为离线；Qwen ASR、BERT、BigVGAN 的加载也明确只使用本地文件。新增测试验证远程请求被阻止，同时本地生成的小型 BERT 模型仍能正常加载，已在 cu124 与 ROCm 的实际依赖环境中通过。最新提交 `f1f6397` 的六项远程检查全绿，其中 Windows 无模型完整回归为 1769 passed / 11 skipped，Electron 无模型冒烟测试通过。 验证记录（此前 L4 资格验证与本轮集成检查）： - `uv.lock` 可解析 CPU 2.6.0、cu124 2.6.0 和 ROCm 2.9.1/7.2.1，冲突组合会明确失败； - 全新 `local-cu124` 同步通过 234 包环境合同和 `uv pip check`； - RTX 4070 Ti SUPER 上，2.6.0+cu124 完成真实 CUDA 矩阵计算，安全加载现有 GPT/SoVITS v3 权重，并经 BERT、CNHubert、GPT、SoVITS LoRA、BigVGAN 生成 1.612 秒、24 kHz 的有限值音频； - 完整 L4 Python 回归 1783 通过、2 跳过； - 同一 `.venv` 精确返回 L1+dev 时移除 127 个语音/模型包，并确认 Torch、Qwen ASR、ONNX Runtime 与 pyopenjtalk 均不存在； - 全新 `local-rocm` 同步通过固定候选版本/导入合同和 `uv pip check`； - 此前提交的远程 Windows 无模型、单 `.venv` 阶梯、macOS voice、ROCm clean-install 与 Electron build 均通过；Torch 2.5.1 critical 漏洞已移除。dependency review 现精确记录四条临时豁免：NLTK GHSA-8mgp-746c-j5xp 尚无修复版；qwen-asr 0.0.6 又严格要求 Transformers 4.57.6，暂时无法采用 GHSA-29pf-2h5f-8g72、GHSA-fgcw-684q-jj6r、GHSA-xrqw-3rrv-vx5w 的 5.x 修复。Amadeus 不调用相关 NLTK 持久化、LightGlue 或 `save_pretrained` 路径；ASR 只解析本地目录，ASR/TTS 均强制 Transformers/Hugging Face 离线。兼容修复发布后必须逐条移除。最新提交 `f1f6397` 的六项远程检查已全部通过； - Ruff、工作流 YAML、锁一致性、profile/sidecar 聚焦测试和 diff check 均通过。 ROCm 继续明确标记为实验候选。社区资料记录了 RX 9070 XT sidecar ASR/TTS 历史成功；维护机 Radeon 780M 上，固定 7.2.1 环境可安装并枚举 gfx1103，但首次 FP32 计算在 `amdhip64_7.dll` 中崩溃。780M 不在 AMD Windows 支持矩阵内，这个负结果只限定本机硬件，不否定社区候选。固定组合仍需由受支持 AMD GPU 完成真实 ASR/TTS、麦克风/播放、打断、生命周期和长时间运行验收。 本 PR 已进入维护者审阅；ROCm 在受支持 AMD 硬件完成剩余实机验收前继续保持实验候选。仓库未提交模型、录音、转写、生成音频、凭证、虚拟环境或验证缓存。关联 #44、#45。 --------- Co-authored-by: Morgan Woods <weiyiding0@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #44
摘要
依赖生命周期从「pip requirements 文件族 + 双 venv」收敛为 pyproject.toml 唯一声明 + uv.lock 唯一锁 + 单一
.venv逐层 L1→L4；Windows CI 重构为 uv 流并新增 L1→L4 ladder job；新增 macOS CI。.venv_cu124第二环境彻底退役：L4 = 同一.venv追加local-cu124extra。平台支持边界
torch==2.5.1+cu124）变更分组
torch==2.5.1；[tool.uv.sources]仅 win32+local-cu124 路由 cu124 index）；uv.lock入库（win32 平台分叉双 torch 条目）；删除 requirements 全族 +generate_python_locks.pypython-windows.yml重构为 uv 流（setup-uv + cache uv.lock）；新增single-venv-ladderjob：L1→L4 四连uv sync --locked、断言torch.__version__以+cu124结尾、负向断言全程无.venv_cu124/.venv_pt251；新增python-macos.yml（macos-14 + brew portaudio + L2 voice + verify + ruff + 平台安全契约测试白名单 + electron build）verify_python_environment：门拆分（cpu/ci/voice 跨平台；vad/cu124 Windows-only fail-closed），pip check→uv pip check；audit_cu124_dependencies：声明侧改读 pyproject 展开（base 恒活 + extras 分组 marker），--requirements兼容位保留；verify_clean_python_install.ps1改 uvtest_profile_contract：改测 pyproject extras / tool.uv.sources 路由 / uv.lock 条目（L1 无 torch、vad 钉 2.5.1、win32+local-cu124 独立条目）；cu124-audit fixtures 改 pyproject 输入['.venv']；asr/llm 第二 venv 候选清零（fallback 为当前解释器）；删除run_electron_cu124.bat，run_electron_utf8.bat唯一入口安装合同（唯一形态）
uv sync为 exact 同步：升梯必须前缀递增带齐下层 extras，漏带会裁层。本地验证（macOS M4，均已实测）
uv sync --locked+ import 合同通过（torch 2.5.1 PyPI 版），全程单一 venvuv lock --check通过；uv.lock 含 win32 分叉2.5.1/2.5.1+cu124verify_python_environment：macOS--profile cpu/voice过、--profile vad明确 fail-closedtsc --noEmit+npm run buildclean待 CI 确认（合入前置）
single-venv-ladderjob 全绿（hosted runner 无 GPU，断言+cu124wheel 构建而非 CUDA 设备）Review 重点
pyproject.toml[tool.uv.sources]平台语义（torch cu124 仅 win32+local-cu124）与 uv.lock 平台分叉回滚
main 未动过，出问题整体 revert 本 PR 即恢复 pip 基线。Windows L1→L4 ladder job 若红，以 revert 为回退点，不带病合入。