Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename metadata_schema to metadata_scheme

Browse Source
This commit is contained in:
Manuel Schmid
2024-01-15 23:59:57 +01:00
parent 80ad0d070e
commit ba5d0b6eaf
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/async_worker.py
+3 -3
View File
@@ -144,7 +144,7 @@ def worker():
inpaint_additional_prompt = args.pop() inpaint_additional_prompt = args.pop()
inpaint_mask_image_upload = args.pop() inpaint_mask_image_upload = args.pop()
save_metadata_to_images = args.pop() if not args_manager.args.disable_metadata else False save_metadata_to_images = args.pop() if not args_manager.args.disable_metadata else False
metadata_schema = args.pop() if not args_manager.args.disable_metadata else 'fooocus' metadata_scheme = args.pop() if not args_manager.args.disable_metadata else 'fooocus'
cn_tasks = {x: [] for x in flags.ip_list} cn_tasks = {x: [] for x in flags.ip_list}
for _ in range(4): for _ in range(4):
@@ -794,7 +794,7 @@ def worker():
imgs = [inpaint_worker.current_task.post_process(x) for x in imgs] imgs = [inpaint_worker.current_task.post_process(x) for x in imgs]
metadata_string = '' metadata_string = ''
if save_metadata_to_images and metadata_schema == 'fooocus': if save_metadata_to_images and metadata_scheme == 'fooocus':
metadata = { metadata = {
'prompt': raw_prompt, 'negative_prompt': raw_negative_prompt, 'styles': str(raw_style_selections), 'prompt': raw_prompt, 'negative_prompt': raw_negative_prompt, 'styles': str(raw_style_selections),
'real_prompt': task['log_positive_prompt'], 'real_negative_prompt': task['log_negative_prompt'], 'real_prompt': task['log_positive_prompt'], 'real_negative_prompt': task['log_negative_prompt'],
@@ -861,7 +861,7 @@ def worker():
'created_by': modules.config.metadata_created_by 'created_by': modules.config.metadata_created_by
} }
metadata_string = json.dumps(metadata, ensure_ascii=False) metadata_string = json.dumps(metadata, ensure_ascii=False)
elif save_metadata_to_images and metadata_schema == 'a1111': elif save_metadata_to_images and metadata_scheme == 'a1111':
generation_params = { generation_params = {
"Steps": steps, "Steps": steps,
"Sampler": sampler_name, "Sampler": sampler_name,
modules/config.py
+3 -3
View File
@@ -320,10 +320,10 @@ default_save_metadata_to_images = get_config_item_or_set_default(
default_value=False, default_value=False,
validator=lambda x: isinstance(x, bool) validator=lambda x: isinstance(x, bool)
) )
default_metadata_schema = get_config_item_or_set_default( default_metadata_scheme = get_config_item_or_set_default(
key='default_metadata_schema', key='default_metadata_scheme',
default_value='fooocus', default_value='fooocus',
validator=lambda x: x in [y[1] for y in modules.flags.metadata_schema if y[1] == x] validator=lambda x: x in [y[1] for y in modules.flags.metadata_scheme if y[1] == x]
) )
metadata_created_by = get_config_item_or_set_default( metadata_created_by = get_config_item_or_set_default(
key='metadata_created_by', key='metadata_created_by',
modules/flags.py
+1 -1
View File
@@ -32,7 +32,7 @@ default_parameters = {
cn_ip: (0.5, 0.6), cn_ip_face: (0.9, 0.75), cn_canny: (0.5, 1.0), cn_cpds: (0.5, 1.0) cn_ip: (0.5, 0.6), cn_ip_face: (0.9, 0.75), cn_canny: (0.5, 1.0), cn_cpds: (0.5, 1.0)
} # stop, weight } # stop, weight
metadata_schema =[ metadata_scheme =[
('Fooocus (json)', 'fooocus'), ('Fooocus (json)', 'fooocus'),
('A1111 (plain text)', 'a1111'), ('A1111 (plain text)', 'a1111'),
] ]
webui.py
+3 -3
View File
@@ -385,11 +385,11 @@ with shared.gradio_root:
if not args_manager.args.disable_metadata: if not args_manager.args.disable_metadata:
save_metadata_to_images = gr.Checkbox(label='Save Metadata to Images', value=modules.config.default_save_metadata_to_images, save_metadata_to_images = gr.Checkbox(label='Save Metadata to Images', value=modules.config.default_save_metadata_to_images,
info='Adds parameters to generated images allowing manual regeneration.') info='Adds parameters to generated images allowing manual regeneration.')
metadata_schema = gr.Radio(label='Metadata Schema', choices=flags.metadata_schema, value=modules.config.default_metadata_schema, metadata_scheme = gr.Radio(label='Metadata Scheme', choices=flags.metadata_scheme, value=modules.config.default_metadata_scheme,
info='Use A1111 for compatibility with Civitai.', info='Use A1111 for compatibility with Civitai.',
visible=modules.config.default_save_metadata_to_images) visible=modules.config.default_save_metadata_to_images)
save_metadata_to_images.change(lambda x: gr.update(visible=x), inputs=[save_metadata_to_images], outputs=[metadata_schema], save_metadata_to_images.change(lambda x: gr.update(visible=x), inputs=[save_metadata_to_images], outputs=[metadata_scheme],
queue=False, show_progress=False) queue=False, show_progress=False)
with gr.Tab(label='Control'): with gr.Tab(label='Control'):
@@ -540,7 +540,7 @@ with shared.gradio_root:
ctrls += [outpaint_selections, inpaint_input_image, inpaint_additional_prompt, inpaint_mask_image] ctrls += [outpaint_selections, inpaint_input_image, inpaint_additional_prompt, inpaint_mask_image]
if not args_manager.args.disable_metadata: if not args_manager.args.disable_metadata:
ctrls += [save_metadata_to_images, metadata_schema] ctrls += [save_metadata_to_images, metadata_scheme]
ctrls += ip_ctrls ctrls += ip_ctrls