Make songforge clone-anywhere with PKG_ROOT and local ComfyUI.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
+2
-2
@@ -8,8 +8,8 @@ from . import paths as pmod
|
||||
|
||||
|
||||
def catalog_path(cfg):
|
||||
p = cfg["paths"].get("catalog_file") or "songforge/index/catalog.jsonl"
|
||||
return pmod.under_workflows(p)
|
||||
p = cfg["paths"].get("catalog_file") or "index/catalog.jsonl"
|
||||
return pmod.under_pkg(p)
|
||||
|
||||
|
||||
def day_dir(runs_root, day=None):
|
||||
|
||||
+84
-22
@@ -1,9 +1,16 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""路径解析。ComfyUI 根优先配置/环境变量,再自动探测。"""
|
||||
"""路径解析。
|
||||
|
||||
PKG_ROOT = 本仓根(clone 到哪就是哪)。
|
||||
ComfyUI 根 / QC Python / 音乐目录来自 local.toml 或环境变量,与仓位置解耦。
|
||||
"""
|
||||
import datetime
|
||||
import os
|
||||
|
||||
ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
# songforge/core/paths.py -> 仓根
|
||||
PKG_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
# 兼容旧名:曾表示 workflows 父目录;现一律指仓根
|
||||
ROOT = PKG_ROOT
|
||||
|
||||
_MARKERS = (
|
||||
os.path.join("models", "checkpoints"),
|
||||
@@ -26,8 +33,9 @@ def comfy_root(explicit=None, cfg=None):
|
||||
if env:
|
||||
return os.path.abspath(env)
|
||||
|
||||
cur = ROOT
|
||||
for _ in range(6):
|
||||
# 嵌套在 ComfyUI/user/default/workflows/songforge 时向上探测
|
||||
cur = PKG_ROOT
|
||||
for _ in range(8):
|
||||
hits = sum(1 for m in _MARKERS if os.path.isdir(os.path.join(cur, m)))
|
||||
if hits >= 2:
|
||||
return cur
|
||||
@@ -36,7 +44,12 @@ def comfy_root(explicit=None, cfg=None):
|
||||
break
|
||||
cur = parent
|
||||
|
||||
return os.path.dirname(os.path.dirname(os.path.dirname(ROOT)))
|
||||
return PKG_ROOT
|
||||
|
||||
|
||||
def comfy_workflows_dir(cfg=None):
|
||||
"""ComfyUI user/default/workflows(模板搜索备用)。"""
|
||||
return os.path.join(comfy_root(cfg=cfg), "user", "default", "workflows")
|
||||
|
||||
|
||||
def model_path(root, *parts):
|
||||
@@ -63,15 +76,29 @@ def music_dir(cfg=None, root=None):
|
||||
return output_dir(root, "MyMusic")
|
||||
|
||||
|
||||
def under_workflows(rel, root=None):
|
||||
def _strip_legacy_prefix(rel):
|
||||
"""旧配置相对 workflows 父目录写 songforge/...,现相对仓根。"""
|
||||
norm = rel.replace("\\", "/")
|
||||
if norm.startswith("songforge/"):
|
||||
return norm[len("songforge/"):]
|
||||
return rel
|
||||
|
||||
|
||||
def under_pkg(rel, root=None):
|
||||
"""相对仓根解析;绝对路径原样返回。兼容旧 songforge/ 前缀。"""
|
||||
if not rel:
|
||||
raise ValueError("路径为空")
|
||||
if os.path.isabs(rel):
|
||||
return os.path.normpath(rel)
|
||||
base = root if root is not None else ROOT
|
||||
rel = _strip_legacy_prefix(rel)
|
||||
base = root if root is not None else PKG_ROOT
|
||||
return os.path.normpath(os.path.join(base, rel))
|
||||
|
||||
|
||||
# 旧名
|
||||
under_workflows = under_pkg
|
||||
|
||||
|
||||
def ensure_dir(path):
|
||||
os.makedirs(path, exist_ok=True)
|
||||
return path
|
||||
@@ -88,32 +115,67 @@ def day_subdir(base, day=None):
|
||||
|
||||
def tmp_today(cfg, day=None):
|
||||
"""paths.tmp_dir/YYYY-MM-DD/,确保存在。"""
|
||||
base = under_workflows(cfg["paths"]["tmp_dir"])
|
||||
base = under_pkg(cfg["paths"]["tmp_dir"])
|
||||
return ensure_dir(day_subdir(base, day))
|
||||
|
||||
|
||||
def resolve_template(name_or_path, cfg=None):
|
||||
"""解析 workflow 模板绝对路径。
|
||||
|
||||
顺序:绝对路径 → 仓内相对路径 → ComfyUI workflows 目录下的同名文件。
|
||||
"""
|
||||
if not name_or_path:
|
||||
raise ValueError("workflow_template 为空")
|
||||
if os.path.isabs(name_or_path) and os.path.isfile(name_or_path):
|
||||
return name_or_path
|
||||
cand = under_pkg(name_or_path)
|
||||
if os.path.isfile(cand):
|
||||
return cand
|
||||
# 包内默认模板
|
||||
bundled = os.path.join(PKG_ROOT, "workflows", "template.json")
|
||||
base = os.path.basename(name_or_path)
|
||||
if base in ("template.json",) and os.path.isfile(bundled):
|
||||
return bundled
|
||||
if name_or_path in ("workflows/template.json", "template.json") and \
|
||||
os.path.isfile(bundled):
|
||||
return bundled
|
||||
# ComfyUI 工作流目录(嵌套部署或本机另放的模板)
|
||||
cw = comfy_workflows_dir(cfg)
|
||||
for p in (os.path.join(cw, name_or_path), os.path.join(cw, base),
|
||||
os.path.join(cw, "songforge", "workflows", base)):
|
||||
if os.path.isfile(p):
|
||||
return p
|
||||
if os.path.isfile(bundled):
|
||||
return bundled
|
||||
return cand
|
||||
|
||||
|
||||
def path_layout(cfg):
|
||||
"""从配置展开本包目录布局(绝对路径)。"""
|
||||
p = cfg["paths"]
|
||||
cro = comfy_root(cfg=cfg)
|
||||
return {
|
||||
"workflows": ROOT,
|
||||
"pkg": PKG_ROOT,
|
||||
"workflows_host": comfy_workflows_dir(cfg),
|
||||
"comfy_root": cro,
|
||||
"runs": under_workflows(p["runs_dir"]),
|
||||
"tmp": under_workflows(p["tmp_dir"]),
|
||||
"tmp_today": day_subdir(under_workflows(p["tmp_dir"])),
|
||||
"lyrics": under_workflows(p["lyrics_dir"]),
|
||||
"qc_cache": under_workflows(p["qc_cache_dir"]),
|
||||
"style_cache": under_workflows(p["style_cache_dir"]),
|
||||
"index": under_workflows(p.get("index_dir") or "songforge/index"),
|
||||
"catalog": under_workflows(
|
||||
p.get("catalog_file") or "songforge/index/catalog.jsonl"),
|
||||
"baseline": under_workflows(
|
||||
p.get("baseline_dir") or "songforge/config/baseline"),
|
||||
"template": resolve_template(
|
||||
p.get("workflow_template") or "workflows/template.json", cfg),
|
||||
"runs": under_pkg(p["runs_dir"]),
|
||||
"tmp": under_pkg(p["tmp_dir"]),
|
||||
"tmp_today": day_subdir(under_pkg(p["tmp_dir"])),
|
||||
"lyrics": under_pkg(p["lyrics_dir"]),
|
||||
"qc_cache": under_pkg(p["qc_cache_dir"]),
|
||||
"style_cache": under_pkg(p["style_cache_dir"]),
|
||||
"index": under_pkg(p.get("index_dir") or "index"),
|
||||
"catalog": under_pkg(
|
||||
p.get("catalog_file") or "index/catalog.jsonl"),
|
||||
"baseline": under_pkg(
|
||||
p.get("baseline_dir") or "config/baseline"),
|
||||
"audio_out": music_dir(cfg, cro),
|
||||
"pkg": under_workflows("songforge"),
|
||||
# 兼容旧键
|
||||
"workflows": PKG_ROOT,
|
||||
}
|
||||
|
||||
|
||||
# 根目录不应出现的过程文件(doctor WARN)
|
||||
# 仓根不应出现的过程文件(doctor WARN)
|
||||
ROOT_JUNK_NAMES = ("qc.json", "run.log", "manifest.json")
|
||||
|
||||
+9
-8
@@ -7,8 +7,9 @@ import os
|
||||
import re
|
||||
|
||||
from .errors import ConfigError
|
||||
from . import paths as pmod
|
||||
|
||||
ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
ROOT = pmod.PKG_ROOT
|
||||
|
||||
# UI widgets_values 顺序 -> API inputs 键名。按节点类型分别声明,避免混用。
|
||||
WIDGET_MAP = {
|
||||
@@ -29,13 +30,13 @@ WIDGET_MAP = {
|
||||
}
|
||||
|
||||
|
||||
def load_template(path_or_name):
|
||||
"""path_or_name 可以是 workflows 下的文件名,也可以是绝对路径。"""
|
||||
p = path_or_name
|
||||
if not os.path.isabs(p):
|
||||
p = os.path.join(ROOT, p)
|
||||
if not os.path.exists(p):
|
||||
raise ConfigError("workflow 模板不存在: %s" % p)
|
||||
def load_template(path_or_name, cfg=None):
|
||||
"""path_or_name:仓内相对路径 / Comfy workflows 文件名 / 绝对路径。"""
|
||||
p = pmod.resolve_template(path_or_name, cfg=cfg)
|
||||
if not os.path.isfile(p):
|
||||
raise ConfigError(
|
||||
"workflow 模板不存在: %s(已试仓内 workflows/ 与 ComfyUI workflows)"
|
||||
% path_or_name)
|
||||
with open(p, encoding="utf-8") as f:
|
||||
return json.load(f)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user