alphard/ComfyUI-Lora-Manager
1
0
Fork 0
mirror of https://github.com/willmiao/ComfyUI-Lora-Manager.git synced 2026-03-24 06:32:12 -03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Simplify model version existence checks and enhance version retrieval methods in scanners

Browse Source
This commit is contained in:
Will Miao
2025-07-09 10:26:03 +08:00
parent df9b554ce1
commit c692713ffb
3 changed files with 75 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
py/routes/misc_routes.py
View File

@@ -636,32 +636,18 @@ class MiscRoutes:
'error': 'Parameter modelVersionId must be an integer'
}, status=400)
# Check if the specific version exists in either scanner's cache
# Check if the specific version exists in either scanner
exists = False
model_type = None
# First check lora cache
lora_cache = await lora_scanner.get_cached_data()
if lora_cache and lora_cache.raw_data:
for item in lora_cache.raw_data:
if (item.get('civitai') and
item['civitai'].get('modelId') == model_id and
item['civitai'].get('id') == model_version_id):
exists = True
model_type = 'lora'
break
# If not found in lora cache, check checkpoint cache
if not exists and checkpoint_scanner:
checkpoint_cache = await checkpoint_scanner.get_cached_data()
if checkpoint_cache and checkpoint_cache.raw_data:
for item in checkpoint_cache.raw_data:
if (item.get('civitai') and
item['civitai'].get('modelId') == model_id and
item['civitai'].get('id') == model_version_id):
exists = True
model_type = 'checkpoint'
break
# Check lora scanner first
if await lora_scanner.check_model_version_exists(model_id, model_version_id):
exists = True
model_type = 'lora'
# If not found in lora, check checkpoint scanner
elif checkpoint_scanner and await checkpoint_scanner.check_model_version_exists(model_id, model_version_id):
exists = True
model_type = 'checkpoint'
return web.json_response({
'success': True,
@@ -671,35 +657,13 @@ class MiscRoutes:
# If modelVersionId is not provided, return all version IDs for the model
else:
# Lists to collect version IDs from both scanners
lora_versions = []
# Get versions from lora scanner first
lora_versions = await lora_scanner.get_model_versions_by_id(model_id)
checkpoint_versions = []
# Check lora cache
lora_cache = await lora_scanner.get_cached_data()
if lora_cache and lora_cache.raw_data:
for item in lora_cache.raw_data:
if (item.get('civitai') and
item['civitai'].get('modelId') == model_id and
item['civitai'].get('id')):
lora_versions.append({
'versionId': item['civitai'].get('id'),
'name': item['civitai'].get('name'),
'fileName': item.get('file_name', '')
})
# Check checkpoint cache
checkpoint_cache = await checkpoint_scanner.get_cached_data()
if checkpoint_cache and checkpoint_cache.raw_data:
for item in checkpoint_cache.raw_data:
if (item.get('civitai') and
item['civitai'].get('modelId') == model_id and
item['civitai'].get('id')):
checkpoint_versions.append({
'versionId': item['civitai'].get('id'),
'name': item['civitai'].get('name'),
'fileName': item.get('file_name', '')
})
# Only check checkpoint scanner if no lora versions found
if not lora_versions:
checkpoint_versions = await checkpoint_scanner.get_model_versions_by_id(model_id)
# Determine model type and combine results
model_type = None