Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
Stable Diffusion Webui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
novelai-storage
Stable Diffusion Webui
Commits
a32f270a
Commit
a32f270a
authored
Aug 05, 2023
by
AUTOMATIC1111
Committed by
GitHub
Aug 05, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #11808 from AUTOMATIC1111/extra-networks-always-visible
Always show extra networks tabs in the UI
parents
c613416a
8197f24d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
55 additions
and
55 deletions
+55
-55
javascript/extraNetworks.js
javascript/extraNetworks.js
+4
-6
modules/ui.py
modules/ui.py
+17
-13
modules/ui_extra_networks.py
modules/ui_extra_networks.py
+27
-33
style.css
style.css
+7
-3
No files found.
javascript/extraNetworks.js
View file @
a32f270a
...
...
@@ -2,16 +2,14 @@ function setupExtraNetworksForTab(tabname) {
gradioApp
().
querySelector
(
'
#
'
+
tabname
+
'
_extra_tabs
'
).
classList
.
add
(
'
extra-networks
'
);
var
tabs
=
gradioApp
().
querySelector
(
'
#
'
+
tabname
+
'
_extra_tabs > div
'
);
var
search
=
gradioApp
().
querySelector
(
'
#
'
+
tabname
+
'
_extra_search textarea
'
);
var
searchDiv
=
gradioApp
().
getElementById
(
tabname
+
'
_extra_search
'
);
var
search
=
searchDiv
.
querySelector
(
'
textarea
'
);
var
sort
=
gradioApp
().
getElementById
(
tabname
+
'
_extra_sort
'
);
var
sortOrder
=
gradioApp
().
getElementById
(
tabname
+
'
_extra_sortorder
'
);
var
refresh
=
gradioApp
().
getElementById
(
tabname
+
'
_extra_refresh
'
);
search
.
classList
.
add
(
'
search
'
);
sort
.
classList
.
add
(
'
sort
'
);
sortOrder
.
classList
.
add
(
'
sortorder
'
);
sort
.
dataset
.
sortkey
=
'
sortDefault
'
;
tabs
.
appendChild
(
search
);
tabs
.
appendChild
(
search
Div
);
tabs
.
appendChild
(
sort
);
tabs
.
appendChild
(
sortOrder
);
tabs
.
appendChild
(
refresh
);
...
...
@@ -179,7 +177,7 @@ function saveCardPreview(event, tabname, filename) {
}
function
extraNetworksSearchButton
(
tabs_id
,
event
)
{
var
searchTextarea
=
gradioApp
().
querySelector
(
"
#
"
+
tabs_id
+
'
>
div
> textarea
'
);
var
searchTextarea
=
gradioApp
().
querySelector
(
"
#
"
+
tabs_id
+
'
>
label
> textarea
'
);
var
button
=
event
.
target
;
var
text
=
button
.
classList
.
contains
(
"
search-all
"
)
?
""
:
button
.
textContent
.
trim
();
...
...
modules/ui.py
View file @
a32f270a
...
...
@@ -261,7 +261,6 @@ class Toprow:
with
gr
.
Row
():
self
.
negative_prompt
=
gr
.
Textbox
(
label
=
"Negative prompt"
,
elem_id
=
f
"{id_part}_neg_prompt"
,
show_label
=
False
,
lines
=
3
,
placeholder
=
"Negative prompt (press Ctrl+Enter or Alt+Enter to generate)"
,
elem_classes
=
[
"prompt"
])
self
.
button_interrogate
=
None
self
.
button_deepbooru
=
None
if
is_img2img
:
...
...
@@ -290,7 +289,6 @@ class Toprow:
with
gr
.
Row
(
elem_id
=
f
"{id_part}_tools"
):
self
.
paste
=
ToolButton
(
value
=
paste_symbol
,
elem_id
=
"paste"
)
self
.
clear_prompt_button
=
ToolButton
(
value
=
clear_prompt_symbol
,
elem_id
=
f
"{id_part}_clear_prompt"
)
self
.
extra_networks_button
=
ToolButton
(
value
=
extra_networks_symbol
,
elem_id
=
f
"{id_part}_extra_networks"
)
self
.
restore_progress_button
=
ToolButton
(
value
=
restore_progress_symbol
,
elem_id
=
f
"{id_part}_restore_progress"
,
visible
=
False
)
self
.
token_counter
=
gr
.
HTML
(
value
=
"<span>0/75</span>"
,
elem_id
=
f
"{id_part}_token_counter"
,
elem_classes
=
[
"token-counter"
])
...
...
@@ -404,11 +402,10 @@ def create_ui():
dummy_component
=
gr
.
Label
(
visible
=
False
)
with
FormRow
(
variant
=
'compact'
,
elem_id
=
"txt2img_extra_networks"
,
visible
=
False
)
as
extra_networks
:
from
modules
import
ui_extra_networks
extra_networks_ui
=
ui_extra_networks
.
create_ui
(
extra_networks
,
toprow
.
extra_networks_button
,
'txt2img'
)
extra_tabs
=
gr
.
Tabs
(
elem_id
=
"txt2img_extra_tabs"
)
extra_tabs
.
__enter__
()
with
gr
.
Row
(
equal_height
=
False
):
with
gr
.
Tab
(
"Generation"
,
id
=
"txt2img_generation"
)
as
txt2img_generation_tab
,
gr
.
Row
()
.
style
(
equal_height
=
False
):
with
gr
.
Column
(
variant
=
'compact'
,
elem_id
=
"txt2img_settings"
):
scripts
.
scripts_txt2img
.
prepare_ui
()
...
...
@@ -631,7 +628,11 @@ def create_ui():
toprow
.
token_button
.
click
(
fn
=
wrap_queued_call
(
update_token_counter
),
inputs
=
[
toprow
.
prompt
,
steps
],
outputs
=
[
toprow
.
token_counter
])
toprow
.
negative_token_button
.
click
(
fn
=
wrap_queued_call
(
update_token_counter
),
inputs
=
[
toprow
.
negative_prompt
,
steps
],
outputs
=
[
toprow
.
negative_token_counter
])
ui_extra_networks
.
setup_ui
(
extra_networks_ui
,
txt2img_gallery
)
from
modules
import
ui_extra_networks
extra_networks_ui
=
ui_extra_networks
.
create_ui
(
txt2img_interface
,
[
txt2img_generation_tab
],
'txt2img'
)
ui_extra_networks
.
setup_ui
(
extra_networks_ui
,
txt2img_gallery
)
extra_tabs
.
__exit__
()
scripts
.
scripts_current
=
scripts
.
scripts_img2img
scripts
.
scripts_img2img
.
initialize_scripts
(
is_img2img
=
True
)
...
...
@@ -639,11 +640,10 @@ def create_ui():
with
gr
.
Blocks
(
analytics_enabled
=
False
)
as
img2img_interface
:
toprow
=
Toprow
(
is_img2img
=
True
)
with
FormRow
(
variant
=
'compact'
,
elem_id
=
"img2img_extra_networks"
,
visible
=
False
)
as
extra_networks
:
from
modules
import
ui_extra_networks
extra_networks_ui_img2img
=
ui_extra_networks
.
create_ui
(
extra_networks
,
toprow
.
extra_networks_button
,
'img2img'
)
extra_tabs
=
gr
.
Tabs
(
elem_id
=
"img2img_extra_tabs"
)
extra_tabs
.
__enter__
()
with
FormRow
(
equal_height
=
False
):
with
gr
.
Tab
(
"Generation"
,
id
=
"img2img_generation"
)
as
img2img_generation_tab
,
FormRow
()
.
style
(
equal_height
=
False
):
with
gr
.
Column
(
variant
=
'compact'
,
elem_id
=
"img2img_settings"
):
copy_image_buttons
=
[]
copy_image_destinations
=
{}
...
...
@@ -965,8 +965,6 @@ def create_ui():
toprow
.
token_button
.
click
(
fn
=
update_token_counter
,
inputs
=
[
toprow
.
prompt
,
steps
],
outputs
=
[
toprow
.
token_counter
])
toprow
.
negative_token_button
.
click
(
fn
=
wrap_queued_call
(
update_token_counter
),
inputs
=
[
toprow
.
negative_prompt
,
steps
],
outputs
=
[
toprow
.
negative_token_counter
])
ui_extra_networks
.
setup_ui
(
extra_networks_ui_img2img
,
img2img_gallery
)
img2img_paste_fields
=
[
(
toprow
.
prompt
,
"Prompt"
),
(
toprow
.
negative_prompt
,
"Negative prompt"
),
...
...
@@ -995,6 +993,12 @@ def create_ui():
paste_button
=
toprow
.
paste
,
tabname
=
"img2img"
,
source_text_component
=
toprow
.
prompt
,
source_image_component
=
None
,
))
from
modules
import
ui_extra_networks
extra_networks_ui_img2img
=
ui_extra_networks
.
create_ui
(
img2img_interface
,
[
img2img_generation_tab
],
'img2img'
)
ui_extra_networks
.
setup_ui
(
extra_networks_ui_img2img
,
img2img_gallery
)
extra_tabs
.
__exit__
()
scripts
.
scripts_current
=
None
with
gr
.
Blocks
(
analytics_enabled
=
False
)
as
extras_interface
:
...
...
modules/ui_extra_networks.py
View file @
a32f270a
...
...
@@ -155,7 +155,7 @@ class ExtraNetworksPage:
subdirs
=
{
""
:
1
,
**
subdirs
}
subdirs_html
=
""
.
join
([
f
"""
<button class='lg secondary gradio-button custom-button{" search-all" if subdir=="" else ""}' onclick='extraNetworksSearchButton("{tabname}_extra_
tabs
", event)'>
<button class='lg secondary gradio-button custom-button{" search-all" if subdir=="" else ""}' onclick='extraNetworksSearchButton("{tabname}_extra_
search
", event)'>
{html.escape(subdir if subdir!="" else "all")}
</button>
"""
for
subdir
in
subdirs
])
...
...
@@ -347,7 +347,7 @@ def pages_in_preferred_order(pages):
return
sorted
(
pages
,
key
=
lambda
x
:
tab_scores
[
x
.
name
])
def
create_ui
(
container
,
button
,
tabname
):
def
create_ui
(
interface
:
gr
.
Blocks
,
unrelated_tabs
,
tabname
):
ui
=
ExtraNetworksUi
()
ui
.
pages
=
[]
ui
.
pages_contents
=
[]
...
...
@@ -355,48 +355,41 @@ def create_ui(container, button, tabname):
ui
.
stored_extra_pages
=
pages_in_preferred_order
(
extra_pages
.
copy
())
ui
.
tabname
=
tabname
with
gr
.
Tabs
(
elem_id
=
tabname
+
"_extra_tabs"
):
for
page
in
ui
.
stored_extra_pages
:
with
gr
.
Tab
(
page
.
title
,
id
=
page
.
id_page
):
elem_id
=
f
"{tabname}_{page.id_page}_cards_html"
page_elem
=
gr
.
HTML
(
'Loading...'
,
elem_id
=
elem_id
)
ui
.
pages
.
append
(
page_elem
)
related_tabs
=
[]
page_elem
.
change
(
fn
=
lambda
:
None
,
_js
=
'function(){applyExtraNetworkFilter('
+
quote_js
(
tabname
)
+
'); return []}'
,
inputs
=
[],
outputs
=
[])
for
page
in
ui
.
stored_extra_pages
:
with
gr
.
Tab
(
page
.
title
,
id
=
page
.
id_page
)
as
tab
:
elem_id
=
f
"{tabname}_{page.id_page}_cards_html"
page_elem
=
gr
.
HTML
(
'Loading...'
,
elem_id
=
elem_id
)
ui
.
pages
.
append
(
page_elem
)
editor
=
page
.
create_user_metadata_editor
(
ui
,
tabname
)
editor
.
create_ui
()
ui
.
user_metadata_editors
.
append
(
editor
)
page_elem
.
change
(
fn
=
lambda
:
None
,
_js
=
'function(){applyExtraNetworkFilter('
+
quote_js
(
tabname
)
+
'); return []}'
,
inputs
=
[],
outputs
=
[])
gr
.
Textbox
(
''
,
show_label
=
False
,
elem_id
=
tabname
+
"_extra_search"
,
placeholder
=
"Search..."
,
visible
=
False
)
gr
.
Dropdown
(
choices
=
[
'Default Sort'
,
'Date Created'
,
'Date Modified'
,
'Name'
],
value
=
'Default Sort'
,
elem_id
=
tabname
+
"_extra_sort"
,
multiselect
=
False
,
visible
=
False
,
show_label
=
False
,
interactive
=
True
)
ToolButton
(
up_down_symbol
,
elem_id
=
tabname
+
"_extra_sortorder"
)
button_refresh
=
gr
.
Button
(
'Refresh'
,
elem_id
=
tabname
+
"_extra_refresh"
)
editor
=
page
.
create_user_metadata_editor
(
ui
,
tabname
)
editor
.
create_ui
()
ui
.
user_metadata_editors
.
append
(
editor
)
related_tabs
.
append
(
tab
)
edit_search
=
gr
.
Textbox
(
''
,
show_label
=
False
,
elem_id
=
tabname
+
"_extra_search"
,
elem_classes
=
"search"
,
placeholder
=
"Search..."
,
visible
=
False
,
interactive
=
True
)
dropdown_sort
=
gr
.
Dropdown
(
choices
=
[
'Default Sort'
,
'Date Created'
,
'Date Modified'
,
'Name'
],
value
=
'Default Sort'
,
elem_id
=
tabname
+
"_extra_sort"
,
elem_classes
=
"sort"
,
multiselect
=
False
,
visible
=
False
,
show_label
=
False
,
interactive
=
True
,
label
=
tabname
+
"_extra_sort_order"
)
button_sortorder
=
ToolButton
(
up_down_symbol
,
elem_id
=
tabname
+
"_extra_sortorder"
,
elem_classes
=
"sortorder"
,
visible
=
False
)
button_refresh
=
gr
.
Button
(
'Refresh'
,
elem_id
=
tabname
+
"_extra_refresh"
,
visible
=
False
)
ui
.
button_save_preview
=
gr
.
Button
(
'Save preview'
,
elem_id
=
tabname
+
"_save_preview"
,
visible
=
False
)
ui
.
preview_target_filename
=
gr
.
Textbox
(
'Preview save filename'
,
elem_id
=
tabname
+
"_preview_filename"
,
visible
=
False
)
def
toggle_visibility
(
is_visible
)
:
is_visible
=
not
is_visible
for
tab
in
unrelated_tabs
:
tab
.
select
(
fn
=
lambda
:
[
gr
.
update
(
visible
=
False
)
for
_
in
range
(
5
)],
inputs
=
[],
outputs
=
[
edit_search
,
edit_search
,
dropdown_sort
,
button_sortorder
,
button_refresh
],
show_progress
=
False
)
return
is_visible
,
gr
.
update
(
visible
=
is_visible
),
gr
.
update
(
variant
=
(
"secondary-down"
if
is_visible
else
"secondary"
))
def
fill_tabs
(
is_empty
):
"""Creates HTML for extra networks' tabs when the extra networks button is clicked for the first time."""
for
tab
in
related_tabs
:
tab
.
select
(
fn
=
lambda
:
[
gr
.
update
(
visible
=
True
)
for
_
in
range
(
5
)],
inputs
=
[],
outputs
=
[
edit_search
,
edit_search
,
dropdown_sort
,
button_sortorder
,
button_refresh
],
show_progress
=
False
)
def
pages_html
():
if
not
ui
.
pages_contents
:
refresh
()
if
is_empty
:
return
True
,
*
ui
.
pages_contents
return
refresh
()
return
True
,
*
[
gr
.
update
()
for
_
in
ui
.
pages_contents
]
state_visible
=
gr
.
State
(
value
=
False
)
button
.
click
(
fn
=
toggle_visibility
,
inputs
=
[
state_visible
],
outputs
=
[
state_visible
,
container
,
button
],
show_progress
=
False
)
state_empty
=
gr
.
State
(
value
=
True
)
button
.
click
(
fn
=
fill_tabs
,
inputs
=
[
state_empty
],
outputs
=
[
state_empty
,
*
ui
.
pages
],
show_progress
=
False
)
return
ui
.
pages_contents
def
refresh
():
for
pg
in
ui
.
stored_extra_pages
:
...
...
@@ -406,6 +399,7 @@ def create_ui(container, button, tabname):
return
ui
.
pages_contents
interface
.
load
(
fn
=
pages_html
,
inputs
=
[],
outputs
=
[
*
ui
.
pages
])
button_refresh
.
click
(
fn
=
refresh
,
inputs
=
[],
outputs
=
ui
.
pages
)
return
ui
...
...
style.css
View file @
a32f270a
...
...
@@ -779,9 +779,14 @@ footer {
/* extra networks UI */
.extra-network-cards
{
height
:
725px
;
overflow
:
scroll
;
height
:
calc
(
100vh
-
24rem
)
;
overflow
:
clip
scroll
;
resize
:
vertical
;
min-height
:
52rem
;
}
.extra-networks
>
div
.tab-nav
{
min-height
:
3.4rem
;
}
.extra-networks
>
div
>
[
id
*=
'_extra_'
]
{
...
...
@@ -797,7 +802,6 @@ footer {
}
.extra-networks
.tab-nav
.search
,
.extra-networks
.tab-nav
.sort
{
display
:
inline-block
;
margin
:
0.3em
;
align-self
:
center
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment