thecollabagepatch commited on
Commit
fffe1f4
·
1 Parent(s): d44297e

ok herewego

Browse files
Files changed (1) hide show
  1. app.py +13 -13
app.py CHANGED
@@ -20,24 +20,22 @@ def preprocess_audio(waveform):
20
 
21
  # Test with a wrapper function
22
  @spaces.GPU
23
- def generate_drum_sample(progress=gr.Progress(track_tqdm=True)):
24
- progress(0.1, desc="Loading model...")
25
  model = MusicGen.get_pretrained('pharoAIsanders420/micro-musicgen-jungle')
26
-
27
- progress(0.3, desc="Setting parameters...")
28
  model.set_generation_params(duration=10)
29
-
30
- progress(0.5, desc="Generating audio...")
31
  wav = model.generate_unconditional(1).squeeze(0)
32
 
33
- progress(0.8, desc="Saving file...")
34
  filename_without_extension = f'jungle'
35
  filename_with_extension = f'{filename_without_extension}.wav'
 
36
  audio_write(filename_without_extension, wav.cpu(), model.sample_rate, strategy="loudness", loudness_compressor=True)
37
-
38
- progress(1.0, desc="Complete!")
39
  return filename_with_extension
40
 
 
 
 
 
41
 
42
 
43
  # @spaces.GPU
@@ -273,12 +271,14 @@ with gr.Blocks() as iface:
273
  continue_button = gr.Button("Continue Generating Music")
274
  continue_output_audio = gr.Audio(label="Continued Music Output", type="filepath")
275
 
276
- # Hidden component to provide dummy input
277
- hidden_trigger = gr.Textbox(value="generate", visible=False)
278
-
279
  # Fixed click handlers - use hidden input for generate_drum_sample
280
  # Normal click connection
281
- generate_button.click(generate_drum_sample, outputs=[drum_audio])
 
 
 
 
 
282
  # continue_drum_sample_button.click(continue_drum_sample, inputs=[drum_audio], outputs=[drum_audio])
283
  # generate_music_button.click(generate_music, inputs=[drum_audio, prompt_duration, musicgen_model, output_duration], outputs=[output_audio])
284
  # continue_button.click(continue_music, inputs=[output_audio, prompt_duration, musicgen_model, output_duration], outputs=continue_output_audio)
 
20
 
21
  # Test with a wrapper function
22
  @spaces.GPU
23
+ def _generate_drum_sample_internal():
 
24
  model = MusicGen.get_pretrained('pharoAIsanders420/micro-musicgen-jungle')
 
 
25
  model.set_generation_params(duration=10)
 
 
26
  wav = model.generate_unconditional(1).squeeze(0)
27
 
 
28
  filename_without_extension = f'jungle'
29
  filename_with_extension = f'{filename_without_extension}.wav'
30
+
31
  audio_write(filename_without_extension, wav.cpu(), model.sample_rate, strategy="loudness", loudness_compressor=True)
32
+
 
33
  return filename_with_extension
34
 
35
+ # Regular function wrapper (no @spaces.GPU on this one)
36
+ def generate_drum_sample():
37
+ return _generate_drum_sample_internal()
38
+
39
 
40
 
41
  # @spaces.GPU
 
271
  continue_button = gr.Button("Continue Generating Music")
272
  continue_output_audio = gr.Audio(label="Continued Music Output", type="filepath")
273
 
 
 
 
274
  # Fixed click handlers - use hidden input for generate_drum_sample
275
  # Normal click connection
276
+ generate_button.click(
277
+ fn=generate_drum_sample,
278
+ inputs=None,
279
+ outputs=drum_audio,
280
+ api_name="generate" # Add explicit API name
281
+ )
282
  # continue_drum_sample_button.click(continue_drum_sample, inputs=[drum_audio], outputs=[drum_audio])
283
  # generate_music_button.click(generate_music, inputs=[drum_audio, prompt_duration, musicgen_model, output_duration], outputs=[output_audio])
284
  # continue_button.click(continue_music, inputs=[output_audio, prompt_duration, musicgen_model, output_duration], outputs=continue_output_audio)