From befa42e6a47d03701b9d12e776ef41eeba5020ee Mon Sep 17 00:00:00 2001 From: TinyTerra Date: Thu, 18 May 2023 15:08:44 +0200 Subject: [PATCH] Fixed pipeLoader reloading model every gen --- .gitignore | 163 +--------------------------------------------- tinyterraNodes.py | 8 ++- 2 files changed, 7 insertions(+), 164 deletions(-) diff --git a/.gitignore b/.gitignore index 50ac305..270eaef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,162 +1,3 @@ -config.json +config.ini -# 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/ +__pycache__ \ No newline at end of file diff --git a/tinyterraNodes.py b/tinyterraNodes.py index 970ba2d..4d0bc9a 100644 --- a/tinyterraNodes.py +++ b/tinyterraNodes.py @@ -46,16 +46,18 @@ def update_loaded_objects(prompt): global loaded_objects # Extract all Efficient Loader class type entries - efficient_loader_entries = [entry for entry in prompt.values() if entry["class_type"] == "Efficient Loader"] + ttN_pipeLoader_entries = [entry for entry in prompt.values() if entry["class_type"] == "ttN pipeLoader"] # Collect all desired model, vae, and lora names desired_ckpt_names = set() desired_vae_names = set() desired_lora_names = set() - for entry in efficient_loader_entries: + for entry in ttN_pipeLoader_entries: desired_ckpt_names.add(entry["inputs"]["ckpt_name"]) desired_vae_names.add(entry["inputs"]["vae_name"]) - desired_lora_names.add(entry["inputs"]["lora_name"]) + desired_lora_names.add(entry["inputs"]["lora1_name"]) + desired_lora_names.add(entry["inputs"]["lora2_name"]) + desired_lora_names.add(entry["inputs"]["lora3_name"]) # Check and clear unused ckpt, clip, and bvae entries for list_key in ["ckpt", "clip", "bvae"]: