From fff4c5d21dffe402238cd948c2456db5b65f46be Mon Sep 17 00:00:00 2001 From: haosenwang1018 Date: Wed, 25 Feb 2026 07:34:45 +0000 Subject: [PATCH 1/2] fix: replace 74 bare excepts with except Exception --- comfyui/flux2/nodes.py | 4 ++-- comfyui/qwenimage/nodes.py | 8 ++++---- comfyui/z_image/nodes.py | 4 ++-- scripts/cogvideox_fun/train.py | 2 +- scripts/cogvideox_fun/train_control.py | 2 +- scripts/cogvideox_fun/train_lora.py | 2 +- scripts/cogvideox_fun/train_reward_lora.py | 2 +- scripts/fantasytalking/train.py | 2 +- scripts/flux/train.py | 2 +- scripts/flux/train_lora.py | 2 +- scripts/flux2/train.py | 2 +- scripts/flux2/train_lora.py | 2 +- scripts/flux2_fun/train_control.py | 2 +- scripts/flux2_fun/train_control_distill.py | 2 +- scripts/hunyuanvideo/train.py | 2 +- scripts/hunyuanvideo/train_lora.py | 2 +- scripts/longcatvideo/train.py | 2 +- scripts/longcatvideo/train_avatar.py | 2 +- scripts/longcatvideo/train_avatar_lora.py | 2 +- scripts/longcatvideo/train_lora.py | 2 +- scripts/qwenimage/train.py | 2 +- scripts/qwenimage/train_edit.py | 2 +- scripts/qwenimage/train_edit_lora.py | 2 +- scripts/qwenimage/train_lora.py | 2 +- scripts/qwenimage_fun/train_control.py | 2 +- scripts/qwenimage_instantx/train_control.py | 2 +- scripts/turbodiffusion/train_distill.py | 2 +- scripts/wan2.1/train.py | 2 +- scripts/wan2.1/train_distill.py | 2 +- scripts/wan2.1/train_distill_lora.py | 2 +- scripts/wan2.1/train_lora.py | 2 +- scripts/wan2.1/train_reward_lora.py | 2 +- scripts/wan2.1_fun/train.py | 2 +- scripts/wan2.1_fun/train_control.py | 2 +- scripts/wan2.1_fun/train_control_lora.py | 2 +- scripts/wan2.1_fun/train_lora.py | 2 +- scripts/wan2.1_fun/train_reward_lora.py | 2 +- scripts/wan2.1_vace/train.py | 2 +- scripts/wan2.2/train.py | 2 +- scripts/wan2.2/train_animate.py | 2 +- scripts/wan2.2/train_animate_lora.py | 2 +- scripts/wan2.2/train_distill.py | 2 +- scripts/wan2.2/train_distill_lora.py | 2 +- scripts/wan2.2/train_lora.py | 2 +- scripts/wan2.2/train_s2v.py | 2 +- scripts/wan2.2/train_s2v_lora.py | 2 +- scripts/wan2.2_fun/train.py | 2 +- scripts/wan2.2_fun/train_control.py | 2 +- scripts/wan2.2_fun/train_control_lora.py | 2 +- scripts/wan2.2_fun/train_lora.py | 2 +- scripts/wan2.2_fun/train_reward_lora.py | 2 +- scripts/wan2.2_vace_fun/train.py | 2 +- scripts/z_image/train.py | 2 +- scripts/z_image/train_distill.py | 2 +- scripts/z_image/train_distill_lora.py | 2 +- scripts/z_image/train_lora.py | 2 +- scripts/z_image_fun/train_control.py | 2 +- scripts/z_image_fun/train_control_distill.py | 2 +- videox_fun/api/api_multi_nodes.py | 2 +- videox_fun/models/__init__.py | 2 +- videox_fun/models/attention_utils.py | 6 +++--- videox_fun/models/fantasytalking_audio_encoder.py | 2 +- videox_fun/ui/controller.py | 2 +- videox_fun/video_caption/compute_text_score.py | 2 +- .../package_patches/easyocr_detection_patched.py | 2 +- .../video_caption/utils/longclip/simple_tokenizer.py | 2 +- videox_fun/video_caption/utils/viclip/simple_tokenizer.py | 2 +- 67 files changed, 74 insertions(+), 74 deletions(-) diff --git a/comfyui/flux2/nodes.py b/comfyui/flux2/nodes.py index 948f6be6..5bbaadc3 100644 --- a/comfyui/flux2/nodes.py +++ b/comfyui/flux2/nodes.py @@ -598,10 +598,10 @@ def convert_mistral3_to_diffusers(state_dict): [os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), "models/Diffusion_Transformer")] # Possible folder names to check try: tokenizer_path = search_sub_dir_in_possible_folders(possible_folders, sub_dir_name="flux2_tokenizer") - except: + except Exception: try: tokenizer_path = os.path.join(search_sub_dir_in_possible_folders(possible_folders, sub_dir_name="FLUX.2-dev"), "tokenizer") - except: + except Exception: tokenizer_path = search_sub_dir_in_possible_folders(possible_folders, sub_dir_name="Mistral-Nemo-Instruct-2407") tokenizer = PixtralProcessor.from_pretrained(tokenizer_path) diff --git a/comfyui/qwenimage/nodes.py b/comfyui/qwenimage/nodes.py index c3e45232..98def3b6 100644 --- a/comfyui/qwenimage/nodes.py +++ b/comfyui/qwenimage/nodes.py @@ -476,10 +476,10 @@ def loadmodel(self, model_name, precision,): [os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), "models/Diffusion_Transformer")] # Possible folder names to check try: tokenizer_path = search_sub_dir_in_possible_folders(possible_folders, sub_dir_name="qwen2_tokenizer") - except: + except Exception: try: tokenizer_path = os.path.join(search_sub_dir_in_possible_folders(possible_folders, sub_dir_name="Qwen-Image"), "tokenizer") - except: + except Exception: tokenizer_path = search_sub_dir_in_possible_folders(possible_folders, sub_dir_name="Qwen2.5-VL-7B-Instruct") tokenizer = Qwen2Tokenizer.from_pretrained(tokenizer_path) @@ -504,10 +504,10 @@ def loadmodel(self, ): [os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), "models/Diffusion_Transformer")] # Possible folder names to check try: processor_path = search_sub_dir_in_possible_folders(possible_folders, sub_dir_name="qwen2_processor") - except: + except Exception: try: processor_path = os.path.join(search_sub_dir_in_possible_folders(possible_folders, sub_dir_name="Qwen-Image-Edit"), "processor") - except: + except Exception: processor_path = search_sub_dir_in_possible_folders(possible_folders, sub_dir_name="Qwen2.5-VL-7B-Instruct") # Get processor diff --git a/comfyui/z_image/nodes.py b/comfyui/z_image/nodes.py index fb5651df..d06d650e 100644 --- a/comfyui/z_image/nodes.py +++ b/comfyui/z_image/nodes.py @@ -435,10 +435,10 @@ def loadmodel(self, model_name, precision,): [os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), "models/Diffusion_Transformer")] # Possible folder names to check try: tokenizer_path = search_sub_dir_in_possible_folders(possible_folders, sub_dir_name="qwen3_tokenizer") - except: + except Exception: try: tokenizer_path = os.path.join(search_sub_dir_in_possible_folders(possible_folders, sub_dir_name="Z-Image-Turbo"), "tokenizer") - except: + except Exception: tokenizer_path = search_sub_dir_in_possible_folders(possible_folders, sub_dir_name="Qwen3-4B") tokenizer = AutoTokenizer.from_pretrained(tokenizer_path) diff --git a/scripts/cogvideox_fun/train.py b/scripts/cogvideox_fun/train.py index 50c91046..7b169dc2 100755 --- a/scripts/cogvideox_fun/train.py +++ b/scripts/cogvideox_fun/train.py @@ -1001,7 +1001,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/cogvideox_fun/train_control.py b/scripts/cogvideox_fun/train_control.py index a94c2f0c..dc1eb386 100755 --- a/scripts/cogvideox_fun/train_control.py +++ b/scripts/cogvideox_fun/train_control.py @@ -961,7 +961,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/cogvideox_fun/train_lora.py b/scripts/cogvideox_fun/train_lora.py index fc2dc384..4979a838 100755 --- a/scripts/cogvideox_fun/train_lora.py +++ b/scripts/cogvideox_fun/train_lora.py @@ -1008,7 +1008,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/cogvideox_fun/train_reward_lora.py b/scripts/cogvideox_fun/train_reward_lora.py index 0d12850a..7cc01950 100755 --- a/scripts/cogvideox_fun/train_reward_lora.py +++ b/scripts/cogvideox_fun/train_reward_lora.py @@ -969,7 +969,7 @@ def save_model_hook(models, weights, output_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/fantasytalking/train.py b/scripts/fantasytalking/train.py index 765d961a..d943a6ff 100644 --- a/scripts/fantasytalking/train.py +++ b/scripts/fantasytalking/train.py @@ -1013,7 +1013,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/flux/train.py b/scripts/flux/train.py index 366c3f99..88f3d154 100644 --- a/scripts/flux/train.py +++ b/scripts/flux/train.py @@ -1023,7 +1023,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/flux/train_lora.py b/scripts/flux/train_lora.py index a60c442f..9121594a 100644 --- a/scripts/flux/train_lora.py +++ b/scripts/flux/train_lora.py @@ -1021,7 +1021,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/flux2/train.py b/scripts/flux2/train.py index 9411ed1f..1cbf0b1c 100644 --- a/scripts/flux2/train.py +++ b/scripts/flux2/train.py @@ -1115,7 +1115,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/flux2/train_lora.py b/scripts/flux2/train_lora.py index ddfa389f..7ab81929 100644 --- a/scripts/flux2/train_lora.py +++ b/scripts/flux2/train_lora.py @@ -1082,7 +1082,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/flux2_fun/train_control.py b/scripts/flux2_fun/train_control.py index ca519eaa..e116bd20 100644 --- a/scripts/flux2_fun/train_control.py +++ b/scripts/flux2_fun/train_control.py @@ -1137,7 +1137,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/flux2_fun/train_control_distill.py b/scripts/flux2_fun/train_control_distill.py index 3d3d2153..276a7a07 100644 --- a/scripts/flux2_fun/train_control_distill.py +++ b/scripts/flux2_fun/train_control_distill.py @@ -1127,7 +1127,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/hunyuanvideo/train.py b/scripts/hunyuanvideo/train.py index 9e4da08f..4606b388 100644 --- a/scripts/hunyuanvideo/train.py +++ b/scripts/hunyuanvideo/train.py @@ -1136,7 +1136,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/hunyuanvideo/train_lora.py b/scripts/hunyuanvideo/train_lora.py index 93066c7c..d5b018d8 100644 --- a/scripts/hunyuanvideo/train_lora.py +++ b/scripts/hunyuanvideo/train_lora.py @@ -1137,7 +1137,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/longcatvideo/train.py b/scripts/longcatvideo/train.py index 50a9b956..38ce1fb9 100644 --- a/scripts/longcatvideo/train.py +++ b/scripts/longcatvideo/train.py @@ -1017,7 +1017,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/longcatvideo/train_avatar.py b/scripts/longcatvideo/train_avatar.py index eeaeb4cb..3d54e44b 100644 --- a/scripts/longcatvideo/train_avatar.py +++ b/scripts/longcatvideo/train_avatar.py @@ -1057,7 +1057,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/longcatvideo/train_avatar_lora.py b/scripts/longcatvideo/train_avatar_lora.py index 20d92df8..654ce4f9 100644 --- a/scripts/longcatvideo/train_avatar_lora.py +++ b/scripts/longcatvideo/train_avatar_lora.py @@ -1044,7 +1044,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/longcatvideo/train_lora.py b/scripts/longcatvideo/train_lora.py index a40772b2..d3282a63 100644 --- a/scripts/longcatvideo/train_lora.py +++ b/scripts/longcatvideo/train_lora.py @@ -1000,7 +1000,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/qwenimage/train.py b/scripts/qwenimage/train.py index 4b5fba1c..24914814 100644 --- a/scripts/qwenimage/train.py +++ b/scripts/qwenimage/train.py @@ -924,7 +924,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/qwenimage/train_edit.py b/scripts/qwenimage/train_edit.py index 2f02e7d2..a043ac6b 100644 --- a/scripts/qwenimage/train_edit.py +++ b/scripts/qwenimage/train_edit.py @@ -960,7 +960,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/qwenimage/train_edit_lora.py b/scripts/qwenimage/train_edit_lora.py index d625d773..953b9512 100644 --- a/scripts/qwenimage/train_edit_lora.py +++ b/scripts/qwenimage/train_edit_lora.py @@ -962,7 +962,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/qwenimage/train_lora.py b/scripts/qwenimage/train_lora.py index d9fa0ef7..4cd539df 100644 --- a/scripts/qwenimage/train_lora.py +++ b/scripts/qwenimage/train_lora.py @@ -918,7 +918,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/qwenimage_fun/train_control.py b/scripts/qwenimage_fun/train_control.py index 56198067..39ca33aa 100644 --- a/scripts/qwenimage_fun/train_control.py +++ b/scripts/qwenimage_fun/train_control.py @@ -954,7 +954,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/qwenimage_instantx/train_control.py b/scripts/qwenimage_instantx/train_control.py index 8ee0c8ed..0471b92a 100644 --- a/scripts/qwenimage_instantx/train_control.py +++ b/scripts/qwenimage_instantx/train_control.py @@ -947,7 +947,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/turbodiffusion/train_distill.py b/scripts/turbodiffusion/train_distill.py index 862ac50b..8261bb20 100644 --- a/scripts/turbodiffusion/train_distill.py +++ b/scripts/turbodiffusion/train_distill.py @@ -1071,7 +1071,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.1/train.py b/scripts/wan2.1/train.py index bc889b7f..b4359b03 100755 --- a/scripts/wan2.1/train.py +++ b/scripts/wan2.1/train.py @@ -1079,7 +1079,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.1/train_distill.py b/scripts/wan2.1/train_distill.py index 390eef6b..4c891df8 100644 --- a/scripts/wan2.1/train_distill.py +++ b/scripts/wan2.1/train_distill.py @@ -1070,7 +1070,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.1/train_distill_lora.py b/scripts/wan2.1/train_distill_lora.py index 428c99c3..12475b92 100644 --- a/scripts/wan2.1/train_distill_lora.py +++ b/scripts/wan2.1/train_distill_lora.py @@ -1130,7 +1130,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.1/train_lora.py b/scripts/wan2.1/train_lora.py index a3e50ef1..6eeb9e8d 100755 --- a/scripts/wan2.1/train_lora.py +++ b/scripts/wan2.1/train_lora.py @@ -1068,7 +1068,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.1/train_reward_lora.py b/scripts/wan2.1/train_reward_lora.py index 4867dcf9..dc33c9bb 100755 --- a/scripts/wan2.1/train_reward_lora.py +++ b/scripts/wan2.1/train_reward_lora.py @@ -978,7 +978,7 @@ def save_model_hook(models, weights, output_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.1_fun/train.py b/scripts/wan2.1_fun/train.py index 01551ecf..6b6c68f0 100755 --- a/scripts/wan2.1_fun/train.py +++ b/scripts/wan2.1_fun/train.py @@ -1037,7 +1037,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.1_fun/train_control.py b/scripts/wan2.1_fun/train_control.py index efa47618..95e91190 100755 --- a/scripts/wan2.1_fun/train_control.py +++ b/scripts/wan2.1_fun/train_control.py @@ -983,7 +983,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.1_fun/train_control_lora.py b/scripts/wan2.1_fun/train_control_lora.py index cad7f2a1..ace5d194 100755 --- a/scripts/wan2.1_fun/train_control_lora.py +++ b/scripts/wan2.1_fun/train_control_lora.py @@ -981,7 +981,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.1_fun/train_lora.py b/scripts/wan2.1_fun/train_lora.py index 422cab06..5bdd07ea 100755 --- a/scripts/wan2.1_fun/train_lora.py +++ b/scripts/wan2.1_fun/train_lora.py @@ -1030,7 +1030,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.1_fun/train_reward_lora.py b/scripts/wan2.1_fun/train_reward_lora.py index b796cb58..67b40341 100755 --- a/scripts/wan2.1_fun/train_reward_lora.py +++ b/scripts/wan2.1_fun/train_reward_lora.py @@ -990,7 +990,7 @@ def save_model_hook(models, weights, output_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.1_vace/train.py b/scripts/wan2.1_vace/train.py index aacd0aab..3da8e522 100644 --- a/scripts/wan2.1_vace/train.py +++ b/scripts/wan2.1_vace/train.py @@ -968,7 +968,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.2/train.py b/scripts/wan2.2/train.py index 526cc3af..dabfa57c 100644 --- a/scripts/wan2.2/train.py +++ b/scripts/wan2.2/train.py @@ -1097,7 +1097,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.2/train_animate.py b/scripts/wan2.2/train_animate.py index 817030c1..015e0321 100644 --- a/scripts/wan2.2/train_animate.py +++ b/scripts/wan2.2/train_animate.py @@ -1061,7 +1061,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.2/train_animate_lora.py b/scripts/wan2.2/train_animate_lora.py index b9573af7..30540020 100644 --- a/scripts/wan2.2/train_animate_lora.py +++ b/scripts/wan2.2/train_animate_lora.py @@ -1066,7 +1066,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.2/train_distill.py b/scripts/wan2.2/train_distill.py index 7ca7368b..1eca0eed 100644 --- a/scripts/wan2.2/train_distill.py +++ b/scripts/wan2.2/train_distill.py @@ -1101,7 +1101,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.2/train_distill_lora.py b/scripts/wan2.2/train_distill_lora.py index c2babaaf..bca396fe 100644 --- a/scripts/wan2.2/train_distill_lora.py +++ b/scripts/wan2.2/train_distill_lora.py @@ -1157,7 +1157,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.2/train_lora.py b/scripts/wan2.2/train_lora.py index 982a25b8..4fc82b13 100755 --- a/scripts/wan2.2/train_lora.py +++ b/scripts/wan2.2/train_lora.py @@ -1097,7 +1097,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.2/train_s2v.py b/scripts/wan2.2/train_s2v.py index 5b0ee4c0..1175379c 100644 --- a/scripts/wan2.2/train_s2v.py +++ b/scripts/wan2.2/train_s2v.py @@ -1057,7 +1057,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.2/train_s2v_lora.py b/scripts/wan2.2/train_s2v_lora.py index f0d5a6e6..a0d23943 100644 --- a/scripts/wan2.2/train_s2v_lora.py +++ b/scripts/wan2.2/train_s2v_lora.py @@ -1072,7 +1072,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.2_fun/train.py b/scripts/wan2.2_fun/train.py index 68d30b5e..d3574ab5 100644 --- a/scripts/wan2.2_fun/train.py +++ b/scripts/wan2.2_fun/train.py @@ -1066,7 +1066,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.2_fun/train_control.py b/scripts/wan2.2_fun/train_control.py index 2a9a4d34..ed02b854 100644 --- a/scripts/wan2.2_fun/train_control.py +++ b/scripts/wan2.2_fun/train_control.py @@ -1064,7 +1064,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.2_fun/train_control_lora.py b/scripts/wan2.2_fun/train_control_lora.py index 968a09f2..2997420a 100644 --- a/scripts/wan2.2_fun/train_control_lora.py +++ b/scripts/wan2.2_fun/train_control_lora.py @@ -1062,7 +1062,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.2_fun/train_lora.py b/scripts/wan2.2_fun/train_lora.py index a229cace..2579c5ec 100644 --- a/scripts/wan2.2_fun/train_lora.py +++ b/scripts/wan2.2_fun/train_lora.py @@ -1059,7 +1059,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.2_fun/train_reward_lora.py b/scripts/wan2.2_fun/train_reward_lora.py index 54b75f91..01eed3f2 100644 --- a/scripts/wan2.2_fun/train_reward_lora.py +++ b/scripts/wan2.2_fun/train_reward_lora.py @@ -1134,7 +1134,7 @@ def save_model_hook(models, weights, output_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/wan2.2_vace_fun/train.py b/scripts/wan2.2_vace_fun/train.py index 62fd9681..91394043 100644 --- a/scripts/wan2.2_vace_fun/train.py +++ b/scripts/wan2.2_vace_fun/train.py @@ -1007,7 +1007,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/z_image/train.py b/scripts/z_image/train.py index adeefdf4..1752c4f8 100644 --- a/scripts/z_image/train.py +++ b/scripts/z_image/train.py @@ -966,7 +966,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/z_image/train_distill.py b/scripts/z_image/train_distill.py index 8bebcb5f..f08a0ca9 100644 --- a/scripts/z_image/train_distill.py +++ b/scripts/z_image/train_distill.py @@ -1003,7 +1003,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/z_image/train_distill_lora.py b/scripts/z_image/train_distill_lora.py index 011534c3..c3bbd2b5 100644 --- a/scripts/z_image/train_distill_lora.py +++ b/scripts/z_image/train_distill_lora.py @@ -1027,7 +1027,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/z_image/train_lora.py b/scripts/z_image/train_lora.py index d53692e0..7db7f93a 100644 --- a/scripts/z_image/train_lora.py +++ b/scripts/z_image/train_lora.py @@ -942,7 +942,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/z_image_fun/train_control.py b/scripts/z_image_fun/train_control.py index e4d5b280..5c846538 100644 --- a/scripts/z_image_fun/train_control.py +++ b/scripts/z_image_fun/train_control.py @@ -1025,7 +1025,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/scripts/z_image_fun/train_control_distill.py b/scripts/z_image_fun/train_control_distill.py index c5f173ad..22964c93 100644 --- a/scripts/z_image_fun/train_control_distill.py +++ b/scripts/z_image_fun/train_control_distill.py @@ -1071,7 +1071,7 @@ def load_model_hook(models, input_dir): elif args.use_came: try: from came_pytorch import CAME - except: + except Exception: raise ImportError( "Please install came_pytorch to use CAME. You can do so by running `pip install came_pytorch`" ) diff --git a/videox_fun/api/api_multi_nodes.py b/videox_fun/api/api_multi_nodes.py index ebd98d9f..b326f34a 100755 --- a/videox_fun/api/api_multi_nodes.py +++ b/videox_fun/api/api_multi_nodes.py @@ -18,7 +18,7 @@ try: import ray -except: +except Exception: print("Ray is not installed. If you want to use multi gpus api. Please install it by running 'pip install ray'.") ray = None diff --git a/videox_fun/models/__init__.py b/videox_fun/models/__init__.py index 2ed299c8..7f0d9f9b 100755 --- a/videox_fun/models/__init__.py +++ b/videox_fun/models/__init__.py @@ -14,7 +14,7 @@ from transformers import (Qwen2_5_VLConfig, Qwen2_5_VLForConditionalGeneration, Qwen2Tokenizer, Qwen2VLProcessor) -except: +except Exception: Qwen2_5_VLForConditionalGeneration, Qwen2Tokenizer = None, None Qwen2VLProcessor, Qwen2_5_VLConfig = None, None print("Your transformers version is too old to load Qwen2_5_VLForConditionalGeneration and Qwen2Tokenizer. If you wish to use QwenImage, please upgrade your transformers package to the latest version.") diff --git a/videox_fun/models/attention_utils.py b/videox_fun/models/attention_utils.py index ec4f80a7..6fc2d7ef 100644 --- a/videox_fun/models/attention_utils.py +++ b/videox_fun/models/attention_utils.py @@ -33,11 +33,11 @@ elif major>9: from sageattention_sm120 import sageattn SAGE_ATTENTION_AVAILABLE = True -except: +except Exception: try: from sageattention import sageattn SAGE_ATTENTION_AVAILABLE = True - except: + except Exception: sageattn = None SAGE_ATTENTION_AVAILABLE = False @@ -61,7 +61,7 @@ def convert_qkv_dtype(q, k, v): return q, k, v # No conversion for other cases return q.to(target_dtype), k.to(target_dtype), v.to(target_dtype) - except: + except Exception: return q, k, v diff --git a/videox_fun/models/fantasytalking_audio_encoder.py b/videox_fun/models/fantasytalking_audio_encoder.py index 7f2f7608..6201e1f9 100644 --- a/videox_fun/models/fantasytalking_audio_encoder.py +++ b/videox_fun/models/fantasytalking_audio_encoder.py @@ -31,7 +31,7 @@ def extract_audio_feat(self, audio_path, num_frames = 81, fps = 16, sr = 16000): try: audio_segment = audio_input[start_sample:end_sample] - except: + except Exception: audio_segment = audio_input input_values = self.processor( diff --git a/videox_fun/ui/controller.py b/videox_fun/ui/controller.py index 31a5e9d0..2bcd4f74 100755 --- a/videox_fun/ui/controller.py +++ b/videox_fun/ui/controller.py @@ -482,7 +482,7 @@ def generate( try: base64_encoding = outputs["base64_encoding"] - except: + except Exception: return gr.Image(visible=False, value=None), gr.Video(None, visible=True), outputs["message"] decoded_data = base64.b64decode(base64_encoding) diff --git a/videox_fun/video_caption/compute_text_score.py b/videox_fun/video_caption/compute_text_score.py index 3acebe12..a5c99698 100644 --- a/videox_fun/video_caption/compute_text_score.py +++ b/videox_fun/video_caption/compute_text_score.py @@ -71,7 +71,7 @@ def compute_text_score(video_path, ocr_reader, sample_method="mid", num_sampled_ quad_area += triangle_area(*triangle1) triangle2 = points[3:] + [points[0]] quad_area += triangle_area(*triangle2) - except: + except Exception: quad_area = 0 text_area = rect_area + quad_area diff --git a/videox_fun/video_caption/package_patches/easyocr_detection_patched.py b/videox_fun/video_caption/package_patches/easyocr_detection_patched.py index bbb49d66..72038e0c 100644 --- a/videox_fun/video_caption/package_patches/easyocr_detection_patched.py +++ b/videox_fun/video_caption/package_patches/easyocr_detection_patched.py @@ -84,7 +84,7 @@ def get_detector(trained_model, device='cpu', quantize=True, cudnn_benchmark=Fal if quantize: try: torch.quantization.quantize_dynamic(net, dtype=torch.qint8, inplace=True) - except: + except Exception: pass else: net.load_state_dict(copyStateDict(torch.load(trained_model, map_location=device))) diff --git a/videox_fun/video_caption/utils/longclip/simple_tokenizer.py b/videox_fun/video_caption/utils/longclip/simple_tokenizer.py index 0a66286b..bd41e3f6 100644 --- a/videox_fun/video_caption/utils/longclip/simple_tokenizer.py +++ b/videox_fun/video_caption/utils/longclip/simple_tokenizer.py @@ -98,7 +98,7 @@ def bpe(self, token): j = word.index(first, i) new_word.extend(word[i:j]) i = j - except: + except Exception: new_word.extend(word[i:]) break diff --git a/videox_fun/video_caption/utils/viclip/simple_tokenizer.py b/videox_fun/video_caption/utils/viclip/simple_tokenizer.py index 744cba81..9395f64c 100644 --- a/videox_fun/video_caption/utils/viclip/simple_tokenizer.py +++ b/videox_fun/video_caption/utils/viclip/simple_tokenizer.py @@ -101,7 +101,7 @@ def bpe(self, token): j = word.index(first, i) new_word.extend(word[i:j]) i = j - except: + except Exception: new_word.extend(word[i:]) break From b8d9b4c281e114c021feca327c149f79a91ea5d0 Mon Sep 17 00:00:00 2001 From: haosenwang1018 <167664334+haosenwang1018@users.noreply.github.com> Date: Mon, 2 Mar 2026 12:38:19 +0000 Subject: [PATCH 2/2] feat: add version constant and get_version() helper --- __init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/__init__.py b/__init__.py index 273bba3b..85eea6d1 100644 --- a/__init__.py +++ b/__init__.py @@ -1,3 +1,10 @@ from .comfyui.comfyui_nodes import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS +__version__ = "1.0.1" + __all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS"] + + +def get_version(): + """Return the VideoX-Fun version.""" + return __version__