wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-04-13 20:12:30 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

fix: replace bare except with specific exception types

Browse Source
This commit is contained in:
XiaoJiJi 2026-03-19 03:41:50 +00:00
parent 47414ffa45
commit 2e49b5582f
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/model_manager.py
View File

@ -73,7 +73,8 @@ class ModelFileManager:
img.save(img_bytes, format="WEBP") img.save(img_bytes, format="WEBP")
img_bytes.seek(0) img_bytes.seek(0)
return web.Response(body=img_bytes.getvalue(), content_type="image/webp") return web.Response(body=img_bytes.getvalue(), content_type="image/webp")
except: except (IOError, OSError, ValueError, Image.DecompressionBombError) as e:
logging.warning(f"Failed to load preview image {default_preview}: {e}")
return web.Response(status=404) return web.Response(status=404)
def get_model_file_list(self, folder_name: str): def get_model_file_list(self, folder_name: str):

2
comfy/ops.py
View File

@ -70,7 +70,7 @@ try:
#TODO: change upper bound version once it's fixed' #TODO: change upper bound version once it's fixed'
NVIDIA_MEMORY_CONV_BUG_WORKAROUND = True NVIDIA_MEMORY_CONV_BUG_WORKAROUND = True
logging.info("working around nvidia conv3d memory bug.") logging.info("working around nvidia conv3d memory bug.")
except: except (RuntimeError, AttributeError, TypeError):
pass pass
cast_to = comfy.model_management.cast_to #TODO: remove once no more references cast_to = comfy.model_management.cast_to #TODO: remove once no more references

8
comfy_extras/nodes_freelunch.py
View File

@ -55,8 +55,8 @@ class FreeU(IO.ComfyNode):
if hsp.device not in on_cpu_devices: if hsp.device not in on_cpu_devices:
try: try:
hsp = Fourier_filter(hsp, threshold=1, scale=scale[1]) hsp = Fourier_filter(hsp, threshold=1, scale=scale[1])
except: except (RuntimeError, TypeError) as e:
logging.warning("Device {} does not support the torch.fft functions used in the FreeU node, switching to CPU.".format(hsp.device)) logging.warning("Device {} does not support the torch.fft functions used in the FreeU node, switching to CPU. Error: {}".format(hsp.device, e))
on_cpu_devices[hsp.device] = True on_cpu_devices[hsp.device] = True
hsp = Fourier_filter(hsp.cpu(), threshold=1, scale=scale[1]).to(hsp.device) hsp = Fourier_filter(hsp.cpu(), threshold=1, scale=scale[1]).to(hsp.device)
else: else:
@ -109,8 +109,8 @@ class FreeU_V2(IO.ComfyNode):
if hsp.device not in on_cpu_devices: if hsp.device not in on_cpu_devices:
try: try:
hsp = Fourier_filter(hsp, threshold=1, scale=scale[1]) hsp = Fourier_filter(hsp, threshold=1, scale=scale[1])
except: except (RuntimeError, TypeError) as e:
logging.warning("Device {} does not support the torch.fft functions used in the FreeU node, switching to CPU.".format(hsp.device)) logging.warning("Device {} does not support the torch.fft functions used in the FreeU node, switching to CPU. Error: {}".format(hsp.device, e))
on_cpu_devices[hsp.device] = True on_cpu_devices[hsp.device] = True
hsp = Fourier_filter(hsp.cpu(), threshold=1, scale=scale[1]).to(hsp.device) hsp = Fourier_filter(hsp.cpu(), threshold=1, scale=scale[1]).to(hsp.device)
else: else:

2
comfy_extras/nodes_hypernetwork.py
View File

@ -35,7 +35,7 @@ def load_hypernetwork_patch(path, strength):
for d in sd: for d in sd:
try: try:
dim = int(d) dim = int(d)
except: except (ValueError, TypeError):
continue continue
output = [] output = []

4
comfy_extras/nodes_lora_extract.py
View File

@ -75,8 +75,8 @@ def calc_lora_model(model_diff, rank, prefix_model, prefix_lora, output_sd, lora
out = extract_lora(weight_diff, rank) out = extract_lora(weight_diff, rank)
output_sd["{}{}.lora_up.weight".format(prefix_lora, k[len(prefix_model):-7])] = out[0].contiguous().half().cpu() output_sd["{}{}.lora_up.weight".format(prefix_lora, k[len(prefix_model):-7])] = out[0].contiguous().half().cpu()
output_sd["{}{}.lora_down.weight".format(prefix_lora, k[len(prefix_model):-7])] = out[1].contiguous().half().cpu() output_sd["{}{}.lora_down.weight".format(prefix_lora, k[len(prefix_model):-7])] = out[1].contiguous().half().cpu()
except: except (RuntimeError, ValueError, TypeError, torch.linalg.LinAlgError) as e:
logging.warning("Could not generate lora weights for key {}, is the weight difference a zero?".format(k)) logging.warning("Could not generate lora weights for key {}, is the weight difference a zero? Error: {}".format(k, e))
elif lora_type == LORAType.FULL_DIFF: elif lora_type == LORAType.FULL_DIFF:
output_sd["{}{}.diff".format(prefix_lora, k[len(prefix_model):-7])] = weight_diff.contiguous().half().cpu() output_sd["{}{}.diff".format(prefix_lora, k[len(prefix_model):-7])] = weight_diff.contiguous().half().cpu()