nodes/SayanoAI-Comfy-RVC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed rvc caching

Browse Source
This commit is contained in:
SayanoAI
2024-10-09 00:08:10 -04:00
parent c84e7732d3
commit 06111b1dec
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
custom_nodes/rvc_nodes.py
+11 -13
View File
@@ -1,11 +1,12 @@
import json import json
import multiprocessing import multiprocessing
import os import os
import shutil
import numpy as np import numpy as np
import torch import torch
from .audio_nodes import to_audio_dict
from . import BASE_DIR from . import BASE_DIR
from ..lib.train.utils import HParams, DEFAULT_TRAINING_PARAMS from ..lib.train.utils import HParams, DEFAULT_TRAINING_PARAMS
@@ -178,7 +179,7 @@ class RVCNode:
OUTPUT_NODE = True OUTPUT_NODE = True
RETURN_TYPES = ("VHS_AUDIO",) RETURN_TYPES = ("VHS_AUDIO", "AUDIO")
FUNCTION = "convert" FUNCTION = "convert"
@@ -189,23 +190,20 @@ class RVCNode:
input_audio = get_audio(audio) input_audio = get_audio(audio)
voice_model = model() voice_model = model()
feature_model = hubert_model() feature_model = hubert_model()
widgetId = get_hash(feature_model, f0_up_key, audio_to_bytes(*input_audio), *voice_model.items(), *pitch_extraction_params.items()) widgetId = get_hash(feature_model.__class__.__name__, voice_model.get("model_name"), str(voice_model.get("file_index")), f0_up_key, audio_to_bytes(*input_audio), *pitch_extraction_params.items())
cache_name = os.path.join(BASE_CACHE_DIR,"rvc",f"{widgetId}.{format}") cache_name = os.path.join(BASE_CACHE_DIR,"rvc",f"{widgetId}.{format}")
audio_name = os.path.basename(cache_name)
tempdir = os.path.join(temp_path,"preview")
os.makedirs(tempdir, exist_ok=True)
preview_file = os.path.join(tempdir,audio_name)
if use_cache and os.path.isfile(cache_name): output_audio = load_input_audio(cache_name) if use_cache and os.path.isfile(cache_name): output_audio = load_input_audio(cache_name)
else: else:
output_audio = vc_single(hubert_model=feature_model,input_audio=input_audio,f0_up_key=f0_up_key,**voice_model,**pitch_extraction_params) output_audio = vc_single(hubert_model=feature_model,input_audio=input_audio,f0_up_key=f0_up_key,**voice_model,**pitch_extraction_params)
print(save_input_audio(preview_file, output_audio))
if use_cache: if use_cache: print(save_input_audio(cache_name, output_audio))
print(save_input_audio(cache_name, output_audio))
if os.path.isfile(cache_name): output_audio = load_input_audio(cache_name)
tempdir = os.path.join(temp_path,"preview") return {"ui": {"preview": [{"filename": audio_name, "type": "temp", "subfolder": "preview", "widgetId": widgetId}]}, "result": (lambda:audio_to_bytes(*output_audio), to_audio_dict(*output_audio))}
os.makedirs(tempdir, exist_ok=True)
audio_name = os.path.basename(cache_name)
preview_file = os.path.join(tempdir,audio_name)
if not os.path.isfile(preview_file): shutil.copyfile(cache_name,preview_file)
return {"ui": {"preview": [{"filename": audio_name, "type": "temp", "subfolder": "preview", "widgetId": widgetId}]}, "result": (lambda:audio_to_bytes(*output_audio),)}
class RVCProcessDatasetNode: class RVCProcessDatasetNode: