mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-09-21 03:01:27 -03:00
Will Miao
d572292142
A ModelScope or Hugging Face download landed as a bare filename, hash and
source link; the model card stayed empty until the user ran "Enrich
Metadata with AI" by hand. But everything that makes a CivitAI download
useful — the display name, the description, the tags, the trigger words,
the example images, the preview — is already published by those sites'
public APIs, so asking for it at download time is deterministic work, not
model work.
Add `py/services/model_sources/hydration.py`, called by
`_save_source_metadata()` once the sidecar exists and the file is in the
scanner cache. It fetches the model card plus the site's card extras and
hands them to the same `PostProcessor` the AI skill uses, with an empty
`llm_output`, so the two paths cannot drift apart. What lands:
* `model_name` from the site's own display name (ModelScope's `Name`), so
the card stops showing the local filename — written only while the value
still equals the file stem, since once a user renames a model that
choice is theirs to keep
* `civitai.name` from the matched version's label (`showName`), which the
card renders as the version chip
* `civitai.description` / `modelDescription` from the author summary plus
the README as HTML
* `civitai.images` / `preview_url` from the per-file example images
* `civitai.trainedWords` from the per-file trigger words
* `base_model`, `tags` and `usage_tips` as before
Provenance stays honest: the pass records
`metadata_source = "source:<platform>"` rather than the skill's
`agent:enrich_hf_metadata`, and — because no provider ran — it no longer
stamps `llm_enriched_at`; that stamp is now conditional on the LLM
actually answering, which is what the field means. The five hand-rolled
`civitai` dict merges in the post-processor collapse into one
`_merge_civitai()` helper.
Two guards keep it safe. Only a model whose stored
`source_platform`/`source_url` match the repository being downloaded is
updated, so a local file that merely shares a name never receives another
model's card; and a file already on disk is topped up too, which
back-fills models downloaded before this existed. READMEs and detail
payloads describe the repository rather than the file, so a short-lived
process-wide `ModelSourceCache` (300 s, 32 entries) keeps a batch over one
repository to two HTTP requests. Every failure is logged and swallowed:
hydration can never fail a download.
Fix the hash policy while here. `_save_source_metadata()` went straight to
`MetadataManager.create_default_metadata()`, bypassing the per-type
factory on the owning scanner, so a checkpoint paid a full SHA256 inside
the download request — `CheckpointScanner`/`OtherScanner` deliberately
record `hash_status="pending"` with an empty `sha256` for their multi-GB
files. Metadata is now created through `scanner._create_default_metadata()`.
Hydration copes with the empty hash: `_matching_versions()` falls back to
the repository basename, which is exactly what the download just wrote.
Report both post-transfer stages, which advance no byte counter and so
read as a stall: the bar sat at 100% showing `0 B/s` for the seconds spent
hashing and fetching. `_report_phase()` broadcasts
`{"status": "metadata", "stage": "indexing" | "source", "platform": ...}`,
and `LoadingManager` names the stage in the status line (keeping the batch
position), retitles the item line, replaces the dead speed figure and runs
a sheen over the bar. `stage`/`platform` are machine-readable; the wording
is localised in the frontend.
Finally, `modelscope.ai` is its own catalogue rather than an alias of
`modelscope.cn` — `referall13/EM1` exists only on `.ai` and
`jj3550945163/Krea-2-LORA` only on `.cn` — so its URLs were rejected with
"Invalid model URL format". Register it as `ModelScopeIntlSource`
(`platform="modelscope-ai"`, `msai:` group prefix, its own default
download directory) and derive every URL either deployment builds from a
per-class `base_url`. `modelscope.com` stays an alias of `.cn`, which is
what it redirects to. The frontend source table, the link dialog hints and
the docs mirror the split.
Verified against the live APIs: both reported `.ai` repositories list
their files, read their READMEs and yield name / version / base model /
trigger words / example images. Backend 3092 passed; frontend 1259 JS +
91 Vue passed. The nine locales carry the new progress copy in the next
commit.
165 lines
3.5 KiB
CSS
165 lines
3.5 KiB
CSS
.loading-overlay {
|
|
position: fixed;
|
|
top: 0;
|
|
left: 0;
|
|
width: 100%;
|
|
height: 100%;
|
|
background: oklch(0% 0 0 / 0.7);
|
|
display: flex;
|
|
justify-content: center;
|
|
align-items: center;
|
|
z-index: var(--z-overlay);
|
|
}
|
|
|
|
.loading-content {
|
|
background: var(--lora-surface);
|
|
backdrop-filter: blur(24px);
|
|
padding: var(--space-3);
|
|
border-radius: var(--border-radius-base);
|
|
text-align: center;
|
|
border: 1px solid var(--lora-border);
|
|
width: min(400px, 90vw);
|
|
}
|
|
|
|
.loading-spinner {
|
|
border: 4px solid #f3f3f3;
|
|
border-top: 4px solid #3498db;
|
|
border-radius: 50%;
|
|
width: 40px;
|
|
height: 40px;
|
|
animation: spin 1s linear infinite;
|
|
margin: 0 auto 1rem;
|
|
}
|
|
|
|
.loading-status {
|
|
margin-bottom: 1rem;
|
|
color: var(--text-color);
|
|
white-space: nowrap;
|
|
overflow: hidden;
|
|
text-overflow: ellipsis;
|
|
max-width: 100%;
|
|
padding: 0 var(--space-2);
|
|
}
|
|
|
|
.progress-container {
|
|
width: 280px;
|
|
background-color: var(--lora-border);
|
|
border-radius: 4px;
|
|
overflow: hidden;
|
|
margin: 0 auto;
|
|
}
|
|
|
|
.progress-bar {
|
|
width: 0%;
|
|
height: var(--space-2);
|
|
background-color: var(--lora-accent);
|
|
transition: width 200ms ease-out;
|
|
}
|
|
|
|
/* Enhanced progress display */
|
|
.progress-details-container {
|
|
margin-top: var(--space-3);
|
|
width: 100%;
|
|
text-align: left;
|
|
}
|
|
|
|
.overall-progress-label {
|
|
font-size: 0.9rem;
|
|
margin-bottom: var(--space-1);
|
|
color: var(--text-color);
|
|
}
|
|
|
|
.current-item-progress {
|
|
margin-top: var(--space-2);
|
|
}
|
|
|
|
.current-item-label {
|
|
font-size: 0.9rem;
|
|
margin-bottom: var(--space-1);
|
|
color: var(--text-color);
|
|
white-space: nowrap;
|
|
overflow: hidden;
|
|
text-overflow: ellipsis;
|
|
}
|
|
|
|
.current-item-bar-container {
|
|
height: 8px;
|
|
background-color: var(--lora-border);
|
|
border-radius: 4px;
|
|
overflow: hidden;
|
|
margin-bottom: var(--space-1);
|
|
}
|
|
|
|
.current-item-bar {
|
|
height: 100%;
|
|
background-color: var(--lora-accent);
|
|
transition: width 200ms ease-out;
|
|
width: 0%;
|
|
}
|
|
|
|
/* The transfer is done but the backend is still indexing the file and reading
|
|
the model site's API. A sheen over the full bar reads as "busy" where a
|
|
motionless 100% bar reads as "stuck". */
|
|
.current-item-bar.is-indeterminate {
|
|
position: relative;
|
|
overflow: hidden;
|
|
}
|
|
|
|
.current-item-bar.is-indeterminate::after {
|
|
content: '';
|
|
position: absolute;
|
|
inset: 0;
|
|
background: linear-gradient(
|
|
90deg,
|
|
transparent 0%,
|
|
rgba(255, 255, 255, 0.5) 50%,
|
|
transparent 100%
|
|
);
|
|
animation: progress-sheen 1.2s ease-in-out infinite;
|
|
}
|
|
|
|
@keyframes progress-sheen {
|
|
from { transform: translateX(-100%); }
|
|
to { transform: translateX(100%); }
|
|
}
|
|
|
|
.current-item-percent {
|
|
font-size: 0.8rem;
|
|
color: var(--text-color-secondary, var(--text-color));
|
|
opacity: 0.7;
|
|
}
|
|
|
|
.download-transfer-stats {
|
|
margin-top: var(--space-2);
|
|
font-size: 0.85rem;
|
|
color: var(--text-color);
|
|
display: flex;
|
|
flex-direction: column;
|
|
gap: var(--space-1);
|
|
}
|
|
|
|
.download-transfer-stats .download-transfer-bytes,
|
|
.download-transfer-stats .download-transfer-speed {
|
|
display: flex;
|
|
align-items: center;
|
|
gap: var(--space-1);
|
|
white-space: nowrap;
|
|
}
|
|
|
|
@keyframes spin {
|
|
0% { transform: rotate(0deg); }
|
|
100% { transform: rotate(360deg); }
|
|
}
|
|
|
|
@media (prefers-reduced-motion: reduce) {
|
|
.model-card,
|
|
.progress-bar,
|
|
.current-item-bar {
|
|
transition: none;
|
|
}
|
|
|
|
.current-item-bar.is-indeterminate::after {
|
|
animation: none;
|
|
}
|
|
}
|