From 090a32d4ea096049c1554aff29500518ce01a30e Mon Sep 17 00:00:00 2001 From: "Alexander G. Morano" Date: Wed, 4 Sep 2024 08:05:06 -0700 Subject: [PATCH] import change for chromium tab crash added ComfyUI default "tooltips" as last fallback for help docs --- README.md | 5 +++++ __init__.py | 13 +++++++++---- pyproject.toml | 2 +- web/core/core_cozy_fields.js | 13 +++++++++---- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 001172d..074c96a 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,11 @@ If those nodes have descriptions written in HTML or Markdown, they will be conve ## UPDATES +**2024/09/04**: +* Import change for chromium tab crash +* Added ComfyUI default "tooltips" as last fallback for help docs +* Supports ComfyUI 0.2.1+, frontend 1.2.45+ + **2024/09/03**: * New `QUEUE TOO` Node focused on efficient image media loading. * Better reporting in `AKASHIC` Node for core ComfyUI types. diff --git a/__init__.py b/__init__.py index 56b4385..efbed9c 100644 --- a/__init__.py +++ b/__init__.py @@ -365,10 +365,14 @@ def _parse(cls, node: dict, node_cls: object) -> dict: continue for k, v in entry.items(): widget_data = v[1] if isinstance(v, (tuple, list,)) and len(v) > 1 else {} + # jovimetrix if (tip := widget_data.get("tooltips", None)) is None: + # cached if (tip := cls._tooltipsDB.get(k), None) is None: - logger.warning(f"no {k}") - continue + # comfyui standard + if (tip := widget_data.get("tooltip", None)) is None: + logger.warning(f"no {k}") + continue if cat == "outputs": data["outputs"][k] = tip else: @@ -957,8 +961,9 @@ def __init__(self, *arg, **kw) -> None: try: shutil.copy2(JOV_DEFAULT, JOV_CONFIG_FILE) logger.warning("---> DEFAULT CONFIGURATION <---") - except: - raise Exception("MAJOR 😿😰😬πŸ₯Ÿ BLUNDERCATS πŸ₯ŸπŸ˜¬πŸ˜°πŸ˜Ώ") + except Exception as e: + logger.error("MAJOR 😿😰😬πŸ₯Ÿ BLUNDERCATS πŸ₯ŸπŸ˜¬πŸ˜°πŸ˜Ώ") + logger.error(e) if JOV_IGNORE_NODE.exists(): JOV_IGNORE_NODE = configLoad(JOV_IGNORE_NODE, False) diff --git a/pyproject.toml b/pyproject.toml index 4902799..3013df5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "jovimetrix" description = "Integrates Webcam, MIDI, Spout and GLSL shader support. Animation via tick. Parameter manipulation with wave generator. Math operations with Unary and Binary support. Value conversion for all major types (int, string, list, dict, Image, Mask). Shape mask generation, image stacking and channel ops, batch splitting, merging and randomizing, load images and video from anywhere, dynamic bus routing with a single node, export support for GIPHY, save output anywhere! flatten, crop, transform; check colorblindness, make stereogram or stereoscopic images, or liner interpolate values and more." -version = "1.2.33" +version = "1.2.34" license = { file = "LICENSE" } dependencies = [ "aenum>=3.1.15,<4", diff --git a/web/core/core_cozy_fields.js b/web/core/core_cozy_fields.js index 718821f..b6996a8 100644 --- a/web/core/core_cozy_fields.js +++ b/web/core/core_cozy_fields.js @@ -28,6 +28,8 @@ app.registerExtension({ g_color_style = val; }, }); + + id = "color 🎨.thickness" app.ui.settings.addSetting({ id: `JOVIMETRIX πŸ”ΊπŸŸ©πŸ”΅.${id}`, @@ -41,10 +43,12 @@ app.registerExtension({ tooltip: "Line thickness around widgets in Round or Line Highlight Mode.", defaultValue: 1, onChange: function(val) { - util_config.setting_store(id, val); + setting_store(id, val); g_thickness = val; }, }); + + id = "color 🎨.highlight" app.ui.settings.addSetting({ id: `JOVIMETRIX πŸ”ΊπŸŸ©πŸ”΅.${id}`, @@ -53,7 +57,7 @@ app.registerExtension({ tooltip: "Color Highlight if Round or Line mode enabled. Hex code entry #FFF. The default will use the node base color.", defaultValue: "", onChange: function(val) { - util_config.setting_store(id, val); + setting_store(id, val); g_highlight = val; }, }); @@ -120,5 +124,6 @@ app.registerExtension({ } return me; } - }, -}) + } + */ +}) \ No newline at end of file