36 Commits
v2.5.4 ... main

Author SHA1 Message Date
Ainaemaet
e88a77f224 feat(search): add multi-token regex and wildcard support (#211)
* feat(search): add multi-token regex and wildcard support

* feat(ui): add layout toggle button in Model Manager header
2025-09-24 15:18:25 +08:00
Hayden
f3de2006ef Prepare release 2.8.3 2025-09-05 16:53:05 +08:00
Hayden
0295dd6288 fix: Validate existence of entry path after improvements previews (#205) 2025-09-05 16:51:54 +08:00
Koro
4f9a437725 Improvements in previews reading (#204)
* Improve model preview handling and optimize file processing

* increate the version
2025-09-05 16:45:51 +08:00
Hayden
815a483cf0 Prepare release 2.8.1 2025-09-03 15:14:07 +08:00
Hayden
ae37765017 fix: Add error message tag (#203) 2025-09-03 15:13:08 +08:00
Hayden
ebef300279 fix: Validate existence of entry path in model preview generation (#202) 2025-09-03 15:06:50 +08:00
Hayden
38cd328e57 Prepare release 2.8.0 2025-08-15 10:13:10 +08:00
Kevin Lewis
71a200ed5c add support for video previews (#197)
* add support for video previews

* fix two cases where video previews did not show
2025-08-15 10:12:13 +08:00
Hayden
c96a164f68 Prepare release 2.7.0 2025-08-11 16:59:45 +08:00
Hayden
0ae0716272 fix: Ensure downloadable files are available for model versions without model files (#199) 2025-08-11 10:51:18 +08:00
Hayden
b692270f87 perf: Reconstruct the i18n directory structure (#198) 2025-08-11 10:38:40 +08:00
Hayden
a9675a5d83 feat: Add model upload functionality (#194) 2025-08-11 09:10:39 +08:00
Hayden
ac4a168f13 feat: support download multiple actual files (#196) 2025-08-11 09:10:20 +08:00
Hayden
8b9f3a0e65 191 windows path is wrong when dragging to create lora node from manager (#195)
* fix: match system path style

* fix: only match dragToAddModelNode
2025-08-11 09:09:51 +08:00
Hayden
8d7e32eaf6 Prepare release 2.6.3 2025-04-29 17:32:13 +08:00
Hayden
e964f26798 Secure storage API keys (#181)
* Migrate api key to private.key

* Optimize API Key setting
2025-04-29 17:30:36 +08:00
Hayden
3cfbb5ac0e 178 bug borderline race condition (#179)
* Add assets files

* Prepare release 2.6.2
2025-04-21 17:17:28 +08:00
Hayden
4472357537 176 bug the version selection panel didnt show up (#177)
* Remove custom z-index

* Prepare release 2.6.1
2025-04-21 10:54:00 +08:00
hayden
aabf3f99b3 Add browser version collection 2025-04-21 10:34:11 +08:00
hayden
6bd6b19c1d format code 2025-04-21 09:54:30 +08:00
Hayden
411219df7d Update publish.yml 2025-04-10 13:15:13 +08:00
Hayden
cc29349aee Prepare release 2.6.0 2025-04-10 13:08:46 +08:00
Hayden
f639e3c795 Support extension gguf (#175) 2025-04-10 13:07:54 +08:00
Hayden
5251eeaa93 Refactor scan infomation featurn (#174)
* feat: add scanning setting panel

* feat: implement the back-end interface

* feat: add i18n-zh

* chore: remove never used code
2025-04-10 13:07:33 +08:00
hayden
3bfc6c28af chore(deps): update vue 2025-04-08 10:32:57 +08:00
hayden
c91eff16ae Remove build sourcemap 2025-04-08 10:20:11 +08:00
hayden
2d638a3451 Add issue template 2025-04-08 10:16:53 +08:00
hayden
280b6ed7c0 Delete action permission restrictions 2025-04-08 10:15:35 +08:00
Hayden
7de73ae09c Cancel Release 2025-03-28 20:49:15 +08:00
Hayden
0fdea64c79 Update publish.yml 2025-03-28 20:47:24 +08:00
Hayden
2b9327e6ca Update publish.yml 2025-03-28 20:34:51 +08:00
Hayden
c33b4e0333 Update publish.yml 2025-03-28 20:25:02 +08:00
Hayden
6dcaed7764 Update publish.yml 2025-03-28 20:22:11 +08:00
Hayden
ab4e0d38e1 Error file size (#170)
* Information providing wrong file size

* prepare release 2.5.5
2025-03-28 17:23:41 +08:00
Robin Huang
581d2c14fc chore(publish): update GitHub Actions workflow for conditional execution and permissions (#168)
- Added permissions to allow writing to issues.
- Introduced conditional execution for the publish-node job based on repository owner.
- Updated checkout action to version 4.

Co-authored-by: snomiao <snomiao+comfy-pr@gmail.com>
2025-03-28 11:29:10 +08:00
41 changed files with 1788 additions and 489 deletions

86
.github/ISSUE_TEMPLATE/bug-report.yaml vendored Normal file
View File

@@ -0,0 +1,86 @@
name: Bug Report
description: 'Something is not behaving as expected.'
title: '[Bug]: '
body:
- type: markdown
attributes:
value: |
Before submitting a **Bug Report**, please ensure the following:
- **1:** You are running the latest version of ComfyUI-Model-Manager.
- **2:** You have looked at the existing bug reports and made sure this isn't already reported.
- **3:** You confirmed that the bug is not caused by other custom nodes.
- type: textarea
id: environment
attributes:
label: Environment
description: 'Describe as detailed as possible what your current usage environment is. local? cloud? etc...'
value: |
[Operating System]:
[Python Version]:
[ComfyUI Version]:
[ComfyUI Frontend Version]:
[ComfyUI-Model-Manager Version]:
[Browser Version]:
validations:
required: true
- type: textarea
attributes:
label: Expected Behavior
description: 'What you expected to happen.'
validations:
required: true
- type: textarea
attributes:
label: Actual Behavior
description: 'What actually happened. Please include a screenshot / video clip of the issue if possible.'
validations:
required: true
- type: textarea
attributes:
label: Steps to Reproduce
description: "Describe how to reproduce the issue. Please be sure to attach a workflow JSON or PNG, ideally one that doesn't require custom nodes to test. If the bug open happens when certain custom nodes are used, most likely that custom node is what has the bug rather than ComfyUI, in which case it should be reported to the node's author."
validations:
required: true
- type: textarea
attributes:
label: Debug Logs
description: 'Please copy the output from your terminal logs here.'
render: powershell
validations:
required: true
- type: textarea
attributes:
label: Browser Logs
description: 'Please copy the output from your browser logs here. You can access this by pressing F12 to toggle the developer tools, then navigating to the Console tab.'
validations:
required: true
- type: textarea
attributes:
label: Setting JSON
description: 'Please upload the setting file here. The setting file is located at `user/default/comfy.settings.json`'
validations:
required: true
- type: dropdown
id: browsers
attributes:
label: What browsers do you use to access the UI ?
multiple: true
options:
- Mozilla Firefox
- Google Chrome
- Brave
- Apple Safari
- Microsoft Edge
- Android
- iOS
- Other
- type: textarea
attributes:
label: Other
description: 'Any other additional information you think might be helpful.'
validations:
required: false

View File

@@ -0,0 +1,39 @@
name: Feature Request
description: Suggest an idea for this project
title: '[Feature Request]: '
body:
- type: checkboxes
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the feature you want, and that it's not implemented in a recent build/commit.
options:
- label: I have searched the existing issues and checked the recent builds/commits
required: true
- type: markdown
attributes:
value: |
*Please fill this form with as much information as possible, provide screenshots and/or illustrations of the feature if possible*
- type: textarea
id: feature
attributes:
label: What would your feature do ?
description: Tell us about your feature in a very clear and simple way, and what problem it would solve
validations:
required: true
- type: textarea
id: workflow
attributes:
label: Proposed workflow
description: Please provide us with step by step information on how you'd like the feature to be accessed and used
value: |
1. Go to ....
2. Press ....
3. ...
validations:
required: true
- type: textarea
id: misc
attributes:
label: Additional information
description: Add any other context or screenshots about the feature request here.

View File

@@ -11,6 +11,7 @@ jobs:
publish-node:
name: Release and Publish Custom Node to registry
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'hayden-fr' }}
steps:
- name: Check out code
uses: actions/checkout@v4
@@ -60,7 +61,7 @@ jobs:
run: |
pnpm install
pnpm run build
tar -czf dist.tar.gz py/ web/ __init__.py LICENSE pyproject.toml requirements.txt
tar -czf dist.tar.gz assets/ py/ web/ __init__.py LICENSE pyproject.toml requirements.txt
- name: Create release draft
uses: softprops/action-gh-release@v2

3
.gitignore vendored
View File

@@ -197,3 +197,6 @@ web/
# config
config/
# private info
private.key

View File

@@ -1,5 +1,6 @@
{
"recommendations": [
"esbenp.prettier-vscode"
"esbenp.prettier-vscode",
"lokalise.i18n-ally"
]
}

View File

@@ -43,5 +43,10 @@
"editor.quickSuggestions": {
"strings": "on"
},
"css.lint.unknownAtRules": "ignore"
"css.lint.unknownAtRules": "ignore",
"i18n-ally.localesPaths": [
"src/locales"
],
"i18n-ally.sourceLanguage": "en",
"i18n-ally.keystyle": "nested"
}

View File

@@ -1,3 +1,11 @@
import folder_paths
# NOTE: This is an experiment
# Add .gguf extension to supported_pt_extensions
folder_paths.supported_pt_extensions.add(".gguf")
import os
from .py import config
from .py import utils
@@ -33,12 +41,14 @@ utils.download_web_distribution(version)
from .py import manager
from .py import download
from .py import information
from .py import upload
routes = config.routes
manager.ModelManager().add_routes(routes)
download.ModelDownload().add_routes(routes)
information.Information().add_routes(routes)
upload.ModelUploader().add_routes(routes)
WEB_DIRECTORY = "web"

View File

@@ -39,8 +39,8 @@
"markdown-it": "^14.1.0",
"markdown-it-metadata-block": "^1.0.6",
"primevue": "^4.0.7",
"vue": "^3.4.31",
"vue-i18n": "^9.13.1",
"vue": "^3.5.6",
"vue-i18n": "^9.14.0",
"yaml": "^2.6.0"
},
"lint-staged": {

14
pnpm-lock.yaml generated
View File

@@ -30,10 +30,10 @@ importers:
specifier: ^4.0.7
version: 4.0.7(vue@3.5.6(typescript@5.6.2))
vue:
specifier: ^3.4.31
specifier: ^3.5.6
version: 3.5.6(typescript@5.6.2)
vue-i18n:
specifier: ^9.13.1
specifier: ^9.14.0
version: 9.14.0(vue@3.5.6(typescript@5.6.2))
yaml:
specifier: ^2.6.0
@@ -705,8 +705,8 @@ packages:
resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
engines: {node: '>= 6'}
caniuse-lite@1.0.30001662:
resolution: {integrity: sha512-sgMUVwLmGseH8ZIrm1d51UbrhqMCH3jvS7gF/M6byuHOnKyLOBL7W8yz5V02OHwgLGA36o/AFhWzzh4uc5aqTA==}
caniuse-lite@1.0.30001712:
resolution: {integrity: sha512-MBqPpGYYdQ7/hfKiet9SCI+nmN5/hp4ZzveOJubl5DTAMa5oggjAuoi0Z4onBpKPFI2ePGnQuQIzF3VxDjDJig==}
chalk@4.1.2:
resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
@@ -2271,7 +2271,7 @@ snapshots:
autoprefixer@10.4.20(postcss@8.4.47):
dependencies:
browserslist: 4.23.3
caniuse-lite: 1.0.30001662
caniuse-lite: 1.0.30001712
fraction.js: 4.3.7
normalize-range: 0.1.2
picocolors: 1.1.0
@@ -2299,7 +2299,7 @@ snapshots:
browserslist@4.23.3:
dependencies:
caniuse-lite: 1.0.30001662
caniuse-lite: 1.0.30001712
electron-to-chromium: 1.5.25
node-releases: 2.0.18
update-browserslist-db: 1.1.0(browserslist@4.23.3)
@@ -2308,7 +2308,7 @@ snapshots:
camelcase-css@2.0.1: {}
caniuse-lite@1.0.30001662: {}
caniuse-lite@1.0.30001712: {}
chalk@4.1.2:
dependencies:

View File

@@ -2,6 +2,9 @@ import os
import uuid
import time
import requests
import base64
import folder_paths
@@ -92,8 +95,68 @@ class TaskContent:
}
class ApiKey:
__store: dict[str, str] = {}
def __init__(self):
self.__cache_file = os.path.join(config.extension_uri, "private.key")
def init(self, request):
# Try to migrate api key from user setting
if not os.path.exists(self.__cache_file):
self.__store = {
"civitai": utils.get_setting_value(request, "api_key.civitai"),
"huggingface": utils.get_setting_value(request, "api_key.huggingface"),
}
self.__update__()
# Remove api key from user setting
utils.set_setting_value(request, "api_key.civitai", None)
utils.set_setting_value(request, "api_key.huggingface", None)
self.__store = utils.load_dict_pickle_file(self.__cache_file)
# Desensitization returns
result: dict[str, str] = {}
for key in self.__store:
v = self.__store[key]
if v is not None:
result[key] = v[:4] + "****" + v[-4:]
return result
def get_value(self, key: str):
return self.__store.get(key, None)
def set_value(self, key: str, value: str):
self.__store[key] = value
self.__update__()
def __update__(self):
utils.save_dict_pickle_file(self.__cache_file, self.__store)
class ModelDownload:
def __init__(self):
self.api_key = ApiKey()
def add_routes(self, routes):
@routes.post("/model-manager/download/init")
async def init_download(request):
"""
Init download setting.
"""
result = self.api_key.init(request)
return web.json_response({"success": True, "data": result})
@routes.post("/model-manager/download/setting")
async def set_download_setting(request):
"""
Set download setting.
"""
json_data = await request.json()
key = json_data.get("key", None)
value = json_data.get("value", None)
value = base64.b64decode(value).decode("utf-8") if value is not None else None
self.api_key.set_value(key, value)
return web.json_response({"success": True})
@routes.get("/model-manager/download/task")
async def scan_download_tasks(request):
@@ -263,7 +326,7 @@ class ModelDownload:
try:
preview_file = task_data.pop("previewFile", None)
utils.save_model_preview_image(task_path, preview_file, download_platform)
utils.save_model_preview(task_path, preview_file, download_platform)
self.set_task_content(task_id, task_data)
task_status = TaskStatus(
taskId=task_id,
@@ -329,12 +392,12 @@ class ModelDownload:
download_platform = task_status.platform
if download_platform == "civitai":
api_key = utils.get_setting_value(request, "api_key.civitai")
api_key = self.api_key.get_value("civitai")
if api_key:
headers["Authorization"] = f"Bearer {api_key}"
elif download_platform == "huggingface":
api_key = utils.get_setting_value(request, "api_key.huggingface")
api_key = self.api_key.get_value("huggingface")
if api_key:
headers["Authorization"] = f"Bearer {api_key}"
@@ -457,8 +520,10 @@ class ModelDownload:
# When parsing model information from HuggingFace API,
# the file size was not found and needs to be obtained from the response header.
if total_size == 0:
total_size = float(response.headers.get("content-length", 0))
# Fixed issue #169. Some model information from Civitai, providing the wrong file size
response_total_size = float(response.headers.get("content-length", 0))
if total_size == 0 or total_size != response_total_size:
total_size = response_total_size
task_content.sizeBytes = total_size
task_status.totalSize = total_size
self.set_task_content(task_id, task_content)

View File

@@ -1,10 +1,12 @@
import os
import re
import uuid
import math
import yaml
import requests
import markdownify
import folder_paths
@@ -17,6 +19,7 @@ from io import BytesIO
from . import utils
from . import config
from . import thread
class ModelSearcher(ABC):
@@ -66,8 +69,12 @@ class CivitaiModelSearcher(ModelSearcher):
models: list[dict] = []
for version in model_versions:
model_files: list[dict] = version.get("files", [])
model_files = utils.filter_with(model_files, {"type": "Model"})
version_files: list[dict] = version.get("files", [])
model_files = utils.filter_with(version_files, {"type": "Model"})
# issue: https://github.com/hayden-fr/ComfyUI-Model-Manager/issues/188
# Some Embeddings do not have Model file, but Negative
# Make sure there are at least downloadable files
model_files = version_files if len(model_files) == 0 else model_files
shortname = version.get("name", None) if len(model_files) > 0 else None
@@ -105,7 +112,7 @@ class CivitaiModelSearcher(ModelSearcher):
description_parts.append("")
model = {
"id": file.get("id"),
"id": version.get("id"),
"shortname": shortname or basename,
"basename": basename,
"extension": extension,
@@ -119,6 +126,7 @@ class CivitaiModelSearcher(ModelSearcher):
"downloadPlatform": "civitai",
"downloadUrl": file.get("downloadUrl"),
"hashes": file.get("hashes"),
"files": version_files if len(version_files) > 1 else None,
}
models.append(model)
@@ -307,16 +315,38 @@ class Information:
utils.print_error(error_msg)
return web.json_response({"success": False, "error": error_msg})
@routes.get("/model-manager/model-info/scan")
async def get_model_info_download_task(request):
"""
Get model information download task list.
"""
try:
result = self.get_scan_model_info_task_list()
if result is not None:
await self.download_model_info(request)
return web.json_response({"success": True, "data": result})
except Exception as e:
error_msg = f"Get model info download task list failed: {str(e)}"
utils.print_error(error_msg)
return web.json_response({"success": False, "error": error_msg})
@routes.post("/model-manager/model-info/scan")
async def download_model_info(request):
async def create_model_info_download_task(request):
"""
Create a task to download model information.
- scanMode: The alternatives are diff and full.
- mode: The alternatives are diff and full.
- path: Scanning root path.
"""
post = await utils.get_request_body(request)
try:
# TODO scanMode is deprecated, use mode instead.
scan_mode = post.get("scanMode", "diff")
await self.download_model_info(scan_mode, request)
return web.json_response({"success": True})
scan_mode = post.get("mode", scan_mode)
scan_path = post.get("path", None)
result = await self.create_scan_model_info_task(scan_mode, scan_path, request)
return web.json_response({"success": True, "data": result})
except Exception as e:
error_msg = f"Download model info failed: {str(e)}"
utils.print_error(error_msg)
@@ -325,23 +355,17 @@ class Information:
@routes.get("/model-manager/preview/{type}/{index}/{filename:.*}")
async def read_model_preview(request):
"""
Get the file stream of the specified image.
Get the file stream of the specified preview
If the file does not exist, no-preview.png is returned.
: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.
:param filename: The filename of the preview.
"""
model_type = request.match_info.get("type", None)
index = int(request.match_info.get("index", None))
filename = request.match_info.get("filename", None)
content_type = utils.resolve_file_content_type(filename)
if content_type == "video":
abs_path = utils.get_full_path(model_type, index, filename)
return web.FileResponse(abs_path)
extension_uri = config.extension_uri
try:
@@ -358,8 +382,16 @@ class Information:
if not os.path.isfile(abs_path):
abs_path = utils.join_path(extension_uri, "assets", "no-preview.png")
image_data = self.get_image_preview_data(abs_path)
return web.Response(body=image_data.getvalue(), content_type="image/webp")
# Determine content type from the actual file
content_type = utils.resolve_file_content_type(abs_path)
if content_type == "video":
# Serve video files directly
return web.FileResponse(abs_path)
else:
# Serve image files (WebP or fallback images)
image_data = self.get_image_preview_data(abs_path)
return web.Response(body=image_data.getvalue(), content_type="image/webp")
@routes.get("/model-manager/preview/download/{filename}")
async def read_download_preview(request):
@@ -440,60 +472,107 @@ class Information:
result = model_searcher.search_by_url(model_page)
return result
async def download_model_info(self, scan_mode: str, request):
utils.print_info(f"Download model info for {scan_mode}")
model_base_paths = utils.resolve_model_base_paths()
for model_type in model_base_paths:
def get_scan_information_task_filepath(self):
download_dir = utils.get_download_path()
return utils.join_path(download_dir, "scan_information.task")
folders, *others = folder_paths.folder_names_and_paths[model_type]
for path_index, base_path in enumerate(folders):
files = utils.recursive_search_files(base_path, request)
def get_scan_model_info_task_list(self):
scan_info_task_file = self.get_scan_information_task_filepath()
if os.path.isfile(scan_info_task_file):
return utils.load_dict_pickle_file(scan_info_task_file)
return None
models = folder_paths.filter_files_extensions(files, folder_paths.supported_pt_extensions)
async def create_scan_model_info_task(self, scan_mode: str, scan_path: str | None, request):
scan_info_task_file = self.get_scan_information_task_filepath()
scan_info_task_content = {"mode": scan_mode}
scan_models: dict[str, bool] = {}
for fullname in models:
fullname = utils.normalize_path(fullname)
basename = os.path.splitext(fullname)[0]
scan_paths: list[str] = []
if scan_path is None:
model_base_paths = utils.resolve_model_base_paths()
for model_type in model_base_paths:
folders, *others = folder_paths.folder_names_and_paths[model_type]
for path_index, base_path in enumerate(folders):
scan_paths.append(base_path)
else:
scan_paths = [scan_path]
abs_model_path = utils.join_path(base_path, fullname)
for base_path in scan_paths:
files = utils.recursive_search_files(base_path, request)
models = folder_paths.filter_files_extensions(files, folder_paths.supported_pt_extensions)
for fullname in models:
fullname = utils.normalize_path(fullname)
abs_model_path = utils.join_path(base_path, fullname)
utils.print_debug(f"Found model: {abs_model_path}")
scan_models[abs_model_path] = False
image_name = utils.get_model_preview_name(abs_model_path)
abs_image_path = utils.join_path(base_path, image_name)
scan_info_task_content["models"] = scan_models
utils.save_dict_pickle_file(scan_info_task_file, scan_info_task_content)
await self.download_model_info(request)
return scan_info_task_content
has_preview = os.path.isfile(abs_image_path)
download_thread_pool = thread.DownloadThreadPool()
description_name = utils.get_model_description_name(abs_model_path)
abs_description_path = utils.join_path(base_path, description_name) if description_name else None
has_description = os.path.isfile(abs_description_path) if abs_description_path else False
async def download_model_info(self, request):
async def download_information_task(task_id: str):
scan_info_task_file = self.get_scan_information_task_filepath()
scan_info_task_content = utils.load_dict_pickle_file(scan_info_task_file)
scan_mode = scan_info_task_content.get("mode", "diff")
scan_models: dict[str, bool] = scan_info_task_content.get("models", {})
for key, value in scan_models.items():
if value is True:
continue
try:
abs_model_path = key
base_path = os.path.dirname(abs_model_path)
utils.print_info(f"Checking model {abs_model_path}")
utils.print_debug(f"Scan mode: {scan_mode}")
utils.print_debug(f"Has preview: {has_preview}")
utils.print_debug(f"Has description: {has_description}")
image_name = utils.get_model_preview_name(abs_model_path)
abs_image_path = utils.join_path(base_path, image_name)
if scan_mode != "full" and (has_preview and has_description):
continue
has_preview = os.path.isfile(abs_image_path)
description_name = utils.get_model_description_name(abs_model_path)
abs_description_path = utils.join_path(base_path, description_name) if description_name else None
has_description = os.path.isfile(abs_description_path) if abs_description_path else False
try:
utils.print_info(f"Checking model {abs_model_path}")
utils.print_debug(f"Scan mode: {scan_mode}")
utils.print_debug(f"Has preview: {has_preview}")
utils.print_debug(f"Has description: {has_description}")
if scan_mode == "full" or not has_preview or not has_description:
utils.print_debug(f"Calculate sha256 for {abs_model_path}")
hash_value = utils.calculate_sha256(abs_model_path)
utils.print_info(f"Searching model info by hash {hash_value}")
model_info = CivitaiModelSearcher().search_by_hash(hash_value)
preview_url_list = model_info.get("preview", [])
preview_image_url = preview_url_list[0] if preview_url_list else None
if preview_image_url:
utils.print_debug(f"Save preview image to {abs_image_path}")
utils.save_model_preview_image(abs_model_path, preview_image_url)
preview_url = preview_url_list[0] if preview_url_list else None
if preview_url:
utils.print_debug(f"Save preview to {abs_model_path}")
utils.save_model_preview(abs_model_path, preview_url)
description = model_info.get("description", None)
if description:
utils.save_model_description(abs_model_path, description)
except Exception as e:
utils.print_error(f"Failed to download model info for {abs_model_path}: {e}")
utils.print_debug("Completed scan model information.")
scan_models[abs_model_path] = True
scan_info_task_content["models"] = scan_models
utils.save_dict_pickle_file(scan_info_task_file, scan_info_task_content)
utils.print_debug(f"Send update scan information task to frontend.")
await utils.send_json("update_scan_information_task", scan_info_task_content)
except Exception as e:
utils.print_error(f"Failed to download model info for {abs_model_path}: {e}")
os.remove(scan_info_task_file)
utils.print_info("Completed scan model information.")
try:
task_id = uuid.uuid4().hex
self.download_thread_pool.submit(download_information_task, task_id)
except Exception as e:
utils.print_debug(str(e))
def get_model_searcher_by_url(self, url: str) -> ModelSearcher:
parsed_url = urlparse(url)

View File

@@ -131,23 +131,16 @@ class ModelManager:
basename = os.path.splitext(filename)[0] if is_file else filename
extension = os.path.splitext(filename)[1] if is_file else ""
if is_file and extension not in folder_paths.supported_pt_extensions:
model_preview = None
if is_file:
preview_name = utils.get_model_preview_name(entry.path)
preview_ext = f".{preview_name.split('.')[-1]}"
model_preview = f"/model-manager/preview/{folder}/{path_index}/{relative_path.replace(extension, preview_ext)}"
if not os.path.exists(entry.path):
utils.print_error(f"{entry.path} is not file or directory.")
return None
preview_type = "image"
preview_ext = ".webp"
preview_images = utils.get_model_all_images(entry.path)
if len(preview_images) > 0:
preview_type = "image"
preview_ext = ".webp"
else:
preview_videos = utils.get_model_all_videos(entry.path)
if len(preview_videos) > 0:
preview_type = "video"
preview_ext = f".{preview_videos[0].split('.')[-1]}"
model_preview = f"/model-manager/preview/{folder}/{path_index}/{relative_path.replace(extension, preview_ext)}"
stat = entry.stat()
return {
"type": folder,
@@ -157,36 +150,45 @@ class ModelManager:
"extension": extension,
"pathIndex": path_index,
"sizeBytes": stat.st_size if is_file else 0,
"preview": model_preview if is_file else None,
"previewType": preview_type,
"preview": model_preview,
"createdAt": round(stat.st_ctime_ns / 1000000),
"updatedAt": round(stat.st_mtime_ns / 1000000),
}
def get_all_files_entry(directory: str):
entries: list[os.DirEntry[str]] = []
if not os.path.exists(directory):
return []
with os.scandir(directory) as it:
for entry in it:
# Skip hidden files
if not include_hidden_files:
if entry.name.startswith("."):
continue
entries.append(entry)
if entry.is_dir():
if not include_hidden_files and entry.name.startswith("."):
continue
if entry.is_file():
extension = os.path.splitext(entry.name)[1]
if extension in folder_paths.supported_pt_extensions:
entries.append(entry)
else:
entries.append(entry)
entries.extend(get_all_files_entry(entry.path))
return entries
BATCH_SIZE = 200
MAX_WORKERS = min(4, os.cpu_count() or 1)
for path_index, base_path in enumerate(folders):
if not os.path.exists(base_path):
continue
file_entries = get_all_files_entry(base_path)
with ThreadPoolExecutor() as executor:
futures = {executor.submit(get_file_info, entry, base_path, path_index): entry for entry in file_entries}
for future in as_completed(futures):
file_info = future.result()
if file_info is None:
continue
result.append(file_info)
for i in range(0, len(file_entries), BATCH_SIZE):
batch = file_entries[i:i + BATCH_SIZE]
with ThreadPoolExecutor(max_workers=MAX_WORKERS) as executor:
futures = {executor.submit(get_file_info, entry, base_path, path_index): entry for entry in batch}
for future in as_completed(futures):
file_info = future.result()
if file_info is not None:
result.append(file_info)
return result
@@ -211,10 +213,11 @@ class ModelManager:
if "previewFile" in model_data:
previewFile = model_data["previewFile"]
if type(previewFile) is str and previewFile == "undefined":
utils.remove_model_preview_image(model_path)
else:
utils.save_model_preview_image(model_path, previewFile)
# Always remove existing preview files first in case the file extension has changed
utils.remove_model_preview(model_path)
# Nothing else to do if the preview file was being removed
if not (type(previewFile) is str and previewFile == "undefined"):
utils.save_model_preview(model_path, previewFile)
if "description" in model_data:
description = model_data["description"]
@@ -236,7 +239,7 @@ class ModelManager:
model_dirname = os.path.dirname(model_path)
os.remove(model_path)
model_previews = utils.get_model_all_images(model_path)
model_previews = utils.get_model_all_previews(model_path)
for preview in model_previews:
os.remove(utils.join_path(model_dirname, preview))

79
py/upload.py Normal file
View File

@@ -0,0 +1,79 @@
import os
import time
import folder_paths
from aiohttp import web
from . import utils
class ModelUploader:
def add_routes(self, routes):
@routes.get("/model-manager/supported-extensions")
async def fetch_model_exts(request):
"""
Get model exts
"""
try:
supported_extensions = list(folder_paths.supported_pt_extensions)
return web.json_response({"success": True, "data": supported_extensions})
except Exception as e:
error_msg = f"Get model supported extension failed: {str(e)}"
utils.print_error(error_msg)
return web.json_response({"success": False, "error": error_msg})
@routes.post("/model-manager/upload")
async def upload_model(request):
"""
Upload model
"""
try:
reader = await request.multipart()
await self.upload_model(reader)
utils.print_info(f"Upload model success")
return web.json_response({"success": True, "data": None})
except Exception as e:
error_msg = f"Upload model failed: {str(e)}"
utils.print_error(error_msg)
return web.json_response({"success": False, "error": error_msg})
async def upload_model(self, reader):
uploaded_size = 0
last_update_time = time.time()
interval = 1.0
while True:
part = await reader.next()
if part is None:
break
name = part.name
if name == "folder":
file_folder = await part.text()
if name == "file":
filename = part.filename
filepath = f"{file_folder}/{filename}"
tmp_filepath = f"{file_folder}/{filename}.tmp"
with open(tmp_filepath, "wb") as f:
while True:
chunk = await part.read_chunk()
if not chunk:
break
f.write(chunk)
uploaded_size += len(chunk)
if time.time() - last_update_time >= interval:
update_upload_progress = {
"uploaded_size": uploaded_size,
}
await utils.send_json("update_upload_progress", update_upload_progress)
update_upload_progress = {
"uploaded_size": uploaded_size,
}
await utils.send_json("update_upload_progress", update_upload_progress)
os.rename(tmp_filepath, filepath)

View File

@@ -17,6 +17,25 @@ from aiohttp import web
from typing import Any, Optional
from . import config
# Media file extensions
VIDEO_EXTENSIONS = ['.mp4', '.webm', '.mov', '.avi', '.mkv', '.flv', '.wmv', '.m4v', '.ogv']
IMAGE_EXTENSIONS = ['.webp', '.png', '.jpg', '.jpeg', '.gif', '.bmp']
# Preview extensions in priority order (videos first, then images)
PREVIEW_EXTENSIONS = ['.webm', '.mp4', '.webp', '.png', '.jpg', '.jpeg', '.gif', '.bmp']
# Content type mappings
VIDEO_CONTENT_TYPE_MAP = {
'video/mp4': '.mp4',
'video/webm': '.webm',
'video/quicktime': '.mov',
'video/x-msvideo': '.avi',
'video/x-matroska': '.mkv',
'video/x-flv': '.flv',
'video/x-ms-wmv': '.wmv',
'video/ogg': '.ogv',
}
def print_info(msg, *args, **kwargs):
logging.info(f"[{config.extension_tag}] {msg}", *args, **kwargs)
@@ -27,7 +46,7 @@ def print_warning(msg, *args, **kwargs):
def print_error(msg, *args, **kwargs):
logging.error(f"[{config.extension_tag}] {msg}", *args, **kwargs)
logging.error(f"[{config.extension_tag}][ERROR] {msg}", *args, **kwargs)
logging.debug(traceback.format_exc())
@@ -252,95 +271,145 @@ def get_model_metadata(filename: str):
return {}
def get_model_all_images(model_path: str):
def _check_preview_variants(base_dirname: str, basename: str, extensions: list[str]) -> list[str]:
"""Check for preview files with given extensions and return found files"""
found = []
for ext in extensions:
# Direct match (basename.ext)
preview_file = f"{basename}{ext}"
if os.path.isfile(join_path(base_dirname, preview_file)):
found.append(preview_file)
# Preview variant (basename.preview.ext)
preview_file = f"{basename}.preview{ext}"
if os.path.isfile(join_path(base_dirname, preview_file)):
found.append(preview_file)
return found
def _get_preview_path(model_path: str, extension: str) -> str:
"""Generate preview file path with given extension"""
basename = os.path.splitext(model_path)[0]
return f"{basename}{extension}"
def get_model_all_previews(model_path: str) -> list[str]:
"""Get all preview files for a model"""
base_dirname = os.path.dirname(model_path)
files = search_files(base_dirname)
files = folder_paths.filter_files_content_types(files, ["image"])
basename = os.path.splitext(os.path.basename(model_path))[0]
output: list[str] = []
for file in files:
file_basename = os.path.splitext(file)[0]
if file_basename == basename:
output.append(file)
if file_basename == f"{basename}.preview":
output.append(file)
return output
return _check_preview_variants(base_dirname, basename, PREVIEW_EXTENSIONS)
def get_model_preview_name(model_path: str):
images = get_model_all_images(model_path)
basename = os.path.splitext(os.path.basename(model_path))[0]
for image in images:
image_name = os.path.splitext(image)[0]
image_ext = os.path.splitext(image)[1]
if image_name == basename and image_ext.lower() == ".webp":
return image
return images[0] if len(images) > 0 else "no-preview.png"
def get_model_all_videos(model_path: str):
def get_model_preview_name(model_path: str) -> str:
"""Get the first available preview file or 'no-preview.png' if none found"""
base_dirname = os.path.dirname(model_path)
files = search_files(base_dirname)
files = folder_paths.filter_files_content_types(files, ["video"])
basename = os.path.splitext(os.path.basename(model_path))[0]
output: list[str] = []
for file in files:
file_basename = os.path.splitext(file)[0]
if file_basename == basename:
output.append(file)
if file_basename == f"{basename}.preview":
output.append(file)
return output
for ext in PREVIEW_EXTENSIONS:
# Check direct match first
preview_name = f"{basename}{ext}"
if os.path.isfile(join_path(base_dirname, preview_name)):
return preview_name
# Check preview variant
preview_name = f"{basename}.preview{ext}"
if os.path.isfile(join_path(base_dirname, preview_name)):
return preview_name
return "no-preview.png"
from PIL import Image
from io import BytesIO
def remove_model_preview_image(model_path: str):
basename = os.path.splitext(model_path)[0]
preview_path = f"{basename}.webp"
if os.path.exists(preview_path):
os.remove(preview_path)
def remove_model_preview(model_path: str):
"""Remove all preview files for a model"""
base_dirname = os.path.dirname(model_path)
basename = os.path.splitext(os.path.basename(model_path))[0]
previews = _check_preview_variants(base_dirname, basename, PREVIEW_EXTENSIONS)
for preview in previews:
preview_path = join_path(base_dirname, preview)
if os.path.exists(preview_path):
os.remove(preview_path)
def save_model_preview_image(model_path: str, image_file_or_url: Any, platform: Optional[str] = None):
basename = os.path.splitext(model_path)[0]
preview_path = f"{basename}.webp"
# Download image file if it is url
if type(image_file_or_url) is str:
image_url = image_file_or_url
def save_model_preview(model_path: str, file_or_url: Any, platform: Optional[str] = None):
"""Save a preview file for a model. Images -> WebP, videos -> original format"""
# Download file if it is a URL
if type(file_or_url) is str:
url = file_or_url
try:
image_response = requests.get(image_url)
image_response.raise_for_status()
image = Image.open(BytesIO(image_response.content))
image.save(preview_path, "WEBP")
response = requests.get(url)
response.raise_for_status()
# Determine content type from response headers or URL extension
content_type = response.headers.get('content-type', '')
if not content_type:
# Fallback to URL extension detection
content_type = resolve_file_content_type(url) or ''
content = response.content
if content_type.startswith("video/"):
# Save video in original format
# Try to get extension from URL or content-type
ext = _get_video_extension_from_url(url) or _get_extension_from_content_type(content_type) or '.mp4'
preview_path = _get_preview_path(model_path, ext)
with open(preview_path, 'wb') as f:
f.write(content)
else:
# Default to image processing for unknown or image types
preview_path = _get_preview_path(model_path, ".webp")
image = Image.open(BytesIO(content))
image.save(preview_path, "WEBP")
except Exception as e:
print_error(f"Failed to download image: {e}")
print_error(f"Failed to download preview: {e}")
# Handle uploaded file
else:
# Assert image as file
image_file = image_file_or_url
file_obj = file_or_url
if not isinstance(image_file, web.FileField):
raise RuntimeError("Invalid image file")
if not isinstance(file_obj, web.FileField):
raise RuntimeError("Invalid file")
content_type: str = image_file.content_type
if not content_type.startswith("image/"):
if platform == "huggingface":
# huggingface previewFile content_type='text/plain', not startswith("image/")
return
else:
raise RuntimeError(f"FileTypeError: expected image, got {content_type}")
image = Image.open(image_file.file)
image.save(preview_path, "WEBP")
content_type: str = file_obj.content_type
filename: str = getattr(file_obj, 'filename', '')
if content_type.startswith("video/"):
# Save video in original format for now, consider transcoding to webm to follow the pattern for images converting to webp
ext = os.path.splitext(filename.lower())[1] or '.mp4'
preview_path = _get_preview_path(model_path, ext)
file_obj.file.seek(0)
content = file_obj.file.read()
with open(preview_path, 'wb') as f:
f.write(content)
elif content_type.startswith("image/"):
# Convert image to webp
preview_path = _get_preview_path(model_path, ".webp")
image = Image.open(file_obj.file)
image.save(preview_path, "WEBP")
else:
raise RuntimeError(f"FileTypeError: expected image or video, got {content_type}")
def _get_video_extension_from_url(url: str) -> Optional[str]:
"""Extract video extension from URL."""
from urllib.parse import urlparse
path = urlparse(url).path.lower()
for ext in VIDEO_EXTENSIONS:
if path.endswith(ext):
return ext
return None
def _get_extension_from_content_type(content_type: str) -> Optional[str]:
"""Map content-type to file extension."""
return VIDEO_CONTENT_TYPE_MAP.get(content_type.lower())
def get_model_all_descriptions(model_path: str):
@@ -398,7 +467,7 @@ def rename_model(model_path: str, new_model_path: str):
shutil.move(model_path, new_model_path)
# move preview
previews = get_model_all_images(model_path)
previews = get_model_all_previews(model_path)
for preview in previews:
preview_path = join_path(model_dirname, preview)
preview_name = os.path.splitext(preview)[0]

View File

@@ -1,7 +1,7 @@
[project]
name = "comfyui-model-manager"
description = "Manage models: browsing, download and delete."
version = "2.5.4"
version = "2.8.3"
license = { file = "LICENSE" }
dependencies = ["markdownify"]

View File

@@ -9,6 +9,8 @@
import DialogDownload from 'components/DialogDownload.vue'
import DialogExplorer from 'components/DialogExplorer.vue'
import DialogManager from 'components/DialogManager.vue'
import DialogScanning from 'components/DialogScanning.vue'
import DialogUpload from 'components/DialogUpload.vue'
import GlobalDialogStack from 'components/GlobalDialogStack.vue'
import GlobalLoading from 'components/GlobalLoading.vue'
import GlobalToast from 'components/GlobalToast.vue'
@@ -35,6 +37,19 @@ onMounted(() => {
})
}
const openModelScanning = () => {
dialog.open({
key: 'model-information-scanning',
title: t('batchScanModelInformation'),
content: DialogScanning,
modal: true,
defaultSize: {
width: 680,
height: 490,
},
})
}
const openDownloadDialog = () => {
dialog.open({
key: 'model-manager-download-list',
@@ -50,8 +65,40 @@ onMounted(() => {
})
}
const openUploadDialog = () => {
dialog.open({
key: 'model-manager-upload',
title: t('uploadModel'),
content: DialogUpload,
headerButtons: [
{
key: 'refresh',
icon: 'pi pi-refresh',
command: refreshModelsAndConfig,
},
],
})
}
const toggleLayout = () => {
// flip the flat setting
const newValue = !config.flat.value
config.flat.value = newValue
// persist so it survives reloads
app.ui?.settings.setSettingValue('ModelManager.UI.Flat', newValue)
// close the current dialog (because it is keepAlive)
dialog.closeAll()
// reopen with the new layout
openManagerDialog()
}
const openManagerDialog = () => {
const { cardWidth, gutter, aspect, flat } = config
// choose icon depending on current layout
const layoutIcon = flat.value ? 'pi pi-folder-open' : 'pi pi-th-large'
if (firstOpenManager.value) {
models.refresh(true)
@@ -64,6 +111,19 @@ onMounted(() => {
content: flat.value ? DialogManager : DialogExplorer,
keepAlive: true,
headerButtons: [
{
key: 'scanning',
icon: 'mdi mdi-folder-search-outline text-lg',
command: openModelScanning,
},
{
key: 'toggle-layout',
icon: layoutIcon,
command: toggleLayout,
tooltip: flat.value
? t('switchToFolderView')
: t('switchToFlatView'),
},
{
key: 'refresh',
icon: 'pi pi-refresh',
@@ -74,6 +134,11 @@ onMounted(() => {
icon: 'pi pi-download',
command: openDownloadDialog,
},
{
key: 'upload',
icon: 'pi pi-upload',
command: openUploadDialog,
},
],
minWidth: cardWidth * 2 + gutter + 42,
minHeight: (cardWidth / aspect) * 0.5 + 162,

View File

@@ -31,12 +31,20 @@
<KeepAlive>
<ModelContent
v-if="currentModel"
:key="currentModel.id"
:key="`${currentModel.id}-${currentModel.currentFileId}`"
:model="currentModel"
:editable="true"
@submit="createDownTask"
>
<template #action>
<div v-if="currentModel.files" class="flex-1">
<ResponseSelect
:model-value="currentModel.currentFileId"
:items="currentModel.selectionFiles"
:type="isMobile ? 'drop' : 'button'"
>
</ResponseSelect>
</div>
<Button
icon="pi pi-download"
:label="$t('download')"

View File

@@ -20,7 +20,10 @@
>
<div class="flex gap-4 overflow-hidden whitespace-nowrap">
<div class="h-18 preview-aspect">
<img :src="item.preview" />
<div v-if="isVideoUrl(item.preview)" class="h-full w-full">
<PreviewVideo :src="item.preview" />
</div>
<img v-else :src="item.preview" />
</div>
<div class="flex flex-1 flex-col gap-3 overflow-hidden">
@@ -72,11 +75,13 @@
<script setup lang="ts">
import DialogCreateTask from 'components/DialogCreateTask.vue'
import PreviewVideo from 'components/PreviewVideo.vue'
import ResponseScroll from 'components/ResponseScroll.vue'
import { useContainerQueries } from 'hooks/container'
import { useDialog } from 'hooks/dialog'
import { useDownload } from 'hooks/download'
import Button from 'primevue/button'
import { isVideoUrl } from 'utils/media'
import { ref } from 'vue'
import { useI18n } from 'vue-i18n'

View File

@@ -133,7 +133,7 @@ import Button from 'primevue/button'
import ConfirmDialog from 'primevue/confirmdialog'
import ContextMenu from 'primevue/contextmenu'
import InputText from 'primevue/inputtext'
import { MenuItem } from 'primevue/menuitem'
import type { MenuItem } from 'primevue/menuitem'
import { genModelKey } from 'utils/model'
import { computed, ref } from 'vue'
import { useI18n } from 'vue-i18n'

View File

@@ -225,17 +225,33 @@ const list = computed(() => {
return !item.isFolder
})
const filterList = pureModels.filter((model) => {
const showAllModel = currentType.value === allType
function buildRegex(raw: string): RegExp {
try {
// Escape regex specials, then restore * wildcards as .*
const escaped = raw
.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
.replace(/\\\*/g, '.*')
return new RegExp(escaped, 'i') // case-insensitive
} catch (e) {
return new RegExp(raw, 'i')
}
}
const matchType = showAllModel || model.type === currentType.value
const filterList = pureModels.filter((model) => {
const showAllModel = currentType.value === allType
const matchType = showAllModel || model.type === currentType.value
const filter = searchContent.value?.toLowerCase() ?? ''
const matchSubFolder = model.subFolder.toLowerCase().includes(filter)
const matchName = model.basename.toLowerCase().includes(filter)
const rawFilter = searchContent.value ?? ''
const tokens = rawFilter.split(/\s+/).filter(Boolean)
const regexes = tokens.map(buildRegex)
return matchType && (matchSubFolder || matchName)
})
// Require every token to match either the folder or the name
const matchesAll = regexes.every((re) =>
re.test(model.subFolder) || re.test(model.basename)
)
return matchType && matchesAll
})
let sortStrategy: (a: Model, b: Model) => number = () => 0
switch (sortOrder.value) {
@@ -262,6 +278,7 @@ const list = computed(() => {
})
})
const contentStyle = computed(() => ({
gridTemplateColumns: `repeat(auto-fit, ${cardSize.value.width}px)`,
gap: `${gutter}px`,

View File

@@ -0,0 +1,271 @@
<template>
<div class="h-full px-4">
<div v-show="batchScanningStep === 0" class="h-full">
<div class="flex h-full items-center px-8">
<div class="h-20 w-full opacity-60">
<ProgressBar mode="indeterminate" style="height: 6px"></ProgressBar>
</div>
</div>
</div>
<Stepper
v-show="batchScanningStep === 1"
v-model:value="stepValue"
class="flex h-full flex-col"
linear
>
<StepList>
<Step value="1">{{ $t('selectModelType') }}</Step>
<Step value="2">{{ $t('selectSubdirectory') }}</Step>
<Step value="3">{{ $t('scanModelInformation') }}</Step>
</StepList>
<StepPanels class="flex-1 overflow-hidden">
<StepPanel value="1" class="h-full">
<div class="flex h-full flex-col overflow-hidden">
<ResponseScroll>
<div class="flex flex-wrap gap-4">
<Button
v-for="item in typeOptions"
:key="item.value"
:label="item.label"
@click="item.command"
></Button>
</div>
</ResponseScroll>
</div>
</StepPanel>
<StepPanel value="2" class="h-full">
<div class="flex h-full flex-col overflow-hidden">
<ResponseScroll class="flex-1">
<Tree
class="h-full"
v-model:selection-keys="selectedKey"
:value="pathOptions"
selectionMode="single"
:pt:nodeLabel:class="'text-ellipsis overflow-hidden'"
></Tree>
</ResponseScroll>
<div class="flex justify-between pt-6">
<Button
:label="$t('back')"
severity="secondary"
icon="pi pi-arrow-left"
@click="handleBackTypeSelect"
></Button>
<Button
:label="$t('next')"
icon="pi pi-arrow-right"
icon-pos="right"
:disabled="!enabledScan"
@click="handleConfirmSubdir"
></Button>
</div>
</div>
</StepPanel>
<StepPanel value="3" class="h-full">
<div class="overflow-hidden break-words py-8">
<div class="overflow-hidden px-8">
<div v-show="currentType === allType" class="text-center">
{{ $t('selectedAllPaths') }}
</div>
<div v-show="currentType !== allType" class="text-center">
<div class="pb-2">
{{ $t('selectedSpecialPath') }}
</div>
<div class="leading-5 opacity-60">
{{ selectedModelFolder }}
</div>
</div>
</div>
</div>
<div class="flex items-center justify-center gap-4">
<Button
v-for="item in scanActions"
:key="item.value"
:label="item.label"
:icon="item.icon"
@click="item.command.call(item)"
></Button>
</div>
</StepPanel>
</StepPanels>
</Stepper>
<div v-show="batchScanningStep === 2" class="h-full">
<div class="flex h-full items-center px-8">
<div class="h-20 w-full">
<div v-show="scanProgress > -1">
<ProgressBar :value="scanProgress">
{{ scanCompleteCount }} / {{ scanTotalCount }}
</ProgressBar>
</div>
<div v-show="scanProgress === -1" class="text-center">
<Button
severity="secondary"
:label="$t('back')"
icon="pi pi-arrow-left"
@click="handleBackTypeSelect"
></Button>
<span class="pl-2">{{ $t('noModelsInCurrentPath') }}</span>
</div>
</div>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import ResponseScroll from 'components/ResponseScroll.vue'
import { configSetting } from 'hooks/config'
import { useModelFolder, useModels } from 'hooks/model'
import { request } from 'hooks/request'
import Button from 'primevue/button'
import ProgressBar from 'primevue/progressbar'
import Step from 'primevue/step'
import StepList from 'primevue/steplist'
import StepPanel from 'primevue/steppanel'
import StepPanels from 'primevue/steppanels'
import Stepper from 'primevue/stepper'
import Tree from 'primevue/tree'
import { api, app } from 'scripts/comfyAPI'
import { computed, onMounted, ref } from 'vue'
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
const stepValue = ref('1')
const { folders } = useModels()
const allType = 'All'
const currentType = ref<string>()
const typeOptions = computed(() => {
const excludeScanTypes = app.ui?.settings.getSettingValue<string>(
configSetting.excludeScanTypes,
)
const customBlackList =
excludeScanTypes
?.split(',')
.map((type) => type.trim())
.filter(Boolean) ?? []
return [
allType,
...Object.keys(folders.value).filter(
(folder) => !customBlackList.includes(folder),
),
].map((type) => {
return {
label: type,
value: type,
command: () => {
currentType.value = type
stepValue.value = currentType.value === allType ? '3' : '2'
},
}
})
})
const { pathOptions } = useModelFolder({ type: currentType })
const selectedModelFolder = ref<string>()
const selectedKey = computed({
get: () => {
const key = selectedModelFolder.value
return key ? { [key]: true } : {}
},
set: (val) => {
const key = Object.keys(val)[0]
selectedModelFolder.value = key
},
})
const enabledScan = computed(() => {
return currentType.value === allType || !!selectedModelFolder.value
})
const handleBackTypeSelect = () => {
selectedModelFolder.value = undefined
currentType.value = undefined
stepValue.value = '1'
batchScanningStep.value = 1
}
const handleConfirmSubdir = () => {
stepValue.value = '3'
}
const batchScanningStep = ref(0)
const scanModelsList = ref<Record<string, boolean>>({})
const scanTotalCount = computed(() => {
return Object.keys(scanModelsList.value).length
})
const scanCompleteCount = computed(() => {
return Object.keys(scanModelsList.value).filter(
(key) => scanModelsList.value[key],
).length
})
const scanProgress = computed(() => {
if (scanTotalCount.value === 0) {
return -1
}
const progress = scanCompleteCount.value / scanTotalCount.value
return Number(progress.toFixed(4)) * 100
})
const handleScanModelInformation = async function () {
batchScanningStep.value = 0
const mode = this.value
const path = selectedModelFolder.value
try {
const result = await request('/model-info/scan', {
method: 'POST',
body: JSON.stringify({ mode, path }),
})
scanModelsList.value = result?.models ?? {}
batchScanningStep.value = 2
} catch {
batchScanningStep.value = 1
}
}
const scanActions = ref([
{
value: 'back',
label: t('back'),
icon: 'pi pi-arrow-left',
command: () => {
stepValue.value = currentType.value === allType ? '1' : '2'
},
},
{
value: 'full',
label: t('scanFullInformation'),
command: handleScanModelInformation,
},
{
value: 'diff',
label: t('scanMissInformation'),
command: handleScanModelInformation,
},
])
const refreshTaskContent = async () => {
const result = await request('/model-info/scan')
const listContent = result?.models ?? {}
scanModelsList.value = listContent
batchScanningStep.value = Object.keys(listContent).length ? 2 : 1
}
onMounted(() => {
refreshTaskContent()
api.addEventListener('update_scan_information_task', (event) => {
const content = event.detail
scanModelsList.value = content.models
})
})
</script>

View File

@@ -0,0 +1,274 @@
<template>
<div class="h-full px-4">
<!-- <div v-show="batchScanningStep === 0" class="h-full">
<div class="flex h-full items-center px-8">
<div class="h-20 w-full opacity-60">
<ProgressBar mode="indeterminate" style="height: 6px"></ProgressBar>
</div>
</div>
</div> -->
<Stepper v-model:value="stepValue" class="flex h-full flex-col" linear>
<StepList>
<Step :value="1">{{ $t('selectModelType') }}</Step>
<Step :value="2">{{ $t('selectSubdirectory') }}</Step>
<Step :value="3">{{ $t('chooseFile') }}</Step>
</StepList>
<StepPanels class="flex-1 overflow-hidden">
<StepPanel :value="1" class="h-full">
<div class="flex h-full flex-col overflow-hidden">
<ResponseScroll>
<div class="flex flex-wrap gap-4">
<Button
v-for="item in typeOptions"
:key="item.value"
:label="item.label"
@click="item.command"
></Button>
</div>
</ResponseScroll>
</div>
</StepPanel>
<StepPanel :value="2" class="h-full">
<div class="flex h-full flex-col overflow-hidden">
<ResponseScroll class="flex-1">
<Tree
class="h-full"
v-model:selection-keys="selectedKey"
:value="pathOptions"
selectionMode="single"
:pt:nodeLabel:class="'text-ellipsis overflow-hidden'"
></Tree>
</ResponseScroll>
<div class="flex justify-between pt-6">
<Button
:label="$t('back')"
severity="secondary"
icon="pi pi-arrow-left"
@click="handleBackTypeSelect"
></Button>
<Button
:label="$t('next')"
icon="pi pi-arrow-right"
icon-pos="right"
:disabled="!enabledUpload"
@click="handleConfirmSubdir"
></Button>
</div>
</div>
</StepPanel>
<StepPanel :value="3" class="h-full">
<div class="flex h-full flex-col items-center justify-center">
<template v-if="showUploadProgress">
<div class="w-4/5">
<ProgressBar
:value="uploadProgress"
:pt:value:style="{ transition: 'width .1s linear' }"
></ProgressBar>
</div>
</template>
<template v-else>
<div class="overflow-hidden break-words py-8">
<div class="overflow-hidden px-8">
<div class="text-center">
<div class="pb-2">
{{ $t('selectedSpecialPath') }}
</div>
<div class="leading-5 opacity-60">
{{ selectedModelFolder }}
</div>
</div>
</div>
</div>
<div class="flex items-center justify-center gap-4">
<Button
v-for="item in uploadActions"
:key="item.value"
:label="item.label"
:icon="item.icon"
@click="item.command.call(item)"
></Button>
</div>
</template>
<div class="h-1/4"></div>
</div>
</StepPanel>
</StepPanels>
</Stepper>
</div>
</template>
<script setup lang="ts">
import ResponseScroll from 'components/ResponseScroll.vue'
import { configSetting } from 'hooks/config'
import { useModelFolder, useModels } from 'hooks/model'
import { request } from 'hooks/request'
import { useToast } from 'hooks/toast'
import Button from 'primevue/button'
import ProgressBar from 'primevue/progressbar'
import Step from 'primevue/step'
import StepList from 'primevue/steplist'
import StepPanel from 'primevue/steppanel'
import StepPanels from 'primevue/steppanels'
import Stepper from 'primevue/stepper'
import Tree from 'primevue/tree'
import { api, app } from 'scripts/comfyAPI'
import { computed, onMounted, onUnmounted, ref, toValue } from 'vue'
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
const { toast } = useToast()
const stepValue = ref(1)
const { folders } = useModels()
const currentType = ref<string>()
const typeOptions = computed(() => {
const excludeScanTypes = app.ui?.settings.getSettingValue<string>(
configSetting.excludeScanTypes,
)
const customBlackList =
excludeScanTypes
?.split(',')
.map((type) => type.trim())
.filter(Boolean) ?? []
return Object.keys(folders.value)
.filter((folder) => !customBlackList.includes(folder))
.map((type) => {
return {
label: type,
value: type,
command: () => {
currentType.value = type
stepValue.value++
},
}
})
})
const { pathOptions } = useModelFolder({ type: currentType })
const selectedModelFolder = ref<string>()
const selectedKey = computed({
get: () => {
const key = selectedModelFolder.value
return key ? { [key]: true } : {}
},
set: (val) => {
const key = Object.keys(val)[0]
selectedModelFolder.value = key
},
})
const enabledUpload = computed(() => {
return !!selectedModelFolder.value
})
const handleBackTypeSelect = () => {
selectedModelFolder.value = undefined
currentType.value = undefined
stepValue.value--
}
const handleConfirmSubdir = () => {
stepValue.value++
}
const uploadTotalSize = ref<number>()
const uploadSize = ref<number>()
const uploadProgress = computed(() => {
const total = toValue(uploadTotalSize)
const size = toValue(uploadSize)
if (typeof total === 'number' && typeof size === 'number') {
return Math.floor((size / total) * 100)
}
return undefined
})
const showUploadProgress = computed(() => {
return typeof uploadProgress.value !== 'undefined'
})
const uploadActions = ref([
{
value: 'back',
label: t('back'),
icon: 'pi pi-arrow-left',
command: () => {
stepValue.value--
},
},
{
value: 'full',
label: t('chooseFile'),
command: () => {
const input = document.createElement('input')
input.type = 'file'
input.accept = supportedExtensions.value.join(',')
input.onchange = async () => {
const files = input.files
const file = files?.item(0)
if (!file) {
return
}
try {
uploadTotalSize.value = file.size
uploadSize.value = 0
const body = new FormData()
body.append('folder', toValue(selectedModelFolder)!)
body.append('file', file)
await request('/upload', {
method: 'POST',
body: body,
})
} catch (error) {
toast.add({
severity: 'error',
summary: 'Error',
detail: error.message,
life: 5000,
})
}
}
input.click()
},
},
])
const supportedExtensions = ref([])
const fetchSupportedExtensions = async () => {
try {
const result = await request('/supported-extensions')
supportedExtensions.value = result ?? []
} catch (error) {
toast.add({
severity: 'error',
summary: 'Error',
detail: error.message,
life: 5000,
})
}
}
const update_process = (event: CustomEvent) => {
const detail = event.detail
uploadSize.value = detail.uploaded_size
}
onMounted(() => {
fetchSupportedExtensions()
api.addEventListener('update_upload_progress', update_process)
})
onUnmounted(() => {
api.removeEventListener('update_upload_progress', update_process)
})
</script>

View File

@@ -25,19 +25,10 @@
</svg>
</div>
<div
v-else-if="model.previewType === 'video'"
v-else-if="isVideoUrl(preview)"
class="h-full w-full p-1 hover:p-0"
>
<video
class="h-full w-full object-cover"
playsinline
autoplay
loop
disablepictureinpicture
preload="none"
>
<source :src="preview" />
</video>
<PreviewVideo :src="preview" />
</div>
<div v-else class="h-full w-full p-1 hover:p-0">
<img class="h-full w-full rounded-lg object-cover" :src="preview" />
@@ -81,8 +72,10 @@
<script setup lang="ts">
import { useElementSize } from '@vueuse/core'
import PreviewVideo from 'components/PreviewVideo.vue'
import { useModelNodeAction } from 'hooks/model'
import { BaseModel } from 'types/typings'
import { isVideoUrl } from 'utils/media'
import { computed, ref } from 'vue'
interface Props {

View File

@@ -17,7 +17,7 @@
></ModelPreview>
<div class="flex flex-col gap-4 overflow-hidden">
<div class="flex items-center justify-end gap-4">
<div class="flex h-10 items-center justify-end gap-4">
<slot name="action" :metadata="formInstance.metadata.value"></slot>
</div>

View File

@@ -5,17 +5,17 @@
class="relative mx-auto w-full overflow-hidden rounded-lg preview-aspect"
:style="$sm({ width: `${cardWidth}px` })"
>
<div v-if="previewType === 'video'" class="h-full w-full p-1 hover:p-0">
<video
class="h-full w-full object-cover"
playsinline
autoplay
loop
disablepictureinpicture
preload="none"
>
<source :src="preview" />
</video>
<div
v-if="
preview &&
isVideoUrl(
preview,
currentType === 'local' ? localContentType : undefined,
)
"
class="h-full w-full p-1 hover:p-0"
>
<PreviewVideo :src="preview" />
</div>
<ResponseImage
@@ -48,7 +48,14 @@
}"
>
<template #item="slotProps">
<div
v-if="isVideoUrl(slotProps.data)"
class="h-full w-full p-1 hover:p-0"
>
<PreviewVideo :src="slotProps.data" />
</div>
<ResponseImage
v-else
:src="slotProps.data"
:error="noPreviewContent"
></ResponseImage>
@@ -98,6 +105,7 @@
</template>
<script setup lang="ts">
import PreviewVideo from 'components/PreviewVideo.vue'
import ResponseFileUpload from 'components/ResponseFileUpload.vue'
import ResponseImage from 'components/ResponseImage.vue'
import ResponseInput from 'components/ResponseInput.vue'
@@ -106,13 +114,13 @@ import { useContainerQueries } from 'hooks/container'
import { useModelPreview } from 'hooks/model'
import Button from 'primevue/button'
import Carousel from 'primevue/carousel'
import { isVideoUrl } from 'utils/media'
const editable = defineModel<boolean>('editable')
const { cardWidth } = useConfig()
const {
preview,
previewType,
typeOptions,
currentType,
defaultContent,
@@ -120,6 +128,7 @@ const {
networkContent,
updateLocalContent,
noPreviewContent,
localContentType,
} = useModelPreview()
const { $sm, $xl } = useContainerQueries()

View File

@@ -0,0 +1,25 @@
<template>
<video
class="h-full w-full object-cover"
playsinline
autoplay
loop
muted
disablepictureinpicture
:preload="preload"
>
<source :src="src" type="video/mp4" />
<source :src="src" type="video/webm" />
</video>
</template>
<script setup lang="ts">
interface Props {
src: string
preload?: 'none' | 'metadata' | 'auto'
}
withDefaults(defineProps<Props>(), {
preload: 'metadata',
})
</script>

View File

@@ -46,7 +46,7 @@ const handleDropFile = (event: DragEvent) => {
const handleClick = (event: MouseEvent) => {
const input = document.createElement('input')
input.type = 'file'
input.accept = 'image/*'
input.accept = 'image/*,video/*'
input.onchange = () => {
const files = input.files
if (files) {

View File

@@ -0,0 +1,69 @@
<template>
<div class="p-4">
<InputText
class="w-full"
v-model="content"
placeholder="Set New API Key"
autocomplete="off"
></InputText>
<div class="mt-4 flex items-center justify-between">
<div>
<span v-show="showError" class="text-red-400">
API Key Not Allow Empty
</span>
</div>
<Button label="Save" autofocus @click="saveKeybinding"></Button>
</div>
</div>
</template>
<script setup lang="ts">
import { useDialog } from 'hooks/dialog'
import { request } from 'hooks/request'
import { useToast } from 'hooks/toast'
import Button from 'primevue/button'
import InputText from 'primevue/inputtext'
import { ref, toValue } from 'vue'
interface Props {
keyField: string
setter: (val: string) => void
}
const props = defineProps<Props>()
const { close } = useDialog()
const { toast } = useToast()
const content = ref<string>()
const showError = ref<boolean>(false)
const saveKeybinding = async () => {
const value = toValue(content)
if (!value) {
showError.value = true
return
}
showError.value = false
const key = toValue(props.keyField)
try {
const encodeValue = value ? btoa(value) : null
await request('/download/setting', {
method: 'POST',
body: JSON.stringify({ key, value: encodeValue }),
})
const desString = value ? value.slice(0, 4) + '****' + value.slice(-4) : ''
props.setter(desString)
close()
} catch (error) {
toast.add({
severity: 'error',
summary: 'Error',
detail: error.message,
life: 3000,
})
}
}
</script>

View File

@@ -1,10 +1,11 @@
import SettingApiKey from 'components/SettingApiKey.vue'
import SettingCardSize from 'components/SettingCardSize.vue'
import { request } from 'hooks/request'
import { defineStore } from 'hooks/store'
import { $el, app, ComfyDialog } from 'scripts/comfyAPI'
import { useToast } from 'hooks/toast'
import { $el, app } from 'scripts/comfyAPI'
import { computed, onMounted, onUnmounted, readonly, ref, watch } from 'vue'
import { useI18n } from 'vue-i18n'
import { useToast } from './toast'
export const useConfig = defineStore('config', (store) => {
const { t } = useI18n()
@@ -67,6 +68,7 @@ export const useConfig = defineStore('config', (store) => {
},
},
flat: flatLayout,
apiKeyInfo: ref<Record<string, string>>({}),
}
watch(cardSizeFlag, (val) => {
@@ -98,57 +100,102 @@ export const configSetting = {
}
function useAddConfigSettings(store: import('hooks/store').StoreProvider) {
const { toast } = useToast()
const { t } = useI18n()
const { confirm } = useToast()
const confirm = (opts: {
message?: string
accept?: () => void
reject?: () => void
const iconButton = (opt: {
icon: string
onClick: () => void | Promise<void>
}) => {
const dialog = new ComfyDialog('div', [])
dialog.show(
$el('div', [
$el('p', { textContent: opts.message }),
$el('div.flex.gap-4', [
$el('button.flex-1', {
textContent: 'Cancel',
onclick: () => {
opts.reject?.()
dialog.close()
document.body.removeChild(dialog.element)
},
}),
$el('button.flex-1', {
textContent: 'Continue',
onclick: () => {
opts.accept?.()
dialog.close()
document.body.removeChild(dialog.element)
},
}),
]),
]),
return $el(
'span.h-4.cursor-pointer',
{ onclick: opt.onClick },
$el(`i.${opt.icon.replace(/\s/g, '.')}`),
)
}
const setApiKey = async (key: string, setter: (val: string) => void) => {
store.dialog.open({
key: `setting.api_key.${key}`,
title: t(`setting.api_key.${key}`),
content: SettingApiKey,
modal: true,
defaultSize: {
width: 500,
height: 200,
},
contentProps: {
keyField: key,
setter: setter,
},
})
}
const removeApiKey = async (key: string) => {
await new Promise((resolve, reject) => {
confirm.require({
message: t('deleteAsk'),
header: 'Danger',
icon: 'pi pi-info-circle',
accept: () => resolve(true),
reject: reject,
})
})
await request('/download/setting', {
method: 'POST',
body: JSON.stringify({ key, value: null }),
})
}
const renderApiKey = (key: string) => {
return () => {
const apiKey = store.config.apiKeyInfo.value[key] || 'None'
const apiKeyDisplayEl = $el('div.text-sm.text-gray-500.flex-1', {
textContent: apiKey,
})
const setter = (val: string) => {
store.config.apiKeyInfo.value[key] = val
apiKeyDisplayEl.textContent = val || 'None'
}
return $el('div.flex.gap-4', [
apiKeyDisplayEl,
iconButton({
icon: 'pi pi-pencil text-blue-400',
onClick: () => {
setApiKey(key, setter)
},
}),
iconButton({
icon: 'pi pi-trash text-red-400',
onClick: async () => {
const value = store.config.apiKeyInfo.value[key]
if (value) {
await removeApiKey(key)
setter('')
}
},
}),
])
}
}
onMounted(() => {
// API keys
app.ui?.settings.addSetting({
id: 'ModelManager.APIKey.HuggingFace',
category: [t('modelManager'), t('setting.apiKey'), 'HuggingFace'],
name: 'HuggingFace API Key',
type: 'text',
defaultValue: undefined,
type: renderApiKey('huggingface'),
})
app.ui?.settings.addSetting({
id: 'ModelManager.APIKey.Civitai',
category: [t('modelManager'), t('setting.apiKey'), 'Civitai'],
name: 'Civitai API Key',
type: 'text',
defaultValue: undefined,
type: renderApiKey('civitai'),
})
const defaultCardSize = store.config.defaultCardSizeMap
@@ -187,101 +234,6 @@ function useAddConfigSettings(store: import('hooks/store').StoreProvider) {
},
})
// Scan information
app.ui?.settings.addSetting({
id: 'ModelManager.ScanFiles.Full',
category: [t('modelManager'), t('setting.scan'), 'Full'],
name: t('setting.scanAll'),
defaultValue: '',
type: () => {
return $el('button.p-button.p-component.p-button-secondary', {
textContent: 'Full Scan',
onclick: () => {
confirm({
message: [
'This operation will override current files.',
'This may take a while and generate MANY server requests!',
'USE AT YOUR OWN RISK! Continue?',
].join('\n'),
accept: () => {
store.loading.loading.value = true
request('/model-info/scan', {
method: 'POST',
body: JSON.stringify({ scanMode: 'full' }),
})
.then(() => {
toast.add({
severity: 'success',
summary: 'Complete download information',
life: 2000,
})
store.models.refresh()
})
.catch((err) => {
toast.add({
severity: 'error',
summary: 'Error',
detail: err.message ?? 'Failed to download information',
life: 15000,
})
})
.finally(() => {
store.loading.loading.value = false
})
},
})
},
})
},
})
app.ui?.settings.addSetting({
id: 'ModelManager.ScanFiles.Incremental',
category: [t('modelManager'), t('setting.scan'), 'Incremental'],
name: t('setting.scanMissing'),
defaultValue: '',
type: () => {
return $el('button.p-button.p-component.p-button-secondary', {
textContent: 'Diff Scan',
onclick: () => {
confirm({
message: [
'Download missing information or preview.',
'This may take a while and generate MANY server requests!',
'USE AT YOUR OWN RISK! Continue?',
].join('\n'),
accept: () => {
store.loading.loading.value = true
request('/model-info/scan', {
method: 'POST',
body: JSON.stringify({ scanMode: 'diff' }),
})
.then(() => {
toast.add({
severity: 'success',
summary: 'Complete download information',
life: 2000,
})
store.models.refresh()
})
.catch((err) => {
toast.add({
severity: 'error',
summary: 'Error',
detail: err.message ?? 'Failed to download information',
life: 15000,
})
})
.finally(() => {
store.loading.loading.value = false
})
},
})
},
})
},
})
app.ui?.settings.addSetting({
id: configSetting.excludeScanTypes,
category: [t('modelManager'), t('setting.scan'), 'ExcludeScanTypes'],

View File

@@ -2,17 +2,19 @@ import { useLoading } from 'hooks/loading'
import { request } from 'hooks/request'
import { defineStore } from 'hooks/store'
import { useToast } from 'hooks/toast'
import { upperFirst } from 'lodash'
import { api } from 'scripts/comfyAPI'
import {
BaseModel,
DownloadTask,
DownloadTaskOptions,
SelectOptions,
VersionModel,
VersionModelFile,
} from 'types/typings'
import { bytesToSize } from 'utils/common'
import { onBeforeMount, onMounted, ref, watch } from 'vue'
import { useI18n } from 'vue-i18n'
import yaml from 'yaml'
export const useDownload = defineStore('download', (store) => {
const { toast, confirm, wrapperToastError } = useToast()
@@ -84,7 +86,16 @@ export const useDownload = defineStore('download', (store) => {
})
})
// Initial download settings
// Migrate API keys from user settings to private key
const init = async () => {
const res = await request('/download/init', { method: 'POST' })
store.config.apiKeyInfo.value = res
}
onBeforeMount(() => {
init()
api.addEventListener('reconnected', () => {
refresh()
})
@@ -153,12 +164,60 @@ declare module 'hooks/store' {
}
}
type WithSelection<T> = SelectOptions & { item: T }
type FileSelectionVersionModel = VersionModel & {
currentFileId?: number
selectionFiles?: WithSelection<VersionModelFile>[]
}
export const useModelSearch = () => {
const loading = useLoading()
const { toast } = useToast()
const data = ref<(SelectOptions & { item: VersionModel })[]>([])
const data = ref<WithSelection<FileSelectionVersionModel>[]>([])
const current = ref<string | number>()
const currentModel = ref<BaseModel>()
const currentModel = ref<FileSelectionVersionModel>()
const genFileSelectionItem = (
item: VersionModel,
): FileSelectionVersionModel => {
const fileSelectionItem: FileSelectionVersionModel = { ...item }
fileSelectionItem.selectionFiles = fileSelectionItem.files
?.sort((file) => (file.type === 'Model' ? -1 : 1))
.map((file) => {
const parts = file.name.split('.')
const extension = `.${parts.pop()}`
const basename = parts.join('.')
const regexp = /---\n([\s\S]*?)\n---/
const yamlMetadataMatch = item.description.match(regexp)
const yamlMetadata = yaml.parse(yamlMetadataMatch?.[1] || '')
yamlMetadata.hashes = file.hashes
yamlMetadata.metadata = file.metadata
const yamlContent = `---\n${yaml.stringify(yamlMetadata)}---`
const description = item.description.replace(regexp, yamlContent)
return {
label: file.type === 'Model' ? upperFirst(item.type) : file.type,
value: file.id,
item: file,
command() {
if (currentModel.value) {
currentModel.value.basename = basename
currentModel.value.extension = extension
currentModel.value.sizeBytes = file.sizeKB * 1024
currentModel.value.metadata = file.metadata
currentModel.value.downloadUrl = file.downloadUrl
currentModel.value.hashes = file.hashes
currentModel.value.description = description
currentModel.value.currentFileId = file.id
}
},
}
})
fileSelectionItem.currentFileId = item.files?.[0]?.id
return fileSelectionItem
}
const handleSearchByUrl = async (url: string) => {
if (!url) {
@@ -168,14 +227,17 @@ export const useModelSearch = () => {
loading.show()
return request(`/model-info?model-page=${encodeURIComponent(url)}`, {})
.then((resData: VersionModel[]) => {
data.value = resData.map((item) => ({
label: item.shortname,
value: item.id,
item,
command() {
current.value = item.id
},
}))
data.value = resData.map((item) => {
const resolvedItem = genFileSelectionItem(item)
return {
label: item.shortname,
value: item.id,
item: resolvedItem,
command() {
current.value = item.id
},
}
})
current.value = data.value[0]?.value
currentModel.value = data.value[0]?.item

View File

@@ -46,7 +46,6 @@ export const useModelExplorer = () => {
description: '',
metadata: {},
preview: '',
previewType: 'image',
type: folder ?? '',
isFolder: true,
children: [],

View File

@@ -6,7 +6,7 @@ import { defineStore } from 'hooks/store'
import { useToast } from 'hooks/toast'
import { castArray, cloneDeep } from 'lodash'
import { TreeNode } from 'primevue/treenode'
import { app } from 'scripts/comfyAPI'
import { api, app } from 'scripts/comfyAPI'
import { BaseModel, Model, SelectEvent, WithResolved } from 'types/typings'
import { bytesToSize, formatDate, previewUrlToFile } from 'utils/common'
import { ModelGrid } from 'utils/legacy'
@@ -27,16 +27,18 @@ import {
import { useI18n } from 'vue-i18n'
import { configSetting } from './config'
const systemStat = ref()
type ModelFolder = Record<string, string[]>
const modelFolderProvideKey = Symbol('modelFolder') as InjectionKey<
Ref<ModelFolder>
>
export const genModelFullName = (model: BaseModel) => {
export const genModelFullName = (model: BaseModel, splitter = '/') => {
return [model.subFolder, `${model.basename}${model.extension}`]
.filter(Boolean)
.join('/')
.join(splitter)
}
export const genModelUrl = (model: BaseModel) => {
@@ -234,6 +236,12 @@ export const useModels = defineStore('models', (store) => {
return [prefixPath, fullname].filter(Boolean).join('/')
}
onMounted(() => {
api.getSystemStats().then((res) => {
systemStat.value = res
})
})
return {
initialized: initialized,
folders: folders,
@@ -443,7 +451,7 @@ export const useModelBaseInfo = () => {
export const useModelFolder = (
option: {
type?: MaybeRefOrGetter<string>
type?: MaybeRefOrGetter<string | undefined>
} = {},
) => {
const { data: models, folders: modelFolders } = useModels()
@@ -545,9 +553,11 @@ export const useModelPreviewEditor = (formInstance: ModelFormInstance) => {
* Local file url
*/
const localContent = ref<string>()
const localContentType = ref<string>()
const updateLocalContent = async (event: SelectEvent) => {
const { files } = event
localContent.value = files[0].objectURL
localContentType.value = files[0].type
}
/**
@@ -579,16 +589,13 @@ export const useModelPreviewEditor = (formInstance: ModelFormInstance) => {
return content
})
const previewType = computed(() => {
return model.value.previewType
})
onMounted(() => {
registerReset(() => {
currentType.value = 'default'
defaultContentPage.value = 0
networkContent.value = undefined
localContent.value = undefined
localContentType.value = undefined
})
registerSubmit((data) => {
@@ -598,7 +605,6 @@ export const useModelPreviewEditor = (formInstance: ModelFormInstance) => {
const result = {
preview,
previewType,
typeOptions,
currentType,
// default value
@@ -608,6 +614,7 @@ export const useModelPreviewEditor = (formInstance: ModelFormInstance) => {
networkContent,
// local file
localContent,
localContentType,
updateLocalContent,
// no preview
noPreviewContent,
@@ -717,11 +724,12 @@ export const useModelNodeAction = () => {
// Use the legacy method instead
const removeEmbeddingExtension = true
const strictDragToAdd = false
const splitter = systemStat.value?.system.os === 'nt' ? '\\' : '/'
ModelGrid.dragAddModel(
event,
model.type,
genModelFullName(model),
genModelFullName(model, splitter),
removeEmbeddingExtension,
strictDragToAdd,
)

View File

@@ -1,133 +1,12 @@
import { app } from 'scripts/comfyAPI'
import { createI18n } from 'vue-i18n'
import en from './locales/en.json'
import zh from './locales/zh.json'
const messages = {
en: {
model: 'Model',
modelManager: 'Model Manager',
openModelManager: 'Open Model Manager',
searchModels: 'Search models',
modelCopied: 'Model Copied',
download: 'Download',
downloadList: 'Download List',
downloadTask: 'Download Task',
createDownloadTask: 'Create Download Task',
parseModelUrl: 'Parse Model URL',
pleaseInputModelUrl: 'Input a URL from civitai.com or huggingface.co',
cancel: 'Cancel',
save: 'Save',
delete: 'Delete',
deleteAsk: 'Confirm delete this {0}?',
modelType: 'Model Type',
default: 'Default',
network: 'Network',
local: 'Local',
none: 'None',
uploadFile: 'Upload File',
tapToChange: 'Tap description to change content',
name: 'Name',
width: 'Width',
height: 'Height',
reset: 'Reset',
sort: {
name: 'Name',
size: 'Largest',
created: 'Latest created',
modified: 'Latest modified',
},
size: {
extraLarge: 'Extra Large Icons',
large: 'Large Icons',
medium: 'Medium Icons',
small: 'Small Icons',
custom: 'Custom Size',
customTip: 'Set in `Settings > Model Manager > UI`',
},
info: {
type: 'Model Type',
pathIndex: 'Directory',
basename: 'File Name',
sizeBytes: 'File Size',
createdAt: 'Created At',
updatedAt: 'Updated At',
},
setting: {
apiKey: 'API Key',
cardHeight: 'Card Height',
cardWidth: 'Card Width',
scan: 'Scan',
scanMissing: 'Download missing information or preview',
scanAll: "Override all models' information and preview",
includeHiddenFiles: 'Include hidden files(start with .)',
excludeScanTypes: 'Exclude scan types (separate with commas)',
ui: 'UI',
cardSize: 'Card Size',
useFlatUI: 'Flat Layout',
},
},
zh: {
model: '模型',
modelManager: '模型管理器',
openModelManager: '打开模型管理器',
searchModels: '搜索模型',
modelCopied: '模型节点已拷贝',
download: '下载',
downloadList: '下载列表',
downloadTask: '下载任务',
createDownloadTask: '创建下载任务',
parseModelUrl: '解析模型URL',
pleaseInputModelUrl: '输入 civitai.com 或 huggingface.co 的 URL',
cancel: '取消',
save: '保存',
delete: '删除',
deleteAsk: '确定要删除此{0}',
modelType: '模型类型',
default: '默认',
network: '网络',
local: '本地',
none: '无',
uploadFile: '上传文件',
tapToChange: '点击描述可更改内容',
name: '名称',
width: '宽度',
height: '高度',
reset: '重置',
sort: {
name: '名称',
size: '最大',
created: '最新创建',
modified: '最新修改',
},
size: {
extraLarge: '超大图标',
large: '大图标',
medium: '中等图标',
small: '小图标',
custom: '自定义尺寸',
customTip: '在 `设置 > 模型管理器 > 外观` 中设置',
},
info: {
type: '类型',
pathIndex: '目录',
basename: '文件名',
sizeBytes: '文件大小',
createdAt: '创建时间',
updatedAt: '更新时间',
},
setting: {
apiKey: '密钥',
cardHeight: '卡片高度',
cardWidth: '卡片宽度',
scan: '扫描',
scanMissing: '下载缺失的信息或预览图片',
scanAll: '覆盖所有模型信息和预览图片',
includeHiddenFiles: '包含隐藏文件(以 . 开头的文件或文件夹)',
excludeScanTypes: '排除扫描类型(使用英文逗号隔开)',
ui: '外观',
cardSize: '卡片尺寸',
useFlatUI: '展平布局',
},
},
en: en,
zh: zh,
}
const getLocalLanguage = () => {

77
src/locales/en.json Normal file
View File

@@ -0,0 +1,77 @@
{
"model": "Model",
"modelManager": "Model Manager",
"openModelManager": "Open Model Manager",
"searchModels": "Search models",
"modelCopied": "Model Copied",
"download": "Download",
"downloadList": "Download List",
"downloadTask": "Download Task",
"createDownloadTask": "Create Download Task",
"parseModelUrl": "Parse Model URL",
"pleaseInputModelUrl": "Input a URL from civitai.com or huggingface.co",
"cancel": "Cancel",
"save": "Save",
"delete": "Delete",
"deleteAsk": "Confirm delete this {0}?",
"modelType": "Model Type",
"default": "Default",
"network": "Network",
"local": "Local",
"none": "None",
"uploadFile": "Upload File",
"tapToChange": "Tap description to change content",
"name": "Name",
"width": "Width",
"height": "Height",
"reset": "Reset",
"back": "Back",
"next": "Next",
"batchScanModelInformation": "Batch scan model information",
"modelInformationScanning": "Scanning model information",
"selectModelType": "Select model type",
"selectSubdirectory": "Select subdirectory",
"scanModelInformation": "Scan model information",
"selectedAllPaths": "Selected all model paths",
"selectedSpecialPath": "Selected special path",
"scanMissInformation": "Download missing information",
"scanFullInformation": "Override full information",
"noModelsInCurrentPath": "There are no models available in the current path",
"uploadModel": "Upload Model",
"chooseFile": "Choose File",
"sort": {
"name": "Name",
"size": "Largest",
"created": "Latest created",
"modified": "Latest modified"
},
"size": {
"extraLarge": "Extra Large Icons",
"large": "Large Icons",
"medium": "Medium Icons",
"small": "Small Icons",
"custom": "Custom Size",
"customTip": "Set in `Settings > Model Manager > UI`"
},
"info": {
"type": "Model Type",
"pathIndex": "Directory",
"basename": "File Name",
"sizeBytes": "File Size",
"createdAt": "Created At",
"updatedAt": "Updated At"
},
"setting": {
"apiKey": "API Key",
"cardHeight": "Card Height",
"cardWidth": "Card Width",
"scan": "Scan",
"scanMissing": "Download missing information or preview",
"scanAll": "Override all models' information and preview",
"includeHiddenFiles": "Include hidden files(start with .)",
"excludeScanTypes": "Exclude scan types (separate with commas)",
"ui": "UI",
"cardSize": "Card Size",
"useFlatUI": "Flat Layout"
}
}

77
src/locales/zh.json Normal file
View File

@@ -0,0 +1,77 @@
{
"model": "模型",
"modelManager": "模型管理器",
"openModelManager": "打开模型管理器",
"searchModels": "搜索模型",
"modelCopied": "模型节点已拷贝",
"download": "下载",
"downloadList": "下载列表",
"downloadTask": "下载任务",
"createDownloadTask": "创建下载任务",
"parseModelUrl": "解析模型URL",
"pleaseInputModelUrl": "输入 civitai.com 或 huggingface.co 的 URL",
"cancel": "取消",
"save": "保存",
"delete": "删除",
"deleteAsk": "确定要删除此{0}",
"modelType": "模型类型",
"default": "默认",
"network": "网络",
"local": "本地",
"none": "无",
"uploadFile": "上传文件",
"tapToChange": "点击描述可更改内容",
"name": "名称",
"width": "宽度",
"height": "高度",
"reset": "重置",
"back": "返回",
"next": "下一步",
"batchScanModelInformation": "批量扫描模型信息",
"modelInformationScanning": "扫描模型信息",
"selectModelType": "选择模型类型",
"selectSubdirectory": "选择子目录",
"scanModelInformation": "扫描模型信息",
"selectedAllPaths": "已选所有模型路径",
"selectedSpecialPath": "已选指定路径",
"scanMissInformation": "下载缺失信息",
"scanFullInformation": "覆盖所有信息",
"noModelsInCurrentPath": "当前路径中没有可用的模型",
"uploadModel": "上传模型",
"chooseFile": "选择文件",
"sort": {
"name": "名称",
"size": "最大",
"created": "最新创建",
"modified": "最新修改"
},
"size": {
"extraLarge": "超大图标",
"large": "大图标",
"medium": "中等图标",
"small": "小图标",
"custom": "自定义尺寸",
"customTip": "在 `设置 > 模型管理器 > 外观` 中设置"
},
"info": {
"type": "类型",
"pathIndex": "目录",
"basename": "文件名",
"sizeBytes": "文件大小",
"createdAt": "创建时间",
"updatedAt": "更新时间"
},
"setting": {
"apiKey": "密钥",
"cardHeight": "卡片高度",
"cardWidth": "卡片宽度",
"scan": "扫描",
"scanMissing": "下载缺失的信息或预览图片",
"scanAll": "覆盖所有模型信息和预览图片",
"includeHiddenFiles": "包含隐藏文件(以 . 开头的文件或文件夹)",
"excludeScanTypes": "排除扫描类型(使用英文逗号隔开)",
"ui": "外观",
"cardSize": "卡片尺寸",
"useFlatUI": "展平布局"
}
}

View File

@@ -4,7 +4,3 @@
@tailwind components;
@tailwind utilities;
}
.comfy-modal {
z-index: 3000;
}

11
src/types/global.d.ts vendored
View File

@@ -1,6 +1,10 @@
declare namespace ComfyAPI {
namespace api {
class ComfyApi {
class ComfyApiEvent {
getSystemStats: () => Promise<any>
}
class ComfyApi extends ComfyApiEvent {
socket: WebSocket
fetchApi: (route: string, options?: RequestInit) => Promise<Response>
addEventListener: (
@@ -8,6 +12,11 @@ declare namespace ComfyAPI {
callback: (event: CustomEvent) => void,
options?: AddEventListenerOptions,
) => void
removeEventListener: (
type: string,
callback: (event: CustomEvent) => void,
options?: AddEventListenerOptions,
) => void
}
const api: ComfyApi

View File

@@ -11,7 +11,6 @@ export interface BaseModel {
pathIndex: number
isFolder: boolean
preview: string | string[]
previewType: string
description: string
metadata: Record<string, string>
}
@@ -22,11 +21,22 @@ export interface Model extends BaseModel {
children?: Model[]
}
export interface VersionModelFile {
id: number
sizeKB: number
name: string
type: string
metadata: Record<string, string>
hashes: Record<string, string>
downloadUrl: string
}
export interface VersionModel extends BaseModel {
shortname: string
downloadPlatform: string
downloadUrl: string
hashes?: Record<string, string>
files?: VersionModelFile[]
}
export type WithResolved<T> = Omit<T, 'preview'> & {

53
src/utils/media.ts Normal file
View File

@@ -0,0 +1,53 @@
/**
* Media file utility functions
*/
const VIDEO_EXTENSIONS = [
'.mp4',
'.webm',
'.mov',
'.avi',
'.mkv',
'.flv',
'.wmv',
'.m4v',
'.ogv',
]
const VIDEO_HOST_PATTERNS = [
'/video', // Civitai video URLs often end with /video
'type=video', // URLs with video type parameter
'format=video', // URLs with video format parameter
'video.civitai.com', // Civitai video domain
]
/**
* Detect if a URL points to a video based on extension or URL patterns
* @param url - The URL to check
* @param localContentType - Optional MIME type for local files
*/
export const isVideoUrl = (url: string, localContentType?: string): boolean => {
if (!url) return false
// For local files with known MIME type
if (localContentType && localContentType.startsWith('video/')) {
return true
}
const urlLower = url.toLowerCase()
// First check if URL ends with a video extension
for (const ext of VIDEO_EXTENSIONS) {
if (urlLower.endsWith(ext)) {
return true
}
}
// Check if URL contains a video extension anywhere (for complex URLs like Civitai)
if (VIDEO_EXTENSIONS.some((ext) => urlLower.includes(ext))) {
return true
}
// Check for specific video hosting patterns
return VIDEO_HOST_PATTERNS.some((pattern) => urlLower.includes(pattern))
}

View File

@@ -11,6 +11,7 @@
"moduleResolution": "Node",
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"resolveJsonModule": true,
/* Linting */
"strict": false,

View File

@@ -114,7 +114,7 @@ export default defineConfig({
outDir: 'web',
minify: 'esbuild',
target: 'es2022',
sourcemap: true,
sourcemap: false,
rollupOptions: {
// Disabling tree-shaking
// Prevent vite remove unused exports