shootthesound
921ea65f2f
Run the sam3_postinstall patches best-effort on node load (only when a sam3 package is resolvable; marker check makes repeat runs cheap). A plain Angelo update + ComfyUI restart now fixes the pkg_resources break (and future patched issues) without touching the .bat/.sh — which can be fiddly with venvs. The installer stays the deterministic fallback. Notice + README reworded to lead with update-and-restart; README also warns against uninstall/reinstall of Angelo (the sam3 clone lives inside the node folder, so removing the node removes SAM 3 with it).
58 lines
2.5 KiB
Python
58 lines
2.5 KiB
Python
"""ComfyUI-Angelo — click-to-refine sampler.
|
|
|
|
Keep the latent alive after sampling; click a region in the node's
|
|
own preview to do extra denoising steps just on that region while
|
|
the rest of the latent is preserved bit-exact (via mask-blended
|
|
re-noise inpainting, with feathered transitions).
|
|
|
|
Built for FLUX 2 Klein 9B distilled (4-step, CFG=1) but works with
|
|
any KSampler-compatible model.
|
|
"""
|
|
|
|
from .angelo_nodes import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS
|
|
|
|
# Record ComfyUI's own Python interpreter so the optional SAM 3 installer
|
|
# (install_sam3_support.bat / .sh) installs into the SAME environment
|
|
# ComfyUI runs in — not whatever `python` happens to be on the user's
|
|
# PATH. sys.executable here is ComfyUI's interpreter for ANY launcher
|
|
# (portable, venv, conda, Stability Matrix, ...), so this is the reliable
|
|
# source of truth. Best-effort; never break node load.
|
|
try:
|
|
import os as _os
|
|
import sys as _sys
|
|
if _sys.executable and _os.path.exists(_sys.executable):
|
|
_marker = _os.path.join(_os.path.dirname(_os.path.abspath(__file__)),
|
|
".comfy_python.txt")
|
|
with open(_marker, "w", encoding="utf-8") as _f:
|
|
_f.write(_sys.executable)
|
|
except Exception as _e: # pragma: no cover
|
|
print(f"[Angelo] could not record python path: {_e}")
|
|
|
|
# Self-heal an existing SAM 3 install at startup (best-effort). The opt-in
|
|
# installer applies these same source patches, but running them here too
|
|
# means a plain node update + ComfyUI restart is enough to fix a broken
|
|
# SAM 3 — no .bat/.sh re-run needed (issue #34: setuptools 82+ removed
|
|
# pkg_resources and killed SAM 3's import). Cheap once patched (marker
|
|
# check short-circuits), a no-op when SAM 3 isn't installed, and it runs
|
|
# before anything can import sam3 (Angelo only imports it lazily at first
|
|
# Detect).
|
|
try:
|
|
import importlib.util as _ilu
|
|
if _ilu.find_spec("sam3") is not None:
|
|
from . import sam3_postinstall as _pi
|
|
_pi.main()
|
|
except Exception as _e: # pragma: no cover
|
|
print(f"[Angelo] SAM 3 self-heal skipped: {_e}")
|
|
|
|
# Registers the /angelo/detect SAM 3 route. Import is best-effort — if
|
|
# the server or sam3 deps aren't present, the node still loads (the
|
|
# detect feature just won't be available).
|
|
try:
|
|
from . import angelo_segment # noqa: F401
|
|
except Exception as _e: # pragma: no cover
|
|
print(f"[Angelo] segmentation route not registered: {_e}")
|
|
|
|
WEB_DIRECTORY = "./web"
|
|
|
|
__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS", "WEB_DIRECTORY"]
|