Skip to content

Commit

Permalink
Collections (#26)
Browse files Browse the repository at this point in the history
* split history content and tab wrapper

* generalize _get_row_index

* add collections folder

* add collections tab

* update README.md
  • Loading branch information
rsxdalv committed Jun 5, 2023
1 parent 781ec5e commit 2209dca
Show file tree
Hide file tree
Showing 8 changed files with 260 additions and 138 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ config.json
outputs/
favorites/
voices/
collections/

# Ignore model checkpoints
data/
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ This code requires the following dependencies:
## Changelog
June 5:
* Fix "Save to Favorites" button on bark generation page, clean up console (v4.1.1)
* Add "Collections" tab for managing several different data sets and easier curration.

June 4:
* Update to v4.1 - improved hash function, code improvements
Expand Down
Empty file added collections/.gitkeep
Empty file.
3 changes: 3 additions & 0 deletions server.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import src.utils.setup_or_recover as setup_or_recover
import src.utils.dotenv_init as dotenv_init

from src.history_tab.collections_directories_atom import collections_directories_atom
from src.config.save_config_bark import save_config_bark
from src.config.save_config_gradio import save_config_gradio
from src.tortoise.generation_tab_tortoise import generation_tab_tortoise
Expand Down Expand Up @@ -67,8 +68,10 @@ def reload_config_and_restart_ui():
tab_voice_clone_demo()
generation_tab_tortoise()

collections_directories_atom.render()
history_tab(register_use_as_history_button)
history_tab(register_use_as_history_button, directory="favorites")
history_tab(register_use_as_history_button, directory="outputs", show_collections=True)
voices_tab(register_use_as_history_button)

settings_tab_bark(config, save_config_bark, load_models)
Expand Down
17 changes: 17 additions & 0 deletions src/history_tab/collections_directories_atom.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import os
import gradio as gr


def get_collections():
dirs = os.listdir("collections")
dirs.sort()

def get_collection_path(d):
return os.path.join("collections", d)

return ["outputs", "favorites"] + [
get_collection_path(d) for d in dirs if os.path.isdir(get_collection_path(d))
]


collections_directories_atom = gr.JSON(visible=False, value=get_collections())
4 changes: 2 additions & 2 deletions src/history_tab/delete_generation_cb.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@


def delete_generation_cb(refresh):
def delete_generation(directory: str):
def delete_generation(directory: str, *args):
shutil.rmtree(directory)

return refresh()
return refresh(*args)

return delete_generation
Loading

0 comments on commit 2209dca

Please sign in to comment.