Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-20 01:31:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

control add metadata

Browse Source
This commit is contained in:
Vladimir Mandic
2024-04-21 14:52:14 -04:00
parent 6e79d5bbde
commit 5e1cf459b5
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+2 -1
View File
@@ -7,7 +7,7 @@
- PixArt-Σ
- IP adapter masking
## Update for 2024-04-20
## Update for 2024-04-21
- **Features**:
- **Gallery**: list, preview, search through all your images and videos!
@@ -95,6 +95,7 @@
- Noise sampler seed, thanks @leppie
- Control module with ADetailer and active ControlNet
- Control module restore button full functionality
- Control add correct metadata to image
## Update for 2024-03-19
modules/control/run.py
+11 -4
View File
@@ -217,23 +217,29 @@ def control_run(units: List[unit.Unit] = [], inputs: List[Image.Image] = [], ini
selected_models = None
elif len(active_model) == 1:
selected_models = active_model[0].model if active_model[0].model is not None else None
p.extra_generation_params["Control model"] = (active_model[0].model_id or '') if active_model[0].model is not None else None
has_models = selected_models is not None
control_conditioning = active_strength[0] if len(active_strength) > 0 else 1 # strength or list[strength]
control_guidance_start = active_start[0] if len(active_start) > 0 else 0
control_guidance_end = active_end[0] if len(active_end) > 0 else 1
else:
selected_models = [m.model for m in active_model if m.model is not None]
p.extra_generation_params["Control model"] = ', '.join([(m.model_id or '') for m in active_model if m.model is not None])
has_models = len(selected_models) > 0
control_conditioning = active_strength[0] if len(active_strength) == 1 else list(active_strength) # strength or list[strength]
control_guidance_start = active_start[0] if len(active_start) == 1 else list(active_start)
control_guidance_end = active_end[0] if len(active_end) == 1 else list(active_end)
p.extra_generation_params["Control conditioning"] = control_conditioning
else:
pass
debug(f'Control: run type={unit_type} models={has_models}')
if has_models:
p.extra_generation_params["Control mode"] = unit_type # overriden later with pretty-print
p.extra_generation_params["Control conditioning"] = control_conditioning if isinstance(control_conditioning, list) else [control_conditioning]
p.extra_generation_params['Control start'] = control_guidance_start if isinstance(control_guidance_start, list) else [control_guidance_start]
p.extra_generation_params['Control end'] = control_guidance_end if isinstance(control_guidance_end, list) else [control_guidance_end]
p.extra_generation_params["Control model"] = ';'.join([(m.model_id or '') for m in active_model if m.model is not None])
p.extra_generation_params["Control conditioning"] = ';'.join([str(c) for c in control_conditioning])
p.extra_generation_params['Control start'] = ';'.join([str(c) for c in control_guidance_start])
p.extra_generation_params['Control end'] = ';'.join([str(c) for c in control_guidance_end])
if unit_type == 't2i adapter' and has_models:
p.extra_generation_params["Control mode"] = 'T2I-Adapter'
p.task_args['adapter_conditioning_scale'] = control_conditioning
@@ -426,9 +432,10 @@ def control_run(units: List[unit.Unit] = [], inputs: List[Image.Image] = [], ini
debug(f'Control processed: {len(processed_images)}')
if len(processed_images) > 0:
p.extra_generation_params["Control process"] = [p.processor_id for p in active_process if p.processor_id is not None]
if len(p.extra_generation_params["Control process"]) == 0:
p.extra_generation_params["Control process"] = None
else:
p.extra_generation_params["Control process"] = ';'.join([p.processor_id for p in active_process if p.processor_id is not None])
if any(img is None for img in processed_images):
yield terminate('Control: attempting process but output is none')
return
wiki
+1 -1
Submodule wiki updated: 46fbdb6173...996d8f1af1