Merge a95cbd2d7f into 5ac1372533

comfy_api_nodes/nodes_gemini.py

@@ -130,7 +130,7 @@ def get_parts_by_type(response: GeminiGenerateContentResponse, part_type: Litera
     Returns:
         List of response parts matching the requested type.
     """
-    if not response.candidates:
+    if response.candidates is None:
         if response.promptFeedback and response.promptFeedback.blockReason:
             feedback = response.promptFeedback
             raise ValueError(
@@ -141,24 +141,14 @@ def get_parts_by_type(response: GeminiGenerateContentResponse, part_type: Litera
             "try changing it to `IMAGE+TEXT` to view the model's reasoning and understand why image generation failed."
         )
     parts = []
-    blocked_reasons = []
-    for candidate in response.candidates:
-        if candidate.finishReason and candidate.finishReason.upper() == "IMAGE_PROHIBITED_CONTENT":
-            blocked_reasons.append(candidate.finishReason)
-            continue
-        if candidate.content is None or candidate.content.parts is None:
-            continue
-        for part in candidate.content.parts:
-            if part_type == "text" and part.text:
-                parts.append(part)
-            elif part.inlineData and part.inlineData.mimeType == part_type:
-                parts.append(part)
-            elif part.fileData and part.fileData.mimeType == part_type:
-                parts.append(part)
-
-    if not parts and blocked_reasons:
-        raise ValueError(f"Gemini API blocked the request. Reasons: {blocked_reasons}")
-
+    for part in response.candidates[0].content.parts:
+        if part_type == "text" and part.text:
+            parts.append(part)
+        elif part.inlineData and part.inlineData.mimeType == part_type:
+            parts.append(part)
+        elif part.fileData and part.fileData.mimeType == part_type:
+            parts.append(part)
+        # Skip parts that don't match the requested type
     return parts
 
 

comfy_extras/nodes_model_patch.py

@@ -244,10 +244,6 @@ class ModelPatchLoader:
         elif 'control_all_x_embedder.2-1.weight' in sd: # alipai z image fun controlnet
             sd = z_image_convert(sd)
             config = {}
-            if 'control_layers.4.adaLN_modulation.0.weight' not in sd:
-                config['n_control_layers'] = 3
-                config['additional_in_dim'] = 17
-                config['refiner_control'] = True
             if 'control_layers.14.adaLN_modulation.0.weight' in sd:
                 config['n_control_layers'] = 15
                 config['additional_in_dim'] = 17

nodes.py

@@ -798,8 +798,8 @@ class VAELoader:
                 vae_path = folder_paths.get_full_path_or_raise("vae_approx", vae_name)
             else:
                 vae_path = folder_paths.get_full_path_or_raise("vae", vae_name)
-            sd, metadata = comfy.utils.load_torch_file(vae_path, return_metadata=True)
-        vae = comfy.sd.VAE(sd=sd, metadata=metadata)
+            sd = comfy.utils.load_torch_file(vae_path)
+        vae = comfy.sd.VAE(sd=sd)
         vae.throw_exception_if_invalid()
         return (vae,)