+# Usage
-
+```bash
+cd /path/to/ComfyUI/custom_nodes
+git clone https://github.com/hayden-fr/ComfyUI-Model-Manager.git
+cd /path/to/ComfyUI/custom_nodes/ComfyUI-Model-Manager
+npm install
+npm run build
+```
## Features
-### Node Graph
+## Freely adjust size and position
-
+
+
+### Support Node Graph
+
+
- Drag a model thumbnail onto the graph to add a new node.
- Drag a model thumbnail onto an existing node to set the input field.
- If there are multiple valid possible fields, then the drag must be exact.
- Drag an embedding thumbnail onto a text area, or highlight any number of nodes, to append it onto the end of the text.
- Drag the preview image in a model's info view onto the graph to load the embedded workflow (if it exists).
-
-
-
- Press the "copy" button to copy a model to ComfyUI's clipboard or copy the embedding to the system clipboard. (Copying the embedding to the system clipboard requires a secure http connection.)
- Press the "add" button to add the model to the ComfyUI graph or append the embedding to one or more selected nodes.
- Press the "load workflow" button to try and load a workflow embedded in a model's preview image.
### Download Tab
-
+
- View multiple models associated with a url.
- Select a save directory and input a filename.
- Optionally set a model's preview image.
-- Optionally edit and save descriptions as a .txt note. (Default behavior can be set in the settings tab.)
-- Add Civitai and HuggingFace API tokens in `server_settings.yaml`.
+- Optionally edit and save descriptions as a .md note.
+- Add Civitai and HuggingFace API tokens in ComfyUI's settings.
+
+
### Models Tab
-
+
- Search in real-time for models using the search bar.
-- Use advance keyword search by typing `"multiple words in quotes"` or a minus sign before to `-exclude` a word or phrase.
-- Add `/` at the start of a search to view a dropdown list of subdirectories (for example, `/0/1.5/styles/clothing`).
- - Any directory paths in ComfyUI's `extra_model_paths.yaml` or directories added in `ComfyUI/models/` will automatically be detected.
-- Sort models by "Date Created", "Date Modified", "Name" and "File Size".
+- Sort models by "Name", "File Size", "Date Created" and "Date Modified".
### Model Info View
-
+
- View file info and metadata.
- Rename, move or **permanently** remove a model and all of it's related files.
-- Read, edit and save notes. (Saved as a `.txt` file beside the model).
- - `Ctrl+s` or `⌘+S` to save a note when the textarea is in focus.
- - Autosave can be enabled in settings. (Note: Once the model info view is closed, the undo history is lost.)
+- Read, edit and save notes. (Saved as a `.md` file beside the model).
- Change or remove a model's preview image.
- View training tags and use the random tag generator to generate prompt ideas. (Inspired by the one in A1111.)
-
-### Settings Tab
-
-
-
-- Settings are saved to `ui_settings.yaml`.
-- Most settings should update immediately, but a few may require a page reload to take effect.
-- Press the "Fix Extensions" button to correct all image file extensions in the model directories. (Note: This may take a minute or so to complete.)
diff --git a/__init__.py b/__init__.py
index f63cc65..87cbb38 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,1232 +1,201 @@
import os
-import io
-import pathlib
-import shutil
-from datetime import datetime
-import sys
-import copy
-import importlib
-import re
-import base64
-
-from aiohttp import web
-import server
-import urllib.parse
-import urllib.request
-import struct
-import json
-import requests
-requests.packages.urllib3.disable_warnings()
-
-import comfy.utils
import folder_paths
-
-comfyui_model_uri = folder_paths.models_dir
-
-extension_uri = os.path.dirname(__file__)
-
-config_loader_path = os.path.join(extension_uri, 'config_loader.py')
-config_loader_spec = importlib.util.spec_from_file_location('config_loader', config_loader_path)
-config_loader = importlib.util.module_from_spec(config_loader_spec)
-config_loader_spec.loader.exec_module(config_loader)
-
-no_preview_image = os.path.join(extension_uri, "no-preview.png")
-ui_settings_uri = os.path.join(extension_uri, "ui_settings.yaml")
-server_settings_uri = os.path.join(extension_uri, "server_settings.yaml")
-
-fallback_model_extensions = set([".bin", ".ckpt", ".gguf", ".onnx", ".pt", ".pth", ".safetensors"]) # TODO: magic values
-jpeg_format_names = ["JPG", "JPEG", "JFIF"]
-image_extensions = (
- ".png", # order matters
- ".webp",
- ".jpeg",
- ".jpg",
- ".jfif",
- ".gif",
- ".apng",
-)
-stable_diffusion_webui_civitai_helper_image_extensions = (
- ".preview.png", # order matters
- ".preview.webp",
- ".preview.jpeg",
- ".preview.jpg",
- ".preview.jfif",
- ".preview.gif",
- ".preview.apng",
-)
-preview_extensions = ( # TODO: JavaScript does not know about this (x2 states)
- image_extensions + # order matters
- stable_diffusion_webui_civitai_helper_image_extensions
-)
-model_info_extension = ".txt"
-#video_extensions = (".avi", ".mp4", ".webm") # TODO: Requires ffmpeg or cv2. Cache preview frame?
-
-def split_valid_ext(s, *arg_exts):
- sl = s.lower()
- for exts in arg_exts:
- for ext in exts:
- if sl.endswith(ext.lower()):
- return (s[:-len(ext)], ext)
- return (s, "")
-
-_folder_names_and_paths = None # dict[str, tuple[list[str], list[str]]]
-def folder_paths_folder_names_and_paths(refresh = False):
- global _folder_names_and_paths
- if refresh or _folder_names_and_paths is None:
- _folder_names_and_paths = {}
- for item_name in os.listdir(comfyui_model_uri):
- item_path = os.path.join(comfyui_model_uri, item_name)
- if not os.path.isdir(item_path):
- continue
- if item_name == "configs":
- continue
- if item_name in folder_paths.folder_names_and_paths:
- dir_paths, extensions = copy.deepcopy(folder_paths.folder_names_and_paths[item_name])
- else:
- dir_paths = [item_path]
- extensions = copy.deepcopy(fallback_model_extensions)
- _folder_names_and_paths[item_name] = (dir_paths, extensions)
- return _folder_names_and_paths
-
-def folder_paths_get_folder_paths(folder_name, refresh = False): # API function crashes querying unknown model folder
- paths = folder_paths_folder_names_and_paths(refresh)
- if folder_name in paths:
- return paths[folder_name][0]
-
- maybe_path = os.path.join(comfyui_model_uri, folder_name)
- if os.path.exists(maybe_path):
- return [maybe_path]
- return []
-
-def folder_paths_get_supported_pt_extensions(folder_name, refresh = False): # Missing API function
- paths = folder_paths_folder_names_and_paths(refresh)
- if folder_name in paths:
- return paths[folder_name][1]
- model_extensions = copy.deepcopy(fallback_model_extensions)
- return model_extensions
+from .py import config
+from .py import utils
-def search_path_to_system_path(model_path):
- sep = os.path.sep
- model_path = os.path.normpath(model_path.replace("/", sep))
- model_path = model_path.lstrip(sep)
+# Init config settings
+config.extension_uri = os.path.dirname(__file__)
+utils.resolve_model_base_paths()
- isep1 = model_path.find(sep, 0)
- if isep1 == -1 or isep1 == len(model_path):
- return (None, None)
+version = utils.get_current_version()
+utils.download_web_distribution(version)
- isep2 = model_path.find(sep, isep1 + 1)
- if isep2 == -1 or isep2 - isep1 == 1:
- isep2 = len(model_path)
- model_path_type = model_path[0:isep1]
- paths = folder_paths_get_folder_paths(model_path_type)
- if len(paths) == 0:
- return (None, None)
+import logging
+from aiohttp import web
+import traceback
+from .py import services
- model_path_index = model_path[isep1 + 1:isep2]
+
+routes = config.routes
+
+
+@routes.get("/model-manager/ws")
+async def socket_handler(request):
+ """
+ Handle websocket connection.
+ """
+ ws = await services.connect_websocket(request)
+ return ws
+
+
+@routes.get("/model-manager/base-folders")
+async def get_model_paths(request):
+ """
+ Returns the base folders for models.
+ """
+ model_base_paths = config.model_base_paths
+ return web.json_response({"success": True, "data": model_base_paths})
+
+
+@routes.post("/model-manager/model")
+async def create_model(request):
+ """
+ Create a new model.
+
+ request body: x-www-form-urlencoded
+ - type: model type.
+ - pathIndex: index of the model folders.
+ - fullname: filename that relative to the model folder.
+ - previewFile: preview file.
+ - description: description.
+ - downloadPlatform: download platform.
+ - downloadUrl: download url.
+ - hash: a JSON string containing the hash value of the downloaded model.
+ """
+ post = await request.post()
try:
- model_path_index = int(model_path_index)
- except:
- return (None, None)
- if model_path_index < 0 or model_path_index >= len(paths):
- return (None, None)
-
- system_path = os.path.normpath(
- paths[model_path_index] +
- sep +
- model_path[isep2:]
- )
-
- return (system_path, model_path_type)
-
-
-def get_safetensor_header(path):
- try:
- header_bytes = comfy.utils.safetensors_header(path)
- header_json = json.loads(header_bytes)
- return header_json if header_json is not None else {}
- except:
- return {}
-
-
-def end_swap_and_pop(x, i):
- x[i], x[-1] = x[-1], x[i]
- return x.pop(-1)
-
-
-def model_type_to_dir_name(model_type):
- if model_type == "checkpoint": return "checkpoints"
- #elif model_type == "clip": return "clip"
- #elif model_type == "clip_vision": return "clip_vision"
- #elif model_type == "controlnet": return "controlnet"
- elif model_type == "diffuser": return "diffusers"
- elif model_type == "embedding": return "embeddings"
- #elif model_type== "gligen": return "gligen"
- elif model_type == "hypernetwork": return "hypernetworks"
- elif model_type == "lora": return "loras"
- #elif model_type == "style_models": return "style_models"
- #elif model_type == "unet": return "unet"
- elif model_type == "upscale_model": return "upscale_models"
- #elif model_type == "vae": return "vae"
- #elif model_type == "vae_approx": return "vae_approx"
- else: return model_type
-
-
-def ui_rules():
- Rule = config_loader.Rule
- return [
- Rule("model-search-always-append", "", str),
- Rule("model-default-browser-model-type", "checkpoints", str),
- Rule("model-real-time-search", True, bool),
- Rule("model-persistent-search", True, bool),
-
- Rule("model-preview-thumbnail-type", "AUTO", str),
- Rule("model-preview-fallback-search-safetensors-thumbnail", False, bool),
- Rule("model-preview-thumbnail-width", 240, int, 150, 480),
- Rule("model-preview-thumbnail-height", 360, int, 185, 480),
- Rule("model-show-label-extensions", False, bool),
- Rule("model-show-add-button", True, bool),
- Rule("model-show-copy-button", True, bool),
- Rule("model-show-load-workflow-button", True, bool),
- Rule("model-info-button-on-left", False, bool),
- Rule("model-buttons-only-on-hover", False, bool),
-
- Rule("model-add-embedding-extension", False, bool),
- Rule("model-add-drag-strict-on-field", False, bool),
- Rule("model-add-offset", 25, int),
-
- Rule("model-info-autosave-notes", False, bool),
-
- Rule("download-save-description-as-text-file", True, bool),
-
- Rule("sidebar-control-always-compact", False, bool),
- Rule("sidebar-default-width", 0.5, float, 0.0, 1.0),
- Rule("sidebar-default-height", 0.5, float, 0.0, 1.0),
- Rule("sidebar-default-state", "None", str),
- Rule("text-input-always-hide-search-button", False, bool),
- Rule("text-input-always-hide-clear-button", False, bool),
-
- Rule("tag-generator-sampler-method", "Frequency", str),
- Rule("tag-generator-count", 10, int),
- Rule("tag-generator-threshold", 2, int),
- ]
-
-
-def server_rules():
- Rule = config_loader.Rule
- return [
- #Rule("model_extension_download_whitelist", [".safetensors"], list),
- Rule("civitai_api_key", "", str),
- Rule("huggingface_api_key", "", str),
- ]
-server_settings = config_loader.yaml_load(server_settings_uri, server_rules())
-config_loader.yaml_save(server_settings_uri, server_rules(), server_settings)
-
-
-def get_def_headers(url=""):
- def_headers = {
- "User-Agent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",
- }
-
- if url.startswith("https://civitai.com/"):
- api_key = server_settings["civitai_api_key"]
- if (api_key != ""):
- def_headers["Authorization"] = f"Bearer {api_key}"
- url += "&" if "?" in url else "?" # not the most robust solution
- url += f"token={api_key}" # TODO: Authorization didn't work in the header
- elif url.startswith("https://huggingface.co/"):
- api_key = server_settings["huggingface_api_key"]
- if api_key != "":
- def_headers["Authorization"] = f"Bearer {api_key}"
-
- return def_headers
-
-
-@server.PromptServer.instance.routes.get("/model-manager/timestamp")
-async def get_timestamp(request):
- return web.json_response({ "timestamp": datetime.now().timestamp() })
-
-
-@server.PromptServer.instance.routes.get("/model-manager/settings/load")
-async def load_ui_settings(request):
- rules = ui_rules()
- settings = config_loader.yaml_load(ui_settings_uri, rules)
- return web.json_response({ "settings": settings })
-
-
-@server.PromptServer.instance.routes.post("/model-manager/settings/save")
-async def save_ui_settings(request):
- body = await request.json()
- settings = body.get("settings")
- rules = ui_rules()
- validated_settings = config_loader.validated(rules, settings)
- success = config_loader.yaml_save(ui_settings_uri, rules, validated_settings)
- print("Saved file: " + ui_settings_uri)
- return web.json_response({
- "success": success,
- "settings": validated_settings if success else "",
- })
-
-
-from PIL import Image, TiffImagePlugin
-from PIL.PngImagePlugin import PngInfo
-def PIL_cast_serializable(v):
- # source: https://github.com/python-pillow/Pillow/issues/6199#issuecomment-1214854558
- if isinstance(v, TiffImagePlugin.IFDRational):
- return float(v)
- elif isinstance(v, tuple):
- return tuple(PIL_cast_serializable(t) for t in v)
- elif isinstance(v, bytes):
- return v.decode(errors="replace")
- elif isinstance(v, dict):
- for kk, vv in v.items():
- v[kk] = PIL_cast_serializable(vv)
- return v
- else:
- return v
-
-
-def get_safetensors_image_bytes(path):
- if not os.path.isfile(path):
- raise RuntimeError("Path was invalid!")
- header = get_safetensor_header(path)
- metadata = header.get("__metadata__", None)
- if metadata is None:
- return None
- thumbnail = metadata.get("modelspec.thumbnail", None)
- if thumbnail is None:
- return None
- image_data = thumbnail.split(',')[1]
- return base64.b64decode(image_data)
-
-
-def get_image_info(image):
- metadata = None
- if len(image.info) > 0:
- metadata = PngInfo()
- for (key, value) in image.info.items():
- value_str = str(PIL_cast_serializable(value)) # not sure if this is correct (sometimes includes exif)
- metadata.add_text(key, value_str)
- return metadata
-
-
-def image_format_is_equal(f1, f2):
- if not isinstance(f1, str) or not isinstance(f2, str):
- return False
- if f1[0] == ".": f1 = f1[1:]
- if f2[0] == ".": f2 = f2[1:]
- f1 = f1.upper()
- f2 = f2.upper()
- return f1 == f2 or (f1 in jpeg_format_names and f2 in jpeg_format_names)
-
-
-def get_auto_thumbnail_format(original_format):
- if original_format in ["JPEG", "WEBP", "JPG"]: # JFIF?
- return original_format
- return "JPEG" # default fallback
-
-
-@server.PromptServer.instance.routes.get("/model-manager/preview/get")
-async def get_model_preview(request):
- uri = request.query.get("uri")
- quality = 75
- response_image_format = request.query.get("image-format", None)
- if isinstance(response_image_format, str):
- response_image_format = response_image_format.upper()
-
- image_path = no_preview_image
- file_name = os.path.split(no_preview_image)[1]
- if uri != "no-preview":
- sep = os.path.sep
- uri = uri.replace("/" if sep == "\\" else "/", sep)
- path, _ = search_path_to_system_path(uri)
- head, extension = split_valid_ext(path, preview_extensions)
- if os.path.exists(path):
- image_path = path
- file_name = os.path.split(head)[1] + extension
- elif os.path.exists(head) and head.endswith(".safetensors"):
- image_path = head
- file_name = os.path.splitext(os.path.split(head)[1])[0] + extension
-
- w = request.query.get("width")
- h = request.query.get("height")
- try:
- w = int(w)
- if w < 1:
- w = None
- except:
- w = None
- try:
- h = int(h)
- if w < 1:
- h = None
- except:
- h = None
-
- image_data = None
- if w is None and h is None: # full size
- if image_path.endswith(".safetensors"):
- image_data = get_safetensors_image_bytes(image_path)
- else:
- with open(image_path, "rb") as image:
- image_data = image.read()
- fp = io.BytesIO(image_data)
- with Image.open(fp) as image:
- image_format = image.format
- if response_image_format is None:
- response_image_format = image_format
- elif response_image_format == "AUTO":
- response_image_format = get_auto_thumbnail_format(image_format)
-
- if not image_format_is_equal(response_image_format, image_format):
- exif = image.getexif()
- metadata = get_image_info(image)
- if response_image_format in jpeg_format_names:
- image = image.convert('RGB')
- image_bytes = io.BytesIO()
- image.save(image_bytes, format=response_image_format, exif=exif, pnginfo=metadata, quality=quality)
- image_data = image_bytes.getvalue()
- else:
- if image_path.endswith(".safetensors"):
- image_data = get_safetensors_image_bytes(image_path)
- fp = io.BytesIO(image_data)
- else:
- fp = image_path
-
- with Image.open(fp) as image:
- image_format = image.format
- if response_image_format is None:
- response_image_format = image_format
- elif response_image_format == "AUTO":
- response_image_format = get_auto_thumbnail_format(image_format)
-
- w0, h0 = image.size
- if w is None:
- w = (h * w0) // h0
- elif h is None:
- h = (w * h0) // w0
-
- exif = image.getexif()
- metadata = get_image_info(image)
-
- ratio_original = w0 / h0
- ratio_thumbnail = w / h
- if abs(ratio_original - ratio_thumbnail) < 0.01:
- crop_box = (0, 0, w0, h0)
- elif ratio_original > ratio_thumbnail:
- crop_width_fp = h0 * w / h
- x0 = int((w0 - crop_width_fp) / 2)
- crop_box = (x0, 0, x0 + int(crop_width_fp), h0)
- else:
- crop_height_fp = w0 * h / w
- y0 = int((h0 - crop_height_fp) / 2)
- crop_box = (0, y0, w0, y0 + int(crop_height_fp))
- image = image.crop(crop_box)
-
- if w < w0 and h < h0:
- resampling_method = Image.Resampling.BOX
- else:
- resampling_method = Image.Resampling.BICUBIC
- image.thumbnail((w, h), resample=resampling_method)
-
- if not image_format_is_equal(image_format, response_image_format) and response_image_format in jpeg_format_names:
- image = image.convert('RGB')
- image_bytes = io.BytesIO()
- image.save(image_bytes, format=response_image_format, exif=exif, pnginfo=metadata, quality=quality)
- image_data = image_bytes.getvalue()
-
- response_file_name = os.path.splitext(file_name)[0] + '.' + response_image_format.lower()
- return web.Response(
- headers={
- "Content-Disposition": f"inline; filename={response_file_name}",
- },
- body=image_data,
- content_type="image/" + response_image_format.lower(),
- )
-
-
-@server.PromptServer.instance.routes.get("/model-manager/image/extensions")
-async def get_image_extensions(request):
- return web.json_response(image_extensions)
-
-
-def download_model_preview(formdata):
- path = formdata.get("path", None)
- if type(path) is not str:
- raise ValueError("Invalid path!")
- path, model_type = search_path_to_system_path(path)
- model_type_extensions = folder_paths_get_supported_pt_extensions(model_type)
- path_without_extension, _ = split_valid_ext(path, model_type_extensions)
-
- overwrite = formdata.get("overwrite", "true").lower()
- overwrite = True if overwrite == "true" else False
-
- image = formdata.get("image", None)
- if type(image) is str:
- civitai_image_url = "https://civitai.com/images/"
- if image.startswith(civitai_image_url):
- image_id = re.search(r"^\d+", image[len(civitai_image_url):]).group(0)
- image_id = str(int(image_id))
- image_info_url = f"https://civitai.com/api/v1/images?imageId={image_id}"
- def_headers = get_def_headers(image_info_url)
- response = requests.get(
- url=image_info_url,
- stream=False,
- verify=False,
- headers=def_headers,
- proxies=None,
- allow_redirects=False,
- )
- if response.ok:
- content_type = response.headers.get("Content-Type")
- info = response.json()
- items = info["items"]
- if len(items) == 0:
- raise RuntimeError("Civitai /api/v1/images returned 0 items!")
- image = items[0]["url"]
- else:
- raise RuntimeError("Bad response from api/v1/images!")
- _, image_extension = split_valid_ext(image, image_extensions)
- if image_extension == "":
- raise ValueError("Invalid image type!")
- image_path = path_without_extension + image_extension
- download_file(image, image_path, overwrite)
- else:
- content_type = image.content_type
- if not content_type.startswith("image/"):
- raise RuntimeError("Invalid content type!")
- image_extension = "." + content_type[len("image/"):]
- if image_extension not in image_extensions:
- raise RuntimeError("Invalid extension!")
-
- image_path = path_without_extension + image_extension
- if not overwrite and os.path.isfile(image_path):
- raise RuntimeError("Image already exists!")
- file: io.IOBase = image.file
- image_data = file.read()
- with open(image_path, "wb") as f:
- f.write(image_data)
- print("Saved file: " + image_path)
-
- if overwrite:
- delete_same_name_files(path_without_extension, preview_extensions, image_extension)
-
- # detect (and try to fix) wrong file extension
- image_format = None
- with Image.open(image_path) as image:
- image_format = image.format
- image_dir_and_name, image_ext = os.path.splitext(image_path)
- if not image_format_is_equal(image_format, image_ext):
- corrected_image_path = image_dir_and_name + "." + image_format.lower()
- if os.path.exists(corrected_image_path) and not overwrite:
- print("WARNING: '" + image_path + "' has wrong extension!")
- else:
- os.rename(image_path, corrected_image_path)
- print("Saved file: " + corrected_image_path)
- image_path = corrected_image_path
- return image_path # return in-case need corrected path
-
-
-@server.PromptServer.instance.routes.post("/model-manager/preview/set")
-async def set_model_preview(request):
- formdata = await request.post()
- try:
- download_model_preview(formdata)
- return web.json_response({ "success": True })
- except ValueError as e:
- print(e, file=sys.stderr, flush=True)
- return web.json_response({
- "success": False,
- "alert": "Failed to set preview!\n\n" + str(e),
- })
-
-
-@server.PromptServer.instance.routes.post("/model-manager/preview/delete")
-async def delete_model_preview(request):
- result = { "success": False }
-
- model_path = request.query.get("path", None)
- if model_path is None:
- result["alert"] = "Missing model path!"
- return web.json_response(result)
- model_path = urllib.parse.unquote(model_path)
-
- model_path, model_type = search_path_to_system_path(model_path)
- model_extensions = folder_paths_get_supported_pt_extensions(model_type)
- path_and_name, _ = split_valid_ext(model_path, model_extensions)
- delete_same_name_files(path_and_name, preview_extensions)
-
- result["success"] = True
- return web.json_response(result)
-
-
-def correct_image_extensions(root_dir):
- detected_image_count = 0
- corrected_image_count = 0
- for root, dirs, files in os.walk(root_dir):
- for file_name in files:
- file_path = root + os.path.sep + file_name
- image_format = None
- try:
- with Image.open(file_path) as image:
- image_format = image.format
- except:
- continue
- image_path = file_path
- image_dir_and_name, image_ext = os.path.splitext(image_path)
- if not image_format_is_equal(image_format, image_ext):
- detected_image_count += 1
- corrected_image_path = image_dir_and_name + "." + image_format.lower()
- if os.path.exists(corrected_image_path):
- print("WARNING: '" + image_path + "' has wrong extension!")
- else:
- try:
- os.rename(image_path, corrected_image_path)
- except:
- print("WARNING: Unable to rename '" + image_path + "'!")
- continue
- ext0 = os.path.splitext(image_path)[1]
- ext1 = os.path.splitext(corrected_image_path)[1]
- print(f"({ext0} -> {ext1}): {corrected_image_path}")
- corrected_image_count += 1
- return (detected_image_count, corrected_image_count)
-
-
-@server.PromptServer.instance.routes.get("/model-manager/preview/correct-extensions")
-async def correct_preview_extensions(request):
- result = { "success": False }
-
- detected = 0
- corrected = 0
-
- model_types = os.listdir(comfyui_model_uri)
- model_types.remove("configs")
- model_types.sort()
-
- for model_type in model_types:
- for base_path_index, model_base_path in enumerate(folder_paths_get_folder_paths(model_type)):
- if not os.path.exists(model_base_path): # TODO: Bug in main code? ("ComfyUI\output\checkpoints", "ComfyUI\output\clip", "ComfyUI\models\t2i_adapter", "ComfyUI\output\vae")
- continue
- d, c = correct_image_extensions(model_base_path)
- detected += d
- corrected += c
-
- result["success"] = True
- result["detected"] = detected
- result["corrected"] = corrected
- return web.json_response(result)
-
-
-@server.PromptServer.instance.routes.get("/model-manager/models/list")
-async def get_model_list(request):
- use_safetensor_thumbnail = (
- config_loader.yaml_load(ui_settings_uri, ui_rules())
- .get("model-preview-fallback-search-safetensors-thumbnail", False)
- )
-
- model_types = os.listdir(comfyui_model_uri)
- model_types.remove("configs")
- model_types.sort()
-
- models = {}
- for model_type in model_types:
- model_extensions = tuple(folder_paths_get_supported_pt_extensions(model_type))
- file_infos = []
- for base_path_index, model_base_path in enumerate(folder_paths_get_folder_paths(model_type)):
- if not os.path.exists(model_base_path): # TODO: Bug in main code? ("ComfyUI\output\checkpoints", "ComfyUI\output\clip", "ComfyUI\models\t2i_adapter", "ComfyUI\output\vae")
- continue
- for cwd, subdirs, files in os.walk(model_base_path):
- dir_models = []
- dir_images = []
-
- for file in files:
- if file.lower().endswith(model_extensions):
- dir_models.append(file)
- elif file.lower().endswith(preview_extensions):
- dir_images.append(file)
-
- for model in dir_models:
- model_name, model_ext = split_valid_ext(model, model_extensions)
- image = None
- image_modified = None
- for ext in preview_extensions: # order matters
- for iImage in range(len(dir_images)-1, -1, -1):
- image_name = dir_images[iImage]
- if not image_name.lower().endswith(ext.lower()):
- continue
- image_name = image_name[:-len(ext)]
- if model_name == image_name:
- image = end_swap_and_pop(dir_images, iImage)
- img_abs_path = os.path.join(cwd, image)
- image_modified = pathlib.Path(img_abs_path).stat().st_mtime_ns
- break
- if image is not None:
- break
- abs_path = os.path.join(cwd, model)
- stats = pathlib.Path(abs_path).stat()
- sizeBytes = stats.st_size
- model_modified = stats.st_mtime_ns
- model_created = stats.st_ctime_ns
- if use_safetensor_thumbnail and image is None and model_ext == ".safetensors":
- # try to fallback on safetensor embedded thumbnail
- header = get_safetensor_header(abs_path)
- metadata = header.get("__metadata__", None)
- if metadata is not None:
- thumbnail = metadata.get("modelspec.thumbnail", None)
- if thumbnail is not None:
- i0 = thumbnail.find("/") + 1
- i1 = thumbnail.find(";")
- image_ext = "." + thumbnail[i0:i1]
- if image_ext in image_extensions:
- image = model + image_ext
- image_modified = model_modified
- rel_path = "" if cwd == model_base_path else os.path.relpath(cwd, model_base_path)
- info = (
- model,
- image,
- base_path_index,
- rel_path,
- model_modified,
- model_created,
- image_modified,
- sizeBytes,
- )
- file_infos.append(info)
- #file_infos.sort(key=lambda tup: tup[4], reverse=True) # TODO: remove sort; sorted on client
-
- model_items = []
- for model, image, base_path_index, rel_path, model_modified, model_created, image_modified, sizeBytes in file_infos:
- item = {
- "name": model,
- "path": "/" + os.path.join(model_type, str(base_path_index), rel_path, model).replace(os.path.sep, "/"), # relative logical path
- #"systemPath": os.path.join(rel_path, model), # relative system path (less information than "search path")
- "dateModified": model_modified,
- "dateCreated": model_created,
- #"dateLastUsed": "", # TODO: track server-side, send increment client-side
- #"countUsed": 0, # TODO: track server-side, send increment client-side
- "sizeBytes": sizeBytes,
- }
- if image is not None:
- raw_post = os.path.join(model_type, str(base_path_index), rel_path, image)
- item["preview"] = {
- "path": urllib.parse.quote_plus(raw_post),
- "dateModified": urllib.parse.quote_plus(str(image_modified)),
- }
- model_items.append(item)
-
- models[model_type] = model_items
-
- return web.json_response(models)
-
-
-def linear_directory_hierarchy(refresh = False):
- model_paths = folder_paths_folder_names_and_paths(refresh)
- dir_list = []
- dir_list.append({ "name": "", "childIndex": 1, "childCount": len(model_paths) })
- for model_dir_name, (model_dirs, _) in model_paths.items():
- dir_list.append({ "name": model_dir_name, "childIndex": None, "childCount": len(model_dirs) })
- for model_dir_index, (_, (model_dirs, extension_whitelist)) in enumerate(model_paths.items()):
- model_dir_child_index = len(dir_list)
- dir_list[model_dir_index + 1]["childIndex"] = model_dir_child_index
- for dir_path_index, dir_path in enumerate(model_dirs):
- dir_list.append({ "name": str(dir_path_index), "childIndex": None, "childCount": None })
- for dir_path_index, dir_path in enumerate(model_dirs):
- if not os.path.exists(dir_path) or os.path.isfile(dir_path):
- continue
-
- #dir_list.append({ "name": str(dir_path_index), "childIndex": None, "childCount": 0 })
- dir_stack = [(dir_path, model_dir_child_index + dir_path_index)]
- while len(dir_stack) > 0: # DEPTH-FIRST
- dir_path, dir_index = dir_stack.pop()
-
- dir_items = os.listdir(dir_path)
- dir_items = sorted(dir_items, key=str.casefold)
-
- dir_child_count = 0
-
- # TODO: sort content of directory: alphabetically
- # TODO: sort content of directory: files first
-
- subdirs = []
- for item_name in dir_items: # BREADTH-FIRST
- item_path = os.path.join(dir_path, item_name)
- if os.path.isdir(item_path):
- # dir
- subdir_index = len(dir_list) # this must be done BEFORE `dir_list.append`
- subdirs.append((item_path, subdir_index))
- dir_list.append({ "name": item_name, "childIndex": None, "childCount": 0 })
- dir_child_count += 1
- else:
- # file
- if extension_whitelist is None or split_valid_ext(item_name, extension_whitelist)[1] != "":
- dir_list.append({ "name": item_name })
- dir_child_count += 1
- if dir_child_count > 0:
- dir_list[dir_index]["childIndex"] = len(dir_list) - dir_child_count
- dir_list[dir_index]["childCount"] = dir_child_count
- subdirs.reverse()
- for dir_path, subdir_index in subdirs:
- dir_stack.append((dir_path, subdir_index))
- return dir_list
-
-
-@server.PromptServer.instance.routes.get("/model-manager/models/directory-list")
-async def get_directory_list(request):
- #body = await request.json()
- dir_list = linear_directory_hierarchy(True)
- #json.dump(dir_list, sys.stdout, indent=4)
- return web.json_response(dir_list)
-
-
-def download_file(url, filename, overwrite):
- if not overwrite and os.path.isfile(filename):
- raise ValueError("File already exists!")
-
- filename_temp = filename + ".download"
-
- def_headers = get_def_headers(url)
- rh = requests.get(
- url=url,
- stream=True,
- verify=False,
- headers=def_headers,
- proxies=None,
- allow_redirects=False,
- )
- if not rh.ok:
- raise ValueError(
- "Unable to download! Request header status code: " +
- str(rh.status_code)
- )
-
- downloaded_size = 0
- if rh.status_code == 200 and os.path.exists(filename_temp):
- downloaded_size = os.path.getsize(filename_temp)
-
- headers = {"Range": "bytes=%d-" % downloaded_size}
- headers["User-Agent"] = def_headers["User-Agent"]
- headers["Authorization"] = def_headers.get("Authorization", None)
-
- r = requests.get(
- url=url,
- stream=True,
- verify=False,
- headers=headers,
- proxies=None,
- allow_redirects=False,
- )
- if rh.status_code == 307 and r.status_code == 307:
- # Civitai redirect
- redirect_url = r.content.decode("utf-8")
- if not redirect_url.startswith("http"):
- # Civitai requires login (NSFW or user-required)
- # TODO: inform user WHY download failed
- raise ValueError("Unable to download from Civitai! Redirect url: " + str(redirect_url))
- download_file(redirect_url, filename, overwrite)
- return
- if rh.status_code == 302 and r.status_code == 302:
- # HuggingFace redirect
- redirect_url = r.content.decode("utf-8")
- redirect_url_index = redirect_url.find("http")
- if redirect_url_index == -1:
- raise ValueError("Unable to download from HuggingFace! Redirect url: " + str(redirect_url))
- download_file(redirect_url[redirect_url_index:], filename, overwrite)
- return
- elif rh.status_code == 200 and r.status_code == 206:
- # Civitai download link
- pass
-
- total_size = int(rh.headers.get("Content-Length", 0)) # TODO: pass in total size earlier
-
- print("Downloading file: " + url)
- if total_size != 0:
- print("Download file size: " + str(total_size))
-
- mode = "wb" if overwrite else "ab"
- with open(filename_temp, mode) as f:
- for chunk in r.iter_content(chunk_size=1024):
- if chunk is not None:
- downloaded_size += len(chunk)
- f.write(chunk)
- f.flush()
-
- if total_size != 0:
- fraction = 1 if downloaded_size == total_size else downloaded_size / total_size
- progress = int(50 * fraction)
- sys.stdout.reconfigure(encoding="utf-8")
- sys.stdout.write(
- "\r[%s%s] %d%%"
- % (
- "-" * progress,
- " " * (50 - progress),
- 100 * fraction,
- )
- )
- sys.stdout.flush()
- print()
-
- if overwrite and os.path.isfile(filename):
- os.remove(filename)
- os.rename(filename_temp, filename)
- print("Saved file: " + filename)
-
-
-def bytes_to_size(total_bytes):
- units = ["B", "KiB", "MiB", "GiB", "TiB", "PiB"]
- b = total_bytes
- i = 0
- while True:
- b = b >> 10
- if (b == 0): break
- i = i + 1
- if i >= len(units) or i == 0:
- return str(total_bytes) + " " + units[0]
- return "{:.2f}".format(total_bytes / (1 << (i * 10))) + " " + units[i]
-
-
-@server.PromptServer.instance.routes.get("/model-manager/model/info")
-async def get_model_info(request):
- result = { "success": False }
-
- model_path = request.query.get("path", None)
- if model_path is None:
- result["alert"] = "Missing model path!"
- return web.json_response(result)
- model_path = urllib.parse.unquote(model_path)
-
- abs_path, model_type = search_path_to_system_path(model_path)
- if abs_path is None:
- result["alert"] = "Invalid model path!"
- return web.json_response(result)
-
- info = {}
- comfyui_directory, name = os.path.split(model_path)
- info["File Name"] = name
- info["File Directory"] = comfyui_directory
- info["File Size"] = bytes_to_size(os.path.getsize(abs_path))
- stats = pathlib.Path(abs_path).stat()
- date_format = "%Y-%m-%d %H:%M:%S"
- date_modified = datetime.fromtimestamp(stats.st_mtime).strftime(date_format)
- #info["Date Modified"] = date_modified
- #info["Date Created"] = datetime.fromtimestamp(stats.st_ctime).strftime(date_format)
-
- model_extensions = folder_paths_get_supported_pt_extensions(model_type)
- abs_name , _ = split_valid_ext(abs_path, model_extensions)
-
- for extension in preview_extensions:
- maybe_preview = abs_name + extension
- if os.path.isfile(maybe_preview):
- preview_path, _ = split_valid_ext(model_path, model_extensions)
- preview_modified = pathlib.Path(maybe_preview).stat().st_mtime_ns
- info["Preview"] = {
- "path": urllib.parse.quote_plus(preview_path + extension),
- "dateModified": urllib.parse.quote_plus(str(preview_modified)),
- }
- break
-
- header = get_safetensor_header(abs_path)
- metadata = header.get("__metadata__", None)
-
- if metadata is not None and info.get("Preview", None) is None:
- thumbnail = metadata.get("modelspec.thumbnail")
- if thumbnail is not None:
- i0 = thumbnail.find("/") + 1
- i1 = thumbnail.find(";", i0)
- thumbnail_extension = "." + thumbnail[i0:i1]
- if thumbnail_extension in image_extensions:
- info["Preview"] = {
- "path": request.query["path"] + thumbnail_extension,
- "dateModified": date_modified,
- }
-
- if metadata is not None:
- info["Base Training Model"] = metadata.get("ss_sd_model_name", "")
- info["Base Model Version"] = metadata.get("ss_base_model_version", "")
- info["Network Dimension"] = metadata.get("ss_network_dim", "")
- info["Network Alpha"] = metadata.get("ss_network_alpha", "")
-
- if metadata is not None:
- training_comment = metadata.get("ss_training_comment", "")
- info["Description"] = (
- metadata.get("modelspec.description", "") +
- "\n\n" +
- metadata.get("modelspec.usage_hint", "") +
- "\n\n" +
- training_comment if training_comment != "None" else ""
- ).strip()
-
- info_text_file = abs_name + model_info_extension
- notes = ""
- if os.path.isfile(info_text_file):
- with open(info_text_file, 'r', encoding="utf-8") as f:
- notes = f.read()
-
- if metadata is not None:
- img_buckets = metadata.get("ss_bucket_info", None)
- datasets = metadata.get("ss_datasets", None)
-
- if type(img_buckets) is str:
- img_buckets = json.loads(img_buckets)
- elif type(datasets) is str:
- datasets = json.loads(datasets)
- if isinstance(datasets, list):
- datasets = datasets[0]
- img_buckets = datasets.get("bucket_info", None)
- resolutions = {}
- if img_buckets is not None:
- buckets = img_buckets.get("buckets", {})
- for resolution in buckets.values():
- dim = resolution["resolution"]
- x, y = dim[0], dim[1]
- count = resolution["count"]
- resolutions[str(x) + "x" + str(y)] = count
- resolutions = list(resolutions.items())
- resolutions.sort(key=lambda x: x[1], reverse=True)
- info["Bucket Resolutions"] = resolutions
-
- tags = None
- if metadata is not None:
- dir_tags = metadata.get("ss_tag_frequency", "{}")
- if type(dir_tags) is str:
- dir_tags = json.loads(dir_tags)
- tags = {}
- for train_tags in dir_tags.values():
- for tag, count in train_tags.items():
- tags[tag] = tags.get(tag, 0) + count
- tags = list(tags.items())
- tags.sort(key=lambda x: x[1], reverse=True)
-
- result["success"] = True
- result["info"] = info
- if metadata is not None:
- result["metadata"] = metadata
- if tags is not None:
- result["tags"] = tags
- result["notes"] = notes
- return web.json_response(result)
-
-
-@server.PromptServer.instance.routes.get("/model-manager/system-separator")
-async def get_system_separator(request):
- return web.json_response(os.path.sep)
-
-
-@server.PromptServer.instance.routes.post("/model-manager/model/download")
-async def download_model(request):
- formdata = await request.post()
- result = { "success": False }
-
- overwrite = formdata.get("overwrite", "false").lower()
- overwrite = True if overwrite == "true" else False
-
- model_path = formdata.get("path", "/0")
- directory, model_type = search_path_to_system_path(model_path)
- if directory is None:
- result["alert"] = "Invalid save path!"
- return web.json_response(result)
-
- download_uri = formdata.get("download")
- if download_uri is None:
- result["alert"] = "Invalid download url!"
- return web.json_response(result)
-
- name = formdata.get("name")
- model_extensions = folder_paths_get_supported_pt_extensions(model_type)
- name_head, model_extension = split_valid_ext(name, model_extensions)
- name_without_extension = os.path.split(name_head)[1]
- if name_without_extension == "":
- result["alert"] = "Cannot have empty model name!"
- return web.json_response(result)
- if model_extension == "":
- result["alert"] = "Unrecognized model extension!"
- return web.json_response(result)
- file_name = os.path.join(directory, name)
- try:
- download_file(download_uri, file_name, overwrite)
+ task_id = await services.create_model_download_task(post)
+ return web.json_response({"success": True, "data": {"taskId": task_id}})
except Exception as e:
- print(e, file=sys.stderr, flush=True)
- result["alert"] = "Failed to download model!\n\n" + str(e)
- return web.json_response(result)
-
- image = formdata.get("image")
- if image is not None and image != "":
- try:
- download_model_preview({
- "path": model_path + os.sep + name,
- "image": image,
- "overwrite": formdata.get("overwrite"),
- })
- except Exception as e:
- print(e, file=sys.stderr, flush=True)
- result["alert"] = "Failed to download preview!\n\n" + str(e)
-
- result["success"] = True
- return web.json_response(result)
+ error_msg = f"Create model download task failed: {str(e)}"
+ logging.error(error_msg)
+ logging.debug(traceback.format_exc())
+ return web.json_response({"success": False, "error": error_msg})
-@server.PromptServer.instance.routes.post("/model-manager/model/move")
-async def move_model(request):
- body = await request.json()
- result = { "success": False }
-
- old_file = body.get("oldFile", None)
- if old_file is None:
- result["alert"] = "No model was given!"
- return web.json_response(result)
- old_file, old_model_type = search_path_to_system_path(old_file)
- if not os.path.isfile(old_file):
- result["alert"] = "Model does not exist!"
- return web.json_response(result)
- old_model_extensions = folder_paths_get_supported_pt_extensions(old_model_type)
- old_file_without_extension, model_extension = split_valid_ext(old_file, old_model_extensions)
- if model_extension == "":
- result["alert"] = "Invalid model extension!"
- return web.json_response(result)
-
- new_file = body.get("newFile", None)
- if new_file is None or new_file == "":
- result["alert"] = "New model name was invalid!"
- return web.json_response(result)
- new_file, new_model_type = search_path_to_system_path(new_file)
- if not new_file.endswith(model_extension):
- result["alert"] = "Cannot change model extension!"
- return web.json_response(result)
- if os.path.isfile(new_file):
- result["alert"] = "Cannot overwrite existing model!"
- return web.json_response(result)
- new_model_extensions = folder_paths_get_supported_pt_extensions(new_model_type)
- new_file_without_extension, new_model_extension = split_valid_ext(new_file, new_model_extensions)
- if model_extension != new_model_extension:
- result["alert"] = "Cannot change model extension!"
- return web.json_response(result)
- new_file_dir, new_file_name = os.path.split(new_file)
- if not os.path.isdir(new_file_dir):
- result["alert"] = "Destination directory does not exist!"
- return web.json_response(result)
- new_name_without_extension = os.path.splitext(new_file_name)[0]
- if new_file_name == new_name_without_extension or new_name_without_extension == "":
- result["alert"] = "New model name was empty!"
- return web.json_response(result)
-
- if old_file == new_file:
- # no-op
- result["success"] = True
- return web.json_response(result)
+@routes.get("/model-manager/models")
+async def read_models(request):
+ """
+ Scan all models and read their information.
+ """
try:
- shutil.move(old_file, new_file)
- print("Moved file: " + new_file)
- except ValueError as e:
- print(e, file=sys.stderr, flush=True)
- result["alert"] = "Failed to move model!\n\n" + str(e)
- return web.json_response(result)
-
- # TODO: this could overwrite existing files in destination; do a check beforehand?
- for extension in preview_extensions + (model_info_extension,):
- old_file = old_file_without_extension + extension
- if os.path.isfile(old_file):
- new_file = new_file_without_extension + extension
- try:
- shutil.move(old_file, new_file)
- print("Moved file: " + new_file)
- except ValueError as e:
- print(e, file=sys.stderr, flush=True)
- msg = result.get("alert","")
- if msg == "":
- result["alert"] = "Failed to move model resource file!\n\n" + str(e)
- else:
- result["alert"] = msg + "\n" + str(e)
-
- result["success"] = True
- return web.json_response(result)
+ result = services.scan_models()
+ return web.json_response({"success": True, "data": result})
+ except Exception as e:
+ error_msg = f"Read models failed: {str(e)}"
+ logging.error(error_msg)
+ logging.debug(traceback.format_exc())
+ return web.json_response({"success": False, "error": error_msg})
-def delete_same_name_files(path_without_extension, extensions, keep_extension=None):
- for extension in extensions:
- if extension == keep_extension: continue
- file = path_without_extension + extension
- if os.path.isfile(file):
- os.remove(file)
- print("Deleted file: " + file)
+@routes.get("/model-manager/model/{type}/{index}/{filename:.*}")
+async def read_model_info(request):
+ """
+ Get the information of the specified model.
+ """
+ model_type = request.match_info.get("type", None)
+ index = int(request.match_info.get("index", None))
+ filename = request.match_info.get("filename", None)
+
+ try:
+ model_path = utils.get_valid_full_path(model_type, index, filename)
+ result = services.get_model_info(model_path)
+ return web.json_response({"success": True, "data": result})
+ except Exception as e:
+ error_msg = f"Read model info failed: {str(e)}"
+ logging.error(error_msg)
+ logging.debug(traceback.format_exc())
+ return web.json_response({"success": False, "error": error_msg})
-@server.PromptServer.instance.routes.post("/model-manager/model/delete")
+@routes.put("/model-manager/model/{type}/{index}/{filename:.*}")
+async def update_model(request):
+ """
+ Update model information.
+
+ request body: x-www-form-urlencoded
+ - previewFile: preview file.
+ - description: description.
+ - type: model type.
+ - pathIndex: index of the model folders.
+ - fullname: filename that relative to the model folder.
+ All fields are optional, but type, pathIndex and fullname must appear together.
+ """
+ model_type = request.match_info.get("type", None)
+ index = int(request.match_info.get("index", None))
+ filename = request.match_info.get("filename", None)
+
+ post: dict = await request.post()
+
+ try:
+ model_path = utils.get_valid_full_path(model_type, index, filename)
+ if model_path is None:
+ raise RuntimeError(f"File {filename} not found")
+ services.update_model(model_path, post)
+ return web.json_response({"success": True})
+ except Exception as e:
+ error_msg = f"Update model failed: {str(e)}"
+ logging.error(error_msg)
+ logging.debug(traceback.format_exc())
+ return web.json_response({"success": False, "error": error_msg})
+
+
+@routes.delete("/model-manager/model/{type}/{index}/{filename:.*}")
async def delete_model(request):
- result = { "success": False }
+ """
+ Delete model.
+ """
+ model_type = request.match_info.get("type", None)
+ index = int(request.match_info.get("index", None))
+ filename = request.match_info.get("filename", None)
- model_path = request.query.get("path", None)
- if model_path is None:
- result["alert"] = "Missing model path!"
- return web.json_response(result)
- model_path = urllib.parse.unquote(model_path)
- model_path, model_type = search_path_to_system_path(model_path)
- if model_path is None:
- result["alert"] = "Invalid model path!"
- return web.json_response(result)
-
- model_extensions = folder_paths_get_supported_pt_extensions(model_type)
- path_and_name, model_extension = split_valid_ext(model_path, model_extensions)
- if model_extension == "":
- result["alert"] = "Cannot delete file!"
- return web.json_response(result)
-
- if os.path.isfile(model_path):
- os.remove(model_path)
- result["success"] = True
- print("Deleted file: " + model_path)
-
- delete_same_name_files(path_and_name, preview_extensions)
- delete_same_name_files(path_and_name, (model_info_extension,))
-
- return web.json_response(result)
+ try:
+ model_path = utils.get_valid_full_path(model_type, index, filename)
+ if model_path is None:
+ raise RuntimeError(f"File {filename} not found")
+ services.remove_model(model_path)
+ return web.json_response({"success": True})
+ except Exception as e:
+ error_msg = f"Delete model failed: {str(e)}"
+ logging.error(error_msg)
+ logging.debug(traceback.format_exc())
+ return web.json_response({"success": False, "error": error_msg})
-@server.PromptServer.instance.routes.post("/model-manager/notes/save")
-async def set_notes(request):
- body = await request.json()
- result = { "success": False }
+@routes.get("/model-manager/preview/{type}/{index}/{filename:.*}")
+async def read_model_preview(request):
+ """
+ Get the file stream of the specified image.
+ If the file does not exist, no-preview.png is returned.
- dt_epoch = body.get("timestamp", None)
+ :param type: The type of the model. eg.checkpoints, loras, vae, etc.
+ :param index: The index of the model folders.
+ :param filename: The filename of the image.
+ """
+ model_type = request.match_info.get("type", None)
+ index = int(request.match_info.get("index", None))
+ filename = request.match_info.get("filename", None)
- text = body.get("notes", None)
- if type(text) is not str:
- result["alert"] = "Invalid note!"
- return web.json_response(result)
+ extension_uri = config.extension_uri
- model_path = body.get("path", None)
- if type(model_path) is not str:
- result["alert"] = "Missing model path!"
- return web.json_response(result)
- model_path, model_type = search_path_to_system_path(model_path)
- model_extensions = folder_paths_get_supported_pt_extensions(model_type)
- file_path_without_extension, _ = split_valid_ext(model_path, model_extensions)
- filename = os.path.normpath(file_path_without_extension + model_info_extension)
-
- if dt_epoch is not None and os.path.exists(filename) and os.path.getmtime(filename) > dt_epoch:
- # discard late save
- result["success"] = True
- return web.json_response(result)
-
- if text.isspace() or text == "":
- if os.path.exists(filename):
- os.remove(filename)
- #print("Deleted file: " + filename) # autosave -> too verbose
- else:
- try:
- with open(filename, "w", encoding="utf-8") as f:
- f.write(text)
- if dt_epoch is not None:
- os.utime(filename, (dt_epoch, dt_epoch))
- #print("Saved file: " + filename) # autosave -> too verbose
- except ValueError as e:
- print(e, file=sys.stderr, flush=True)
- result["alert"] = "Failed to save notes!\n\n" + str(e)
- web.json_response(result)
+ try:
+ folders = folder_paths.get_folder_paths(model_type)
+ base_path = folders[index]
+ abs_path = os.path.join(base_path, filename)
+ except:
+ abs_path = extension_uri
- result["success"] = True
- return web.json_response(result)
+ if not os.path.isfile(abs_path):
+ abs_path = os.path.join(extension_uri, "assets", "no-preview.png")
+ return web.FileResponse(abs_path)
+
+
+@routes.get("/model-manager/preview/download/{filename}")
+async def read_download_preview(request):
+ filename = request.match_info.get("filename", None)
+ extension_uri = config.extension_uri
+
+ download_path = utils.get_download_path()
+ preview_path = os.path.join(download_path, filename)
+
+ if not os.path.isfile(preview_path):
+ preview_path = os.path.join(extension_uri, "assets", "no-preview.png")
+
+ return web.FileResponse(preview_path)
WEB_DIRECTORY = "web"
NODE_CLASS_MAPPINGS = {}
-__all__ = ["NODE_CLASS_MAPPINGS"]
+__all__ = ["WEB_DIRECTORY", "NODE_CLASS_MAPPINGS"]
diff --git a/no-preview.png b/assets/no-preview.png
similarity index 100%
rename from no-preview.png
rename to assets/no-preview.png
diff --git a/config_loader.py b/config_loader.py
deleted file mode 100644
index 2f9e895..0000000
--- a/config_loader.py
+++ /dev/null
@@ -1,72 +0,0 @@
-import yaml
-from dataclasses import dataclass
-
-@dataclass
-class Rule:
- key: any
- value_default: any
- value_type: type
- value_min: any # int | float | None
- value_max: any # int | float | None
-
- def __init__(
- self,
- key,
- value_default,
- value_type: type,
- value_min: any = None, # int | float | None
- value_max: any = None, # int | float | None
- ):
- self.key = key
- self.value_default = value_default
- self.value_type = value_type
- self.value_min = value_min
- self.value_max = value_max
-
-def _get_valid_value(data: dict, r: Rule):
- if r.value_type != type(r.value_default):
- raise Exception(f"'value_type' does not match type of 'value_default'!")
- value = data.get(r.key)
- if value is None:
- value = r.value_default
- else:
- try:
- value = r.value_type(value)
- except:
- value = r.value_default
-
- value_is_numeric = r.value_type == int or r.value_type == float
- if value_is_numeric and r.value_min:
- if r.value_type != type(r.value_min):
- raise Exception(f"Type of 'value_type' does not match the type of 'value_min'!")
- value = max(r.value_min, value)
- if value_is_numeric and r.value_max:
- if r.value_type != type(r.value_max):
- raise Exception(f"Type of 'value_type' does not match the type of 'value_max'!")
- value = min(r.value_max, value)
-
- return value
-
-def validated(rules: list[Rule], data: dict = {}):
- valid = {}
- for r in rules:
- valid[r.key] = _get_valid_value(data, r)
- return valid
-
-def yaml_load(path, rules: list[Rule]):
- data = {}
- try:
- with open(path, 'r') as file:
- data = yaml.safe_load(file)
- except:
- pass
- return validated(rules, data)
-
-def yaml_save(path, rules: list[Rule], data: dict) -> bool:
- data = validated(rules, data)
- try:
- with open(path, 'w') as file:
- yaml.dump(data, file)
- return True
- except:
- return False
diff --git a/demo/beta-menu-model-manager-button-settings-group.png b/demo/beta-menu-model-manager-button-settings-group.png
deleted file mode 100644
index e5f0d7e..0000000
Binary files a/demo/beta-menu-model-manager-button-settings-group.png and /dev/null differ
diff --git a/demo/tab-download.png b/demo/tab-download.png
index 4e5f7a7..50ffa5f 100644
Binary files a/demo/tab-download.png and b/demo/tab-download.png differ
diff --git a/demo/tab-model-drag-add.gif b/demo/tab-model-drag-add.gif
deleted file mode 100644
index 897b474..0000000
Binary files a/demo/tab-model-drag-add.gif and /dev/null differ
diff --git a/demo/tab-model-info-overview.png b/demo/tab-model-info-overview.png
old mode 100644
new mode 100755
index 0637e75..bef89c4
Binary files a/demo/tab-model-info-overview.png and b/demo/tab-model-info-overview.png differ
diff --git a/demo/tab-model-node-graph.gif b/demo/tab-model-node-graph.gif
new file mode 100755
index 0000000..638bcdc
Binary files /dev/null and b/demo/tab-model-node-graph.gif differ
diff --git a/demo/tab-model-preview-thumbnail-buttons-example.png b/demo/tab-model-preview-thumbnail-buttons-example.png
deleted file mode 100644
index 8f96ba6..0000000
Binary files a/demo/tab-model-preview-thumbnail-buttons-example.png and /dev/null differ
diff --git a/demo/tab-models-dropdown.png b/demo/tab-models-dropdown.png
deleted file mode 100644
index e23f763..0000000
Binary files a/demo/tab-models-dropdown.png and /dev/null differ
diff --git a/demo/tab-models.gif b/demo/tab-models.gif
new file mode 100755
index 0000000..b3e28f0
Binary files /dev/null and b/demo/tab-models.gif differ
diff --git a/demo/tab-models.png b/demo/tab-models.png
old mode 100644
new mode 100755
index 672ecea..f2a8825
Binary files a/demo/tab-models.png and b/demo/tab-models.png differ
diff --git a/demo/tab-settings.png b/demo/tab-settings.png
old mode 100644
new mode 100755
index 13ee3ef..04f3b49
Binary files a/demo/tab-settings.png and b/demo/tab-settings.png differ
diff --git a/eslint.config.js b/eslint.config.js
new file mode 100644
index 0000000..a9322a5
--- /dev/null
+++ b/eslint.config.js
@@ -0,0 +1,32 @@
+import globals from 'globals'
+import pluginJs from '@eslint/js'
+import tsEslint from 'typescript-eslint'
+import pluginVue from 'eslint-plugin-vue'
+
+export default [
+ {
+ files: ['src/**/*.{js,mjs,cjs,ts,vue}'],
+ },
+ {
+ ignores: [
+ 'src/scripts/*',
+ 'src/extensions/core/*',
+ 'src/types/vue-shim.d.ts',
+ ],
+ },
+ { languageOptions: { globals: globals.browser } },
+ pluginJs.configs.recommended,
+ ...tsEslint.configs.recommended,
+ ...pluginVue.configs['flat/essential'],
+ {
+ files: ['src/**/*.vue'],
+ languageOptions: { parserOptions: { parser: tsEslint.parser } },
+ },
+ {
+ rules: {
+ '@typescript-eslint/no-explicit-any': 'off',
+ '@typescript-eslint/no-unused-vars': 'off',
+ '@typescript-eslint/prefer-as-const': 'off',
+ },
+ },
+]
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..5500a50
--- /dev/null
+++ b/index.html
@@ -0,0 +1,11 @@
+
+
+
+
+
+ | + {{ $t(`info.${item.key}`) }} + | +{{ item.display }} | +
| + {{ item.key }} + | +{{ item.value }} | +
+ {{ $t('uploadFile') }} +
+'
- + (escaped ? code : escape$1(code, true))
- + ''
- + (escaped ? code : escape$1(code, true))
- + '\n${body}\n`; - } - html({ text }) { - return text; - } - heading({ tokens, depth }) { - return `
${this.parser.parseInline(tokens)}
\n`; - } - table(token) { - let header = ''; - // header - let cell = ''; - for (let j = 0; j < token.header.length; j++) { - cell += this.tablecell(token.header[j]); - } - header += this.tablerow({ text: cell }); - let body = ''; - for (let j = 0; j < token.rows.length; j++) { - const row = token.rows[j]; - cell = ''; - for (let k = 0; k < row.length; k++) { - cell += this.tablecell(row[k]); - } - body += this.tablerow({ text: cell }); - } - if (body) - body = `${body}`; - return '${text}`;
- }
- br(token) {
- return 'An error occurred:
' - + escape$1(e.message + '', true) - + ''; - if (async) { - return Promise.resolve(msg); - } - return msg; - } - if (async) { - return Promise.reject(e); - } - throw e; - }; - } -} - -const markedInstance = new Marked(); -function marked(src, opt) { - return markedInstance.parse(src, opt); -} -/** - * Sets the default options. - * - * @param options Hash of options - */ -marked.options = - marked.setOptions = function (options) { - markedInstance.setOptions(options); - marked.defaults = markedInstance.defaults; - changeDefaults(marked.defaults); - return marked; - }; -/** - * Gets the original marked default options. - */ -marked.getDefaults = _getDefaults; -marked.defaults = _defaults; -/** - * Use Extension - */ -marked.use = function (...args) { - markedInstance.use(...args); - marked.defaults = markedInstance.defaults; - changeDefaults(marked.defaults); - return marked; -}; -/** - * Run callback for every token - */ -marked.walkTokens = function (tokens, callback) { - return markedInstance.walkTokens(tokens, callback); -}; -/** - * Compiles markdown to HTML without enclosing `p` tag. - * - * @param src String of markdown source to be compiled - * @param options Hash of options - * @return String of compiled HTML - */ -marked.parseInline = markedInstance.parseInline; -/** - * Expose - */ -marked.Parser = _Parser; -marked.parser = _Parser.parse; -marked.Renderer = _Renderer; -marked.TextRenderer = _TextRenderer; -marked.Lexer = _Lexer; -marked.lexer = _Lexer.lex; -marked.Tokenizer = _Tokenizer; -marked.Hooks = _Hooks; -marked.parse = marked; -const options = marked.options; -const setOptions = marked.setOptions; -const use = marked.use; -const walkTokens = marked.walkTokens; -const parseInline = marked.parseInline; -const parse = marked; -const parser = _Parser.parse; -const lexer = _Lexer.lex; - -export { _Hooks as Hooks, _Lexer as Lexer, Marked, _Parser as Parser, _Renderer as Renderer, _TextRenderer as TextRenderer, _Tokenizer as Tokenizer, _defaults as defaults, _getDefaults as getDefaults, lexer, marked, options, parse, parseInline, parser, setOptions, use, walkTokens }; -//# sourceMappingURL=marked.esm.js.map \ No newline at end of file diff --git a/web/model-manager.css b/web/model-manager.css deleted file mode 100644 index 394185e..0000000 --- a/web/model-manager.css +++ /dev/null @@ -1,717 +0,0 @@ -/* model manager */ -.model-manager { - background-color: var(--comfy-menu-bg); - box-sizing: border-box; - color: var(--bg-color); - font-family: monospace; - font-size: 15px; - height: 100%; - padding: 8px; - position: fixed; - overflow: hidden; - width: 100%; - z-index: 1100; - - /*override comfy-modal settings*/ - border-radius: 0; - box-shadow: none; - justify-content: unset; - max-height: 100vh; - max-width: 100vw; - transform: none; - /*disable double-tap zoom on model manager*/ - touch-action: manipulation; -} - -.model-manager .comfy-modal-content { - width: 100%; - gap: 16px; -} - -.model-manager .no-highlight { - user-select: none; - -moz-user-select: none; - -webkit-text-select: none; - -webkit-user-select: none; -} - -.model-manager label:has(> *){ - pointer-events: none; -} - -.model-manager label > * { - pointer-events: auto; -} - -/* sidebar */ - -.model-manager { - --model-manager-sidebar-width-left: 50vw; - --model-manager-sidebar-width-right: 50vw; - --model-manager-sidebar-height-top: 50vh; - --model-manager-sidebar-height-bottom: 50vh; - - --model-manager-thumbnail-width: 240px; - --model-manager-thumbnail-height: 360px; - - --model-manager-left: 0; - --model-manager-right: 0; - --model-manager-top: 0; - --model-manager-bottom: 0; - - left: var(--model-manager-left); - top: var(--model-manager-right); - right: var(--model-manager-top); - bottom: var(--model-manager-bottom); -} - -.model-manager.cursor-drag-left, -.model-manager.cursor-drag-right { - cursor: ew-resize; -} - -.model-manager.cursor-drag-top, -.model-manager.cursor-drag-bottom { - cursor: ns-resize; -} - -.model-manager.cursor-drag-top.cursor-drag-left, -.model-manager.cursor-drag-bottom.cursor-drag-right { - cursor: nwse-resize; -} - -.model-manager.cursor-drag-top.cursor-drag-right, -.model-manager.cursor-drag-bottom.cursor-drag-left { - cursor: nesw-resize; -} - -/* sidebar buttons */ -.model-manager .sidebar-buttons { - overflow: hidden; - color: var(--input-text); - display: flex; - gap: 2px; - flex-direction: row-reverse; - flex-wrap: wrap; -} - -.model-manager .sidebar-buttons .radio-button-group-active { - border-color: var(--fg-color); - color: var(--fg-color); - overflow: hidden; -} - -.model-manager[data-sidebar-state="left"] { - width: var(--model-manager-sidebar-width-left); - max-width: 95vw; - min-width: 22vw; - right: auto; - border-right: solid var(--border-color) 2px; -} - -.model-manager[data-sidebar-state="top"] { - height: var(--model-manager-sidebar-height-top); - max-height: 95vh; - min-height: 22vh; - bottom: auto; - border-bottom: solid var(--border-color) 2px; -} - -.model-manager[data-sidebar-state="bottom"] { - height: var(--model-manager-sidebar-height-bottom); - max-height: 95vh; - min-height: 22vh; - top: auto; - border-top: solid var(--border-color) 2px; -} - -.model-manager[data-sidebar-state="right"] { - width: var(--model-manager-sidebar-width-right); - max-width: 95vw; - min-width: 22vw; - left: auto; - border-left: solid var(--border-color) 2px; -} - -/* common */ -.model-manager h1 { - min-width: 0; - overflow-wrap: break-word; -} - -.model-manager textarea { - border: solid 2px var(--border-color); - border-radius: 8px; - font-size: 1.2em; - resize: vertical; - width: 100%; - height: 100%; -} - -.model-manager input[type="file"] { - width: 100%; -} - -.model-manager button, .model-manager .model-manager-head .topbar-right select { - margin: 0; - border: 2px solid var(--border-color); -} - -.model-manager button:not(.icon-button), -.model-manager select, -.model-manager input { - padding: 4px 8px; - margin: 0; -} - -.model-manager button:disabled, -.model-manager select:disabled, -.model-manager input:disabled { - background-color: var(--comfy-menu-bg); - filter: brightness(1.2); - cursor: not-allowed; -} - -.model-manager select:hover{ - filter: brightness(1.2); - cursor: pointer; -} - -.model-manager button.block { - width: 100%; -} - -.model-manager ::-webkit-scrollbar { - width: 16px; -} - -.model-manager ::-webkit-scrollbar-track { - background-color: var(--comfy-input-bg); - border-right: 1px solid var(--border-color); - border-bottom: 1px solid var(--border-color); -} - -.model-manager ::-webkit-scrollbar-thumb { - background-color: var(--fg-color); - border-radius: 3px; -} - -.model-manager .search-text-area::-webkit-input-placeholder { - font-style: italic; -} -.model-manager .search-text-area:-moz-placeholder { - font-style: italic; -} -.model-manager .search-text-area::-moz-placeholder { - font-style: italic; -} -.model-manager .search-text-area:-ms-input-placeholder { - font-style: italic; -} - -.model-manager .icon-button { - height: 40px; - width: 40px; - line-height: 1.15; -} - -.model-manager .row { - display: flex; - min-width: 0; - gap: 8px; -} - -.model-manager .tab-header { - display: flex; - padding: 8px 0px; - flex-direction: column; - background-color: var(--bg-color); -} - -.model-manager .tab-header-flex-block { - width: 100%; - min-width: 0; -} - -.model-manager .comfy-button-success { - color: green; - border-color: green; -} - -.model-manager .comfy-button-failure { - color: darkred; - border-color: darkred; -} - -.model-manager .no-select { - -webkit-user-select: none; - -ms-user-select: none; - user-select: none; -} - -/* main content */ -.model-manager .model-manager-panel { - color: var(--fg-color); -} - -.model-manager .model-tab-group { - display: flex; - gap: 4px; - height: 44px; -} - -.model-manager .model-tab-group .tab-button { - background-color: var(--comfy-menu-bg); - border: 2px solid var(--border-color); - border-bottom: none; - border-radius: 8px 8px 0px 0px; - cursor: pointer; - padding: 8px 12px; - margin-bottom: 0px; - z-index: 1; -} - -.model-manager .model-tab-group .tab-button.active { - background-color: var(--bg-color); - margin-bottom: -2px; - cursor: default; - position: relative; - z-index: 1; - pointer-events: none; -} - -.model-manager .model-manager-body { - background-color: var(--bg-color); - border: 2px solid var(--border-color); -} - -.model-manager .model-manager-panel { - flex: 1; - display: flex; - flex-direction: column; - overflow: hidden; -} - -.model-manager .model-manager-body { - flex: 1; - overflow: hidden; - padding: 8px 0px 8px 16px; -} - -.model-manager .model-manager-body .tab-contents { - position: relative; - display: flex; - flex-direction: column; - height: 100%; - width: auto; - overflow-x: auto; - overflow-y: hidden; -} - -.model-manager .model-manager-body .tab-content { - display: flex; - flex-direction: column; - height: 100%; - overflow-y: auto; - padding-right: 16px; -} - -/* model info view */ -.model-manager .model-info-container { - background-color: var(--bg-color); - border-radius: 16px; - color: var(--fg-color); - width: auto; -} - -.model-manager .model-metadata { - table-layout: fixed; - text-align: left; - width: 100%; -} - -.model-manager .model-metadata-key { - overflow-wrap: break-word; - width: 20%; -} - -.model-manager .model-metadata-value { - overflow-wrap: anywhere; - width: 80%; -} - -.model-manager table { - border-collapse: collapse; -} - -.model-manager th { - border: 1px solid; - padding: 4px 8px; -} - -/* download tab */ - -.model-manager .download-model-infos { - display: flex; - flex-direction: column; - padding: 0; - row-gap: 10px; -} - -.model-manager .download-details summary { - background-color: var(--comfy-menu-bg); - border-radius: 16px; - padding: 16px; - word-wrap: break-word; -} - -.model-manager .download-details[open] summary { - background-color: var(--border-color); -} - -.model-manager .download-details > div { - column-gap: 8px; - display: flex; - flex-direction: row; - flex-wrap: wrap; - padding: 8px; - row-gap: 16px; -} - -.model-manager [data-name="Download"] .download-settings-wrapper { - flex: 1; -} - -.model-manager [data-name="Download"] .download-settings { - display: flex; - flex-direction: column; - row-gap: 16px; -} - -.model-manager .download-button { - max-width: fit-content; -} - -/* models tab */ -.model-manager [data-name="Models"] .row { - position: sticky; - z-index: 1; - top: 0; -} - -/* preview image */ -.model-manager .item { - position: relative; - width: var(--model-manager-thumbnail-width);; - height: var(--model-manager-thumbnail-height);; - text-align: center; - overflow: hidden; - border-radius: 8px; -} - -.model-manager .item img { - width: 100%; - height: 100%; - object-fit: cover; - border-radius: 8px; -} - -.model-manager .model-info-container .item { - width: auto; - height: auto; -} -.model-manager .model-info-container .item img { - height: auto; - width: auto; - max-width: 100%; - max-height: 50vh; -} - -.model-manager .model-preview-button-left, -.model-manager .model-preview-button-right { - position: absolute; - top: 0; - bottom: 0; - margin: auto; - border-radius: 20px; -} - -.model-manager .model-preview-button-right { - right: 4px; -} - -.model-manager .model-preview-button-left { - left: 4px; -} - -.model-manager .item .model-preview-overlay { - position: absolute; - top: 0; - left: 0; - height: 100%; - width: 100%; - background-color: rgba(0, 0, 0, 0); -} - -/* grid */ -.model-manager .comfy-grid { - display: flex; - flex-wrap: wrap; - gap: 16px; -} - -.model-manager .comfy-grid .model-label { - background-color: rgb(from var(--content-hover-bg) r g b / 0.6); - width: 100%; - height: 2.2rem; - position: absolute; - bottom: 0; - text-align: center; - line-height: 2.2rem; -} - -.model-manager .comfy-grid .model-label > p { - width: calc(100% - 2rem); - overflow-x: scroll; - white-space: nowrap; - display: inline-block; - vertical-align: middle; - margin: 0; -} - -.model-manager .comfy-grid .model-label { - scrollbar-width: none; - -ms-overflow-style: none; -} - -.model-manager .comfy-grid .model-label ::-webkit-scrollbar { - width: 0; - height: 0; -} - -.model-manager .comfy-grid .model-preview-top-right, -.model-manager .comfy-grid .model-preview-top-left { - position: absolute; - flex-direction: column; - gap: 8px; - top: 8px; -} - -.model-manager .comfy-grid .model-preview-top-right { - right: 8px; -} - -.model-manager .comfy-grid .model-preview-top-left { - left: 8px; -} - -.model-manager .item .model-buttons-hidden { - display: none; -} - -.model-manager .item:hover .model-buttons-hidden, -.model-manager .comfy-grid .model-buttons-visible { - display: flex; -} - -.model-manager .comfy-grid .model-button { - opacity: 0.65; -} - -.model-manager .comfy-grid .model-button:hover { - opacity: 1; -} - -.model-manager .comfy-grid .model-label { - user-select: text; -} - -/* radio */ -.model-manager .comfy-radio-group { - display: flex; - gap: 8px; - flex-wrap: wrap; - min-width: 0; -} - -.model-manager .comfy-radio { - display: flex; - gap: 4px; - padding: 4px 16px; - color: var(--input-text); - border: 2px solid var(--border-color); - border-radius: 16px; - background-color: var(--comfy-input-bg); - font-size: 18px; -} - -.model-manager .comfy-radio:has(> input[type="radio"]:checked) { - border-color: var(--border-color); - background-color: var(--comfy-menu-bg); -} - -.model-manager .comfy-radio input[type="radio"]:checked + label { - color: var(--fg-color); -} - -.model-manager .radio-input { - opacity: 0; - position: absolute; -} - -/* model preview select */ -.model-manager .model-preview-select-radio-container { - min-width: 0; - flex: 1; -} - -.model-manager .model-preview-select-radio-inputs > div { - padding: 16px 0 8px 0; -} - -.model-manager .model-preview-select-radio-container img { - position: relative; - width: 230px; - height: 345px; - text-align: center; - overflow: hidden; - border-radius: 8px; - object-fit: cover; -} - -/* topbar */ -.model-manager .topbar-buttons { - display: flex; - float: right; -} - -.model-manager .topbar-buttons button { - height: 33px; - padding: 1px 6px; - width: 33px; -} - -.model-manager .model-manager-head .topbar-left { - display: flex; - float: left; -} - -.model-manager .model-manager-head .topbar-right { - column-gap: 4px; - display: flex; - flex-direction: row-reverse; - float: right; -} - -.model-manager .model-manager-head .topbar-right select { - position: relative; - top: 0; - bottom: 0; - font-size: 20px; - text-align-last: center; - -o-appearance: none; - -ms-appearance: none; - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; -} - -/* search dropdown */ -.model-manager .input-dropdown-container { - position: relative; -} - -.model-manager .search-models { - display: flex; - flex: 1; - flex-direction: row; - min-width: 0; -} - -.model-manager .model-select-dropdown { - min-width: 0; - overflow: auto; -} - -.model-manager .search-text-area, -.model-manager .plain-text-area, -.model-manager .model-select-dropdown { - flex: 1; - min-height: 36px; - padding-block: 0; - min-width: 36px; -} - -.model-manager .model-select-dropdown { - min-height: 40px; -} - -.model-manager .search-directory-dropdown { - background-color: var(--bg-color); - border: 2px var(--border-color) solid; - border-radius: 10px; - color: var(--fg-color); - max-height: 40vh; - overflow: auto; - position: absolute; - z-index: 1; -} - -@media (pointer:none), (pointer:coarse) { - .model-manager .search-directory-dropdown { - max-height: 17.5vh; - } -} - -.model-manager .search-directory-dropdown:empty { - display: none; -} - -.model-manager .search-directory-dropdown > p { - margin: 0; - padding: 0.85em 20px; - min-width: 0; -} -.model-manager .search-directory-dropdown > p { - -ms-overflow-style: none; /* Internet Explorer 10+ */ - scrollbar-width: none; /* Firefox */ -} -.model-manager .search-directory-dropdown > p::-webkit-scrollbar { - display: none; /* Safari and Chrome */ -} - -.model-manager .search-directory-dropdown > p.search-directory-dropdown-key-selected, -.model-manager .search-directory-dropdown > p.search-directory-dropdown-mouse-selected { - background-color: var(--border-color); -} - -.model-manager .search-directory-dropdown > p.search-directory-dropdown-key-selected { - border-left: 1mm solid var(--input-text); -} - -/* model manager settings */ -.model-manager .model-manager-settings > div, -.model-manager .model-manager-settings > label, -.model-manager .tag-generator-settings > label, -.model-manager .tag-generator-settings > div { - display: flex; - flex-direction: row; - align-items: center; - gap: 8px; - margin: 16px 0; -} - -.model-manager .model-manager-settings button { - height: 40px; - min-width: 120px; - justify-content: center; -} - -.model-manager .model-manager-settings input[type="number"], -.model-manager .tag-generator-settings input[type="number"]{ - width: 60px; -} - -.model-manager .search-settings-text { - width: 100%; -} diff --git a/web/model-manager.js b/web/model-manager.js deleted file mode 100644 index 4a8413b..0000000 --- a/web/model-manager.js +++ /dev/null @@ -1,5642 +0,0 @@ -import { app } from '../../scripts/app.js'; -import { api } from '../../scripts/api.js'; -import { ComfyDialog, $el } from '../../scripts/ui.js'; -import { ComfyButton } from '../../scripts/ui/components/button.js'; -import { marked } from './marked.js'; -import('./downshow.js'); - -function clamp(x, min, max) { - return Math.min(Math.max(x, min), max); -} - -/** - * @param {string} url - * @param {any} [options=undefined] - * @returns {Promise} - */ -function comfyRequest(url, options = undefined) { - return new Promise((resolve, reject) => { - api - .fetchApi(url, options) - .then((response) => response.json()) - .then(resolve) - .catch(reject); - }); -} - -/** - * @param {(...args) => Promise
'; - for (let i = 0; i < map.length; i++) { - const v = map[i]; - const tag = v[0]; - const count = v[1]; - text += tag + ' (' + count + ')'; - if (i !== map.length - 1) { - text += ', '; - } - } - text += '
'; - return text; -} - -/** - * @param {String} p - * @returns {[String, int][]} - */ -function ParseTagParagraph(p) { - return p.split(',').map((x) => { - const text = x.endsWith(', ') ? x.substring(0, x.length - 2) : x; - const i = text.lastIndexOf('('); - const tag = text.substring(0, i).trim(); - const frequency = parseInt(text.substring(i + 1, text.length - 1)); - return [tag, frequency]; - }); -} - -class ImageSelect { - /** @constant {string} */ #PREVIEW_DEFAULT = 'Default'; - /** @constant {string} */ #PREVIEW_UPLOAD = 'Upload'; - /** @constant {string} */ #PREVIEW_URL = 'URL'; - /** @constant {string} */ #PREVIEW_NONE = 'No Preview'; - - elements = { - /** @type {HTMLDivElement} */ radioGroup: null, - /** @type {HTMLDivElement} */ radioButtons: null, - /** @type {HTMLDivElement} */ previews: null, - - /** @type {HTMLImageElement} */ defaultPreviewNoImage: null, - /** @type {HTMLDivElement} */ defaultPreviews: null, - /** @type {HTMLDivElement} */ defaultUrl: null, - - /** @type {HTMLImageElement} */ customUrlPreview: null, - /** @type {HTMLInputElement} */ customUrl: null, - /** @type {HTMLDivElement} */ custom: null, - - /** @type {HTMLImageElement} */ uploadPreview: null, - /** @type {HTMLInputElement} */ uploadFile: null, - /** @type {HTMLDivElement} */ upload: null, - }; - - /** @type {string} */ - #name = null; - - /** @returns {Promise