Skip to content

Transform your 3D texturing workflow with the power of generative AI, directly within Blender!

add support for gguf flux checkpoints, fix flux comfy workflow saving

sakalondec740f9b74ae
diff --git a/stablegen/__init__.py b/stablegen/__init__.py
index 7b43a9a..5de95f6 100755
--- a/stablegen/__init__.py
+++ b/stablegen/__init__.py
@@ -221,16 +221,18 @@ def update_model_list(self, context):
if comfyui_base_dir and os.path.isdir(comfyui_base_dir):
if context.scene.model_architecture == 'sdxl':
comfy_ckpts_path = os.path.join(comfyui_base_dir, "models", "checkpoints")
+ types = ('.safetensors', '.ckpt', '.pth', '.sft')
else:
comfy_ckpts_path = os.path.join(comfyui_base_dir, "models", "unet") # For FLUX1
+ types = ('.safetensors', '.ckpt', '.pth', '.sft', '.gguf')
all_model_items.append(
- get_models_from_directory(comfy_ckpts_path, ('.safetensors', '.ckpt', '.pth', '.sft'), "Checkpoint")
+ get_models_from_directory(comfy_ckpts_path, types, "Checkpoint")
)
# 2. Scan External Checkpoints Path
if external_ckpts_dir and os.path.isdir(external_ckpts_dir):
all_model_items.append(
- get_models_from_directory(external_ckpts_dir, ('.safetensors', '.ckpt', '.pth', '.sft'), "Ext. Checkpoint")
+ get_models_from_directory(external_ckpts_dir, types, "Ext. Checkpoint")
)
return merge_and_deduplicate_models(all_model_items)
diff --git a/stablegen/generator.py b/stablegen/generator.py
index 53dcfd7..766ad41 100644
--- a/stablegen/generator.py
+++ b/stablegen/generator.py
@@ -1853,6 +1853,13 @@ class ComfyUIGenerate(bpy.types.Operator):
prompt[NODES['flux_guidance']]["inputs"]["guidance"] = context.scene.cfg
prompt[NODES['ksampler']]["inputs"]["sampler_name"] = context.scene.sampler
+ # Replace unet_loader with UNETLoaderGGUF if using GGUF model
+ if ".gguf" in context.scene.model_name:
+ del prompt[NODES['unet_loader']]
+ from .util.helpers import gguf_unet_loader
+ unet_loader_dict = json.loads(gguf_unet_loader)
+ prompt.update(unet_loader_dict)
+
# Set the model name
prompt[NODES['unet_loader']]["inputs"]["unet_name"] = context.scene.model_name
@@ -1903,6 +1910,8 @@ class ComfyUIGenerate(bpy.types.Operator):
client_id = str(uuid.uuid4())
output_dir = context.preferences.addons[__package__].preferences.output_dir
+ revision_dir = get_generation_dirs(context)["revision"]
+
# Build Flux base prompt and node mapping.
prompt, NODES = self.create_base_prompt_flux(context)
@@ -1953,14 +1962,11 @@ class ComfyUIGenerate(bpy.types.Operator):
# Connect final node to FluxGuidance
prompt[NODES['flux_guidance']]["inputs"]["conditioning"] = [final_node, 0]
# Note: No negative prompt is connected.
+
# Save prompt for debugging.
- try:
- with open(os.path.join(output_dir, "prompt_flux.json"), 'w') as f:
- json.dump(prompt, f, indent=2)
- except Exception as e:
- print(f"Failed to save flux prompt: {e}")
- # Execute generation via websocket.
+ self._save_prompt_to_file(prompt, revision_dir)
+ # Execute generation via websocket.
# Execute generation and get results
ws = self._connect_to_websocket(server_address, client_id)
@@ -2056,6 +2062,13 @@ class ComfyUIGenerate(bpy.types.Operator):
prompt[NODES['ksampler']]["inputs"]["sampler_name"] = context.scene.refine_sampler if context.scene.generation_method == 'grid' else context.scene.sampler
prompt[NODES['scheduler']]["inputs"]["scheduler"] = context.scene.refine_scheduler if context.scene.generation_method == 'grid' else context.scene.scheduler
+ # Replace unet_loader with UNETLoaderGGUF if using GGUF model
+ if ".gguf" in context.scene.model_name:
+ del prompt[NODES['unet_loader']]
+ from .util.helpers import gguf_unet_loader
+ unet_loader_dict = json.loads(gguf_unet_loader)
+ prompt.update(unet_loader_dict)
+
# Set the model name
prompt[NODES['unet_loader']]["inputs"]["unet_name"] = context.scene.model_name
@@ -2092,6 +2105,8 @@ class ComfyUIGenerate(bpy.types.Operator):
client_id = str(uuid.uuid4())
output_dir = context.preferences.addons[__package__].preferences.output_dir
+ revision_dir = get_generation_dirs(context)["revision"]
+
# Initialize the img2img prompt template for Flux
prompt, NODES = self._create_img2img_base_prompt_flux(context)
@@ -2152,8 +2167,7 @@ class ComfyUIGenerate(bpy.types.Operator):
prompt[NODES['flux_lora_image']]["inputs"]["image"] = depth_path
# Save prompt for debugging
- with open(os.path.join(output_dir, "prompt_flux_img2img.json"), 'w') as f:
- json.dump(prompt, f)
+ self._save_prompt_to_file(prompt, revision_dir)
# Execute generation and get results
ws = self._connect_to_websocket(server_address, client_id)
diff --git a/stablegen/util/helpers.py b/stablegen/util/helpers.py
index 08e9e9b..13711b0 100755
--- a/stablegen/util/helpers.py
+++ b/stablegen/util/helpers.py
@@ -1268,3 +1268,17 @@ depth_lora_flux = """
}
"""
+gguf_unet_loader = """
+{
+ "12": {
+ "inputs": {
+ "unet_name": ""
+ },
+ "class_type": "UnetLoaderGGUF",
+ "_meta": {
+ "title": "Unet Loader (GGUF)"
+ }
+ }
+}
+"""
+