mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-09-21 19:21:27 -03:00
Will Miao
38d4c59b4c
ModelScope became a linkable source, but downloading from it was impossible:
the URL picker only recognised huggingface.co, the file listing hit a
huggingface-only endpoint, the resolve URL was hardcoded, and the default
path template always wrote into a `huggingface/` directory.
Move the download knowledge into the providers so the handlers stay generic:
- `ModelSource` gains `list_files()`, `file_download_url()`,
`default_revision` and `default_subdir`. `HuggingFaceSource` keeps the Hub
tree API (`/api/models/{id}/tree/{rev}`, LFS-aware sizes, `main`).
`ModelScopeSource` uses `/api/v1/models/{id}/repo/files?Revision=master`
— which reports real byte sizes for LFS files, so no HEAD probe is needed,
and which only accepts `master` (an HF-imported repo still 404s on `main`)
— and downloads through `/models/{id}/resolve/{rev}/{path}`. That URL
redirects to a CDN target carrying a time-limited `auth_key`, so it is
rebuilt on every request and never cached, which is also what keeps
resumable Range requests working.
- `hf_handlers.py`/`HfHandler` become `model_source_handlers.py`/
`ModelSourceHandler` with `list_model_source_files` and
`download_model_source`. New routes `/api/lm/model-source-files` and
`/api/lm/download-model-source`; the old `/api/lm/hf-repo-files` and
`/api/lm/download-hf-model` paths stay as aliases, and a payload without
`platform` still means Hugging Face, so existing callers are unaffected.
- A downloaded sidecar now records `source_platform` + `source_url` (with the
`hf_url` alias only for Hugging Face) instead of always writing `hf_url`,
and `use_default_paths` files ModelScope downloads under
`modelscope/<owner>/<repo>`. The now-unused shared HF aiohttp session and
its shutdown hook are gone; providers open short-lived sessions.
- Frontend: `detectUrlType` returns the platform-neutral
`model-source-repo` / `model-source-file` plus an explicit `platform`, the
DownloadManager's `hf*` state and methods are renamed to `source*`, every
`source === 'huggingface'` check becomes `isExternalModelSource()`, and
batch groups are keyed by `platform:repo` so the same `owner/name` on two
sites renders as two groups. A bare `owner/name` still means Hugging Face.
- `is_valid_source_id()` centralises repo-id validation (exactly
`owner/name`, no traversal, no leading dot). This also fixes the old HF
download check that rejected any dot in the name, i.e. legitimate repos
such as `black-forest-labs/FLUX.1-dev`.
Verified against the live APIs: the example repo lists 8 weight files with
correct sizes, and a ranged GET of the built resolve URL returns 206 after
following the redirect to the CDN. Backend 2853 passed; frontend 1143 JS +
91 Vue passed. The nine locales carry the refreshed download copy in the
next commit.
107 lines
3.3 KiB
Python
107 lines
3.3 KiB
Python
"""Hugging Face model source."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import re
|
|
|
|
from .base import (
|
|
ModelSource,
|
|
ModelSourceError,
|
|
fetch_json,
|
|
fetch_text,
|
|
filter_weight_files,
|
|
)
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
#: Lenient — used to normalise URLs already stored in metadata; tolerates
|
|
#: sub-paths such as ``/resolve/main/model.safetensors``.
|
|
_URL_PATTERN = re.compile(
|
|
r"https?://(?:www\.)?huggingface\.co/(?P<id>[^/?#\s]+/[^/?#\s]+)"
|
|
)
|
|
|
|
#: Strict — validates what the user pasted into the "link model" dialog.
|
|
_STRICT_URL_PATTERN = re.compile(
|
|
r"https?://(?:www\.)?huggingface\.co/(?P<id>[^/?#\s]+/[^/?#\s]+)/?$"
|
|
)
|
|
|
|
|
|
class HuggingFaceSource(ModelSource):
|
|
"""Hugging Face Hub (``huggingface.co``)."""
|
|
|
|
platform = "huggingface"
|
|
label = "Hugging Face"
|
|
supports_enrichment = True
|
|
supports_download = True
|
|
default_revision = "main"
|
|
default_subdir = "huggingface"
|
|
url_pattern = _URL_PATTERN
|
|
strict_url_pattern = _STRICT_URL_PATTERN
|
|
|
|
def canonical_url(self, source_id: str) -> str:
|
|
return f"https://huggingface.co/{source_id}"
|
|
|
|
def asset_base_url(self, source_id: str, revision: str = "") -> str:
|
|
return f"https://huggingface.co/{source_id}/resolve/{self.resolve_revision(revision)}"
|
|
|
|
async def fetch_model_card(self, source_id: str) -> str:
|
|
"""Fetch ``README.md`` from Hugging Face (tries ``main``, then ``master``)."""
|
|
|
|
for branch in ("main", "master"):
|
|
text = await fetch_text(
|
|
f"https://huggingface.co/{source_id}/raw/{branch}/README.md"
|
|
)
|
|
if text:
|
|
return text
|
|
return ""
|
|
|
|
async def list_files(
|
|
self, source_id: str, revision: str = ""
|
|
) -> list[dict]:
|
|
"""List weight files via the Hub tree API.
|
|
|
|
The tree endpoint (rather than the model-info endpoint) is used
|
|
because it reports accurate sizes for LFS-tracked files.
|
|
"""
|
|
|
|
revision = self.resolve_revision(revision)
|
|
status, payload = await fetch_json(
|
|
f"https://huggingface.co/api/models/{source_id}/tree/{revision}"
|
|
)
|
|
|
|
if status == 404:
|
|
raise ModelSourceError(f"Repository '{source_id}' not found", status=404)
|
|
if status != 200 or not isinstance(payload, list):
|
|
raise ModelSourceError(
|
|
f"Hugging Face API error while listing '{source_id}' (HTTP {status})"
|
|
)
|
|
|
|
entries = []
|
|
for entry in payload:
|
|
if not isinstance(entry, dict):
|
|
continue
|
|
path = entry.get("path", "")
|
|
size = entry.get("size", 0) or 0
|
|
if not size and isinstance(entry.get("lfs"), dict):
|
|
size = entry["lfs"].get("size", 0) or 0
|
|
entries.append((path, size))
|
|
|
|
return filter_weight_files(entries)
|
|
|
|
def file_download_url(
|
|
self, source_id: str, filename: str, revision: str = ""
|
|
) -> str:
|
|
return (
|
|
f"https://huggingface.co/{source_id}/resolve/"
|
|
f"{self.resolve_revision(revision)}/{filename}"
|
|
)
|
|
|
|
def page_url_for_file(self, source_id: str, filename: str) -> str:
|
|
return (
|
|
f"https://huggingface.co/{source_id}/blob/{self.default_revision}/{filename}"
|
|
)
|
|
|
|
|
|
__all__ = ["HuggingFaceSource"]
|