Merge branch 'master' into dr-support-pip-cm

comfy/lora.py

@@ -301,6 +301,7 @@ def model_lora_keys_unet(model, key_map={}):
                 key_map["{}".format(key_lora)] = k
                 # Support transformer prefix format
                 key_map["transformer.{}".format(key_lora)] = k
+                key_map["lycoris_{}".format(key_lora.replace(".", "_"))] = k #SimpleTuner lycoris format
 
     return key_map
 

comfy_api_nodes/nodes_kling.py

@@ -1690,7 +1690,11 @@ class KlingImageGenerationNode(KlingImageGenerationBase):
     ):
         self.validate_prompt(prompt, negative_prompt)
 
-        if image is not None:
+        if image is None:
+            image_type = None
+        elif model_name == KlingImageGenModelName.kling_v1:
+            raise ValueError(f"The model {KlingImageGenModelName.kling_v1.value} does not support reference images.")
+        else:
             image = tensor_to_base64_string(image)
 
         initial_operation = SynchronousOperation(

execution.py

@@ -646,8 +646,6 @@ class PromptExecutor:
             self.add_message("execution_error", mes, broadcast=False)
 
     def execute(self, prompt, prompt_id, extra_data={}, execute_outputs=[]):
-        asyncio_loop = asyncio.new_event_loop()
-        asyncio.set_event_loop(asyncio_loop)
         asyncio.run(self.execute_async(prompt, prompt_id, extra_data, execute_outputs))
 
     async def execute_async(self, prompt, prompt_id, extra_data={}, execute_outputs=[]):

requirements.txt

@@ -1,6 +1,6 @@
 comfyui-frontend-package==1.24.4
-comfyui-workflow-templates==0.1.52
-comfyui-embedded-docs==0.2.4
+comfyui-workflow-templates==0.1.53
+comfyui-embedded-docs==0.2.6
 comfyui_manager
 torch
 torchsde