Skip to content

Making it more easy to install/run in a standard way, removing hardco… #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aurel-g wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Making it more easy to install/run in a standard way, removing hardco… #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion SampleDiffusion/EXT_SampleDiffusion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from comfy.model_management import get_torch_device
import importlib
import yaml
from pathlib import Path

def hijack_import(importname, installname):
try:
Expand Down Expand Up @@ -107,7 +108,7 @@ async def view_image(request):
# init and sample_diffusion lib load


comfy_dir = get_comfy_dir()
comfy_dir = Path(__file__).resolve().parent.parent
if not os.path.exists(os.path.join(comfy_dir, 'custom_nodes/SampleDiffusion/libs')):
os.makedirs(os.path.join(comfy_dir, 'custom_nodes/SampleDiffusion/libs'))
lib = os.path.join(comfy_dir, 'custom_nodes/SampleDiffusion/libs/sample_generator')
Expand Down
2 changes: 1 addition & 1 deletion SampleDiffusion/EXT_VariationUtils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import soundfile as sf

from comfy.model_management import get_torch_device
from custom_nodes.SampleDiffusion.EXT_SampleDiffusion import AudioInference
from .EXT_SampleDiffusion import AudioInference
from diffusion_library.sampler import SamplerType
from diffusion_library.scheduler import SchedulerType

Expand Down
4 changes: 3 additions & 1 deletion SampleDiffusion/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@

NODE_CLASS_MAPPINGS = {}

current_package = __name__

for node in os.listdir(os.path.dirname(__file__)):
if node.startswith('EXT_'):
node = node.split('.')[0]
node_import = importlib.import_module('custom_nodes.SampleDiffusion.' + node)
node_import = importlib.import_module(f"{current_package}.{node}")
# get class node mappings from py file
NODE_CLASS_MAPPINGS.update(node_import.NODE_CLASS_MAPPINGS)
1 change: 1 addition & 0 deletions __init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from .SampleDiffusion import *