This commit is contained in:
lllyasviel 2023-10-08 15:11:46 -07:00 committed by GitHub
parent e00b647eee
commit d631cfe491
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 4 deletions

View File

@ -1 +1 @@
version = '2.1.07' version = '2.1.08'

View File

@ -966,7 +966,20 @@ SD_XL_BASE_RATIOS = {
"3.0": (1728, 576), "3.0": (1728, 576),
} }
aspect_ratios = {str(v[0]) + '×' + str(v[1]): v for k, v in SD_XL_BASE_RATIOS.items()} aspect_ratios = {}
default_aspect_ratio = None
# import math
for k, (w, h) in SD_XL_BASE_RATIOS.items():
txt = f'{w}×{h}'
# gcd = math.gcd(w, h)
# txt += f' {w//gcd}:{h//gcd}'
aspect_ratios[txt] = (w, h)
if k == "1.29":
default_aspect_ratio = txt
def apply_style(style, positive): def apply_style(style, positive):

View File

@ -12,7 +12,7 @@ import modules.gradio_hijack as grh
import modules.advanced_parameters as advanced_parameters import modules.advanced_parameters as advanced_parameters
import comfy.model_management as model_management import comfy.model_management as model_management
from modules.sdxl_styles import style_keys, aspect_ratios, fooocus_expansion, default_styles from modules.sdxl_styles import style_keys, aspect_ratios, fooocus_expansion, default_styles, default_aspect_ratio
def generate_clicked(*args): def generate_clicked(*args):
@ -162,7 +162,7 @@ with shared.gradio_root:
with gr.Tab(label='Setting'): with gr.Tab(label='Setting'):
performance_selection = gr.Radio(label='Performance', choices=['Speed', 'Quality'], value='Speed') performance_selection = gr.Radio(label='Performance', choices=['Speed', 'Quality'], value='Speed')
aspect_ratios_selection = gr.Radio(label='Aspect Ratios', choices=list(aspect_ratios.keys()), aspect_ratios_selection = gr.Radio(label='Aspect Ratios', choices=list(aspect_ratios.keys()),
value='1152×896', info='width × height') value=default_aspect_ratio, info='width × height')
image_number = gr.Slider(label='Image Number', minimum=1, maximum=32, step=1, value=2) image_number = gr.Slider(label='Image Number', minimum=1, maximum=32, step=1, value=2)
negative_prompt = gr.Textbox(label='Negative Prompt', show_label=True, placeholder="Type prompt here.", negative_prompt = gr.Textbox(label='Negative Prompt', show_label=True, placeholder="Type prompt here.",
info='Describing objects that you do not want to see.') info='Describing objects that you do not want to see.')