monster/Qwen-Image-Layered-MRP-MLX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Save controlnet_image and mflux version in metadata

Browse Source
This commit is contained in:
filipstrand 2024-09-22 19:03:00 +02:00
parent cda698df8d
commit 5737b27164
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mflux/post_processing/generated_image.py
View File

@ -1,3 +1,4 @@
import importlib
import json import json
import logging import logging
from pathlib import Path from pathlib import Path
@ -25,6 +26,7 @@ class GeneratedImage:
generation_time: float, generation_time: float,
lora_paths: list[str], lora_paths: list[str],
lora_scales: list[float], lora_scales: list[float],
controlnet_image_path: str | None = None,
controlnet_strength: float | None = None, controlnet_strength: float | None = None,
): ):
self.image = image self.image = image
@ -38,6 +40,7 @@ class GeneratedImage:
self.generation_time = generation_time self.generation_time = generation_time
self.lora_paths = lora_paths self.lora_paths = lora_paths
self.lora_scales = lora_scales self.lora_scales = lora_scales
self.controlnet_image = controlnet_image_path
self.controlnet_strength = controlnet_strength self.controlnet_strength = controlnet_strength
def save(self, path: str, export_json_metadata: bool = False) -> None: def save(self, path: str, export_json_metadata: bool = False) -> None:
@ -99,6 +102,7 @@ class GeneratedImage:
def _get_metadata(self) -> dict: def _get_metadata(self) -> dict:
return { return {
"mflux_version": str(GeneratedImage.get_version()),
"model": str(self.model_config.alias), "model": str(self.model_config.alias),
"seed": str(self.seed), "seed": str(self.seed),
"steps": str(self.steps), "steps": str(self.steps),
@ -109,5 +113,13 @@ class GeneratedImage:
"lora_paths": ", ".join(self.lora_paths) if self.lora_paths else "", "lora_paths": ", ".join(self.lora_paths) if self.lora_paths else "",
"lora_scales": ", ".join([f"{scale:.2f}" for scale in self.lora_scales]) if self.lora_scales else "", "lora_scales": ", ".join([f"{scale:.2f}" for scale in self.lora_scales]) if self.lora_scales else "",
"prompt": self.prompt, "prompt": self.prompt,
"controlnet_image": "None" if self.controlnet_image is None else self.controlnet_image,
"controlnet_strength": "None" if self.controlnet_strength is None else f"{self.controlnet_strength:.2f}", "controlnet_strength": "None" if self.controlnet_strength is None else f"{self.controlnet_strength:.2f}",
} }
@staticmethod
def get_version():
try:
return importlib.metadata.version("mflux")
except importlib.metadata.PackageNotFoundError:
return "unknown"

2
src/mflux/post_processing/image_util.py
View File

@ -19,6 +19,7 @@ class ImageUtil:
lora_paths: list[str], lora_paths: list[str],
lora_scales: list[float], lora_scales: list[float],
config: RuntimeConfig, config: RuntimeConfig,
controlnet_image_path: str | None = None,
) -> GeneratedImage: ) -> GeneratedImage:
normalized = ImageUtil._denormalize(decoded_latents) normalized = ImageUtil._denormalize(decoded_latents)
normalized_numpy = ImageUtil._to_numpy(normalized) normalized_numpy = ImageUtil._to_numpy(normalized)
@ -35,6 +36,7 @@ class ImageUtil:
generation_time=generation_time, generation_time=generation_time,
lora_paths=lora_paths, lora_paths=lora_paths,
lora_scales=lora_scales, lora_scales=lora_scales,
controlnet_image_path=controlnet_image_path,
controlnet_strength=config.controlnet_strength if isinstance(config.config, ConfigControlnet) else None, controlnet_strength=config.controlnet_strength if isinstance(config.config, ConfigControlnet) else None,
) )