From 74458b7410d192ee5aab0935a5363cd620352200 Mon Sep 17 00:00:00 2001 From: Margen67 Date: Wed, 26 Feb 2025 19:40:58 -0800 Subject: [PATCH 1/2] More consistent formatting --- .github/workflows/stable-release.yml | 1 - comfy/hooks.py | 2 +- comfy/supported_models.py | 12 ++++++------ comfy/utils.py | 4 ++-- comfy_extras/nodes_morphology.py | 2 +- folder_paths.py | 2 +- nodes.py | 4 ++-- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml index 9de458b1e..557382382 100644 --- a/.github/workflows/stable-release.yml +++ b/.github/workflows/stable-release.yml @@ -1,4 +1,3 @@ - name: "Release Stable Version" on: diff --git a/comfy/hooks.py b/comfy/hooks.py index 9d0731072..0436e74ac 100644 --- a/comfy/hooks.py +++ b/comfy/hooks.py @@ -587,7 +587,7 @@ def get_sorted_list_via_attr(objects: list, attr: str) -> list: sorted_list.extend(object_list) return sorted_list -def create_transformer_options_from_hooks(model: ModelPatcher, hooks: HookGroup, transformer_options: dict[str]=None): +def create_transformer_options_from_hooks(model: ModelPatcher, hooks: HookGroup, transformer_options: dict[str]=None): # if no hooks or is not a ModelPatcher for sampling, return empty dict if hooks is None or model.is_clip: return {} diff --git a/comfy/supported_models.py b/comfy/supported_models.py index a8212c1fa..f4dba6254 100644 --- a/comfy/supported_models.py +++ b/comfy/supported_models.py @@ -602,10 +602,10 @@ class PixArtAlpha(supported_models_base.BASE): } sampling_settings = { - "beta_schedule" : "sqrt_linear", - "linear_start" : 0.0001, - "linear_end" : 0.02, - "timesteps" : 1000, + "beta_schedule": "sqrt_linear", + "linear_start": 0.0001, + "linear_end": 0.02, + "timesteps": 1000, } unet_extra_config = {} @@ -665,8 +665,8 @@ class HunyuanDiT1(HunyuanDiT): unet_extra_config = {} sampling_settings = { - "linear_start" : 0.00085, - "linear_end" : 0.03, + "linear_start": 0.00085, + "linear_end": 0.03, } class Flux(supported_models_base.BASE): diff --git a/comfy/utils.py b/comfy/utils.py index df7057c6a..6794bf045 100644 --- a/comfy/utils.py +++ b/comfy/utils.py @@ -443,8 +443,8 @@ PIXART_MAP_BLOCK = { ("mlp.fc1.bias", "ff.net.0.proj.bias"), ("mlp.fc2.weight", "ff.net.2.weight"), ("mlp.fc2.bias", "ff.net.2.bias"), - ("cross_attn.proj.weight" ,"attn2.to_out.0.weight"), - ("cross_attn.proj.bias" ,"attn2.to_out.0.bias"), + ("cross_attn.proj.weight", "attn2.to_out.0.weight"), + ("cross_attn.proj.bias", "attn2.to_out.0.bias"), } def pixart_to_diffusers(mmdit_config, output_prefix=""): diff --git a/comfy_extras/nodes_morphology.py b/comfy_extras/nodes_morphology.py index b1372b8ce..5013de0cf 100644 --- a/comfy_extras/nodes_morphology.py +++ b/comfy_extras/nodes_morphology.py @@ -8,7 +8,7 @@ class Morphology: @classmethod def INPUT_TYPES(s): return {"required": {"image": ("IMAGE",), - "operation": (["erode", "dilate", "open", "close", "gradient", "bottom_hat", "top_hat"],), + "operation": (["erode", "dilate", "open", "close", "gradient", "bottom_hat", "top_hat"],), "kernel_size": ("INT", {"default": 3, "min": 3, "max": 999, "step": 1}), }} diff --git a/folder_paths.py b/folder_paths.py index 72c70f594..560c561ae 100644 --- a/folder_paths.py +++ b/folder_paths.py @@ -84,7 +84,7 @@ class CacheHelper: cache_helper = CacheHelper() extension_mimetypes_cache = { - "webp" : "image", + "webp": "image", } def map_legacy(folder_name: str) -> str: diff --git a/nodes.py b/nodes.py index f7f6cb156..bd6d440db 100644 --- a/nodes.py +++ b/nodes.py @@ -1988,7 +1988,7 @@ NODE_CLASS_MAPPINGS = { "ImageBatch": ImageBatch, "ImagePadForOutpaint": ImagePadForOutpaint, "EmptyImage": EmptyImage, - "ConditioningAverage": ConditioningAverage , + "ConditioningAverage": ConditioningAverage, "ConditioningCombine": ConditioningCombine, "ConditioningConcat": ConditioningConcat, "ConditioningSetArea": ConditioningSetArea, @@ -2075,7 +2075,7 @@ NODE_DISPLAY_NAME_MAPPINGS = { "LatentUpscaleBy": "Upscale Latent By", "LatentComposite": "Latent Composite", "LatentBlend": "Latent Blend", - "LatentFromBatch" : "Latent From Batch", + "LatentFromBatch": "Latent From Batch", "RepeatLatentBatch": "Repeat Latent Batch", # Image "SaveImage": "Save Image", From c6ad7a4d0138b1219b7e9ef79749e7d8ced80d4f Mon Sep 17 00:00:00 2001 From: Margen67 Date: Wed, 26 Feb 2025 19:46:50 -0800 Subject: [PATCH 2/2] Remove whitespace --- .github/workflows/test-unit.yml | 2 +- README.md | 6 +++--- pytest.ini | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 78c918031..f01fac038 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -15,7 +15,7 @@ jobs: continue-on-error: true steps: - uses: actions/checkout@v4 - - name: Set up Python + - name: Set up Python uses: actions/setup-python@v4 with: python-version: '3.12' diff --git a/README.md b/README.md index 9190dd493..9049f6071 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ ComfyUI lets you design and execute advanced stable diffusion pipelines using a ## Get Started #### [Desktop Application](https://www.comfy.org/download) -- The easiest way to get started. +- The easiest way to get started. - Available on Windows & macOS. #### [Windows Portable Package](#installing) @@ -188,7 +188,7 @@ This is the command to install the nightly with ROCm 6.3 which might have some p ### Intel GPUs (Windows and Linux) (Option 1) Intel Arc GPU users can install native PyTorch with torch.xpu support using pip (currently available in PyTorch nightly builds). More information can be found [here](https://pytorch.org/docs/main/notes/get_start_xpu.html) - + 1. To install PyTorch nightly, use the following command: ```pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/xpu``` @@ -319,7 +319,7 @@ Generate a self-signed certificate (not appropriate for shared/production use) a Use `--tls-keyfile key.pem --tls-certfile cert.pem` to enable TLS/SSL, the app will now be accessible with `https://...` instead of `http://...`. -> Note: Windows users can use [alexisrolland/docker-openssl](https://github.com/alexisrolland/docker-openssl) or one of the [3rd party binary distributions](https://wiki.openssl.org/index.php/Binaries) to run the command example above. +> Note: Windows users can use [alexisrolland/docker-openssl](https://github.com/alexisrolland/docker-openssl) or one of the [3rd party binary distributions](https://wiki.openssl.org/index.php/Binaries) to run the command example above.

If you use a container, note that the volume mount `-v` can be a relative path so `... -v ".\:/openssl-certs" ...` would create the key & cert files in the current directory of your command prompt or powershell terminal. ## Support and dev channel diff --git a/pytest.ini b/pytest.ini index a224d8cbb..f518a1fa4 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,5 +1,5 @@ [pytest] -markers = +markers = inference: mark as inference test (deselect with '-m "not inference"') execution: mark as execution test (deselect with '-m "not execution"') testpaths =