feat: add configurable HuggingFace search methods with Brave and Comfy-Org fallbacks
- Add new UI toggles for HF search methods: API search, Comfy-Org fallback, Brave fallback - Integrate Brave Search API as a fallback for finding models on HuggingFace - Add Comfy-Org author fallback search for authoritative sources - Refactor HuggingFace search logic into modular helper functions - Improve filename cleaning to handle fp4 and mixed precision formats - Add brave_search_api_key, hf_use_api_search, hf_use_comfy_org_fallback, hf_use_brave_fallback settings
This commit is contained in:
Dariusz L
+32
-1
@@ -826,11 +826,35 @@ class ModelLinkerExtension:
|
||||
# Handle both boolean and string forms
|
||||
is_urn_raw = data.get("is_urn", False)
|
||||
civitai_session_token = data.get("civitai_session_token", "")
|
||||
hf_token = data.get("hf_token", "")
|
||||
brave_search_api_key = data.get("brave_search_api_key", "")
|
||||
hf_use_api_search = data.get("hf_use_api_search", True)
|
||||
hf_use_comfy_org_fallback = data.get(
|
||||
"hf_use_comfy_org_fallback", True
|
||||
)
|
||||
hf_use_brave_fallback = data.get(
|
||||
"hf_use_brave_fallback", True
|
||||
)
|
||||
is_urn = (
|
||||
is_urn_raw
|
||||
if isinstance(is_urn_raw, bool)
|
||||
else (str(is_urn_raw).lower() == "true")
|
||||
)
|
||||
hf_use_api_search = (
|
||||
hf_use_api_search
|
||||
if isinstance(hf_use_api_search, bool)
|
||||
else str(hf_use_api_search).lower() == "true"
|
||||
)
|
||||
hf_use_comfy_org_fallback = (
|
||||
hf_use_comfy_org_fallback
|
||||
if isinstance(hf_use_comfy_org_fallback, bool)
|
||||
else str(hf_use_comfy_org_fallback).lower() == "true"
|
||||
)
|
||||
hf_use_brave_fallback = (
|
||||
hf_use_brave_fallback
|
||||
if isinstance(hf_use_brave_fallback, bool)
|
||||
else str(hf_use_brave_fallback).lower() == "true"
|
||||
)
|
||||
|
||||
# For URN-only requests, model_id and version_id are required instead of filename
|
||||
model_id = data.get("model_id")
|
||||
@@ -923,7 +947,14 @@ class ModelLinkerExtension:
|
||||
# 2. Search HuggingFace for exact file match
|
||||
if search_huggingface_source:
|
||||
log_info(f"Search source [huggingface] start: filename={filename}")
|
||||
hf_result = search_huggingface_for_file(filename)
|
||||
hf_result = search_huggingface_for_file(
|
||||
filename,
|
||||
token=hf_token or None,
|
||||
brave_api_key=brave_search_api_key or None,
|
||||
use_api_search=hf_use_api_search,
|
||||
use_comfy_org_fallback=hf_use_comfy_org_fallback,
|
||||
use_brave_fallback=hf_use_brave_fallback,
|
||||
)
|
||||
log_search_result("huggingface", hf_result)
|
||||
if hf_result:
|
||||
results["huggingface"] = hf_result
|
||||
|
||||
+311
-90
@@ -19,6 +19,8 @@ from ..log_system.log_funcs import (
|
||||
)
|
||||
|
||||
HF_API_URL = "https://huggingface.co/api"
|
||||
HF_AUTHOR_FALLBACKS = ["Comfy-Org"]
|
||||
BRAVE_SEARCH_API_URL = "https://api.search.brave.com/res/v1/web/search"
|
||||
|
||||
# Cache for search results
|
||||
_search_cache: Dict[str, Any] = {}
|
||||
@@ -76,7 +78,7 @@ def clean_filename_for_search(filename: str) -> str:
|
||||
base = os.path.splitext(filename)[0]
|
||||
# Remove common precision/format suffixes
|
||||
base = re.sub(
|
||||
r"[-_]?(fp16|fp32|fp8|bf16|e4m3fn|scaled|pruned|emaonly|q4|q8).*$",
|
||||
r"[-_]?(fp16|fp32|fp8|fp4|bf16|e4m3fn|scaled|pruned|emaonly|mixed|q4|q8).*$",
|
||||
"",
|
||||
base,
|
||||
flags=re.IGNORECASE,
|
||||
@@ -84,8 +86,211 @@ def clean_filename_for_search(filename: str) -> str:
|
||||
return base
|
||||
|
||||
|
||||
def _build_huggingface_result(
|
||||
repo_id: str, file_path: str, file_info: Dict[str, Any], match_type: str
|
||||
) -> Dict[str, Any]:
|
||||
return {
|
||||
"source": "huggingface",
|
||||
"repo_id": repo_id,
|
||||
"filename": os.path.basename(file_path),
|
||||
"path": file_path,
|
||||
"url": get_huggingface_download_url(repo_id, file_path),
|
||||
"size": file_info.get("size"),
|
||||
"match_type": match_type,
|
||||
}
|
||||
|
||||
|
||||
def _get_repo_tree(
|
||||
repo_id: str, headers: Dict[str, str], branch: str = "main"
|
||||
) -> Optional[List[Dict[str, Any]]]:
|
||||
files_url = f"{HF_API_URL}/models/{repo_id}/tree/{quote(branch, safe='')}"
|
||||
|
||||
try:
|
||||
response = requests.get(
|
||||
files_url,
|
||||
params={"recursive": "1"},
|
||||
headers=headers,
|
||||
timeout=15,
|
||||
)
|
||||
if response.status_code != 200:
|
||||
log_debug(
|
||||
f"HuggingFace tree request returned {response.status_code} for repo={repo_id}, branch={branch}"
|
||||
)
|
||||
return None
|
||||
return response.json()
|
||||
except Exception as e:
|
||||
log_debug(f"Error getting HuggingFace tree for {repo_id}@{branch}: {e}")
|
||||
return None
|
||||
|
||||
|
||||
def _find_matching_file_in_repo(
|
||||
repo_id: str,
|
||||
files: List[Dict[str, Any]],
|
||||
filename: str,
|
||||
exact_only: bool = False,
|
||||
) -> Optional[Dict[str, Any]]:
|
||||
filename_lower = filename.lower()
|
||||
filename_base = os.path.splitext(filename_lower)[0]
|
||||
partial_match = None
|
||||
|
||||
for file_info in files:
|
||||
file_path = file_info.get("path", "")
|
||||
if not file_path:
|
||||
continue
|
||||
|
||||
file_name = os.path.basename(file_path)
|
||||
file_name_lower = file_name.lower()
|
||||
file_base = os.path.splitext(file_name_lower)[0]
|
||||
|
||||
if file_name_lower == filename_lower or file_path.lower().endswith(filename_lower):
|
||||
return _build_huggingface_result(repo_id, file_path, file_info, "exact")
|
||||
|
||||
if exact_only:
|
||||
return None
|
||||
|
||||
for file_info in files:
|
||||
file_path = file_info.get("path", "")
|
||||
if not file_path:
|
||||
continue
|
||||
|
||||
file_name = os.path.basename(file_path)
|
||||
file_name_lower = file_name.lower()
|
||||
file_base = os.path.splitext(file_name_lower)[0]
|
||||
|
||||
if not exact_only:
|
||||
if filename_base in file_base or file_base in filename_base:
|
||||
if file_path.endswith(".safetensors") or file_path.endswith(".ckpt"):
|
||||
partial_match = _build_huggingface_result(
|
||||
repo_id, file_path, file_info, "partial"
|
||||
)
|
||||
break
|
||||
|
||||
return partial_match
|
||||
|
||||
|
||||
def _build_huggingface_search_queries(filename: str) -> List[str]:
|
||||
filename_base = os.path.splitext(os.path.basename(filename))[0].lower()
|
||||
cleaned_base = clean_filename_for_search(filename).lower()
|
||||
simplified_base = re.sub(
|
||||
r"[-_]?(fp16|fp32|fp8|fp4|bf16|e4m3fn|mixed|scaled|pruned|emaonly|q4|q8)$",
|
||||
"",
|
||||
filename_base,
|
||||
flags=re.IGNORECASE,
|
||||
)
|
||||
|
||||
queries = []
|
||||
for query in [filename_base, cleaned_base, simplified_base]:
|
||||
query = (query or "").strip(" -_")
|
||||
if query and query not in queries:
|
||||
queries.append(query)
|
||||
|
||||
return queries
|
||||
|
||||
|
||||
def _get_repos_by_author(
|
||||
author: str, headers: Dict[str, str], limit: int = 200
|
||||
) -> List[str]:
|
||||
try:
|
||||
response = requests.get(
|
||||
f"{HF_API_URL}/models",
|
||||
params={"author": author, "limit": limit},
|
||||
headers=headers,
|
||||
timeout=15,
|
||||
)
|
||||
if response.status_code != 200:
|
||||
log_debug(
|
||||
f"HuggingFace author search returned {response.status_code} for author={author}"
|
||||
)
|
||||
return []
|
||||
|
||||
repos = response.json()
|
||||
return [repo.get("id", "") for repo in repos if repo.get("id")]
|
||||
except Exception as e:
|
||||
log_debug(f"Error getting HuggingFace repos for author={author}: {e}")
|
||||
return []
|
||||
|
||||
|
||||
def _search_brave_for_huggingface_candidates(
|
||||
filename: str, brave_api_key: str
|
||||
) -> List[Dict[str, str]]:
|
||||
if not brave_api_key:
|
||||
return []
|
||||
|
||||
query = f'"{filename}" site:huggingface.co'
|
||||
headers = {
|
||||
"Accept": "application/json",
|
||||
"Accept-Encoding": "gzip",
|
||||
"X-Subscription-Token": brave_api_key,
|
||||
}
|
||||
params = {
|
||||
"q": query,
|
||||
"count": 20,
|
||||
"safesearch": "off",
|
||||
"spellcheck": "false",
|
||||
}
|
||||
candidates = []
|
||||
seen = set()
|
||||
|
||||
try:
|
||||
response = requests.get(
|
||||
BRAVE_SEARCH_API_URL, headers=headers, params=params, timeout=15
|
||||
)
|
||||
if response.status_code != 200:
|
||||
log_warn(
|
||||
f"Brave search returned {response.status_code} for query={query}"
|
||||
)
|
||||
return []
|
||||
|
||||
payload = response.json()
|
||||
results = ((payload or {}).get("web") or {}).get("results") or []
|
||||
for result in results:
|
||||
candidate_url = result.get("url", "")
|
||||
if not candidate_url:
|
||||
continue
|
||||
|
||||
parsed = parse_huggingface_url(candidate_url)
|
||||
if parsed:
|
||||
repo_id = parsed.get("repo", "")
|
||||
file_path = parsed.get("filename", "")
|
||||
branch = parsed.get("branch", "main")
|
||||
else:
|
||||
parsed_url = urlparse(candidate_url)
|
||||
if "huggingface.co" not in parsed_url.netloc:
|
||||
continue
|
||||
path_parts = [part for part in parsed_url.path.split("/") if part]
|
||||
if len(path_parts) < 2:
|
||||
continue
|
||||
repo_id = f"{path_parts[0]}/{path_parts[1]}"
|
||||
file_path = filename
|
||||
branch = "main"
|
||||
|
||||
key = (repo_id, branch, file_path)
|
||||
if not repo_id or key in seen:
|
||||
continue
|
||||
|
||||
seen.add(key)
|
||||
candidates.append(
|
||||
{
|
||||
"repo": repo_id,
|
||||
"branch": branch,
|
||||
"filename": file_path,
|
||||
"url": candidate_url,
|
||||
}
|
||||
)
|
||||
except Exception as e:
|
||||
log_debug(f"Brave search error for filename={filename}: {e}")
|
||||
|
||||
return candidates
|
||||
|
||||
|
||||
def search_huggingface_for_file(
|
||||
filename: str, token: Optional[str] = None, exact_only: bool = False
|
||||
filename: str,
|
||||
token: Optional[str] = None,
|
||||
exact_only: bool = False,
|
||||
brave_api_key: Optional[str] = None,
|
||||
use_api_search: bool = True,
|
||||
use_comfy_org_fallback: bool = True,
|
||||
use_brave_fallback: bool = True,
|
||||
) -> Optional[Dict[str, Any]]:
|
||||
"""
|
||||
Search HuggingFace for a specific model file.
|
||||
@@ -102,109 +307,130 @@ def search_huggingface_for_file(
|
||||
"""
|
||||
global _search_cache
|
||||
|
||||
cache_key = f"hf_{filename}_exact{exact_only}"
|
||||
brave_key = "brave" if brave_api_key and use_brave_fallback else "nobrave"
|
||||
token_key = "token" if token else "notoken"
|
||||
methods_key = (
|
||||
f"api{int(bool(use_api_search))}_"
|
||||
f"comfy{int(bool(use_comfy_org_fallback))}_"
|
||||
f"brave{int(bool(use_brave_fallback))}"
|
||||
)
|
||||
cache_key = f"hf_{filename}_exact{exact_only}_{token_key}_{brave_key}_{methods_key}"
|
||||
if cache_key in _search_cache:
|
||||
log_debug(f"HuggingFace search cache hit for {filename} (exact_only={exact_only})")
|
||||
return _search_cache[cache_key]
|
||||
|
||||
try:
|
||||
# Use filename without extension for search
|
||||
filename_base = os.path.splitext(filename)[0].lower()
|
||||
|
||||
headers = {}
|
||||
if token:
|
||||
headers["Authorization"] = f"Bearer {token}"
|
||||
|
||||
# Search for repos containing this filename
|
||||
search_url = f"{HF_API_URL}/models?search={quote(filename_base)}&limit=10"
|
||||
log_info(
|
||||
f"HuggingFace search start: filename={filename}, query={filename_base}, exact_only={exact_only}"
|
||||
f"HuggingFace search start: filename={filename}, exact_only={exact_only}"
|
||||
)
|
||||
|
||||
response = requests.get(search_url, headers=headers, timeout=10)
|
||||
if response.status_code != 200:
|
||||
log_warn(
|
||||
f"HuggingFace search returned {response.status_code} for query={filename_base}"
|
||||
)
|
||||
return None
|
||||
repos_to_check = []
|
||||
seen_repos = set()
|
||||
search_queries = _build_huggingface_search_queries(filename)
|
||||
|
||||
repos = response.json()
|
||||
log_info(
|
||||
f"HuggingFace search API returned {len(repos)} repos for query={filename_base}"
|
||||
)
|
||||
|
||||
for repo in repos:
|
||||
repo_id = repo.get("id", "")
|
||||
if not repo_id:
|
||||
continue
|
||||
|
||||
log_debug(f"HuggingFace checking repo {repo_id} for filename={filename}")
|
||||
|
||||
# Check if this repo actually has a matching file
|
||||
files_url = f"{HF_API_URL}/models/{repo_id}/tree/main"
|
||||
|
||||
try:
|
||||
files_response = requests.get(files_url, headers=headers, timeout=10)
|
||||
if files_response.status_code == 200:
|
||||
files = files_response.json()
|
||||
log_debug(
|
||||
f"HuggingFace repo {repo_id} returned {len(files)} tree items"
|
||||
if use_api_search:
|
||||
for search_query in search_queries:
|
||||
search_url = f"{HF_API_URL}/models?search={quote(search_query)}&limit=20"
|
||||
response = requests.get(search_url, headers=headers, timeout=10)
|
||||
if response.status_code != 200:
|
||||
log_warn(
|
||||
f"HuggingFace search returned {response.status_code} for query={search_query}"
|
||||
)
|
||||
continue
|
||||
|
||||
for file_info in files:
|
||||
file_path = file_info.get("path", "")
|
||||
file_base = os.path.splitext(os.path.basename(file_path))[
|
||||
0
|
||||
].lower()
|
||||
repos = response.json()
|
||||
log_info(
|
||||
f"HuggingFace search API returned {len(repos)} repos for query={search_query}"
|
||||
)
|
||||
|
||||
# Check for exact match first (always try this)
|
||||
if file_path.endswith(filename):
|
||||
result = {
|
||||
"source": "huggingface",
|
||||
"repo_id": repo_id,
|
||||
"filename": os.path.basename(file_path),
|
||||
"path": file_path,
|
||||
"url": get_huggingface_download_url(repo_id, file_path),
|
||||
"size": file_info.get("size"),
|
||||
"match_type": "exact",
|
||||
}
|
||||
_search_cache[cache_key] = result
|
||||
log_info(f"Found {filename} on HuggingFace: {repo_id}")
|
||||
return result
|
||||
for repo in repos:
|
||||
repo_id = repo.get("id", "")
|
||||
if repo_id and repo_id not in seen_repos:
|
||||
seen_repos.add(repo_id)
|
||||
repos_to_check.append(repo_id)
|
||||
|
||||
# Check for partial match (filename_base in file_base or vice versa)
|
||||
# Skip partial matches if exact_only is True - prevents confusing
|
||||
# users with wrong model suggestions for downloads
|
||||
if not exact_only:
|
||||
if filename_base in file_base or file_base in filename_base:
|
||||
if file_path.endswith(
|
||||
".safetensors"
|
||||
) or file_path.endswith(".ckpt"):
|
||||
result = {
|
||||
"source": "huggingface",
|
||||
"repo_id": repo_id,
|
||||
"filename": os.path.basename(file_path),
|
||||
"path": file_path,
|
||||
"url": get_huggingface_download_url(
|
||||
repo_id, file_path
|
||||
),
|
||||
"size": file_info.get("size"),
|
||||
"match_type": "partial",
|
||||
}
|
||||
_search_cache[cache_key] = result
|
||||
log_info(
|
||||
f"Found similar file for {filename} on HuggingFace: {repo_id}/{file_path}"
|
||||
)
|
||||
return result
|
||||
|
||||
except Exception as e:
|
||||
log_debug(f"Error checking HuggingFace repo {repo_id}: {e}")
|
||||
for repo_id in repos_to_check:
|
||||
log_debug(f"HuggingFace checking repo {repo_id} for filename={filename}")
|
||||
files = _get_repo_tree(repo_id, headers=headers)
|
||||
if not files:
|
||||
continue
|
||||
|
||||
log_debug(f"HuggingFace repo {repo_id} returned {len(files)} tree items")
|
||||
result = _find_matching_file_in_repo(
|
||||
repo_id, files, filename, exact_only=exact_only
|
||||
)
|
||||
if result:
|
||||
_search_cache[cache_key] = result
|
||||
log_info(
|
||||
f"Found {result['match_type']} HuggingFace match for {filename}: {repo_id}/{result['path']}"
|
||||
)
|
||||
return result
|
||||
|
||||
author_fallback_repos = []
|
||||
if use_comfy_org_fallback:
|
||||
for author in HF_AUTHOR_FALLBACKS:
|
||||
repos = _get_repos_by_author(author, headers=headers)
|
||||
log_info(
|
||||
f"HuggingFace author fallback returned {len(repos)} repos for author={author}"
|
||||
)
|
||||
for repo_id in repos:
|
||||
if repo_id not in seen_repos:
|
||||
seen_repos.add(repo_id)
|
||||
author_fallback_repos.append(repo_id)
|
||||
|
||||
for repo_id in author_fallback_repos:
|
||||
log_debug(
|
||||
f"HuggingFace author fallback checking repo {repo_id} for filename={filename}"
|
||||
)
|
||||
files = _get_repo_tree(repo_id, headers=headers)
|
||||
if not files:
|
||||
continue
|
||||
|
||||
result = _find_matching_file_in_repo(
|
||||
repo_id, files, filename, exact_only=exact_only
|
||||
)
|
||||
if result:
|
||||
_search_cache[cache_key] = result
|
||||
log_info(
|
||||
f"Found {result['match_type']} HuggingFace author fallback match for {filename}: {repo_id}/{result['path']}"
|
||||
)
|
||||
return result
|
||||
|
||||
brave_candidates = (
|
||||
_search_brave_for_huggingface_candidates(filename, brave_api_key or "")
|
||||
if use_brave_fallback
|
||||
else []
|
||||
)
|
||||
log_info(
|
||||
f"Brave fallback returned {len(brave_candidates)} candidates for filename={filename}"
|
||||
)
|
||||
|
||||
for candidate in brave_candidates:
|
||||
repo_id = candidate.get("repo", "")
|
||||
branch = candidate.get("branch", "main")
|
||||
expected_file = candidate.get("filename", filename)
|
||||
files = _get_repo_tree(repo_id, headers=headers, branch=branch)
|
||||
if not files:
|
||||
continue
|
||||
|
||||
result = _find_matching_file_in_repo(
|
||||
repo_id, files, expected_file, exact_only=True
|
||||
)
|
||||
if result and result.get("filename", "").lower() == filename.lower():
|
||||
_search_cache[cache_key] = result
|
||||
log_info(
|
||||
f"Found exact Brave fallback match for {filename}: {repo_id}/{result['path']}"
|
||||
)
|
||||
return result
|
||||
|
||||
# Not found
|
||||
_search_cache[cache_key] = None
|
||||
log_info(
|
||||
f"HuggingFace search no result: filename={filename}, query={filename_base}, repos_checked={len(repos)}"
|
||||
f"HuggingFace search no result: filename={filename}, repos_checked={len(repos_to_check)}, author_fallback_repos={len(author_fallback_repos)}, brave_candidates={len(brave_candidates)}"
|
||||
)
|
||||
return None
|
||||
|
||||
@@ -268,13 +494,8 @@ def get_repo_files(repo: str, token: Optional[str] = None) -> List[Dict[str, Any
|
||||
if token:
|
||||
headers["Authorization"] = f"Bearer {token}"
|
||||
|
||||
response = requests.get(
|
||||
f"{HF_API_URL}/models/{repo}/tree/main", headers=headers, timeout=15
|
||||
)
|
||||
|
||||
if response.status_code == 200:
|
||||
items = response.json()
|
||||
|
||||
items = _get_repo_tree(repo, headers=headers)
|
||||
if items:
|
||||
for item in items:
|
||||
path = item.get("path", "")
|
||||
if path.endswith(
|
||||
|
||||
+66
-3
@@ -2796,6 +2796,22 @@ class LinkerManagerDialog extends ComfyDialog {
|
||||
color: var(--ml-text-muted);
|
||||
line-height: 1.45;
|
||||
}
|
||||
.ml-checkbox-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
font-size: 13px;
|
||||
color: var(--ml-text);
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
}
|
||||
.ml-checkbox-row input[type="checkbox"] {
|
||||
width: 15px;
|
||||
height: 15px;
|
||||
margin: 0;
|
||||
accent-color: #4ea1ff;
|
||||
cursor: pointer;
|
||||
}
|
||||
.ml-options-input-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -3687,6 +3703,10 @@ class LinkerManagerDialog extends ComfyDialog {
|
||||
civitai_key: localStorage.getItem('modelLinker.civitaiApiKey') || '',
|
||||
civitai_session_token: localStorage.getItem('modelLinker.civitaiSessionToken') || '',
|
||||
hf_token: localStorage.getItem('modelLinker.huggingFaceToken') || '',
|
||||
brave_search_api_key: localStorage.getItem('modelLinker.braveSearchApiKey') || '',
|
||||
hf_use_api_search: localStorage.getItem('modelLinker.hfUseApiSearch') !== 'false',
|
||||
hf_use_comfy_org_fallback: localStorage.getItem('modelLinker.hfUseComfyOrgFallback') !== 'false',
|
||||
hf_use_brave_fallback: localStorage.getItem('modelLinker.hfUseBraveFallback') !== 'false',
|
||||
civitai_candidate_limit
|
||||
};
|
||||
}
|
||||
@@ -3720,7 +3740,7 @@ class LinkerManagerDialog extends ComfyDialog {
|
||||
<p class="ml-options-section-subtitle">All CivitAI-related options are grouped here for downloads and search behavior.</p>
|
||||
<div class="ml-options-stack">
|
||||
<div class="ml-options-field">
|
||||
<label for="ml-options-civitai" class="ml-options-label">CivitAI API Key</label>
|
||||
<label for="ml-options-civitai" class="ml-options-label">CivitAI API Key <a href="https://civitai.com/user/account" target="_blank" rel="noopener noreferrer" class="ml-options-inline-link">Get key</a></label>
|
||||
<div class="ml-options-input-row">
|
||||
<input id="ml-options-civitai" class="ml-options-input" type="password" placeholder="Paste CivitAI API key" value="${tokens.civitai_key}">
|
||||
<button id="ml-options-civitai-toggle" type="button" class="ml-options-visibility-btn" aria-label="Show or hide CivitAI API key" title="Show or hide">
|
||||
@@ -3775,7 +3795,22 @@ class LinkerManagerDialog extends ComfyDialog {
|
||||
<p class="ml-options-section-subtitle">Authorization for gated repositories and protected downloads.</p>
|
||||
<div class="ml-options-stack">
|
||||
<div class="ml-options-field">
|
||||
<label for="ml-options-hf" class="ml-options-label">HuggingFace Token</label>
|
||||
<div class="ml-options-help">Choose which HuggingFace search methods are allowed. You can enable any combination.</div>
|
||||
<label class="ml-checkbox-row">
|
||||
<input id="ml-options-hf-use-api-search" type="checkbox" ${tokens.hf_use_api_search ? 'checked' : ''}>
|
||||
<span>Use HuggingFace API repo search</span>
|
||||
</label>
|
||||
<label class="ml-checkbox-row">
|
||||
<input id="ml-options-hf-use-comfy-org-fallback" type="checkbox" ${tokens.hf_use_comfy_org_fallback ? 'checked' : ''}>
|
||||
<span>Use Comfy-Org fallback</span>
|
||||
</label>
|
||||
<label class="ml-checkbox-row">
|
||||
<input id="ml-options-hf-use-brave-fallback" type="checkbox" ${tokens.hf_use_brave_fallback ? 'checked' : ''}>
|
||||
<span>Use Brave fallback</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="ml-options-field">
|
||||
<label for="ml-options-hf" class="ml-options-label">HuggingFace Token <a href="https://huggingface.co/settings/tokens" target="_blank" rel="noopener noreferrer" class="ml-options-inline-link">Get key</a></label>
|
||||
<div class="ml-options-input-row">
|
||||
<input id="ml-options-hf" class="ml-options-input" type="password" placeholder="Paste HuggingFace token" value="${tokens.hf_token}">
|
||||
<button id="ml-options-hf-toggle" type="button" class="ml-options-visibility-btn" aria-label="Show or hide HuggingFace token" title="Show or hide">
|
||||
@@ -3787,6 +3822,19 @@ class LinkerManagerDialog extends ComfyDialog {
|
||||
</div>
|
||||
<div class="ml-options-help">Used for gated HuggingFace repos that need authorization during download.</div>
|
||||
</div>
|
||||
<div class="ml-options-field">
|
||||
<label for="ml-options-brave" class="ml-options-label">Brave Search API Key <a href="https://api-dashboard.search.brave.com/app/keys" target="_blank" rel="noopener noreferrer" class="ml-options-inline-link">Get key</a></label>
|
||||
<div class="ml-options-input-row">
|
||||
<input id="ml-options-brave" class="ml-options-input" type="password" placeholder="Paste Brave Search API key" value="${tokens.brave_search_api_key}">
|
||||
<button id="ml-options-brave-toggle" type="button" class="ml-options-visibility-btn" aria-label="Show or hide Brave Search API key" title="Show or hide">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
|
||||
<path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"></path>
|
||||
<circle cx="12" cy="12" r="3"></circle>
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
<div class="ml-options-help">Used as the last fallback for exact web search with query format like <code>"model.safetensors" site:huggingface.co</code>.</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -3801,10 +3849,15 @@ class LinkerManagerDialog extends ComfyDialog {
|
||||
const civitaiInput = this.contentElement.querySelector('#ml-options-civitai');
|
||||
const civitaiSessionInput = this.contentElement.querySelector('#ml-options-civitai-session');
|
||||
const hfInput = this.contentElement.querySelector('#ml-options-hf');
|
||||
const braveInput = this.contentElement.querySelector('#ml-options-brave');
|
||||
const civitaiToggle = this.contentElement.querySelector('#ml-options-civitai-toggle');
|
||||
const civitaiSessionToggle = this.contentElement.querySelector('#ml-options-civitai-session-toggle');
|
||||
const hfToggle = this.contentElement.querySelector('#ml-options-hf-toggle');
|
||||
const braveToggle = this.contentElement.querySelector('#ml-options-brave-toggle');
|
||||
const civitaiLimitInput = this.contentElement.querySelector('#ml-options-civitai-limit');
|
||||
const hfUseApiSearchInput = this.contentElement.querySelector('#ml-options-hf-use-api-search');
|
||||
const hfUseComfyOrgFallbackInput = this.contentElement.querySelector('#ml-options-hf-use-comfy-org-fallback');
|
||||
const hfUseBraveFallbackInput = this.contentElement.querySelector('#ml-options-hf-use-brave-fallback');
|
||||
const status = this.contentElement.querySelector('#ml-options-status');
|
||||
const saveBtn = this.contentElement.querySelector('#ml-options-save');
|
||||
const civitaiHelpBtn = this.contentElement.querySelector('#ml-options-civitai-help');
|
||||
@@ -3848,6 +3901,7 @@ class LinkerManagerDialog extends ComfyDialog {
|
||||
bindVisibilityToggle(civitaiInput, civitaiToggle);
|
||||
bindVisibilityToggle(civitaiSessionInput, civitaiSessionToggle);
|
||||
bindVisibilityToggle(hfInput, hfToggle);
|
||||
bindVisibilityToggle(braveInput, braveToggle);
|
||||
|
||||
if (saveBtn) {
|
||||
saveBtn.addEventListener('click', async () => {
|
||||
@@ -3858,6 +3912,10 @@ class LinkerManagerDialog extends ComfyDialog {
|
||||
localStorage.setItem('modelLinker.civitaiApiKey', civitaiInput?.value || '');
|
||||
localStorage.setItem('modelLinker.civitaiSessionToken', civitaiSessionInput?.value || '');
|
||||
localStorage.setItem('modelLinker.huggingFaceToken', hfInput?.value || '');
|
||||
localStorage.setItem('modelLinker.braveSearchApiKey', braveInput?.value || '');
|
||||
localStorage.setItem('modelLinker.hfUseApiSearch', hfUseApiSearchInput?.checked ? 'true' : 'false');
|
||||
localStorage.setItem('modelLinker.hfUseComfyOrgFallback', hfUseComfyOrgFallbackInput?.checked ? 'true' : 'false');
|
||||
localStorage.setItem('modelLinker.hfUseBraveFallback', hfUseBraveFallbackInput?.checked ? 'true' : 'false');
|
||||
localStorage.setItem('modelLinker.civitaiCandidateLimit', `${civitaiCandidateLimit}`);
|
||||
if (civitaiLimitInput) {
|
||||
civitaiLimitInput.value = `${civitaiCandidateLimit}`;
|
||||
@@ -6146,7 +6204,12 @@ class LinkerManagerDialog extends ComfyDialog {
|
||||
is_urn: isUrn,
|
||||
sources: [selectedSource],
|
||||
civitai_session_token: tokens.civitai_session_token,
|
||||
civitai_candidate_limit: tokens.civitai_candidate_limit
|
||||
civitai_candidate_limit: tokens.civitai_candidate_limit,
|
||||
hf_token: tokens.hf_token,
|
||||
brave_search_api_key: tokens.brave_search_api_key,
|
||||
hf_use_api_search: tokens.hf_use_api_search,
|
||||
hf_use_comfy_org_fallback: tokens.hf_use_comfy_org_fallback,
|
||||
hf_use_brave_fallback: tokens.hf_use_brave_fallback
|
||||
};
|
||||
if (isUrn && missing.urn) {
|
||||
searchData.model_id = missing.urn.model_id;
|
||||
|
||||
Reference in New Issue
Block a user