Skip to content

The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.

New Year ruff cleanup. (#11595)

comfyanonymous65cfcf5b1bb0
diff --git a/app/model_manager.py b/app/model_manager.py
index ab36bca74..f124d1117 100644
--- a/app/model_manager.py
+++ b/app/model_manager.py
@@ -44,7 +44,7 @@ class ModelFileManager:
@routes.get("/experiment/models/{folder}")
async def get_all_models(request):
folder = request.match_info.get("folder", None)
- if not folder in folder_paths.folder_names_and_paths:
+ if folder not in folder_paths.folder_names_and_paths:
return web.Response(status=404)
files = self.get_model_file_list(folder)
return web.json_response(files)
@@ -55,7 +55,7 @@ class ModelFileManager:
path_index = int(request.match_info.get("path_index", None))
filename = request.match_info.get("filename", None)
- if not folder_name in folder_paths.folder_names_and_paths:
+ if folder_name not in folder_paths.folder_names_and_paths:
return web.Response(status=404)
folders = folder_paths.folder_names_and_paths[folder_name]
diff --git a/comfy/hooks.py b/comfy/hooks.py
index 9d0731072..1a76c7ba4 100644
--- a/comfy/hooks.py
+++ b/comfy/hooks.py
@@ -527,7 +527,8 @@ class HookKeyframeGroup:
if self._current_keyframe.get_effective_guarantee_steps(max_sigma) > 0:
break
# if eval_c is outside the percent range, stop looking further
- else: break
+ else:
+ break
# update steps current context is used
self._current_used_steps += 1
# update current timestep this was performed on
diff --git a/comfy/ldm/chroma_radiance/model.py b/comfy/ldm/chroma_radiance/model.py
index 70d173889..4fb56165e 100644
--- a/comfy/ldm/chroma_radiance/model.py
+++ b/comfy/ldm/chroma_radiance/model.py
@@ -270,7 +270,7 @@ class ChromaRadiance(Chroma):
bad_keys = tuple(
k
for k, v in overrides.items()
- if type(v) != type(getattr(params, k)) and (v is not None or k not in nullable_keys)
+ if not isinstance(v, type(getattr(params, k))) and (v is not None or k not in nullable_keys)
)
if bad_keys:
e = f"Invalid value(s) in transformer_options chroma_radiance_options: {', '.join(bad_keys)}"
diff --git a/comfy/ldm/hunyuan_video/upsampler.py b/comfy/ldm/hunyuan_video/upsampler.py
index 85f515f67..d9e76922f 100644
--- a/comfy/ldm/hunyuan_video/upsampler.py
+++ b/comfy/ldm/hunyuan_video/upsampler.py
@@ -3,7 +3,8 @@ import torch.nn as nn
import torch.nn.functional as F
from comfy.ldm.modules.diffusionmodules.model import ResnetBlock, VideoConv3d
from comfy.ldm.hunyuan_video.vae_refiner import RMS_norm
-import model_management, model_patcher
+import model_management
+import model_patcher
class SRResidualCausalBlock3D(nn.Module):
def __init__(self, channels: int):
diff --git a/comfy/ldm/modules/diffusionmodules/model.py b/comfy/ldm/modules/diffusionmodules/model.py
index 681a55db5..1ae3ef034 100644
--- a/comfy/ldm/modules/diffusionmodules/model.py
+++ b/comfy/ldm/modules/diffusionmodules/model.py
@@ -394,7 +394,8 @@ class Model(nn.Module):
attn_resolutions, dropout=0.0, resamp_with_conv=True, in_channels,
resolution, use_timestep=True, use_linear_attn=False, attn_type="vanilla"):
super().__init__()
- if use_linear_attn: attn_type = "linear"
+ if use_linear_attn:
+ attn_type = "linear"
self.ch = ch
self.temb_ch = self.ch*4
self.num_resolutions = len(ch_mult)
@@ -548,7 +549,8 @@ class Encoder(nn.Module):
conv3d=False, time_compress=None,
**ignore_kwargs):
super().__init__()
- if use_linear_attn: attn_type = "linear"
+ if use_linear_attn:
+ attn_type = "linear"
self.ch = ch
self.temb_ch = 0
self.num_resolutions = len(ch_mult)
diff --git a/comfy/ldm/modules/ema.py b/comfy/ldm/modules/ema.py
index bded25019..96ee6e895 100644
--- a/comfy/ldm/modules/ema.py
+++ b/comfy/ldm/modules/ema.py
@@ -45,7 +45,7 @@ class LitEma(nn.Module):
shadow_params[sname] = shadow_params[sname].type_as(m_param[key])
shadow_params[sname].sub_(one_minus_decay * (shadow_params[sname] - m_param[key]))
else:
- assert not key in self.m_name2s_name
+ assert key not in self.m_name2s_name
def copy_to(self, model):
m_param = dict(model.named_parameters())
@@ -54,7 +54,7 @@ class LitEma(nn.Module):
if m_param[key].requires_grad:
m_param[key].data.copy_(shadow_params[self.m_name2s_name[key]].data)
else:
- assert not key in self.m_name2s_name
+ assert key not in self.m_name2s_name
def store(self, parameters):
"""
diff --git a/comfy/ldm/util.py b/comfy/ldm/util.py
index 30b4b4721..304936ff4 100644
--- a/comfy/ldm/util.py
+++ b/comfy/ldm/util.py
@@ -71,7 +71,7 @@ def count_params(model, verbose=False):
def instantiate_from_config(config):
- if not "target" in config:
+ if "target" not in config:
if config == '__is_first_stage__':
return None
elif config == "__is_unconditional__":
diff --git a/comfy/taesd/taehv.py b/comfy/taesd/taehv.py
index 3dfe1e4d4..0e5f9a378 100644
--- a/comfy/taesd/taehv.py
+++ b/comfy/taesd/taehv.py
@@ -154,7 +154,8 @@ class TAEHV(nn.Module):
self._show_progress_bar = value
def encode(self, x, **kwargs):
- if self.patch_size > 1: x = F.pixel_unshuffle(x, self.patch_size)
+ if self.patch_size > 1:
+ x = F.pixel_unshuffle(x, self.patch_size)
x = x.movedim(2, 1) # [B, C, T, H, W] -> [B, T, C, H, W]
if x.shape[1] % 4 != 0:
# pad at end to multiple of 4
@@ -167,5 +168,6 @@ class TAEHV(nn.Module):
def decode(self, x, **kwargs):
x = self.process_in(x).movedim(2, 1) # [B, C, T, H, W] -> [B, T, C, H, W]
x = apply_model_with_memblocks(self.decoder, x, self.parallel, self.show_progress_bar)
- if self.patch_size > 1: x = F.pixel_shuffle(x, self.patch_size)
+ if self.patch_size > 1:
+ x = F.pixel_shuffle(x, self.patch_size)
return x[:, self.frames_to_trim:].movedim(2, 1)
diff --git a/comfy_execution/graph.py b/comfy_execution/graph.py
index 8fc5846b7..9d170b16e 100644
--- a/comfy_execution/graph.py
+++ b/comfy_execution/graph.py
@@ -207,15 +207,15 @@ class ExecutionList(TopologicalSort):
return self.output_cache.get(node_id) is not None
def cache_link(self, from_node_id, to_node_id):
- if not to_node_id in self.execution_cache:
+ if to_node_id not in self.execution_cache:
self.execution_cache[to_node_id] = {}
self.execution_cache[to_node_id][from_node_id] = self.output_cache.get(from_node_id)
- if not from_node_id in self.execution_cache_listeners:
+ if from_node_id not in self.execution_cache_listeners:
self.execution_cache_listeners[from_node_id] = set()
self.execution_cache_listeners[from_node_id].add(to_node_id)
def get_cache(self, from_node_id, to_node_id):
- if not to_node_id in self.execution_cache:
+ if to_node_id not in self.execution_cache:
return None
value = self.execution_cache[to_node_id].get(from_node_id)
if value is None:
diff --git a/comfy_extras/nodes_apg.py b/comfy_extras/nodes_apg.py
index f27ae7da8..b9df2dcc9 100644
--- a/comfy_extras/nodes_apg.py
+++ b/comfy_extras/nodes_apg.py
@@ -55,7 +55,8 @@ class APG(io.ComfyNode):
def pre_cfg_function(args):
nonlocal running_avg, prev_sigma
- if len(args["conds_out"]) == 1: return args["conds_out"]
+ if len(args["conds_out"]) == 1:
+ return args["conds_out"]
cond = args["conds_out"][0]
uncond = args["conds_out"][1]
diff --git a/comfy_extras/nodes_wan.py b/comfy_extras/nodes_wan.py
index b0bd471bf..d32aad98e 100644
--- a/comfy_extras/nodes_wan.py
+++ b/comfy_extras/nodes_wan.py
@@ -817,7 +817,7 @@ def get_sample_indices(original_fps,
if required_duration > total_frames / original_fps:
raise ValueError("required_duration must be less than video length")
- if not fixed_start is None and fixed_start >= 0:
+ if fixed_start is not None and fixed_start >= 0:
start_frame = fixed_start
else:
max_start = total_frames - required_origin_frames
diff --git a/nodes.py b/nodes.py
index d9e4ebd91..eae2f0086 100644
--- a/nodes.py
+++ b/nodes.py
@@ -2242,8 +2242,10 @@ async def init_external_custom_nodes():
for possible_module in possible_modules:
module_path = os.path.join(custom_node_path, possible_module)
- if os.path.isfile(module_path) and os.path.splitext(module_path)[1] != ".py": continue
- if module_path.endswith(".disabled"): continue
+ if os.path.isfile(module_path) and os.path.splitext(module_path)[1] != ".py":
+ continue
+ if module_path.endswith(".disabled"):
+ continue
if args.disable_all_custom_nodes and possible_module not in args.whitelist_custom_nodes:
logging.info(f"Skipping {possible_module} due to disable_all_custom_nodes and whitelist_custom_nodes")
continue
diff --git a/pyproject.toml b/pyproject.toml
index bc1467941..60378de1e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,12 +15,16 @@ lint.select = [
"N805", # invalid-first-argument-name-for-method
"S307", # suspicious-eval-usage
"S102", # exec
+ "E",
"T", # print-usage
"W",
# The "F" series in Ruff stands for "Pyflakes" rules, which catch various Python syntax errors and undefined names.
# See all rules here: https://docs.astral.sh/ruff/rules/#pyflakes-f
"F",
]
+
+lint.ignore = ["E501", "E722", "E731", "E712", "E402", "E741"]
+
exclude = ["*.ipynb", "**/generated/*.pyi"]
[tool.pylint]
diff --git a/server.py b/server.py
index c27f8be7d..70c8b5e3b 100644
--- a/server.py
+++ b/server.py
@@ -324,7 +324,7 @@ class PromptServer():
@routes.get("/models/{folder}")
async def get_models(request):
folder = request.match_info.get("folder", None)
- if not folder in folder_paths.folder_names_and_paths:
+ if folder not in folder_paths.folder_names_and_paths:
return web.Response(status=404)
files = folder_paths.get_filename_list(folder)
return web.json_response(files)
@@ -579,7 +579,7 @@ class PromptServer():
folder_name = request.match_info.get("folder_name", None)
if folder_name is None:
return web.Response(status=404)
- if not "filename" in request.rel_url.query:
+ if "filename" not in request.rel_url.query:
return web.Response(status=404)
filename = request.rel_url.query["filename"]
@@ -593,7 +593,7 @@ class PromptServer():
if out is None:
return web.Response(status=404)
dt = json.loads(out)
- if not "__metadata__" in dt:
+ if "__metadata__" not in dt:
return web.Response(status=404)
return web.json_response(dt["__metadata__"])