From 4fa0b9ddeebd90596223e2fee4955e504f2414fd Mon Sep 17 00:00:00 2001 From: Crystian Date: Mon, 1 Jul 2024 01:21:08 +0200 Subject: [PATCH] some fixes: utf-8 from nvidia driver is supported comfyui files added read metadata from webp --- .others/version.py | 20 ++++++++++++++++++++ __init__.py | 2 +- core/version.py | 2 +- docs/screwdriver.png | Bin 0 -> 2644 bytes general/gpu.py | 8 +++++++- nodes/image.py | 37 +++++++++++++++++++++++++++++-------- pyproject.toml | 28 ++++++++++++++-------------- requirements.txt | 1 + version | 2 +- 9 files changed, 74 insertions(+), 26 deletions(-) create mode 100644 docs/screwdriver.png diff --git a/.others/version.py b/.others/version.py index 50922f6..ac4beff 100644 --- a/.others/version.py +++ b/.others/version.py @@ -38,3 +38,23 @@ print(f"> File2 {file2}") with open(file2, "w") as f2: f2.writelines([f"version = \"{version}\"\n"]) + +# modify pyproject.toml file with @version +file3 = os.path.join(os.path.dirname(__file__), "../pyproject.toml") +print(f"> File3: {file3}") + +file3VersionFound = False +# lines = None +with open(file3, "r") as f: + lines = f.readlines() + for line in lines: + + if "version = " in line: + file3VersionFound = True + lines[lines.index(line)] = f"version = \"{version}\"\n" + +if not file3VersionFound: + raise RuntimeError(f"Version label not found in file: {file3}") + +with open(file3, "w") as f3: + f3.writelines(lines) diff --git a/__init__.py b/__init__.py index 55bde3b..ed1d33f 100644 --- a/__init__.py +++ b/__init__.py @@ -2,7 +2,7 @@ @author: Crystian @title: Crystools @nickname: Crystools -@version: 1.12.0 +@version: 1.13.0 @project: "https://github.com/crystian/ComfyUI-Crystools", @description: Plugins for multiples uses, mainly for debugging, you need them! IG: https://www.instagram.com/crystian.ia """ diff --git a/core/version.py b/core/version.py index 6f73501..e3d9739 100644 --- a/core/version.py +++ b/core/version.py @@ -1 +1 @@ -version = "1.12.0" +version = "1.13.0" diff --git a/docs/screwdriver.png b/docs/screwdriver.png new file mode 100644 index 0000000000000000000000000000000000000000..61a05747f309e5839bc3eab633be3153f06a23fe GIT binary patch literal 2644 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.5.0", "pynvml", "py-cpuinfo"] - -[project.urls] -Repository = "https://github.com/crystian/ComfyUI-Crystools" - -[tool.comfy] -PublisherId = "" -DisplayName = "ComfyUI-Crystools" -Icon = "" +[project] +name = "comfyui-crystools" +description = "With this suit, you can see the resources monitor, progress bar & time elapsed, metadata and compare between two images, compare between two JSONs, show any value to console/display, pipes, and more!\nThis provides better nodes to load/save images, previews, etc, and see \"hidden\" data without loading a new workflow." +version = "1.13.0" +license = "LICENSE" +dependencies = ["deepdiff", "torch", "numpy", "Pillow>=9.5.0", "pynvml", "py-cpuinfo"] + +[project.urls] +Repository = "https://github.com/crystian/ComfyUI-Crystools" + +[tool.comfy] +PublisherId = "crystian" +DisplayName = "ComfyUI-Crystools" +Icon = "https://raw.githubusercontent.com/crystian/ComfyUI-Crystools/main/docs/screwdriver.png" diff --git a/requirements.txt b/requirements.txt index 21f0496..d61acb5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,4 @@ numpy Pillow>=9.5.0 pynvml py-cpuinfo +piexif diff --git a/version b/version index 0eed1a2..feaae22 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.12.0 +1.13.0