1580158
/
sd-model-organizer
mirror of https://github.com/alexandersokol/sd-model-organizer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51 from jhonsstn/feat/blur-nsfw-preview 

Feat/blur nsfw preview
pull/55/head
Alexander Sokol 2023-07-25 01:13:53 +03:00 committed by GitHub
parent dae3299b2c 200b03d1c6
commit 3280327f94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 130 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/mo/environment.py
View File

@ -60,6 +60,7 @@ class Environment:
storage_type: Callable[[], str]
download_preview: Callable[[], bool]
nsfw_blur: Callable[[], bool]
model_path: Callable[[], str]
vae_path: Callable[[], str]
lora_path: Callable[[], str]

5
scripts/mo/ui_styled_html.py
View File

@ -313,8 +313,11 @@ def record_details(record: Record) -> str:
def records_cards(records: List) -> str:
content = '<div class="mo-card-grid">'
nsfw_blur = env.nsfw_blur()
for record in records:
content += '<div class="mo-card">'
contains_nsfw = any('nsfw' in group.lower() for group in record.groups) and nsfw_blur
content += f'<div class="mo-card {"blur" if contains_nsfw else ""}">'
preview_url = get_best_preview_url(record)
content += f'<img src="{preview_url}" alt="Preview Image" ' \

163
scripts/model_organizer.py
View File

@ -40,7 +40,10 @@ def _default_lora_path() -> str:
def _default_hypernetworks_path() -> str:
if hasattr(shared.cmd_opts, 'hypernetwork_dir') and shared.cmd_opts.hypernetwork_dir:
if (
hasattr(shared.cmd_opts, 'hypernetwork_dir')
and shared.cmd_opts.hypernetwork_dir
):
return shared.cmd_opts.hypernetwork_dir
else:
return os.path.join(paths.models_path, 'hypernetworks')
@ -67,38 +70,76 @@ def _lycoris_path() -> str:
return _default_lycoris_path()
env.layout = lambda: shared.opts.mo_layout if hasattr(shared.opts, 'mo_layout') else LAYOUT_CARDS
env.layout = (
lambda: shared.opts.mo_layout if hasattr(shared.opts, 'mo_layout') else LAYOUT_CARDS
)
env.card_width = lambda: shared.opts.mo_card_width if hasattr(shared.opts, 'mo_card_width') and \
shared.opts.mo_card_width else DEFAULT_CARD_WIDTH
env.card_width = (
lambda: shared.opts.mo_card_width
if hasattr(shared.opts, 'mo_card_width') and shared.opts.mo_card_width
else DEFAULT_CARD_WIDTH
)
env.card_height = lambda: shared.opts.mo_card_height if hasattr(shared.opts, 'mo_card_height') and \
shared.opts.mo_card_height else DEFAULT_CARD_HEIGHT
env.card_height = (
lambda: shared.opts.mo_card_height
if hasattr(shared.opts, 'mo_card_height') and shared.opts.mo_card_height
else DEFAULT_CARD_HEIGHT
)
env.storage_type = lambda: shared.opts.mo_storage_type if hasattr(shared.opts, 'mo_storage_type') else STORAGE_SQLITE
env.storage_type = (
lambda: shared.opts.mo_storage_type
if hasattr(shared.opts, 'mo_storage_type')
else STORAGE_SQLITE
)
env.download_preview = lambda: shared.opts.mo_download_preview if hasattr(shared.opts,
'mo_download_preview') else True
env.download_preview = (
lambda: shared.opts.mo_download_preview
if hasattr(shared.opts, 'mo_download_preview')
else True
)
env.model_path = lambda: shared.opts.mo_model_path if hasattr(shared.opts, 'mo_model_path') and \
shared.opts.mo_model_path else _default_model_path()
env.nsfw_blur = (
lambda: shared.opts.mo_nsfw_blur
if hasattr(shared.opts, 'mo_nsfw_blur')
else True
)
env.vae_path = lambda: shared.opts.mo_vae_path if hasattr(shared.opts, 'mo_vae_path') and \
shared.opts.mo_vae_path else _default_vae_path()
env.model_path = (
lambda: shared.opts.mo_model_path
if hasattr(shared.opts, 'mo_model_path') and shared.opts.mo_model_path
else _default_model_path()
)
env.lora_path = lambda: shared.opts.mo_lora_path if hasattr(shared.opts, 'mo_lora_path') and \
shared.opts.mo_lora_path else _default_lora_path()
env.vae_path = (
lambda: shared.opts.mo_vae_path
if hasattr(shared.opts, 'mo_vae_path') and shared.opts.mo_vae_path
else _default_vae_path()
)
env.hypernetworks_path = lambda: shared.opts.mo_hypernetworks_path if \
hasattr(shared.opts,
'mo_hypernetworks_path') and shared.opts.mo_hypernetworks_path else _default_hypernetworks_path()
env.lora_path = (
lambda: shared.opts.mo_lora_path
if hasattr(shared.opts, 'mo_lora_path') and shared.opts.mo_lora_path
else _default_lora_path()
)
env.hypernetworks_path = (
lambda: shared.opts.mo_hypernetworks_path
if hasattr(shared.opts, 'mo_hypernetworks_path')
and shared.opts.mo_hypernetworks_path
else _default_hypernetworks_path()
)
env.lycoris_path = _lycoris_path
env.embeddings_path = lambda: shared.opts.mo_embeddings_path if \
hasattr(shared.opts, 'mo_embeddings_path') and shared.opts.mo_embeddings_path else _default_embeddings_path()
env.embeddings_path = (
lambda: shared.opts.mo_embeddings_path
if hasattr(shared.opts, 'mo_embeddings_path') and shared.opts.mo_embeddings_path
else _default_embeddings_path()
)
env.is_debug_mode_enabled = lambda: hasattr(shared.cmd_opts, 'mo_debug') and shared.cmd_opts.mo_debug
env.is_debug_mode_enabled = (
lambda: hasattr(shared.cmd_opts, 'mo_debug') and shared.cmd_opts.mo_debug
)
env.script_dir = scripts.basedir()
env.theme = lambda: shared.cmd_opts.theme
@ -106,29 +147,53 @@ env.theme = lambda: shared.cmd_opts.theme
def on_ui_settings():
opts = {
'mo_layout': OptionInfo(LAYOUT_CARDS, "Layout Type:", gr.Radio,
{"choices": [LAYOUT_CARDS, LAYOUT_TABLE]}),
'mo_layout': OptionInfo(
LAYOUT_CARDS,
"Layout Type:",
gr.Radio,
{"choices": [LAYOUT_CARDS, LAYOUT_TABLE]},
),
'mo_card_width': OptionInfo(250, 'Card width (250 default value):'),
'mo_card_height': OptionInfo(350, 'Card height (350 default value):'),
'mo_storage_type': OptionInfo(STORAGE_SQLITE, "Storage Type:", gr.Radio,
{"choices": [STORAGE_SQLITE, STORAGE_FIREBASE]}),
'mo_storage_type': OptionInfo(
STORAGE_SQLITE,
"Storage Type:",
gr.Radio,
{"choices": [STORAGE_SQLITE, STORAGE_FIREBASE]},
),
'mo_download_preview': OptionInfo(True, 'Download Preview'),
'mo_nsfw_blur': OptionInfo(True, 'Blur NSFW Previews (models with "nsfw" tag)'),
}
dir_opts = {
'mo_model_path': OptionInfo('', f'Model directory (If empty uses default: {_default_model_path()}):'),
'mo_vae_path': OptionInfo('', f'VAE directory (If empty uses default: {_default_vae_path()}) :'),
'mo_lora_path': OptionInfo('', f'Lora directory (If empty uses default: {_default_lora_path()}):'),
'mo_hypernetworks_path': OptionInfo('',
f'Hypernetworks directory (If empty uses default: '
f'{_default_hypernetworks_path()}):'),
'mo_lycoris_path': OptionInfo('',
f'LyCORIS directory (If empty uses default: {_default_lycoris_path()}):'),
'mo_embeddings_path': OptionInfo('', f'Embeddings directory (If empty uses default: '
f'{_default_embeddings_path()}):')
'mo_model_path': OptionInfo(
'', f'Model directory (If empty uses default: {_default_model_path()}):'
),
'mo_vae_path': OptionInfo(
'', f'VAE directory (If empty uses default: {_default_vae_path()}) :'
),
'mo_lora_path': OptionInfo(
'', f'Lora directory (If empty uses default: {_default_lora_path()}):'
),
'mo_hypernetworks_path': OptionInfo(
'',
f'Hypernetworks directory (If empty uses default: '
f'{_default_hypernetworks_path()}):',
),
'mo_lycoris_path': OptionInfo(
'', f'LyCORIS directory (If empty uses default: {_default_lycoris_path()}):'
),
'mo_embeddings_path': OptionInfo(
'',
f'Embeddings directory (If empty uses default: '
f'{_default_embeddings_path()}):',
),
}
if hasattr(shared.cmd_opts, 'mo_show_dir_settings') and shared.cmd_opts.mo_show_dir_settings:
if (
hasattr(shared.cmd_opts, 'mo_show_dir_settings')
and shared.cmd_opts.mo_show_dir_settings
):
opts.update(dir_opts)
mo_options = shared.options_section(('mo', 'Model Organizer'), opts)
@ -138,14 +203,26 @@ def on_ui_settings():
def on_ui_tabs():
if env.is_debug_mode_enabled(): # TODO Remove these lines
ui_extra_networks.allowed_dirs.add('/Users/alexander/Downloads/sd-downloads/ckpt')
ui_extra_networks.allowed_dirs.add('/Users/alexander/Downloads/sd-downloads/vae')
ui_extra_networks.allowed_dirs.add('/Users/alexander/Downloads/sd-downloads/embeddings')
ui_extra_networks.allowed_dirs.add('/Users/alexander/Downloads/sd-downloads/hypernetworks')
ui_extra_networks.allowed_dirs.add('/Users/alexander/Downloads/sd-downloads/lora')
ui_extra_networks.allowed_dirs.add('/Users/alexander/Downloads/sd-downloads/lyco')
ui_extra_networks.allowed_dirs.add(
'/Users/alexander/Downloads/sd-downloads/ckpt'
)
ui_extra_networks.allowed_dirs.add(
'/Users/alexander/Downloads/sd-downloads/vae'
)
ui_extra_networks.allowed_dirs.add(
'/Users/alexander/Downloads/sd-downloads/embeddings'
)
ui_extra_networks.allowed_dirs.add(
'/Users/alexander/Downloads/sd-downloads/hypernetworks'
)
ui_extra_networks.allowed_dirs.add(
'/Users/alexander/Downloads/sd-downloads/lora'
)
ui_extra_networks.allowed_dirs.add(
'/Users/alexander/Downloads/sd-downloads/lyco'
)
return (main_ui_block(), "Model Organizer", "model_organizer"),
return ((main_ui_block(), "Model Organizer", "model_organizer"),)
def on_app_started(demo: Optional[Blocks], app: FastAPI):

5
styles/styles.css
View File

@ -464,6 +464,7 @@
border-radius: 8px;
/*justify-self: start;*/
position: relative;
overflow: hidden;
}
.mo-card img {
@ -474,6 +475,10 @@
object-position: center;
}
.blur img {
filter: blur(10px);
}
.mo-card-blur-overlay-bottom {
position: absolute;
bottom: 0;