diff --git a/language/en.json b/language/en.json index 0617ae1e..d9d185a1 100644 --- a/language/en.json +++ b/language/en.json @@ -373,7 +373,7 @@ "Metadata": "Metadata", "Apply Metadata": "Apply Metadata", "Metadata Scheme": "Metadata Scheme", - "Image Prompt parameters are not included. Use A1111 for compatibility with Civitai.": "Image Prompt parameters are not included. Use A1111 for compatibility with Civitai.", - "Fooocus (json)": "Fooocus (json)", - "A1111 (plain text)": "A1111 (plain text)" + "Image Prompt parameters are not included. Use a1111 for compatibility with Civitai.": "Image Prompt parameters are not included. Use a1111 for compatibility with Civitai.", + "fooocus (json)": "fooocus (json)", + "a1111 (plain text)": "a1111 (plain text)" } \ No newline at end of file diff --git a/modules/flags.py b/modules/flags.py index 06ced601..278f7000 100644 --- a/modules/flags.py +++ b/modules/flags.py @@ -83,8 +83,8 @@ class MetadataScheme(Enum): metadata_scheme = [ - ('Fooocus (json)', MetadataScheme.FOOOCUS.value), - ('A1111 (plain text)', MetadataScheme.A1111.value), + (f'{MetadataScheme.FOOOCUS.value} (json)', MetadataScheme.FOOOCUS.value), + (f'{MetadataScheme.A1111.value} (plain text)', MetadataScheme.A1111.value), ] lora_count = 5 @@ -114,10 +114,10 @@ class Performance(Enum): def list(cls) -> list: return list(map(lambda c: c.value, cls)) - def steps(self) -> int: + def steps(self) -> int | None: return Steps[self.name].value if Steps[self.name] else None - def steps_uov(self) -> int: + def steps_uov(self) -> int | None: return StepsUOV[self.name].value if Steps[self.name] else None diff --git a/webui.py b/webui.py index 8722cb88..74778eac 100644 --- a/webui.py +++ b/webui.py @@ -411,7 +411,7 @@ with shared.gradio_root: 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.') metadata_scheme = gr.Radio(label='Metadata Scheme', choices=flags.metadata_scheme, value=modules.config.default_metadata_scheme, - info='Image Prompt parameters are not included. Use A1111 for compatibility with Civitai.', + info='Image Prompt parameters are not included. Use a1111 for compatibility with Civitai.', 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_scheme],