Skip to content

Commit e395452

Browse files
authored
update show_progress to current gradio (#718)
1 parent f45f251 commit e395452

8 files changed

Lines changed: 38 additions & 38 deletions

File tree

birdnet_analyzer/gui/embeddings.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def select_directory_to_state_and_tb(state_key):
180180
select_audio_directory_btn.click(
181181
partial(select_directory_to_state_and_tb, state_key="embeddings-input-dir"),
182182
outputs=[selected_audio_directory_tb, input_directory_state],
183-
show_progress=False,
183+
show_progress="hidden",
184184
)
185185

186186
with gr.Row():
@@ -285,7 +285,7 @@ def select_directory_and_update_tb(db_name):
285285
select_directory_and_update_tb,
286286
inputs=[db_name_tb],
287287
outputs=[db_directory_state, db_name_tb, audio_speed_slider, fmin_number, fmax_number],
288-
show_progress=False,
288+
show_progress="hidden",
289289
)
290290

291291
with gr.Accordion(loc.localize("embedding-file-output-accordion-label"), open=False):
@@ -339,7 +339,7 @@ def check_settings(dir_name, db_name):
339339
check_settings,
340340
inputs=[db_directory_state, db_name_tb],
341341
outputs=[audio_speed_slider, fmin_number, fmax_number],
342-
show_progress=False,
342+
show_progress="hidden",
343343
)
344344

345345
progress_plot = gr.Plot()
@@ -609,7 +609,7 @@ def update_query_spectrogram(audiofilepath, db_selection, crop_mode, crop_overla
609609
select_query_btn,
610610
query_sample_tb,
611611
],
612-
show_progress=False,
612+
show_progress="hidden",
613613
)
614614

615615
search_btn.click(

birdnet_analyzer/gui/evaluation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -752,14 +752,14 @@ def plot_confusion_matrix(pa: PerformanceAssessor, predictions, labels):
752752
get_selection_func("eval-annotations-dir", update_annotation_columns),
753753
outputs=[annotation_files_state, annotation_directory_input, annotation_group]
754754
+ [annotation_columns[label] for label in ["Start Time", "End Time", "Class", "Recording", "Duration"]],
755-
show_progress=True,
755+
show_progress="full",
756756
)
757757

758758
prediction_select_directory_btn.click(
759759
get_selection_func("eval-predictions-dir", update_prediction_columns),
760760
outputs=[prediction_files_state, prediction_directory_input, prediction_group]
761761
+ [prediction_columns[label] for label in ["Start Time", "End Time", "Class", "Confidence", "Recording", "Duration"]],
762-
show_progress=True,
762+
show_progress="full",
763763
)
764764

765765
def toggle_after_selection(annotation_files, prediction_files):

birdnet_analyzer/gui/multi_file.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def select_directory_on_empty(): # Nishant - Function modified for For Folder s
124124

125125
return ["", [[loc.localize("multi-tab-samples-dataframe-no-files-found")]]]
126126

127-
select_directory_btn.click(select_directory_on_empty, outputs=[input_directory_state, directory_input], show_progress=True)
127+
select_directory_btn.click(select_directory_on_empty, outputs=[input_directory_state, directory_input], show_progress="full")
128128

129129
with gr.Column():
130130
select_out_directory_btn = gr.Button(loc.localize("multi-tab-output-selection-button-label"))
@@ -141,7 +141,7 @@ def select_directory_wrapper(): # Nishant - Function modified for For Folder se
141141
select_out_directory_btn.click(
142142
select_directory_wrapper,
143143
outputs=[output_directory_predict_state, selected_out_textbox],
144-
show_progress=False,
144+
show_progress="hidden",
145145
)
146146

147147
(

birdnet_analyzer/gui/review.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -403,12 +403,12 @@ def toggle_autoplay(value):
403403
regression_dl_btn,
404404
]
405405

406-
spectrogram_dl_btn.click(partial(gu.download_plot, filename="spectrogram"), show_progress=False, inputs=spectrogram_image)
407-
regression_dl_btn.click(partial(gu.download_plot, filename="regression"), show_progress=False, inputs=species_regression_plot)
406+
spectrogram_dl_btn.click(partial(gu.download_plot, filename="spectrogram"), show_progress="hidden", inputs=spectrogram_image)
407+
regression_dl_btn.click(partial(gu.download_plot, filename="regression"), show_progress="hidden", inputs=species_regression_plot)
408408

409409
species_dropdown.change(
410410
select_subdir,
411-
show_progress=True,
411+
show_progress="full",
412412
inputs=[species_dropdown, review_state],
413413
outputs=review_change_output,
414414
)
@@ -432,39 +432,39 @@ def toggle_autoplay(value):
432432
partial(next_review, target_dir=POSITIVE_LABEL_DIR),
433433
inputs=review_state,
434434
outputs=review_btn_output,
435-
show_progress=True,
435+
show_progress="full",
436436
show_progress_on=review_audio,
437437
)
438438

439439
negative_btn.click(
440440
partial(next_review, target_dir=NEGATIVE_LABEL_DIR),
441441
inputs=review_state,
442442
outputs=review_btn_output,
443-
show_progress=True,
443+
show_progress="full",
444444
show_progress_on=review_audio,
445445
)
446446

447447
skip_btn.click(
448448
next_review,
449449
inputs=review_state,
450450
outputs=review_btn_output,
451-
show_progress=True,
451+
show_progress="full",
452452
show_progress_on=review_audio,
453453
)
454454

455455
undo_btn.click(
456456
undo_review,
457457
inputs=review_state,
458458
outputs=review_btn_output,
459-
show_progress=True,
459+
show_progress="full",
460460
show_progress_on=review_audio,
461461
)
462462

463463
select_directory_btn.click(
464464
start_review,
465465
inputs=review_state,
466466
outputs=review_change_output,
467-
show_progress=True,
467+
show_progress="full",
468468
)
469469

470470

birdnet_analyzer/gui/segments.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def select_directory_to_state_and_tb(state_key):
9696
select_audio_directory_btn.click(
9797
partial(select_directory_to_state_and_tb, state_key="segments-audio-dir"),
9898
outputs=[selected_audio_directory_tb, audio_directory_state],
99-
show_progress=False,
99+
show_progress="hidden",
100100
)
101101

102102
with gr.Row():
@@ -111,7 +111,7 @@ def select_directory_to_state_and_tb(state_key):
111111
select_result_directory_btn.click(
112112
partial(select_directory_to_state_and_tb, state_key="segments-result-dir"),
113113
outputs=[result_directory_state, selected_result_directory_tb],
114-
show_progress=False,
114+
show_progress="hidden",
115115
)
116116

117117
with gr.Row():
@@ -124,7 +124,7 @@ def select_directory_to_state_and_tb(state_key):
124124
select_output_directory_btn.click(
125125
partial(select_directory_to_state_and_tb, state_key="segments-output-dir"),
126126
outputs=[selected_output_directory_tb, output_directory_state],
127-
show_progress=False,
127+
show_progress="hidden",
128128
)
129129

130130
min_conf_slider = gr.Slider(

birdnet_analyzer/gui/species.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def select_directory_and_update_tb(name_tb):
5252
select_directory_and_update_tb,
5353
inputs=classifier_name,
5454
outputs=[output_directory_state, classifier_name],
55-
show_progress=False,
55+
show_progress="hidden",
5656
)
5757

5858
lat_number, lon_number, week_number, sf_thresh_number, yearlong_checkbox, map_plot = (

birdnet_analyzer/gui/train.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ def build_train_tab():
251251
select_directory_btn.click(
252252
partial(select_subdirectories, state_key="train-data-dir"),
253253
outputs=[input_directory_state, directory_input],
254-
show_progress=False,
254+
show_progress="hidden",
255255
)
256256

257257
select_test_directory_btn = gr.Button(loc.localize("training-tab-test-data-selection-button-label"))
@@ -263,7 +263,7 @@ def build_train_tab():
263263
select_test_directory_btn.click(
264264
partial(select_subdirectories, state_key="test-data-dir"),
265265
outputs=[test_data_dir_state, test_directory_input],
266-
show_progress=False,
266+
show_progress="hidden",
267267
)
268268

269269
with gr.Column():
@@ -298,7 +298,7 @@ def select_directory_and_update_tb():
298298
select_classifier_directory_btn.click(
299299
select_directory_and_update_tb,
300300
outputs=[output_directory_state, classifier_name, output_format],
301-
show_progress=False,
301+
show_progress="hidden",
302302
)
303303

304304
with gr.Row():
@@ -337,7 +337,7 @@ def select_directory_and_update():
337337
select_cache_file_directory_btn.click(
338338
select_directory_and_update,
339339
outputs=[cache_file_state, cache_file_name],
340-
show_progress=False,
340+
show_progress="hidden",
341341
)
342342

343343
with gr.Column(visible=False) as load_cache_file_row:
@@ -355,7 +355,7 @@ def on_cache_file_selection_click():
355355
selected_cache_file_btn.click(
356356
on_cache_file_selection_click,
357357
outputs=[cache_file_state, cache_file_input],
358-
show_progress=False,
358+
show_progress="hidden",
359359
)
360360

361361
def on_cache_mode_change(value):
@@ -443,7 +443,7 @@ def on_crop_select(new_crop_mode):
443443
crop_mode,
444444
crop_overlap,
445445
],
446-
show_progress=False,
446+
show_progress="hidden",
447447
)
448448

449449
autotune_cb = gr.Checkbox(
@@ -571,7 +571,7 @@ def on_crop_select(new_crop_mode):
571571
def on_focal_loss_change(value):
572572
return gr.Row(visible=value)
573573

574-
use_focal_loss.change(on_focal_loss_change, inputs=use_focal_loss, outputs=focal_loss_params, show_progress=False)
574+
use_focal_loss.change(on_focal_loss_change, inputs=use_focal_loss, outputs=focal_loss_params, show_progress="hidden")
575575

576576
def on_autotune_change(value):
577577
return (
@@ -584,7 +584,7 @@ def on_autotune_change(value):
584584
on_autotune_change,
585585
inputs=autotune_cb,
586586
outputs=[custom_params, autotune_params, focal_loss_params],
587-
show_progress=False,
587+
show_progress="hidden",
588588
)
589589

590590
model_save_mode = gr.Radio(

birdnet_analyzer/gui/utils.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,9 @@ def on_tab_select(value: gr.SelectData):
281281

282282
return ""
283283

284-
languages_dropdown.input(on_language_change, inputs=languages_dropdown, show_progress=False)
285-
theme_radio.input(on_theme_change, inputs=theme_radio, show_progress=False)
286-
settings_tab.select(on_tab_select, outputs=error_log_tb, show_progress=False)
284+
languages_dropdown.input(on_language_change, inputs=languages_dropdown, show_progress="hidden")
285+
theme_radio.input(on_theme_change, inputs=theme_radio, show_progress="hidden")
286+
settings_tab.select(on_tab_select, outputs=error_log_tb, show_progress="hidden")
287287

288288

289289
def sample_sliders(opened=True):
@@ -326,7 +326,7 @@ def sample_sliders(opened=True):
326326
lambda use_top_n: (gr.Number(visible=use_top_n), gr.Slider(visible=not use_top_n)),
327327
inputs=use_top_n_checkbox,
328328
outputs=[top_n_input, confidence_slider],
329-
show_progress=False,
329+
show_progress="hidden",
330330
)
331331

332332
with gr.Row():
@@ -443,8 +443,8 @@ def species_list_coordinates(show_map=False):
443443

444444
map_plot = gr.Plot(plot_map_scatter_mapbox(0, 0), show_label=False, scale=2, visible=show_map)
445445

446-
lat_number.change(plot_map_scatter_mapbox, inputs=[lat_number, lon_number], outputs=map_plot, show_progress=False)
447-
lon_number.change(plot_map_scatter_mapbox, inputs=[lat_number, lon_number], outputs=map_plot, show_progress=False)
446+
lat_number.change(plot_map_scatter_mapbox, inputs=[lat_number, lon_number], outputs=map_plot, show_progress="hidden")
447+
lon_number.change(plot_map_scatter_mapbox, inputs=[lat_number, lon_number], outputs=map_plot, show_progress="hidden")
448448

449449
with gr.Group():
450450
with gr.Row():
@@ -471,7 +471,7 @@ def species_list_coordinates(show_map=False):
471471
def on_change(use_yearlong):
472472
return gr.Slider(interactive=(not use_yearlong))
473473

474-
yearlong_checkbox.change(on_change, inputs=yearlong_checkbox, outputs=week_number, show_progress=False)
474+
yearlong_checkbox.change(on_change, inputs=yearlong_checkbox, outputs=week_number, show_progress="hidden")
475475

476476
return lat_number, lon_number, week_number, sf_thresh_number, yearlong_checkbox, map_plot
477477

@@ -492,7 +492,7 @@ def save_file_dialog(filetypes=(), state_key=None, default_filename=""):
492492
if state_key:
493493
settings.set_state(state_key, os.path.dirname(file))
494494

495-
return file
495+
return str(file)
496496

497497
return None
498498

@@ -609,14 +609,14 @@ def on_custom_classifier_selection_click():
609609
classifier_selection_button.click(
610610
on_custom_classifier_selection_click,
611611
outputs=[selected_classifier_state, classifier_file_input],
612-
show_progress=False,
612+
show_progress="hidden",
613613
)
614614

615615
species_list_radio.change(
616616
show_species_choice,
617617
inputs=[species_list_radio],
618618
outputs=[position_row, species_file_input, custom_classifier_selector, empty_col],
619-
show_progress=False,
619+
show_progress="hidden",
620620
)
621621

622622
return (

0 commit comments

Comments
 (0)