mirror of
https://github.com/lllyasviel/Fooocus.git
synced 2026-08-16 13:13:16 +02:00
Merge branch 'feature/add-metadata-to-files'
This commit is contained in:
@@ -825,6 +825,7 @@ def worker():
|
|||||||
('Fooocus V2 Expansion', 'prompt_expansion', task['expansion']),
|
('Fooocus V2 Expansion', 'prompt_expansion', task['expansion']),
|
||||||
('Styles', 'styles', str(raw_style_selections)),
|
('Styles', 'styles', str(raw_style_selections)),
|
||||||
('Performance', 'performance', performance_selection.value),
|
('Performance', 'performance', performance_selection.value),
|
||||||
|
('Steps', 'steps', steps),
|
||||||
('Resolution', 'resolution', str((width, height))),
|
('Resolution', 'resolution', str((width, height))),
|
||||||
('Guidance Scale', 'guidance_scale', guidance_scale),
|
('Guidance Scale', 'guidance_scale', guidance_scale),
|
||||||
('Sharpness', 'sharpness', modules.patch.patch_settings[pid].sharpness),
|
('Sharpness', 'sharpness', modules.patch.patch_settings[pid].sharpness),
|
||||||
|
|||||||
+3
-3
@@ -1,4 +1,4 @@
|
|||||||
from enum import Enum
|
from enum import IntEnum, Enum
|
||||||
|
|
||||||
disabled = 'Disabled'
|
disabled = 'Disabled'
|
||||||
enabled = 'Enabled'
|
enabled = 'Enabled'
|
||||||
@@ -104,13 +104,13 @@ lora_count_with_lcm = lora_count + 1
|
|||||||
controlnet_image_count = 4
|
controlnet_image_count = 4
|
||||||
|
|
||||||
|
|
||||||
class Steps(Enum):
|
class Steps(IntEnum):
|
||||||
QUALITY = 60
|
QUALITY = 60
|
||||||
SPEED = 30
|
SPEED = 30
|
||||||
EXTREME_SPEED = 8
|
EXTREME_SPEED = 8
|
||||||
|
|
||||||
|
|
||||||
class StepsUOV(Enum):
|
class StepsUOV(IntEnum):
|
||||||
QUALITY = 36
|
QUALITY = 36
|
||||||
SPEED = 18
|
SPEED = 18
|
||||||
EXTREME_SPEED = 8
|
EXTREME_SPEED = 8
|
||||||
|
|||||||
@@ -97,7 +97,8 @@ def get_steps(key: str, fallback: str | None, source_dict: dict, results: list,
|
|||||||
h = source_dict.get(key, source_dict.get(fallback, default))
|
h = source_dict.get(key, source_dict.get(fallback, default))
|
||||||
assert h is not None
|
assert h is not None
|
||||||
h = int(h)
|
h = int(h)
|
||||||
if h not in set(item.value for item in Steps):
|
# if not in steps or in steps and performance is not the same
|
||||||
|
if h not in iter(Steps) or Steps(h).name.casefold() != source_dict.get('performance', '').replace(' ', '_').casefold():
|
||||||
results.append(h)
|
results.append(h)
|
||||||
return
|
return
|
||||||
results.append(-1)
|
results.append(-1)
|
||||||
|
|||||||
Reference in New Issue
Block a user