From bfbd4e33e1b75b00d7cf26b77777cfa3bd4d86c3 Mon Sep 17 00:00:00 2001 From: Zuellni <123005779+Zuellni@users.noreply.github.com> Date: Fri, 23 Aug 2024 22:15:43 +0200 Subject: [PATCH] Fix default values not showing in preview --- .gitignore | 160 --------------------------------------------------- README.md | 4 +- pickscore.py | 24 ++++++-- 3 files changed, 20 insertions(+), 168 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 68bc17f..0000000 --- a/.gitignore +++ /dev/null @@ -1,160 +0,0 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ -cover/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -.pybuilder/ -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -# For a library or package, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# .python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# poetry -# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. -# This is especially recommended for binary packages to ensure reproducibility, and is more -# commonly ignored for libraries. -# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control -#poetry.lock - -# pdm -# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. -#pdm.lock -# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it -# in version control. -# https://pdm.fming.dev/#use-with-ide -.pdm.toml - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ - -# pytype static type analyzer -.pytype/ - -# Cython debug symbols -cython_debug/ - -# PyCharm -# JetBrains specific template is maintained in a separate JetBrains.gitignore that can -# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore -# and can be added to the global gitignore or merged into this file. For a more nuclear -# option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ diff --git a/README.md b/README.md index bf006b5..3e3eb38 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,11 @@ git clone https://github.com/Zuellni/ComfyUI-PickScore-Nodes custom_nodes/ComfyU ## Nodes Name | Description :--- | :--- -Loader | Loads scoring models from [Hugging Face](https://huggingface.co) or a given directory. The [default model](https://huggingface.co/yuvalkirstain/PickScore_v1) is about 4 GB. +Loader | Loads scoring models from [Hugging Face](https://huggingface.co) or a given directory. Uses [yuvalkirstain/PickScore_v1](https://huggingface.co/yuvalkirstain/PickScore_v1) by default. Processor | Takes images/text and converts them to inputs for the `Selector` node. Selector | Selects up to `limit` images and passes them to other nodes along with latents/masks of the same shape. Interrupts processing if the `threshold` isn't reached. ## Workflow An example workflow is embedded in the image below and can be opened in ComfyUI. -![workflow](https://github.com/Zuellni/ComfyUI-PickScore-Nodes/assets/123005779/9f439d31-c3cc-4e06-b650-eb2e102344e6) +![Workflow](https://github.com/Zuellni/ComfyUI-PickScore-Nodes/assets/123005779/9f439d31-c3cc-4e06-b650-eb2e102344e6) diff --git a/pickscore.py b/pickscore.py index 7951d77..e2dfed7 100644 --- a/pickscore.py +++ b/pickscore.py @@ -1,9 +1,13 @@ import torch from transformers import CLIPModel, CLIPProcessor -from comfy.model_management import InterruptProcessingException, get_torch_device +from comfy.model_management import ( + InterruptProcessingException, + get_torch_device, + soft_empty_cache, +) -_CATEGORY = "Zuellni/PickScore" +_CATEGORY = "zuellni/pickscore" _MAPPING = "ZuellniPickScore" @@ -23,8 +27,12 @@ class Loader: def setup(self, path): self.device = get_torch_device() - self.dtype = torch.float32 if self.device == torch.device("cpu") else torch.float16 - self.pipeline = CLIPModel.from_pretrained(path, torch_dtype=self.dtype).eval() + + self.dtype = ( + torch.float32 if self.device == torch.device("cpu") else torch.float16 + ) + + self.model = CLIPModel.from_pretrained(path, torch_dtype=self.dtype).eval() self.processor = CLIPProcessor.from_pretrained(path) return (self,) @@ -34,6 +42,7 @@ class Loader: def offload(self): self.pipeline.cpu() + soft_empty_cache() class Processor: @@ -43,7 +52,7 @@ class Processor: "required": { "model": ("PS_MODEL",), "images": ("IMAGE",), - "text": ("STRING", {"multiline": True}), + "text": ("STRING", {"default": "", "multiline": True}), }, } @@ -77,7 +86,10 @@ class Selector: "required": { "model": ("PS_MODEL",), "inputs": ("PS_INPUTS",), - "threshold": ("FLOAT", {"max": 1, "step": 0.001}), + "threshold": ( + "FLOAT", + {"default": 0.0, "min": 0.0, "max": 1.0, "step": 0.001}, + ), "limit": ("INT", {"default": 1, "min": 1, "max": 1000}), }, "optional": {