Make songforge clone-anywhere with PKG_ROOT and local ComfyUI.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
+9
-5
@@ -27,8 +27,10 @@ def cmd_doctor(args):
|
||||
root = layout["comfy_root"]
|
||||
log.info("doctor 开始", server=cfg["engine"]["server"])
|
||||
print("== 路径 ==")
|
||||
print(" 仓根 PKG %s" % layout["pkg"])
|
||||
print(" ComfyUI 根 %s" % root)
|
||||
print(" workflows %s" % ROOT)
|
||||
print(" Comfy 服务 %s" % cfg["engine"]["server"])
|
||||
print(" 模板 %s" % layout["template"])
|
||||
print(" runs %s (按日 YYYY-MM-DD/)" % layout["runs"])
|
||||
print(" tmp %s" % layout["tmp"])
|
||||
print(" lyrics %s" % layout["lyrics"])
|
||||
@@ -36,8 +38,8 @@ def cmd_doctor(args):
|
||||
print(" catalog %s" % layout["catalog"])
|
||||
print(" qc_cache %s" % layout["qc_cache"])
|
||||
print(" 音频输出 %s" % layout["audio_out"])
|
||||
local_toml = os.path.join(ROOT, "songforge", "config", "local.toml")
|
||||
local_json = os.path.join(ROOT, "songforge", "config", "local.json")
|
||||
local_toml = os.path.join(pmod.PKG_ROOT, "config", "local.toml")
|
||||
local_json = os.path.join(pmod.PKG_ROOT, "config", "local.json")
|
||||
if os.path.isfile(local_toml):
|
||||
print(" local.toml 有")
|
||||
elif os.path.isfile(local_json):
|
||||
@@ -45,6 +47,8 @@ def cmd_doctor(args):
|
||||
else:
|
||||
print(" local.toml 无(复制 config/local.toml.example)")
|
||||
print(" CLI python %s" % loader.python_hint())
|
||||
qc_py = (cfg.get("paths") or {}).get("qc_python")
|
||||
print(" QC python %s" % (qc_py or "(未配置,qc 时自动探测)"))
|
||||
|
||||
print("== 根目录卫生 ==")
|
||||
pkg = layout["pkg"]
|
||||
@@ -77,7 +81,7 @@ def cmd_doctor(args):
|
||||
print("== 模型 ==")
|
||||
ck = pmod.model_path(root, "checkpoints", cfg["model"]["checkpoint"])
|
||||
lora = pmod.model_path(root, "loras", cfg["model"]["lora"])
|
||||
tpl = os.path.join(ROOT, cfg["paths"]["workflow_template"])
|
||||
tpl = layout["template"]
|
||||
rc = 0
|
||||
for label, p in (("checkpoint", ck), ("lora", lora),
|
||||
("template", tpl)):
|
||||
@@ -271,7 +275,7 @@ def cmd_gen(args):
|
||||
cap_ratio=round(stats["fill"], 3),
|
||||
instrumental=inst, density_profile=prof or "default")
|
||||
|
||||
template = wfmod.load_template(cfg["paths"]["workflow_template"])
|
||||
template = wfmod.load_template(cfg["paths"]["workflow_template"], cfg=cfg)
|
||||
prefix = cfg["paths"]["output_prefix"]
|
||||
fmt = cfg["paths"]["output_format"]
|
||||
seed_base = args.seed if args.seed else random.randint(1, 2 ** 31 - 1)
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ from ..core import workflow as wfmod
|
||||
from ..core.errors import ConfigError
|
||||
from ..log.logger import Logger, Run
|
||||
|
||||
ROOT = wfmod.ROOT
|
||||
ROOT = pmod.PKG_ROOT
|
||||
|
||||
# chill 吟唱(第三张专辑)的前奏小节数。
|
||||
#
|
||||
|
||||
@@ -35,8 +35,8 @@ from ..config import loader
|
||||
from ..core import catalog as catmod
|
||||
from ..core import paths as pmod
|
||||
|
||||
ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
WORKER = os.path.join(ROOT, "songforge", "tools", "qc_worker.py")
|
||||
ROOT = pmod.PKG_ROOT
|
||||
WORKER = os.path.join(ROOT, "tools", "qc_worker.py")
|
||||
|
||||
|
||||
def _cfg():
|
||||
@@ -112,11 +112,13 @@ def _read_manifest(run_id):
|
||||
runs = pmod.under_workflows(cfg["paths"]["runs_dir"])
|
||||
rundir = catmod.find_run_dir(runs, rid)
|
||||
if not rundir:
|
||||
# 兼容旧路径 songforge/runs/<id>
|
||||
legacy = os.path.join(ROOT, "songforge", "runs", rid, "manifest.json")
|
||||
if os.path.isfile(legacy):
|
||||
with open(legacy, encoding="utf-8") as f:
|
||||
return json.load(f), os.path.dirname(legacy)
|
||||
# 兼容旧扁平 runs/
|
||||
for legacy_root in (os.path.join(ROOT, "runs", rid),
|
||||
os.path.join(ROOT, "data", "runs", rid)):
|
||||
legacy = os.path.join(legacy_root, "manifest.json")
|
||||
if os.path.isfile(legacy):
|
||||
with open(legacy, encoding="utf-8") as f:
|
||||
return json.load(f), os.path.dirname(legacy)
|
||||
return None, None
|
||||
with open(os.path.join(rundir, "manifest.json"), encoding="utf-8") as f:
|
||||
return json.load(f), rundir
|
||||
|
||||
+24
-18
@@ -16,7 +16,7 @@ from .common import ROOT, now_id
|
||||
# 素材库迁到 _archive/lyrics_corpus 后,selftest 仍读包内 probe。
|
||||
# 旧文件名 02_InstLowChill.txt 已不在树里,以现有 03 为准。
|
||||
_CHILL_DEMO = os.path.join(
|
||||
ROOT, "songforge", "lyrics", "probe", "03_InstLowChill6.txt")
|
||||
ROOT, "lyrics", "probe", "03_InstLowChill6.txt")
|
||||
|
||||
|
||||
def _t_runid():
|
||||
@@ -79,13 +79,16 @@ def _t_path_layout():
|
||||
layout = pmod.path_layout(cfg)
|
||||
runs_n = layout["runs"].replace("\\", "/")
|
||||
tmp_n = layout["tmp"].replace("\\", "/")
|
||||
assert runs_n.endswith("songforge/data/runs"), "runs 路径异常: %s" % runs_n
|
||||
assert tmp_n.endswith("songforge/data/tmp"), "tmp 路径异常: %s" % tmp_n
|
||||
assert runs_n.replace("\\", "/").endswith("/data/runs") or \
|
||||
runs_n.endswith("data/runs"), "runs 路径异常: %s" % runs_n
|
||||
assert tmp_n.replace("\\", "/").endswith("/data/tmp") or \
|
||||
tmp_n.endswith("data/tmp"), "tmp 路径异常: %s" % tmp_n
|
||||
assert os.path.isdir(layout["baseline"]), "baseline 目录缺失: %s" % layout["baseline"]
|
||||
assert os.path.isfile(layout["template"]), "模板缺失: %s" % layout["template"]
|
||||
for name in ("qc_baseline.json", "qc_baseline_old.json", "style_ref.json"):
|
||||
assert os.path.isfile(os.path.join(layout["baseline"], name)), \
|
||||
"缺少基线文件 %s" % name
|
||||
return [("目录布局", "data/runs|tmp + baseline + catalog 已从 config.paths 解析")]
|
||||
return [("目录布局", "仓根 data/ + baseline + 包内模板 已解析")]
|
||||
|
||||
|
||||
def _t_paths():
|
||||
@@ -648,7 +651,7 @@ def _t_parity():
|
||||
oapi = old.convert(owf)
|
||||
|
||||
cfg = loader.load({})
|
||||
template = wfmod.load_template(cfg["paths"]["workflow_template"])
|
||||
template = wfmod.load_template(cfg["paths"]["workflow_template"], cfg=cfg)
|
||||
m = [x for x in old.META if x[0] == title][0]
|
||||
_, oseed, obpm, okey, odur, oinst = m
|
||||
nwf = wfmod.build_workflow(
|
||||
@@ -686,22 +689,25 @@ def _t_parity():
|
||||
|
||||
|
||||
def _t_fallback():
|
||||
"""fallback 资产必须仍在原位。"""
|
||||
"""包内模板 + Comfy 输出目录必须可用;旧 workflows 旁路资产可选。"""
|
||||
root = pmod.comfy_root()
|
||||
need = [
|
||||
os.path.join(ROOT, "song_rules.py"),
|
||||
os.path.join(ROOT, "urbanhiphop-身体先听懂.json"),
|
||||
pmod.output_dir(root, "MyMusic"),
|
||||
bundled = os.path.join(pmod.PKG_ROOT, "workflows", "template.json")
|
||||
music = pmod.output_dir(root, "MyMusic")
|
||||
if not os.path.isfile(bundled):
|
||||
return [("fallback 资产", "FAIL 缺包内模板 %s" % bundled)]
|
||||
if not os.path.isdir(music):
|
||||
os.makedirs(music, exist_ok=True)
|
||||
host = pmod.comfy_workflows_dir()
|
||||
legacy = [
|
||||
os.path.join(host, "song_rules.py"),
|
||||
os.path.join(host, "urbanhiphop-身体先听懂.json"),
|
||||
]
|
||||
missing = [p for p in need if not os.path.exists(p)]
|
||||
bak_root = os.path.join(ROOT, "bak")
|
||||
legacy_ok = sum(1 for p in legacy if os.path.isfile(p))
|
||||
bak_root = os.path.join(host, "bak")
|
||||
stamps = sorted(os.listdir(bak_root)) if os.path.isdir(bak_root) else []
|
||||
if missing:
|
||||
return [("fallback 资产", "FAIL 缺失 %s" % missing)]
|
||||
if not stamps:
|
||||
return [("fallback 资产", "FAIL bak 目录为空")]
|
||||
return [("fallback 资产", "song_rules.py / 模板 / output/MyMusic 就位,bak %d 份"
|
||||
% len(stamps))]
|
||||
return [("fallback 资产",
|
||||
"包内模板 + MyMusic 就位;Comfy workflows 旧资产 %d/2,bak %d 份"
|
||||
% (legacy_ok, len(stamps)))]
|
||||
|
||||
|
||||
def _t_window():
|
||||
|
||||
Reference in New Issue
Block a user