Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always show extra networks tabs in the UI #11808

Merged
merged 10 commits into from
Aug 5, 2023

Conversation

AUTOMATIC1111
Copy link
Owner

Description

  • removes the extra networks button
  • always shows extra networks tabs
  • main generation interface becomes the first tab of the extra networks tabset

Screenshots/videos:

firefox_vsMiy0KPDA

Checklist:

@AUTOMATIC1111
Copy link
Owner Author

if no one offers an opinion about this I'm going to merge it in.

@w-e-w
Copy link
Collaborator

w-e-w commented Jul 17, 2023

was going to make a PR but I accidentally pushed directly
the search box path has changed so old button folder search js doesn't work any more
this fixed that

@w-e-w w-e-w force-pushed the extra-networks-always-visible branch from b03542a to 543ea57 Compare July 17, 2023 07:35
@dhwz
Copy link
Contributor

dhwz commented Jul 17, 2023

@AUTOMATIC1111 what about automatically hiding files not compatible with the loaded model? e.g. placing files in subfolders,
I've sorted my models/loras/embeddings/vae etc. now in subfolders like "1.5" and "xl".

@AUTOMATIC1111
Copy link
Owner Author

@dhwz: it will be done too

@dhwz
Copy link
Contributor

dhwz commented Jul 18, 2023

@AUTOMATIC1111 So you're gonna merge this also into 1.5.0? The current panel is really bad on the top, so I would prefer your change.

@w-e-w
Copy link
Collaborator

w-e-w commented Jul 18, 2023

not in 1.5.0, there was a short conversation on this topic in auto's discord

@dhwz
Copy link
Contributor

dhwz commented Jul 18, 2023

okay

@w-e-w
Copy link
Collaborator

w-e-w commented Jul 18, 2023

some more idea:

  1. sort extra network by last used time (the order only refresh after "refresh" or after tab has been switched)
  2. favorites / pin extra network

@w-e-w
Copy link
Collaborator

w-e-w commented Jul 18, 2023

add the lable of the sort order drop down so that the default sort method can be config can be the user
pr #11867

…order-lable

add dropdown extra_sort_order lable
@Kadah
Copy link

Kadah commented Jul 26, 2023

Should be easier for new user to find vs the "HDD-looking" button.

Unrelated to this PR changes but to other recent changes in dev on extra-nets:

The new default tile size is massive, large lora collections are pretty much unnavigable. 200px is about the smallest where the shorter model names do not completely block the show/edit metadata buttons. 150px seems to be around the size of the small tiles before, but even the shortest model names will block the buttons while also having the model names unreadable.

The internal metadata popup is escaping everything, so its displaying newlines as "\n" instead and making the info a jumbled mess. I use this quite a lot and would love to see this being readable again.
Edit: This has been fixed. 👍

The dir tag cloud takes up a tonnes of space with lots of dirs. I had to cut down the number of sub-dirs recently as list was taking up an entire page at 2k.

Previous bugs/annoyances:
The tag cloud of dirs are sometimes ordered randomly. Though it seems to have improved recently, was always random before.
Dirs that contain no models are shown. (For me that's usually bmaltais/kohya_ss "sample" dirs that it makes even when not used).

Edit: Running this on my local fork and even though its padding space between the prompt and the gen panel, I like it. Could be a nice place for some addons to put their tab instead of the main tab bar.

Edit2: Maybe starting a Generate cycle should return to the Generation tab.

@w-e-w
Copy link
Collaborator

w-e-w commented Jul 26, 2023

#12040

@AUTOMATIC1111 AUTOMATIC1111 merged commit a32f270 into dev Aug 5, 2023
6 checks passed
@AUTOMATIC1111 AUTOMATIC1111 deleted the extra-networks-always-visible branch August 5, 2023 05:07
@AUTOMATIC1111
Copy link
Owner Author

Sizes of cards are configured in settings.

@MNeMoNiCuZ
Copy link

Scary! Looking forward to seeing what it looks like.
I've been using this CSS to have them at the bottom of the screen to give it enough space to fit thousands of models as good as it can.
https://civitai.com/models/68126/move-loras-extra-networks-below-everything

It would be cool if that still works in case this tab-based approach doesn't feel good with when you have many models.

@w-e-w
Copy link
Collaborator

w-e-w commented Aug 24, 2023

Scary! Looking forward to seeing what it looks like. I've been using this CSS to have them at the bottom of the screen to give it enough space to fit thousands of models as good as it can. https://civitai.com/models/68126/move-loras-extra-networks-below-everything

It would be cool if that still works in case this tab-based approach doesn't feel good with when you have many models.

if you have issues or suggestions open issues post don't post it here this is a closed PR

when testing the new version I suggest you remove user.css and compare, as the css is not intended to work on this version

if my brief test is correct it has some unintended side effects of making the box infinite while we normally limited to a single page and have a separate scroll bar

w-e-w added a commit that referenced this pull request Jun 30, 2024
fix broken Replace preview for extra networks tabs edit metadata
caused by #11808
w-e-w added a commit that referenced this pull request Jun 30, 2024
fix broken Replace preview for extra networks tabs edit metadata
caused by #11808
w-e-w added a commit that referenced this pull request Jun 30, 2024
fix broken Replace preview for extra networks tabs edit metadata
caused by #11808
@w-e-w w-e-w mentioned this pull request Jun 30, 2024
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants