Spaces:
Running
Running
Commit
·
6b7f648
1
Parent(s):
3afa5a7
fix examples
Browse files- app.py +19 -8
- separate.py +2 -2
app.py
CHANGED
|
@@ -50,6 +50,9 @@ for name in wav_files:
|
|
| 50 |
|
| 51 |
examples = [[model_list[0], w] for w in wav_files]
|
| 52 |
|
|
|
|
|
|
|
|
|
|
| 53 |
|
| 54 |
def build_html_output(s: str, style: str = "result_item_success"):
|
| 55 |
return f"""
|
|
@@ -69,7 +72,7 @@ def process_url(model_name: str, url: str):
|
|
| 69 |
return process(model_name, in_filename=f.name)
|
| 70 |
except Exception as e:
|
| 71 |
logging.info(str(e))
|
| 72 |
-
return "", build_html_output(str(e), "result_item_error")
|
| 73 |
|
| 74 |
|
| 75 |
def process_uploaded_file(model_name: str, in_filename: str):
|
|
@@ -85,7 +88,7 @@ def process_uploaded_file(model_name: str, in_filename: str):
|
|
| 85 |
return process(model_name, in_filename=in_filename)
|
| 86 |
except Exception as e:
|
| 87 |
logging.info(str(e))
|
| 88 |
-
return "", build_html_output(str(e), "result_item_error")
|
| 89 |
|
| 90 |
|
| 91 |
def process_microphone(model_name: str, in_filename: str):
|
|
@@ -102,7 +105,7 @@ def process_microphone(model_name: str, in_filename: str):
|
|
| 102 |
return process(model_name, in_filename=in_filename)
|
| 103 |
except Exception as e:
|
| 104 |
logging.info(str(e))
|
| 105 |
-
return "", build_html_output(str(e), "result_item_error")
|
| 106 |
|
| 107 |
|
| 108 |
def process(model_name, in_filename: str):
|
|
@@ -110,7 +113,6 @@ def process(model_name, in_filename: str):
|
|
| 110 |
logging.info(f"in_filename: {in_filename}")
|
| 111 |
|
| 112 |
samples, sample_rate = load_audio(in_filename)
|
| 113 |
-
samples = np.transpose(samples)
|
| 114 |
samples = np.ascontiguousarray(samples)
|
| 115 |
|
| 116 |
duration = samples.shape[1] / sample_rate # in seconds
|
|
@@ -185,7 +187,7 @@ with demo:
|
|
| 185 |
gr.Markdown(title)
|
| 186 |
|
| 187 |
model_dropdown = gr.Dropdown(
|
| 188 |
-
choices=model_list
|
| 189 |
label="Select a model",
|
| 190 |
value=model_list[0],
|
| 191 |
)
|
|
@@ -246,9 +248,18 @@ with demo:
|
|
| 246 |
|
| 247 |
gr.Examples(
|
| 248 |
examples=[
|
| 249 |
-
|
| 250 |
-
|
| 251 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 252 |
],
|
| 253 |
inputs=[model_dropdown, url_textbox],
|
| 254 |
outputs=[url_vocals, url_non_vocals, recorded_html_info],
|
|
|
|
| 50 |
|
| 51 |
examples = [[model_list[0], w] for w in wav_files]
|
| 52 |
|
| 53 |
+
logging.info(f"examples: {examples}")
|
| 54 |
+
print(f"examples: {examples}")
|
| 55 |
+
|
| 56 |
|
| 57 |
def build_html_output(s: str, style: str = "result_item_success"):
|
| 58 |
return f"""
|
|
|
|
| 72 |
return process(model_name, in_filename=f.name)
|
| 73 |
except Exception as e:
|
| 74 |
logging.info(str(e))
|
| 75 |
+
return "", "", build_html_output(str(e), "result_item_error")
|
| 76 |
|
| 77 |
|
| 78 |
def process_uploaded_file(model_name: str, in_filename: str):
|
|
|
|
| 88 |
return process(model_name, in_filename=in_filename)
|
| 89 |
except Exception as e:
|
| 90 |
logging.info(str(e))
|
| 91 |
+
return "", "", build_html_output(str(e), "result_item_error")
|
| 92 |
|
| 93 |
|
| 94 |
def process_microphone(model_name: str, in_filename: str):
|
|
|
|
| 105 |
return process(model_name, in_filename=in_filename)
|
| 106 |
except Exception as e:
|
| 107 |
logging.info(str(e))
|
| 108 |
+
return "", "", build_html_output(str(e), "result_item_error")
|
| 109 |
|
| 110 |
|
| 111 |
def process(model_name, in_filename: str):
|
|
|
|
| 113 |
logging.info(f"in_filename: {in_filename}")
|
| 114 |
|
| 115 |
samples, sample_rate = load_audio(in_filename)
|
|
|
|
| 116 |
samples = np.ascontiguousarray(samples)
|
| 117 |
|
| 118 |
duration = samples.shape[1] / sample_rate # in seconds
|
|
|
|
| 187 |
gr.Markdown(title)
|
| 188 |
|
| 189 |
model_dropdown = gr.Dropdown(
|
| 190 |
+
choices=model_list,
|
| 191 |
label="Select a model",
|
| 192 |
value=model_list[0],
|
| 193 |
)
|
|
|
|
| 248 |
|
| 249 |
gr.Examples(
|
| 250 |
examples=[
|
| 251 |
+
[
|
| 252 |
+
model_list[0],
|
| 253 |
+
"https://huggingface.co/csukuangfj/spleeter-torch/resolve/main/test_wavs/yesterday-once-more-Carpenters.mp3",
|
| 254 |
+
],
|
| 255 |
+
[
|
| 256 |
+
model_list[0],
|
| 257 |
+
"https://huggingface.co/csukuangfj/spleeter-torch/resolve/main/test_wavs/das-beste-Silbermond.mp3",
|
| 258 |
+
],
|
| 259 |
+
[
|
| 260 |
+
model_list[0],
|
| 261 |
+
"https://huggingface.co/csukuangfj/spleeter-torch/resolve/main/test_wavs/hotel-in-california.mp3",
|
| 262 |
+
],
|
| 263 |
],
|
| 264 |
inputs=[model_dropdown, url_textbox],
|
| 265 |
outputs=[url_vocals, url_non_vocals, recorded_html_info],
|
separate.py
CHANGED
|
@@ -46,7 +46,7 @@ def load_audio(filename):
|
|
| 46 |
def get_file(
|
| 47 |
repo_id: str,
|
| 48 |
filename: str,
|
| 49 |
-
subfolder: str = "
|
| 50 |
) -> str:
|
| 51 |
nn_model_filename = hf_hub_download(
|
| 52 |
repo_id=repo_id,
|
|
@@ -95,7 +95,7 @@ def load_spleeter_model(name: str):
|
|
| 95 |
elif "int8" in name:
|
| 96 |
suffix = "int8.onnx"
|
| 97 |
else:
|
| 98 |
-
suffix = "
|
| 99 |
|
| 100 |
vocals = get_file(repo_id=f"csukuangfj/{name}", filename=f"vocals.{suffix}")
|
| 101 |
accompaniment = get_file(
|
|
|
|
| 46 |
def get_file(
|
| 47 |
repo_id: str,
|
| 48 |
filename: str,
|
| 49 |
+
subfolder: str = ".",
|
| 50 |
) -> str:
|
| 51 |
nn_model_filename = hf_hub_download(
|
| 52 |
repo_id=repo_id,
|
|
|
|
| 95 |
elif "int8" in name:
|
| 96 |
suffix = "int8.onnx"
|
| 97 |
else:
|
| 98 |
+
suffix = "onnx"
|
| 99 |
|
| 100 |
vocals = get_file(repo_id=f"csukuangfj/{name}", filename=f"vocals.{suffix}")
|
| 101 |
accompaniment = get_file(
|